Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

MIPS: rb532: move GPIOD definition into C-files

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 <jic23@kernel.org>
Suggested-by: Andy Shevchenko <andy.shevchenko@gmail.com>
Reported-by: k2ci <kernel-bot@kylinos.cn>
Signed-off-by: Jackie Liu <liuyun01@kylinos.cn>
Signed-off-by: Thomas Bogendoerfer <tsbogend@alpha.franken.de>

authored by

Jackie Liu and committed by
Thomas Bogendoerfer
bf64f7fe 34123208

+10 -9
-9
arch/mips/include/asm/mach-rc32434/rb.h
··· 29 29 #define DEV3TC 0x01003C 30 30 #define BTCS 0x010040 31 31 #define BTCOMPARE 0x010044 32 - #define GPIOBASE 0x050000 33 - /* Offsets relative to GPIOBASE */ 34 - #define GPIOFUNC 0x00 35 - #define GPIOCFG 0x04 36 - #define GPIOD 0x08 37 - #define GPIOILEVEL 0x0C 38 - #define GPIOISTAT 0x10 39 - #define GPIONMIEN 0x14 40 - #define IMASK6 0x38 41 32 #define LO_WPX (1 << 0) 42 33 #define LO_ALE (1 << 1) 43 34 #define LO_CLE (1 << 2)
+10
arch/mips/rb532/gpio.c
··· 37 37 #include <asm/mach-rc32434/rb.h> 38 38 #include <asm/mach-rc32434/gpio.h> 39 39 40 + #define GPIOBASE 0x050000 41 + /* Offsets relative to GPIOBASE */ 42 + #define GPIOFUNC 0x00 43 + #define GPIOCFG 0x04 44 + #define GPIOD 0x08 45 + #define GPIOILEVEL 0x0C 46 + #define GPIOISTAT 0x10 47 + #define GPIONMIEN 0x14 48 + #define IMASK6 0x38 49 + 40 50 struct rb532_gpio_chip { 41 51 struct gpio_chip chip; 42 52 void __iomem *regbase;