Re: [PATCH 0/5] Alchemy GPIO rewrite v7

[Manuel Lauss <manuel.lauss@xxxxxxxxxxxxxx>]

Ralf Baechle wrote:
> Thanks, queued.  Looking much better than earlier versions but there
> still are many magic numbers being used in the code.

Thanks!

Does the below patch address your concerns?

---

From: Manuel Lauss <manuel.lauss@xxxxxxxxx>
Subject: [PATCH] Alchemy: gpio: document magic numbers.

Signed-off-by: Manuel Lauss <manuel.lauss@xxxxxxxxx>
---
 arch/mips/include/asm/mach-au1x00/au1000.h      |    3 +++
 arch/mips/include/asm/mach-au1x00/gpio-au1000.h |   13 +++++++++----
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/arch/mips/include/asm/mach-au1x00/au1000.h b/arch/mips/include/asm/mach-au1x00/au1000.h
index 854e95f..b672390 100644
--- a/arch/mips/include/asm/mach-au1x00/au1000.h
+++ b/arch/mips/include/asm/mach-au1x00/au1000.h
@@ -1550,6 +1550,9 @@ enum soc_au1200_ints {
 #define GPIO2_INTENABLE 	(GPIO2_BASE + 0x10)
 #define GPIO2_ENABLE		(GPIO2_BASE + 0x14)

+#define GPIO2_ENABLE_RESET	(1 << 1)	/* reset peripheral */
+#define GPIO2_ENABLE_CLK	(1 << 0)	/* clock enable */
+
 /* Power Management */
 #define SYS_SCRATCH0		0xB1900018
 #define SYS_SCRATCH1		0xB190001C
diff --git a/arch/mips/include/asm/mach-au1x00/gpio-au1000.h b/arch/mips/include/asm/mach-au1x00/gpio-au1000.h
index 127d4ed..cc7a998 100644
--- a/arch/mips/include/asm/mach-au1x00/gpio-au1000.h
+++ b/arch/mips/include/asm/mach-au1x00/gpio-au1000.h
@@ -275,10 +275,15 @@ static inline void __alchemy_gpio2_mod_dir(int gpio, int to_out)
 	au_sync();
 }

+/* GPIO2_OUTPUT expects the levels of output pins in bits 0-15;
+ * bits 16-31 indicate whether the level change should be carried out
+ * for a particular pin.
+ */
 static inline void alchemy_gpio2_set_value(int gpio, int v)
 {
 	unsigned long mask;
-	mask = ((v) ? 0x00010001 : 0x00010000) << (gpio - ALCHEMY_GPIO2_BASE);
+	mask = (1 << 16) | (v ? 1 : 0);		/* set up en | value */
+	mask <<= gpio - ALCHEMY_GPIO2_BASE;
 	au_writel(mask, GPIO2_OUTPUT);
 	au_sync();
 }
@@ -420,9 +425,9 @@ static inline void alchemy_gpio2_disable_int(int gpio2)
  */
 static inline void alchemy_gpio2_enable(void)
 {
-	au_writel(3, GPIO2_ENABLE);	/* reset, clock enabled */
+	au_writel(GPIO2_ENABLE_RESET | GPIO2_ENABLE_CLK, GPIO2_ENABLE);
 	au_sync();
-	au_writel(1, GPIO2_ENABLE);	/* clock enabled */
+	au_writel(GPIO2_ENABLE_CLK, GPIO2_ENABLE);
 	au_sync();
 }

@@ -433,7 +438,7 @@ static inline void alchemy_gpio2_enable(void)
  */
 static inline void alchemy_gpio2_disable(void)
 {
-	au_writel(2, GPIO2_ENABLE);	/* reset, clock disabled */
+	au_writel(GPIO2_ENABLE_RESET, GPIO2_ENABLE);
 	au_sync();
 }

--
1.6.3.1