All of lore.kernel.org
 help / color / mirror / Atom feed
From: Arnd Bergmann <arnd@kernel.org>
To: linux-arm-kernel@lists.infradead.org,
	Russell King <linux@armlinux.org.uk>,
	Linus Walleij <linus.walleij@linaro.org>,
	Lubomir Rintel <lkundrak@v3.sk>
Cc: linux-kernel@vger.kernel.org, Arnd Bergmann <arnd@arndb.de>
Subject: [PATCH 07/11] ARM: mmp: select specific CPU implementation
Date: Fri, 21 Oct 2022 17:49:37 +0200	[thread overview]
Message-ID: <20221021155000.4108406-8-arnd@kernel.org> (raw)
In-Reply-To: <20221021155000.4108406-1-arnd@kernel.org>

From: Arnd Bergmann <arnd@arndb.de>

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

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
-- 
2.29.2


_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

WARNING: multiple messages have this Message-ID (diff)
From: Arnd Bergmann <arnd@kernel.org>
To: linux-arm-kernel@lists.infradead.org,
	Russell King <linux@armlinux.org.uk>,
	Linus Walleij <linus.walleij@linaro.org>,
	Lubomir Rintel <lkundrak@v3.sk>
Cc: linux-kernel@vger.kernel.org, Arnd Bergmann <arnd@arndb.de>
Subject: [PATCH 07/11] ARM: mmp: select specific CPU implementation
Date: Fri, 21 Oct 2022 17:49:37 +0200	[thread overview]
Message-ID: <20221021155000.4108406-8-arnd@kernel.org> (raw)
In-Reply-To: <20221021155000.4108406-1-arnd@kernel.org>

From: Arnd Bergmann <arnd@arndb.de>

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

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
-- 
2.29.2


  parent reply	other threads:[~2022-10-21 15:57 UTC|newest]

Thread overview: 55+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-10-21 15:49 [PATCH 00/11] ARM: sa1100, mmp: drop unused board files Arnd Bergmann
2022-10-21 15:49 ` Arnd Bergmann
2022-10-21 15:49 ` Arnd Bergmann
2022-10-21 15:49 ` Arnd Bergmann
2022-10-21 15:49 ` [PATCH 01/11] ARM: sa1100: un-deprecate jornada720 Arnd Bergmann
2022-10-21 15:49   ` Arnd Bergmann
2022-10-21 15:49 ` [PATCH 02/11] ARM: sa1100: remove unused board files Arnd Bergmann
2022-10-21 15:49   ` Arnd Bergmann
2022-10-21 15:49   ` Arnd Bergmann
2022-10-22 10:31   ` Greg Kroah-Hartman
2022-10-22 10:31     ` Greg Kroah-Hartman
2022-10-22 10:31     ` Greg Kroah-Hartman
2022-10-25  5:10   ` Viresh Kumar
2022-10-25  5:10     ` Viresh Kumar
2022-10-25  5:10     ` Viresh Kumar
2022-10-31 15:18   ` Lee Jones
2022-10-31 15:18     ` Lee Jones
2022-10-31 15:18     ` Lee Jones
2022-10-31 19:55   ` Linus Walleij
2022-10-31 19:55     ` Linus Walleij
2022-10-31 19:55     ` Linus Walleij
2022-10-21 15:49 ` [PATCH 03/11] ARM: sa1100: remove irda references Arnd Bergmann
2022-10-21 15:49   ` Arnd Bergmann
2022-10-21 15:49 ` [PATCH 04/11] ARM: sa1100: make cpufreq driver build standalone Arnd Bergmann
2022-10-21 15:49   ` Arnd Bergmann
2022-10-25  5:07   ` Viresh Kumar
2022-10-25  5:07     ` Viresh Kumar
2022-10-25  8:28   ` Russell King (Oracle)
2022-10-25  8:28     ` Russell King (Oracle)
2022-10-25 10:14     ` Arnd Bergmann
2022-10-25 10:14       ` Arnd Bergmann
2022-10-25 12:12       ` Russell King (Oracle)
2022-10-25 12:12         ` Russell King (Oracle)
2022-10-21 15:49 ` [PATCH 05/11] cpufreq: remove sa1100 driver Arnd Bergmann
2022-10-21 15:49   ` Arnd Bergmann
2022-10-25  5:07   ` Viresh Kumar
2022-10-25  5:07     ` Viresh Kumar
2022-10-21 15:49 ` [PATCH 06/11] mtd: remove lart flash driver Arnd Bergmann
2022-10-21 15:49   ` Arnd Bergmann
2022-10-21 15:49   ` Arnd Bergmann
2022-11-07 16:22   ` Miquel Raynal
2022-11-07 16:22     ` Miquel Raynal
2022-11-07 16:22     ` Miquel Raynal
2022-10-21 15:49 ` Arnd Bergmann [this message]
2022-10-21 15:49   ` [PATCH 07/11] ARM: mmp: select specific CPU implementation Arnd Bergmann
2022-10-21 15:49 ` [PATCH 08/11] ARM: mmp: remove all board files Arnd Bergmann
2022-10-21 15:49   ` Arnd Bergmann
2022-10-21 15:49 ` [PATCH 09/11] ARM: mmp: remove custom sram code Arnd Bergmann
2022-10-21 15:49   ` Arnd Bergmann
2022-11-04 14:07   ` Vinod Koul
2022-11-04 14:07     ` Vinod Koul
2022-10-21 15:49 ` [PATCH 10/11] ARM: mmp: remove device definitions Arnd Bergmann
2022-10-21 15:49   ` Arnd Bergmann
2022-10-21 15:49 ` [PATCH 11/11] ARM: mmp: remove old PM support Arnd Bergmann
2022-10-21 15:49   ` Arnd Bergmann

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20221021155000.4108406-8-arnd@kernel.org \
    --to=arnd@kernel.org \
    --cc=arnd@arndb.de \
    --cc=linus.walleij@linaro.org \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux@armlinux.org.uk \
    --cc=lkundrak@v3.sk \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.