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

Commit 4c1d76a1 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'pxa-for-4.7' of https://github.com/rjarzmik/linux into fixes 

Merge "pxa changes for v4.7 cycle" from Robert Jarzmik:

This is a minor cycle with :
 - cleanup fix from Stephen on clocks (CLK_ROOT deprecated)
 - pin control activation for device-tree platforms

* tag 'pxa-for-4.7' of https://github.com/rjarzmik/linux:
  ARM: pxa: Remove CLK_IS_ROOT
  ARM: pxa: activate pinctrl for device-tree machines

These should have been part of the original pull request but got
accidentally dropped. Both changes in this branch can be considered
bugfixes, so I'm putting them in the fixes branch now.
parents 7f058c0a e4c740e2

arch/arm/mach-pxa/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ comment "Intel/Marvell Dev Platforms (sorted by hardware release time)" 


config MACH_PXA27X_DT

	bool "Support PXA27x platforms from device tree"

	select PINCTRL

	select POWER_SUPPLY

	select PXA27x

	select USE_OF
@@ -17,6 +18,7 @@ config MACH_PXA27X_DT 
config MACH_PXA3XX_DT

	bool "Support PXA3xx platforms from device tree"

	select CPU_PXA300

	select PINCTRL

	select POWER_SUPPLY

	select PXA3xx

	select USE_OF

arch/arm/mach-pxa/eseries.c

+1 −1
Original line number Diff line number Diff line
@@ -128,7 +128,7 @@ struct resource eseries_tmio_resources[] = { 
/* Some e-series hardware cannot control the 32K clock */

static void __init __maybe_unused eseries_register_clks(void)

{

	clk_register_fixed_rate(NULL, "CLK_CK32K", NULL, CLK_IS_ROOT, 32768);

	clk_register_fixed_rate(NULL, "CLK_CK32K", NULL, 0, 32768);

}



#ifdef CONFIG_MACH_E330