diff options
Diffstat (limited to 'drivers/gpio/Kconfig')
| -rw-r--r-- | drivers/gpio/Kconfig | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig index ffeda94..34c4a40 100644 --- a/drivers/gpio/Kconfig +++ b/drivers/gpio/Kconfig @@ -34,6 +34,7 @@ config DWAPB_GPIO help Support for the Designware APB GPIO driver. +<<<<<<< bc5d0384458466ed5b3608d326eec03cd4f13016 config AT91_GPIO bool "AT91 PIO GPIO driver" depends on DM_GPIO @@ -46,6 +47,14 @@ config AT91_GPIO The assignment to a function of an embedded peripheral is the responsibility of AT91 Pinctrl driver. This driver is responsible for the general-purpose I/O. +======= +config MPC8XXX_GPIO + bool "NXP (Freescale) MPC8xxx driver" + depends on DM_GPIO + default n + help + Support for the NXP (Freescale) MPC/QorIQ GPIO controller +>>>>>>> dm: gpio: Add DM GPIO driver for MPC8xxx platforms config ATMEL_PIO4 bool "ATMEL PIO4 driver" |