Home Explore Help
Sign In
GfA
/
linux_kernel
5
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

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>
Olof Johansson 8 years ago
parent
3384d2f651 87c586a6a0
commit
e7d2b85722
2 changed files with 7 additions and 1 deletions
Unified View Show Diff Stats
  1. 6 1
      MAINTAINERS
  2. 1 0
      arch/arm/mach-sunxi/Kconfig

+ 6 - 1
MAINTAINERS
View File 

@@ -1047,8 +1047,13 @@ M:	Chen-Yu Tsai <wens@csie.org>
 
 L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 
 L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 
 S:	Maintained
 
 S:	Maintained
 
 N:	sun[x456789]i
 
 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:	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
 
 ARM/Allwinner SoC Clock Support
 
 M:	Emilio López <emilio@elopez.com.ar>
 
 M:	Emilio López <emilio@elopez.com.ar>

+ 1 - 0
arch/arm/mach-sunxi/Kconfig
View File 

@@ -6,6 +6,7 @@ menuconfig ARCH_SUNXI
 
 	select GENERIC_IRQ_CHIP
 
 	select GENERIC_IRQ_CHIP
 
 	select GPIOLIB
 
 	select GPIOLIB
 
 	select PINCTRL
 
 	select PINCTRL
 
+	select PM_OPP
 
 	select SUN4I_TIMER
 
 	select SUN4I_TIMER
 
 	select RESET_CONTROLLER
 
 	select RESET_CONTROLLER