Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e7d2b857 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'sunxi-core-for-4.12' of...

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: default avatarOlof Johansson <olof@lixom.net>
parents 3384d2f6 87c586a6
Loading
Loading
Loading
Loading
+6 −1
Original line number Diff line number Diff line
@@ -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>
+1 −0
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ menuconfig ARCH_SUNXI
	select GENERIC_IRQ_CHIP
	select GPIOLIB
	select PINCTRL
	select PM_OPP
	select SUN4I_TIMER
	select RESET_CONTROLLER