Received: from mail.onstor.com ([66.201.51.107]) by onstor-exch02.onstor.net with Microsoft SMTPSVC(6.0.3790.3959);
	 Thu, 4 Sep 2008 14:51:57 -0700
Received: from chiesmta2-2.messageone.com ([216.203.30.55]) by mail.onstor.com with Microsoft SMTPSVC(6.0.3790.3959);
	 Thu, 4 Sep 2008 14:51:56 -0700
Received: from ftp.linux-mips.org (ftp.linux-mips.org [213.58.128.207])
	by chiesmta2-2.messageone.com (8.13.8/8.13.8) with ESMTP id m84LptLD002177
	for <andy.sharp@onstor.com>; Thu, 4 Sep 2008 16:51:55 -0500
Received: from localhost.localdomain ([127.0.0.1]:19665 "EHLO
	ftp.linux-mips.org") by ftp.linux-mips.org with ESMTP
	id S36923997AbYIDVvp (ORCPT <rfc822;andy.sharp@onstor.com>);
	Thu, 4 Sep 2008 22:51:45 +0100
Received: with ECARTIS (v1.0.0; list linux-mips); Thu, 04 Sep 2008 22:51:28 +0100 (BST)
Received: from mail30f.wh2.ocn.ne.jp ([220.111.41.203]:52573 "HELO
	mail30f.wh2.ocn.ne.jp") by ftp.linux-mips.org with SMTP
	id S36923990AbYIDVv0 (ORCPT <rfc822;linux-mips@linux-mips.org>);
	Thu, 4 Sep 2008 22:51:26 +0100
Received: from vs30b.wh2.ocn.ne.jp (220.111.41.233)
	by mail30f.wh2.ocn.ne.jp (RS ver 1.0.95vs) with SMTP id 1-0177415067;
	Fri,  5 Sep 2008 06:51:20 +0900 (JST)
From: Bruno Randolf <br1@einfach.org>
Subject: [PATCH] au1000: fix gpio output
To: florian@openwrt.org, linux-mips@linux-mips.org
Date: 	Thu, 04 Sep 2008 23:51:06 +0200
Message-ID: <20080904215105.4089.97714.stgit@void>
User-Agent: StGIT/0.14.3
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 7bit
X-SF-Loop: 1
X-archive-position: 20417
X-ecartis-version: Ecartis v1.0.0
Sender: linux-mips-bounce@linux-mips.org
Errors-to: linux-mips-bounce@linux-mips.org
X-original-sender: br1@einfach.org
Precedence: bulk
X-list: 	linux-mips
X-MessageOne-Virus-Version: vendor=fsecure engine=4.65.7161:2.4.4,1.2.40,4.0.164 definitions=2008-09-04_06:2008-09-02,2008-09-04,2008-09-04 signatures=0
X-MessageOne-Virus-Scanned: Clean
X-MessageOne-Envelope-Sender: linux-mips-bounce@linux-mips.org
X-MessageOne-Spam-Details: rule=m773emszm_notspam policy=m773emszm score=0 spamscore=0 ipscore=0 phishscore=0 bulkscore=0 adultscore=0 classifier=spam adjust=0 reason=mlx engine=3.1.0-0805090000 definitions=main-0809040142
X-MessageOne-Spam-Score: 0
X-MessageOne-Spam-Bar: 
Return-Path: linux-mips-bounce@linux-mips.org
X-OriginalArrivalTime: 04 Sep 2008 21:51:56.0790 (UTC) FILETIME=[735BF160:01C90ED8]

when setting the output state of one GPIO pin we have to keep the state of the
other pins, hence use binary OR. also gpio_direction_output() wants to set an
initial value, so add that too.

this fixes a problem with the USB power switch on mtx-1 boards.

Signed-off-by: Bruno Randolf <br1@einfach.org>
---

 arch/mips/au1000/common/gpio.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/arch/mips/au1000/common/gpio.c b/arch/mips/au1000/common/gpio.c
index b485d94..1f05843 100644
--- a/arch/mips/au1000/common/gpio.c
+++ b/arch/mips/au1000/common/gpio.c
@@ -61,7 +61,8 @@ static int au1xxx_gpio2_direction_input(unsigned gpio)
 static int au1xxx_gpio2_direction_output(unsigned gpio, int value)
 {
 	gpio -= AU1XXX_GPIO_BASE;
-	gpio2->dir = (0x01 << gpio) | (value << gpio);
+	gpio2->dir |= 0x01 << gpio;
+	gpio2->output = (GPIO2_OUTPUT_ENABLE_MASK << gpio) | (value << gpio);
 	return 0;
 }
 
@@ -90,6 +91,7 @@ static int au1xxx_gpio1_direction_input(unsigned gpio)
 static int au1xxx_gpio1_direction_output(unsigned gpio, int value)
 {
 	gpio1->trioutclr = (0x01 & gpio);
+	au1xxx_gpio1_write(gpio, value);
 	return 0;
 }
 


