Skip to contentSkip to conversation

MIPS: rb532: move GPIOD definition into C-files

PATCH Applied Jackie Liu 2 participants 2 messages Mar 30, 2022 MIPS

lore
Share & tools
lore

Jackie Liu

author
#0 lore raw

PATCH v4 1/1 MIPS: rb532: move GPIOD definition into C-files

From: Jackie Liu <[email protected]>

My kernel robot reports build error from drivers/iio/adc/da9150-gpadc.c,

drivers/iio/adc/da9150-gpadc.c:254:13: error: ‘DA9150_GPADC_CHAN_0x08’ undeclared here (not in a function); did you mean ‘DA9150_GPADC_CHAN_TBAT’?

     254 |  .channel = DA9150_GPADC_CHAN_##_id,

We define GPIOD in rb.h, in fact it should only be used in gpio.c, but it affects the driver da9150-gpadc.c which goes against the original intention of the design, just move it to its scope.

Fixes 1b432840d0a4 ("MIPS: RB532: GPIO register offsets are relative to GPIOBASE")
Suggested-by Jonathan Cameron <[email protected]>
Suggested-by Andy Shevchenko <[email protected]>
Reported-by k2ci <[email protected]>
Signed-off-by Jackie Liu <[email protected]>

---
v1->v2:
Keep GPIONMIEN and IMASK6 as hardware document.

v2->v3:
s/he/it/.

v3->v4:
s/his/its/.

 arch/mips/include/asm/mach-rc32434/rb.h |  9 ---------
 arch/mips/rb532/gpio.c                  | 10 ++++++++++
 2 files changed, 10 insertions(+), 9 deletions(-)
arch/mips/include/asm/mach-rc32434/rb.h +0 -9
index 34d179ca020b..dd9d4b026e62 100644
@@ -29,15 +29,6 @@
 #define DEV3TC		0x01003C
 #define BTCS		0x010040
 #define BTCOMPARE	0x010044
-#define GPIOBASE	0x050000
-/* Offsets relative to GPIOBASE */
-#define GPIOFUNC	0x00
-#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)
arch/mips/rb532/gpio.c +10 -0
index 94f02ada4082..29c21b9d42da 100644
@@ -37,6 +37,16 @@
 #include <asm/mach-rc32434/rb.h>
 #include <asm/mach-rc32434/gpio.h>
 
+#define GPIOBASE	0x050000
+/* Offsets relative to GPIOBASE */
+#define GPIOFUNC	0x00
+#define GPIOCFG		0x04
+#define GPIOD		0x08
+#define GPIOILEVEL	0x0C
+#define GPIOISTAT	0x10
+#define GPIONMIEN	0x14
+#define IMASK6		0x38
+
 struct rb532_gpio_chip {
 	struct gpio_chip chip;
 	void __iomem	 *regbase;
Signature · 1 line
2.25.1
maintainer Applied
#1 lore raw
Quoted 12 lines · Jackie Liu

From: Jackie Liu <[email protected]>

My kernel robot reports build error from drivers/iio/adc/da9150-gpadc.c,

drivers/iio/adc/da9150-gpadc.c:254:13: error: ‘DA9150_GPADC_CHAN_0x08’ undeclared here (not in a function); did you mean ‘DA9150_GPADC_CHAN_TBAT’?

     254 |  .channel = DA9150_GPADC_CHAN_##_id,

We define GPIOD in rb.h, in fact it should only be used in gpio.c, but it affects the driver da9150-gpadc.c which goes against the original intention of the design, just move it to its scope.

Quoted 5 lines
Fixes 1b432840d0a4 ("MIPS: RB532: GPIO register offsets are relative to GPIOBASE")
Suggested-by Jonathan Cameron <[email protected]>
Suggested-by Andy Shevchenko <[email protected]>
Reported-by k2ci <[email protected]>
Signed-off-by Jackie Liu <[email protected]>

applied to mips-next.

Thomas.

Signature · 2 lines
Crap can work. Given enough thrust pigs will fly, but it's not necessarily a
good idea.                                                [ RFC1925, 2.3 ]