diff options
author | Arnd Bergmann <arnd@arndb.de> | 2022-09-16 16:18:51 +0200 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2023-01-16 09:26:05 +0100 |
commit | 90ca4d9015eca4e9fd5a18e4572d419682e8f396 (patch) | |
tree | 8f502e5b40a67d24b85f653d3a238e1dcac5e7ca /arch | |
parent | 349619f064f9f75cfb6b698e7268cf5971ffe145 (diff) | |
download | linux-stable-90ca4d9015eca4e9fd5a18e4572d419682e8f396.tar.gz linux-stable-90ca4d9015eca4e9fd5a18e4572d419682e8f396.tar.bz2 linux-stable-90ca4d9015eca4e9fd5a18e4572d419682e8f396.zip |
ARM: mmp: select specific CPU implementation
The behavior of the MMP platform code depends on whether the
CPU_PXA168/CPU_PXA910/CPU_MMP2 symbols are enabled or not.
I believe the intention here was that these can be left disabled for
a pure DT-only build, but it's not clear if that actually works. At
the minimum, the cpu_is_pxa168() and cpu_is_pxa910() checks behave
differently, which causes changes in the power management code.
For the moment, make the behavior depend on whether CONFIG_ATAGS is set
or not, to make it easier to bisect the removal of the old code later.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/arm/mach-mmp/Kconfig | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/mach-mmp/Kconfig b/arch/arm/mach-mmp/Kconfig index d71417d57961..da38106149c4 100644 --- a/arch/arm/mach-mmp/Kconfig +++ b/arch/arm/mach-mmp/Kconfig @@ -113,6 +113,8 @@ config MACH_MMP_DT select PINCTRL_SINGLE select ARCH_HAS_RESET_CONTROLLER select CPU_MOHAWK + select CPU_PXA168 if ATAGS + select CPU_PXA910 if ATAGS help Include support for Marvell MMP2 based platforms using the device tree. Needn't select any other machine while @@ -125,6 +127,7 @@ config MACH_MMP2_DT select PINCTRL_SINGLE select ARCH_HAS_RESET_CONTROLLER select CPU_PJ4 + select CPU_MMP2 if ATAGS select PM_GENERIC_DOMAINS if PM select PM_GENERIC_DOMAINS_OF if PM && OF help |