diff options
| author |   Olof Johansson <olof@lixom.net> | 2017-04-19 05:34:06 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2017-04-19 05:34:06 -0700 |
| commit | e7d2b85722f3fab353ceffd2974a875a7a777e7d (patch) | |
| tree | 0244421fe5a49c4ec4c04043842b840aca42f1ad | |
| parent | Merge tag 'davinci-for-v4.12/soc-2' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci into next/soc (diff) | |
| parent | MAINTAINERS: Update the Allwinner sunXi entry (diff) | |
| download | wireguard-linux-e7d2b85722f3fab353ceffd2974a875a7a777e7d.tar.xz wireguard-linux-e7d2b85722f3fab353ceffd2974a875a7a777e7d.zip | |
Merge tag 'sunxi-core-for-4.12' of https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux into next/soc
Allwinner core changes for 4.12
A change to our MAINTAINERS entry to reflect the new git tree, and a select
in our KConfig option to enable the device frequency scaling.
* tag 'sunxi-core-for-4.12' of https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux:
MAINTAINERS: Update the Allwinner sunXi entry
ARM: sunxi: Select PM_OPP
Signed-off-by: Olof Johansson <olof@lixom.net>
| -rw-r--r-- | MAINTAINERS | 7 | ||||
| -rw-r--r-- | arch/arm/mach-sunxi/Kconfig | 1 |
2 files changed, 7 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index c776906f67a9..8cd40d7063b2 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1047,8 +1047,13 @@ M: Chen-Yu Tsai <wens@csie.org> L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) S: Maintained N: sun[x456789]i -F: arch/arm/boot/dts/ntc-gr8* +N: sun50i +F: arch/arm/mach-sunxi/ F: arch/arm64/boot/dts/allwinner/ +F: drivers/clk/sunxi-ng/ +F: drivers/pinctrl/sunxi/ +F: drivers/soc/sunxi/ +T: git git://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux.git ARM/Allwinner SoC Clock Support M: Emilio López <emilio@elopez.com.ar> diff --git a/arch/arm/mach-sunxi/Kconfig b/arch/arm/mach-sunxi/Kconfig index b9863f9a35fa..58153cdf025b 100644 --- a/arch/arm/mach-sunxi/Kconfig +++ b/arch/arm/mach-sunxi/Kconfig @@ -6,6 +6,7 @@ menuconfig ARCH_SUNXI select GENERIC_IRQ_CHIP select GPIOLIB select PINCTRL + select PM_OPP select SUN4I_TIMER select RESET_CONTROLLER |