aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/arm/mach-pxa/Kconfig2
-rw-r--r--arch/arm/mach-pxa/eseries.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/arch/arm/mach-pxa/Kconfig b/arch/arm/mach-pxa/Kconfig
index 7ee4652b4c61..cd894d69e766 100644
--- a/arch/arm/mach-pxa/Kconfig
+++ b/arch/arm/mach-pxa/Kconfig
@@ -6,6 +6,7 @@ comment "Intel/Marvell Dev Platforms (sorted by hardware release time)"
6 6
7config MACH_PXA27X_DT 7config MACH_PXA27X_DT
8 bool "Support PXA27x platforms from device tree" 8 bool "Support PXA27x platforms from device tree"
9 select PINCTRL
9 select POWER_SUPPLY 10 select POWER_SUPPLY
10 select PXA27x 11 select PXA27x
11 select USE_OF 12 select USE_OF
@@ -17,6 +18,7 @@ config MACH_PXA27X_DT
17config MACH_PXA3XX_DT 18config MACH_PXA3XX_DT
18 bool "Support PXA3xx platforms from device tree" 19 bool "Support PXA3xx platforms from device tree"
19 select CPU_PXA300 20 select CPU_PXA300
21 select PINCTRL
20 select POWER_SUPPLY 22 select POWER_SUPPLY
21 select PXA3xx 23 select PXA3xx
22 select USE_OF 24 select USE_OF
diff --git a/arch/arm/mach-pxa/eseries.c b/arch/arm/mach-pxa/eseries.c
index e838b11fb8c7..fa9d71d194f0 100644
--- a/arch/arm/mach-pxa/eseries.c
+++ b/arch/arm/mach-pxa/eseries.c
@@ -128,7 +128,7 @@ struct resource eseries_tmio_resources[] = {
128/* Some e-series hardware cannot control the 32K clock */ 128/* Some e-series hardware cannot control the 32K clock */
129static void __init __maybe_unused eseries_register_clks(void) 129static void __init __maybe_unused eseries_register_clks(void)
130{ 130{
131 clk_register_fixed_rate(NULL, "CLK_CK32K", NULL, CLK_IS_ROOT, 32768); 131 clk_register_fixed_rate(NULL, "CLK_CK32K", NULL, 0, 32768);
132} 132}
133 133
134#ifdef CONFIG_MACH_E330 134#ifdef CONFIG_MACH_E330