diff options
| author | Tony Lindgren <tony@atomide.com> | 2020-11-16 10:18:56 +0100 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2020-11-16 10:18:56 +0100 |
| commit | df85429959b2a533cb969c75a5e3b588962f47f2 (patch) | |
| tree | 9422f6cd99f7beaf2d844edf2c5d2d91e526baa7 /arch | |
| parent | ARM: dts: am437x-l4: fix compatible for cpsw switch dt node (diff) | |
| parent | bus: ti-sysc: Fix bogus resetdone warning on enable for cpsw (diff) | |
| download | linux-df85429959b2a533cb969c75a5e3b588962f47f2.tar.xz linux-df85429959b2a533cb969c75a5e3b588962f47f2.zip | |
Merge tag 'ti-sysc-fixes' into fixes
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-omap2/Kconfig | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/Kconfig b/arch/arm/mach-omap2/Kconfig index 3ee7bdff86b2..3f62a0c9450d 100644 --- a/arch/arm/mach-omap2/Kconfig +++ b/arch/arm/mach-omap2/Kconfig @@ -7,7 +7,6 @@ config ARCH_OMAP2 depends on ARCH_MULTI_V6 select ARCH_OMAP2PLUS select CPU_V6 - select PM_GENERIC_DOMAINS if PM select SOC_HAS_OMAP2_SDRC config ARCH_OMAP3 @@ -106,6 +105,8 @@ config ARCH_OMAP2PLUS select OMAP_DM_TIMER select OMAP_GPMC select PINCTRL + select PM_GENERIC_DOMAINS if PM + select PM_GENERIC_DOMAINS_OF if PM select RESET_CONTROLLER select SOC_BUS select TI_SYSC |