android/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mfd: lpc_sch: Rename GPIOBASE to prevent build error

Browse Source 
[ Upstream commit cdff1eda69326fb46de10c5454212b3efcf4bb41 ]

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: e82c60ae7d ("mfd: Introduce lpc_sch for Intel SCH LPC bridge")
Signed-off-by: Randy Dunlap <rdunlap@infradead.org>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Randy Dunlap 2021-09-06 17:19:49 -07:00 committed by Greg Kroah-Hartman
parent 027c44b8c8
commit b2f9b7455b
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/mfd/lpc_sch.c
View File

@ -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)
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)