| To: | Phil Sutter <n0-1@freewrt.org> |
|---|---|
| Subject: | [PATCH] rb532: gpio register offsets are relatives to GPIOBASE |
| From: | Florian Fainelli <florian@openwrt.org> |
| Date: | Sun, 26 Oct 2008 11:12:36 +0100 |
| Cc: | Ralf Baechle <ralf@linux-mips.org>, "linux-mips" <linux-mips@linux-mips.org> |
| Dkim-signature: | v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:from:date:subject :mime-version:x-uid:x-length:to:cc:content-type :content-transfer-encoding:content-disposition:message-id:sender; bh=UlFRKpi4GJAGzEaLdSQAb813iIRcDlsZ9MZC3zyuhr8=; b=tken4FXRQ9WQcsL+iDJG+CcXg8XigJye08YMPB7pHL//9SP6T/3Tt2z+mct6aO72VY wfa6dyRTMDfjObcliokHaO/U4beyzE1bJaP8m9kpeVNHATfGmOJeq3bkxpxt4JS3pm+p z9ZfQOOoH2+9ukDeAQhbGNzzU9tzzhzEn0prY= |
| Domainkey-signature: | a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:date:subject:mime-version:x-uid:x-length:to:cc:content-type :content-transfer-encoding:content-disposition:message-id:sender; b=eTlltmJNzWjKBoXNQhBRcc/mPcQkQ81c/OMXlSfphjB3zsqv1YBYuLqIplaO8vd+bj Nz2EKPJXcDZw7lxYGoI3RpKkF8hmh0fbOBT/MnUqXuBWEqdJP52PACod0UwQKDDxI+JA VvGMQY0ZAVh9CltH0f74nuBMkskUk+Ei3xgl4= |
| Original-recipient: | rfc822;linux-mips@linux-mips.org |
| Sender: | linux-mips-bounce@linux-mips.org |
This patch fixes the wrong use of GPIO register offsets
in devices.c. To avoid further problems, use gpio_get_value
to return the NAND status instead of our own expanded code.
Signef-off-by: Phil Sutter <n0-1@freewrt.org>
Signed-off-by: Florian Fainelli <florian@openwrt.org>
---
diff --git a/arch/mips/include/asm/mach-rc32434/rb.h
b/arch/mips/include/asm/mach-rc32434/rb.h
index 79e8ef6..0cb9466 100644
--- a/arch/mips/include/asm/mach-rc32434/rb.h
+++ b/arch/mips/include/asm/mach-rc32434/rb.h
@@ -40,12 +40,13 @@
#define BTCS 0x010040
#define BTCOMPARE 0x010044
#define GPIOBASE 0x050000
-#define GPIOCFG 0x050004
-#define GPIOD 0x050008
-#define GPIOILEVEL 0x05000C
-#define GPIOISTAT 0x050010
-#define GPIONMIEN 0x050014
-#define IMASK6 0x038038
+/* Offsets relative to GPIOBASE */
+#define GPIOCFG 0x04
+#define GPIOD 0x08
+#define GPIOILEVEL 0x0C
+#define GPIOISTAT 0x10
+#define GPIONMIEN 0x14
+#define IMASK6 0x38
#define LO_WPX (1 << 0)
#define LO_ALE (1 << 1)
#define LO_CLE (1 << 2)
diff --git a/arch/mips/rb532/devices.c b/arch/mips/rb532/devices.c
index 31619c6..c40be04 100644
--- a/arch/mips/rb532/devices.c
+++ b/arch/mips/rb532/devices.c
@@ -118,7 +118,7 @@ static struct platform_device cf_slot0 = {
/* Resources and device for NAND */
static int rb532_dev_ready(struct mtd_info *mtd)
{
- return readl(IDT434_REG_BASE + GPIOD) & GPIO_RDY;
+ return gpio_get_value(GPIO_RDY);
}
static void rb532_cmd_ctrl(struct mtd_info *mtd, int cmd, unsigned int ctrl)
|
| <Prev in Thread] | Current Thread | [Next in Thread> |
|---|---|---|
| ||
| Previous by Date: | Re: [PATCH] txx9: CONFIG_TOSHIBA_RBTX4939 spelling, Ralf Baechle |
|---|---|
| Next by Date: | Re: [PATCH/RFC v1 00/12] Support for Broadcom 63xx SOCs, Ralf Baechle |
| Previous by Thread: | [PATCH] [MIPS] IP22: Small cleanups, Dmitri Vorobiev |
| Next by Thread: | [PATCH] disable the right device, Phil Sutter |
| Indexes: | [Date] [Thread] [Top] [All Lists] |