From: Ricardo Ribalda Delgado Date: Wed, 17 Dec 2014 15:51:10 +0000 (+0100) Subject: gpio/xilinx: Add support for X86 Arch X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=c54c58bad6e64649dfe51c2e8d9e5a1524d673e8;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git gpio/xilinx: Add support for X86 Arch Core can be accessed via PCIe on X86 platform. This patch also allows the driver to be used as module. Acked-by: Michal Simek Signed-off-by: Ricardo Ribalda Delgado Signed-off-by: Linus Walleij --- diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig index cb235f3691bc..1eff81c93b75 100644 --- a/drivers/gpio/Kconfig +++ b/drivers/gpio/Kconfig @@ -367,8 +367,8 @@ config GPIO_XGENE here to enable the GFC GPIO functionality. config GPIO_XILINX - bool "Xilinx GPIO support" - depends on PPC_OF || MICROBLAZE || ARCH_ZYNQ + tristate "Xilinx GPIO support" + depends on OF_GPIO && (PPC_OF || MICROBLAZE || ARCH_ZYNQ || ARCH_X86) help Say yes here to support the Xilinx FPGA GPIO device diff --git a/drivers/gpio/gpio-xilinx.c b/drivers/gpio/gpio-xilinx.c index c7ed92bb561b..554060a9fb48 100644 --- a/drivers/gpio/gpio-xilinx.c +++ b/drivers/gpio/gpio-xilinx.c @@ -30,7 +30,7 @@ #define XGPIO_CHANNEL_OFFSET 0x8 /* Read/Write access to the GPIO registers */ -#ifdef CONFIG_ARCH_ZYNQ +#if defined(CONFIG_ARCH_ZYNQ) || defined(CONFIG_X86) # define xgpio_readreg(offset) readl(offset) # define xgpio_writereg(offset, val) writel(val, offset) #else