diff options
| author | Olof Johansson <olof@lixom.net> | 2015-04-03 17:47:11 -0400 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2015-04-03 17:47:11 -0400 |
| commit | bb1518f39bec1b3061425ad378793cf9c4bdb3d2 (patch) | |
| tree | 26226f353511e32b3514c210f1462414eaa89beb /arch/arm64/Kconfig | |
| parent | 2b01311afc120ffb0ce5ec94721a77f05c84763f (diff) | |
| parent | 359f9365d3f8d0d62683344807c986ec7d711b59 (diff) | |
Merge tag 'v4.0-next-arm64' of https://github.com/mbgg/linux-mediatek into next/arm64
Merge "ARM: mediatek: arm64 changes for 4.1" from Matthias Brugger:
- Select PINCTRL for Mediatek platform
- Add pinctrl/GPIO/EINT node for mt8173.
* tag 'v4.0-next-arm64' of https://github.com/mbgg/linux-mediatek:
arm64: dts: mt8173: Add pinctrl/GPIO/EINT node for mt8173.
arm64: mediatek: Select PINCTRL for Mediatek platform
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm64/Kconfig')
| -rw-r--r-- | arch/arm64/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig index 3a73fcef66c1..524306787325 100644 --- a/arch/arm64/Kconfig +++ b/arch/arm64/Kconfig | |||
| @@ -174,6 +174,7 @@ config ARCH_FSL_LS2085A | |||
| 174 | config ARCH_MEDIATEK | 174 | config ARCH_MEDIATEK |
| 175 | bool "Mediatek MT65xx & MT81xx ARMv8 SoC" | 175 | bool "Mediatek MT65xx & MT81xx ARMv8 SoC" |
| 176 | select ARM_GIC | 176 | select ARM_GIC |
| 177 | select PINCTRL | ||
| 177 | help | 178 | help |
| 178 | Support for Mediatek MT65xx & MT81xx ARMv8 SoCs | 179 | Support for Mediatek MT65xx & MT81xx ARMv8 SoCs |
| 179 | 180 | ||