diff options
author | Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com> | 2014-12-17 16:51:10 +0100 |
---|---|---|
committer | Linus Walleij <linus.walleij@linaro.org> | 2015-01-15 17:23:14 +0100 |
commit | c54c58bad6e64649dfe51c2e8d9e5a1524d673e8 (patch) | |
tree | 0793a1d6926bb7538faa93a05d97d777a3ab2541 /drivers/gpio | |
parent | 749564ffd52d91ddf9917315e6fba2a3dcf3137e (diff) | |
download | linux-c54c58bad6e64649dfe51c2e8d9e5a1524d673e8.tar.bz2 |
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 <michal.simek@xilinx.com>
Signed-off-by: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'drivers/gpio')
-rw-r--r-- | drivers/gpio/Kconfig | 4 | ||||
-rw-r--r-- | drivers/gpio/gpio-xilinx.c | 2 |
2 files changed, 3 insertions, 3 deletions
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 |