From patchwork Fri Oct 21 15:49:37 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 13015039 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 55E1BFA373E for ; Fri, 21 Oct 2022 15:57:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=W8It86Srbpc2ph/vn3o6Q/sCkgSzX9/mCYsvq/ximFU=; b=3GX4+6KJ1WPy1l OguVfT1aSTacej76bdajW8CGTaUxqDnYaPK509BIglWBn6ijlVfeEJLS7FsVUkYapl2BTeWYroXUe wyv0S+7XeFwbc6CU9GkXE0LqgMWlHJGBI18nLjt1JqesSNHsgdRGkeeii7jeQqlsch9+ZyErjzjTL dvv6BNzlTtUx62ic3IPDloFIywRSq66RX2X/ptDMlp2Ox80N36mJactfzRkXgiO7gtYuWp/atLxrd OKhMPN2c63FGqInUXt930hOL4hUBC/vt+VLt4g8U4wQCw3Ku1ZbQbcUZQoLj8vmq9ZK5jSKgjWFEV ulZMJnMEGqFqoY22C/zw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1oluO0-008mef-No; Fri, 21 Oct 2022 15:56:40 +0000 Received: from dfw.source.kernel.org ([2604:1380:4641:c500::1]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1oluNn-008mUW-7E for linux-arm-kernel@lists.infradead.org; Fri, 21 Oct 2022 15:56:28 +0000 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id B27C661EFE; Fri, 21 Oct 2022 15:56:26 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id AF3BCC433C1; Fri, 21 Oct 2022 15:56:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1666367786; bh=j50IJWTM+ka8Tvy0ZYlIik8TuO6XdXeMeLuiUvXyurg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=dbKjGctVSH/+SRrzYRqJIVMhwq0w15beQQOedRgkQ9SV9jKk73nrXQk53jHiZIvZ9 B4LaRJw+gP9aXeM9jFtA1oUzF1E52Rhsn6Y0ioO3o85oddYoJxcJdxqX3p3v+j1V6v Z2+VNwBrwL7/HoLOqf2YftT9VP6ta7X2aNWbsNygoOXGztjK+sNlu9UrG/es4BGrKl hXwaYbh9bxtRCRyZbL7TaOk9SfEXZ4A0veeKDoTcLtqar1UOfXYpfbdm342mYzU/ts oS80UbAjtqjVe3dHfJbZP4lhhbaqw7yKdxqrPqhD/5y/vepJLFek9xp5BekyWFEZcm d62ZZghzk2FMQ== From: Arnd Bergmann To: linux-arm-kernel@lists.infradead.org, Russell King , Linus Walleij , Lubomir Rintel Cc: linux-kernel@vger.kernel.org, Arnd Bergmann Subject: [PATCH 07/11] ARM: mmp: select specific CPU implementation Date: Fri, 21 Oct 2022 17:49:37 +0200 Message-Id: <20221021155000.4108406-8-arnd@kernel.org> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20221021155000.4108406-1-arnd@kernel.org> References: <20221021155000.4108406-1-arnd@kernel.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20221021_085627_325020_5950A184 X-CRM114-Status: GOOD ( 16.44 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: Arnd Bergmann 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 --- 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