tjh.dev
Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
ARM: OMAP2+: Fix booting for am335x after moving to simple-pm-bus
We now depend on SIMPLE_PM_BUS for probing devices. While we have it
selected in omap2plus_defconfig, custom configs can fail if it's missing.
As SIMPLE_PM_BUS depends on OF and PM, we must now select PM in Kconfig.
We have already OF selected by ARCH_MULTIPLATFORM.
Let's also drop the earlier PM dependency entries as suggested by
Geert Uytterhoeven <geert@linux-m68k.org>.
Reported-by: Geert Uytterhoeven <geert@linux-m68k.org>
Reported-by: Matti Vaittinen <matti.vaittinen@fi.rohmeurope.com>
Fixes: 5a230524f879 ("ARM: dts: Use simple-pm-bus for genpd for am3 l4_wkup")
Signed-off-by: Tony Lindgren <tony@atomide.com>
+14
-14
+14
-14
arch/arm/mach-omap2/Kconfig
+14
-14
arch/arm/mach-omap2/Kconfig
···
17
17
bool "TI OMAP3"
18
18
depends on ARCH_MULTI_V7
19
19
select ARCH_OMAP2PLUS
20
-
select ARM_CPU_SUSPEND if PM
20
+
select ARM_CPU_SUSPEND
21
21
select OMAP_HWMOD
22
22
select OMAP_INTERCONNECT
23
-
select PM_OPP if PM
24
-
select PM if CPU_IDLE
23
+
select PM_OPP
25
24
select SOC_HAS_OMAP2_SDRC
26
25
select ARM_ERRATA_430973
27
26
···
29
30
depends on ARCH_MULTI_V7
30
31
select ARCH_OMAP2PLUS
31
32
select ARCH_NEEDS_CPU_IDLE_COUPLED if SMP
32
-
select ARM_CPU_SUSPEND if PM
33
+
select ARM_CPU_SUSPEND
33
34
select ARM_ERRATA_720789
34
35
select ARM_GIC
35
36
select HAVE_ARM_SCU if SMP
···
39
40
select OMAP_INTERCONNECT_BARRIER
40
41
select PL310_ERRATA_588369 if CACHE_L2X0
41
42
select PL310_ERRATA_727915 if CACHE_L2X0
42
-
select PM_OPP if PM
43
+
select PM_OPP
43
44
select PM if CPU_IDLE
44
45
select ARM_ERRATA_754322
45
46
select ARM_ERRATA_775420
···
49
50
bool "TI OMAP5"
50
51
depends on ARCH_MULTI_V7
51
52
select ARCH_OMAP2PLUS
52
-
select ARM_CPU_SUSPEND if PM
53
+
select ARM_CPU_SUSPEND
53
54
select ARM_GIC
54
55
select HAVE_ARM_SCU if SMP
55
56
select HAVE_ARM_ARCH_TIMER
···
57
58
select OMAP_HWMOD
58
59
select OMAP_INTERCONNECT
59
60
select OMAP_INTERCONNECT_BARRIER
60
-
select PM_OPP if PM
61
+
select PM_OPP
61
62
select ZONE_DMA if ARM_LPAE
62
63
63
64
config SOC_AM33XX
64
65
bool "TI AM33XX"
65
66
depends on ARCH_MULTI_V7
66
67
select ARCH_OMAP2PLUS
67
-
select ARM_CPU_SUSPEND if PM
68
+
select ARM_CPU_SUSPEND
68
69
69
70
config SOC_AM43XX
70
71
bool "TI AM43x"
···
78
79
select ARM_ERRATA_754322
79
80
select ARM_ERRATA_775420
80
81
select OMAP_INTERCONNECT
81
-
select ARM_CPU_SUSPEND if PM
82
+
select ARM_CPU_SUSPEND
82
83
83
84
config SOC_DRA7XX
84
85
bool "TI DRA7XX"
85
86
depends on ARCH_MULTI_V7
86
87
select ARCH_OMAP2PLUS
87
-
select ARM_CPU_SUSPEND if PM
88
+
select ARM_CPU_SUSPEND
88
89
select ARM_GIC
89
90
select HAVE_ARM_SCU if SMP
90
91
select HAVE_ARM_ARCH_TIMER
···
93
94
select OMAP_HWMOD
94
95
select OMAP_INTERCONNECT
95
96
select OMAP_INTERCONNECT_BARRIER
96
-
select PM_OPP if PM
97
+
select PM_OPP
97
98
select ZONE_DMA if ARM_LPAE
98
99
select PINCTRL_TI_IODELAY if OF && PINCTRL
99
100
···
111
112
select OMAP_DM_TIMER
112
113
select OMAP_GPMC
113
114
select PINCTRL
114
-
select PM_GENERIC_DOMAINS if PM
115
-
select PM_GENERIC_DOMAINS_OF if PM
115
+
select PM
116
+
select PM_GENERIC_DOMAINS
117
+
select PM_GENERIC_DOMAINS_OF
116
118
select RESET_CONTROLLER
119
+
select SIMPLE_PM_BUS
117
120
select SOC_BUS
118
121
select TI_SYSC
119
122
select OMAP_IRQCHIP
···
141
140
select I2C_OMAP
142
141
select MENELAUS if ARCH_OMAP2
143
142
select NEON if CPU_V7
144
-
select PM
145
143
select REGULATOR
146
144
select REGULATOR_FIXED_VOLTAGE
147
145
select TWL4030_CORE if ARCH_OMAP3 || ARCH_OMAP4