kernel: update 3.18 to 3.18.14
[openwrt/svn-archive/archive.git] / target / linux / oxnas / patches-3.18 / 330-oxnas-pinctrl.patch
1 --- a/drivers/pinctrl/Kconfig
2 +++ b/drivers/pinctrl/Kconfig
3 @@ -67,6 +67,15 @@ config PINCTRL_AT91
4 help
5 Say Y here to enable the at91 pinctrl driver
6
7 +config PINCTRL_OXNAS
8 + bool "OXNAS pinctrl driver"
9 + depends on OF
10 + depends on ARCH_OXNAS
11 + select PINMUX
12 + select PINCONF
13 + help
14 + Say Y here to enable the oxnas pinctrl driver
15 +
16 config PINCTRL_BAYTRAIL
17 bool "Intel Baytrail GPIO pin control"
18 depends on GPIOLIB && ACPI && X86
19 --- a/drivers/pinctrl/Makefile
20 +++ b/drivers/pinctrl/Makefile
21 @@ -18,6 +18,7 @@ obj-$(CONFIG_PINCTRL_BCM2835) += pinctrl
22 obj-$(CONFIG_PINCTRL_BAYTRAIL) += pinctrl-baytrail.o
23 obj-$(CONFIG_PINCTRL_BCM281XX) += pinctrl-bcm281xx.o
24 obj-$(CONFIG_PINCTRL_FALCON) += pinctrl-falcon.o
25 +obj-$(CONFIG_PINCTRL_OXNAS) += pinctrl-oxnas.o
26 obj-$(CONFIG_PINCTRL_PALMAS) += pinctrl-palmas.o
27 obj-$(CONFIG_PINCTRL_ROCKCHIP) += pinctrl-rockchip.o
28 obj-$(CONFIG_PINCTRL_SINGLE) += pinctrl-single.o