diff mbox series

ARM: OMAP2+: Fix booting for am335x after moving to simple-pm-bus

Message ID 20210115082936.44923-1-tony@atomide.com (mailing list archive)
State New
Headers show
Series ARM: OMAP2+: Fix booting for am335x after moving to simple-pm-bus | expand

Commit Message

Tony Lindgren Jan. 15, 2021, 8:29 a.m. UTC
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 them in Kconfig.

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>
---
 arch/arm/mach-omap2/Kconfig | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Comments

Geert Uytterhoeven Jan. 15, 2021, 8:58 a.m. UTC | #1
Hi Tony,

On Fri, Jan 15, 2021 at 9:29 AM Tony Lindgren <tony@atomide.com> wrote:
> 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 them in Kconfig.
>
> 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>

Thanks for your patch!

> --- a/arch/arm/mach-omap2/Kconfig
> +++ b/arch/arm/mach-omap2/Kconfig
> @@ -105,8 +105,10 @@ config ARCH_OMAP2PLUS
>         select OMAP_DM_TIMER
>         select OMAP_GPMC
>         select PINCTRL
> +       select PM
>         select PM_GENERIC_DOMAINS if PM
>         select PM_GENERIC_DOMAINS_OF if PM
> +       select SIMPLE_PM_BUS if OF && PM

PM is selected above, so those 3 dependencies on PM can be removed.
ARCH_OMAP2PLUS depends on ARCH_MULTIPLATFORM, which
selects USE_OF and thus OF?


>         select RESET_CONTROLLER
>         select SOC_BUS
>         select TI_SYSC
> @@ -133,7 +135,6 @@ config ARCH_OMAP2PLUS_TYPICAL
>         select I2C_OMAP
>         select MENELAUS if ARCH_OMAP2
>         select NEON if CPU_V7
> -       select PM
>         select REGULATOR
>         select REGULATOR_FIXED_VOLTAGE
>         select TWL4030_CORE if ARCH_OMAP3 || ARCH_OMAP4
> --
> 2.30.0



--
Gr{oetje,eeting}s,

                        Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
                                -- Linus Torvalds
Tony Lindgren Jan. 15, 2021, 9:07 a.m. UTC | #2
* Geert Uytterhoeven <geert@linux-m68k.org> [210115 08:59]:
> On Fri, Jan 15, 2021 at 9:29 AM Tony Lindgren <tony@atomide.com> wrote:
> > --- a/arch/arm/mach-omap2/Kconfig
> > +++ b/arch/arm/mach-omap2/Kconfig
> > @@ -105,8 +105,10 @@ config ARCH_OMAP2PLUS
> >         select OMAP_DM_TIMER
> >         select OMAP_GPMC
> >         select PINCTRL
> > +       select PM
> >         select PM_GENERIC_DOMAINS if PM
> >         select PM_GENERIC_DOMAINS_OF if PM
> > +       select SIMPLE_PM_BUS if OF && PM
> 
> PM is selected above, so those 3 dependencies on PM can be removed.
> ARCH_OMAP2PLUS depends on ARCH_MULTIPLATFORM, which
> selects USE_OF and thus OF?

Yeah OK I'll drop those. And fix the sorting issue I noticed for Kconfig :)

Regards,

Tony
diff mbox series

Patch

diff --git a/arch/arm/mach-omap2/Kconfig b/arch/arm/mach-omap2/Kconfig
--- a/arch/arm/mach-omap2/Kconfig
+++ b/arch/arm/mach-omap2/Kconfig
@@ -105,8 +105,10 @@  config ARCH_OMAP2PLUS
 	select OMAP_DM_TIMER
 	select OMAP_GPMC
 	select PINCTRL
+	select PM
 	select PM_GENERIC_DOMAINS if PM
 	select PM_GENERIC_DOMAINS_OF if PM
+	select SIMPLE_PM_BUS if OF && PM
 	select RESET_CONTROLLER
 	select SOC_BUS
 	select TI_SYSC
@@ -133,7 +135,6 @@  config ARCH_OMAP2PLUS_TYPICAL
 	select I2C_OMAP
 	select MENELAUS if ARCH_OMAP2
 	select NEON if CPU_V7
-	select PM
 	select REGULATOR
 	select REGULATOR_FIXED_VOLTAGE
 	select TWL4030_CORE if ARCH_OMAP3 || ARCH_OMAP4