diff options
| author |   Arnd Bergmann <arnd@arndb.de> | 2015-03-04 23:06:49 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2015-03-04 23:06:49 +0100 |
| commit | 0a9061c3304bd74f74409e2bb49f70872afad2d8 (patch) | |
| tree | a44829f9b297e95d038a78b572a788932ff0b2b6 /arch | |
| parent | Merge tag 'renesas-soc-for-v4.1' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/soc (diff) | |
| parent | of: Define board compatible for MINIX NEO-X8 (diff) | |
| download | wireguard-linux-0a9061c3304bd74f74409e2bb49f70872afad2d8.tar.xz wireguard-linux-0a9061c3304bd74f74409e2bb49f70872afad2d8.zip | |
Merge tag 'for-v4.0-rc/meson-soc' of https://github.com/carlocaione/linux-meson into next/soc
Pull "meson SoC changes" from Carlo Caione:
- Add some forgotten documentation
- Kconfig changes to enable PINCTRL
* tag 'for-v4.0-rc/meson-soc' of https://github.com/carlocaione/linux-meson:
of: Define board compatible for MINIX NEO-X8
of: Add vendor prefix for MINIX
ARM: meson: select PINCTRL_MESON and ARCH_REQUIRE_GPIOLIB
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-meson/Kconfig | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/mach-meson/Kconfig b/arch/arm/mach-meson/Kconfig index 18301dc9d2e7..0743e2059645 100644 --- a/arch/arm/mach-meson/Kconfig +++ b/arch/arm/mach-meson/Kconfig @@ -1,8 +1,11 @@ menuconfig ARCH_MESON bool "Amlogic Meson SoCs" if ARCH_MULTI_V7 + select ARCH_REQUIRE_GPIOLIB select GENERIC_IRQ_CHIP select ARM_GIC select CACHE_L2X0 + select PINCTRL + select PINCTRL_MESON if ARCH_MESON |