Commit cdff1eda authored by Randy Dunlap's avatar Randy Dunlap Committed by Lee Jones

mfd: lpc_sch: Rename GPIOBASE to prevent build error

One MIPS platform (mach-rc32434) defines GPIOBASE. This macro
conflicts with one of the same name in lpc_sch.c. Rename the latter one
to prevent the build error.

../drivers/mfd/lpc_sch.c:25: error: "GPIOBASE" redefined [-Werror]
   25 | #define GPIOBASE        0x44
../arch/mips/include/asm/mach-rc32434/rb.h:32: note: this is the location of the previous definition
   32 | #define GPIOBASE        0x050000

Cc: Denis Turischev <denis@compulab.co.il>
Fixes: e82c60ae ("mfd: Introduce lpc_sch for Intel SCH LPC bridge")
Signed-off-by: default avatarRandy Dunlap <rdunlap@infradead.org>
Signed-off-by: default avatarLee Jones <lee.jones@linaro.org>
parent 452d0741
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
#define SMBASE 0x40 #define SMBASE 0x40
#define SMBUS_IO_SIZE 64 #define SMBUS_IO_SIZE 64
#define GPIOBASE 0x44 #define GPIO_BASE 0x44
#define GPIO_IO_SIZE 64 #define GPIO_IO_SIZE 64
#define GPIO_IO_SIZE_CENTERTON 128 #define GPIO_IO_SIZE_CENTERTON 128
...@@ -145,7 +145,7 @@ static int lpc_sch_probe(struct pci_dev *dev, const struct pci_device_id *id) ...@@ -145,7 +145,7 @@ static int lpc_sch_probe(struct pci_dev *dev, const struct pci_device_id *id)
if (ret == 0) if (ret == 0)
cells++; cells++;
ret = lpc_sch_populate_cell(dev, GPIOBASE, "sch_gpio", ret = lpc_sch_populate_cell(dev, GPIO_BASE, "sch_gpio",
info->io_size_gpio, info->io_size_gpio,
id->device, &lpc_sch_cells[cells]); id->device, &lpc_sch_cells[cells]);
if (ret < 0) if (ret < 0)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment