diff options
| author | Olof Johansson <olof@lixom.net> | 2017-06-18 20:36:21 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2017-06-18 20:36:21 -0700 |
| commit | 6198c74939c085fbd31fab3ba6f1eb2ce2820b39 (patch) | |
| tree | 577bb99f828c9070c560929aa88e3fb72bc16d10 | |
| parent | 92042d292d89c79a7c874dc706c2b96b81010cdd (diff) | |
| parent | 2dda2de5a1e1684aa4d31d0c2db42f6446a76a86 (diff) | |
Merge tag 'amlogic-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic into next/soc
Amlogic SoC updates for v4.13
- enable the clock controller for 32-bit Meson8
* tag 'amlogic-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic:
arm: meson: select the clock controller for Meson8
Signed-off-by: Olof Johansson <olof@lixom.net>
| -rw-r--r-- | arch/arm/mach-meson/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-meson/Kconfig b/arch/arm/mach-meson/Kconfig index b6e3acc63e14..ee30511849ca 100644 --- a/arch/arm/mach-meson/Kconfig +++ b/arch/arm/mach-meson/Kconfig @@ -21,6 +21,7 @@ config MACH_MESON8 bool "Amlogic Meson8 SoCs support" default ARCH_MESON select MESON6_TIMER + select COMMON_CLK_MESON8B config MACH_MESON8B bool "Amlogic Meson8b SoCs support" |