Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
From:   peng.fan@nxp.com
To:     shawnguo@kernel.org, s.hauer@pengutronix.de
Cc:     kernel@pengutronix.de, festevam@gmail.com, linux-imx@nxp.com,
        allison@lohutok.net, info@metux.net, Anson.Huang@nxp.com,
        leonard.crestez@nxp.com, git@andred.net, abel.vesa@nxp.com,
        ard.biesheuvel@linaro.org, linux-arm-kernel@lists.infradead.org,
        linux-kernel@vger.kernel.org, Peng Fan <peng.fan@nxp.com>
Subject: [PATCH V2 2/3] ARM: imx: move cpu definitions into a header
Date:   Wed, 29 Apr 2020 17:17:22 +0800
Message-Id: <1588151843-2133-3-git-send-email-peng.fan@nxp.com>
In-Reply-To: <1588151843-2133-1-git-send-email-peng.fan@nxp.com>
References: <1588151843-2133-1-git-send-email-peng.fan@nxp.com>
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-MessageSentRepresentingType: 1
Received: from localhost.localdomain (119.31.174.66) by SG2PR01CA0165.apcprd01.prod.exchangelabs.com (2603:1096:4:28::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256) id 15.20.2958.19 via Frontend Transport; Wed, 29 Apr 2020 09:26:25 +0000
X-Mailer: git-send-email 2.7.4
X-Originating-IP: [119.31.174.66]
X-MS-PublicTrafficType: Email
X-MS-Office365-Filtering-HT: Tenant
X-MS-Office365-Filtering-Correlation-Id: 291053bd-8a1d-4cae-7115-08d7ec1f663e
X-MS-TrafficTypeDiagnostic: DB6PR0402MB2694:|DB6PR0402MB2694:
X-MS-Exchange-Transport-Forked: True
X-Microsoft-Antispam-PRVS: <DB6PR0402MB26944631F242EC0CD47B8CDD88AD0@DB6PR0402MB2694.eurprd04.prod.outlook.com>
X-MS-Oob-TLC-OOBClassifiers: OLM:4941;
X-Forefront-PRVS: 03883BD916
X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DB6PR0402MB2760.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFTY:;SFS:(4636009)(366004)(396003)(376002)(346002)(136003)(39860400002)(956004)(2616005)(6666004)(8676002)(4326008)(86362001)(6506007)(69590400007)(5660300002)(66556008)(16526019)(66476007)(186003)(36756003)(52116002)(66946007)(9686003)(6486002)(6512007)(8936002)(478600001)(316002)(7416002)(2906002)(26005);DIR:OUT;SFP:1101;
X-MS-Exchange-SenderADCheck: 1
X-Microsoft-Antispam: BCL:0;
X-Microsoft-Antispam-Message-Info: y5B8w7I31HlI+fJoFbS+CDmcCqBIQpfBtus4GFwGwmWEaGeTXKKoKWWwXtER0V1gWsyiTUrVHMBegM/7rWpak6dpmf1FPDeS4c3dLYN8GJACgLQc5LqTXNHRtJDGBMJaM1jI6yT0YlBN5dGm4mtlS+cSeiJnfxJjnRhYxJUn1UpO+dkYQLnAwN6O7j/85iC3K+uTyWoFBYuWIVsJ86QR2YS7LyUBfbGmtEKhmBfleeKKVE/0UlOSXfsgPtyAxHh3PmNUSgxr1KWPW+gHYQZWqXwMgxu7HJA37dhMC5JUbFMN9joEv+NWBgJxyZ69iw5uadBqBtep9Q8FEVyWDYNn6rGrzIdu1JltNb1qlIDzu3SAL8J5LMu2vEWWmL1mE/MLlWdqptw2NoexUbg5CBL2mAwYJXboanjScKnaKryadpyshxYmyU038R+WdzH0HN1jMjd4ndpBpS8ZdZgpDX6oNFL0c6pccQnUnw98qFye+W+fGv14d783s+6ZdLKlfC6q
X-MS-Exchange-AntiSpam-MessageData: QdnRhlvzMFql97MxSmw5xu/j9ljW1a/7aFWvIoihjZZtysaw1fnhBKirG15xZk7dUKtudwyhv514QfxDscG/Bovrx/qv15/lojRt3oRTuretkHjhMgGb2dAeJNhpoI2C0knYNW9+pTmse0Ju7Rp4R/Wmsqa0N45xLFjGAhHR9+WpbHo5oTGqSqNvbE5U2uE2KavnNoBrdBQsDt8FNqHng7HcC9n8/0t8G/hJvxVcJzYmphubCvDDZePGBjv//E7aRbQzlf+JfXz+XW0Ujo4oPU2aIDgre7QRNDYacK8loFwUd4Q5g4OjW5SkQp7XQQPZpVO8XaTvSheOuDazzMoGVx6bBs26GNjdropYb1/cO0dUOkpA3BEbSR+YdL1MTIWoXGd/sbAWbWQG0lkboOioUOyMlevCjqPVLibcg2vGwvu4AEfHp/a6VnV8ikw9MdSSQAT9v5hpoAqR13WMEt9ybXKq8wJGNwxn7zrDl978mazvbFLqJXk6/4YfpmlcieGOSkevtMcC56ounXdM60uobswzZZHpIKLa+nAoBiiv48UALM95bY8XVi4i7cSTcaryRnstCzOttqRpdmbk4CQ7QEuLkk6XWTVa7+/znBWrj1zDCALSSt4tm0XrhI7520zLIyX+HegIp719k2s7DNXfOkikEzVsHyV05OyNycNE3sUQT8/DXTp12EeXoQH001Z3fXrAP7fKN33ckuWzn0Ht2qnBeBLlVTwVlvKZWPbrtsZzFLgoGsC0FRQH0xqkgaMJvnjt1bAfav7UHE60F5hCOqhvSp8IWIOUqkZU+RCXsPQ=
X-OriginatorOrg: nxp.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 291053bd-8a1d-4cae-7115-08d7ec1f663e
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Apr 2020 09:26:30.1963
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: JIQAdCie+ZCAyHtrGUQ1pm5fLe/U4Za7VNFG4mSvkstiGZ1OOV1gnineDXrVYnOmNzGhZiIEOQFXsp0x3nb0mQ==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB6PR0402MB2694
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

From: Peng Fan <peng.fan@nxp.com>

The soc device register code will be moved to drivers/soc/imx/,
the code needs the cpu type definitions. So let's move the cpu
type definitions to a header.

Signed-off-by: Peng Fan <peng.fan@nxp.com>
---
 arch/arm/mach-imx/mxc.h | 22 +---------------------
 include/soc/imx/cpu.h   | 30 ++++++++++++++++++++++++++++++
 2 files changed, 31 insertions(+), 21 deletions(-)
 create mode 100644 include/soc/imx/cpu.h

diff --git a/arch/arm/mach-imx/mxc.h b/arch/arm/mach-imx/mxc.h
index 2bfd2d59b4a6..fe2d0f5abfcc 100644
--- a/arch/arm/mach-imx/mxc.h
+++ b/arch/arm/mach-imx/mxc.h
@@ -8,35 +8,15 @@
 #define __ASM_ARCH_MXC_H__
 
 #include <linux/types.h>
+#include <soc/imx/cpu.h>
 
 #ifndef __ASM_ARCH_MXC_HARDWARE_H__
 #error "Do not include directly."
 #endif
 
-#define MXC_CPU_MX1		1
-#define MXC_CPU_MX21		21
-#define MXC_CPU_MX25		25
-#define MXC_CPU_MX27		27
-#define MXC_CPU_MX31		31
-#define MXC_CPU_MX35		35
-#define MXC_CPU_MX51		51
-#define MXC_CPU_MX53		53
-#define MXC_CPU_IMX6SL		0x60
-#define MXC_CPU_IMX6DL		0x61
-#define MXC_CPU_IMX6SX		0x62
-#define MXC_CPU_IMX6Q		0x63
-#define MXC_CPU_IMX6UL		0x64
-#define MXC_CPU_IMX6ULL		0x65
-/* virtual cpu id for i.mx6ulz */
-#define MXC_CPU_IMX6ULZ		0x6b
-#define MXC_CPU_IMX6SLL		0x67
-#define MXC_CPU_IMX7D		0x72
-#define MXC_CPU_IMX7ULP		0xff
-
 #define IMX_DDR_TYPE_LPDDR2		1
 
 #ifndef __ASSEMBLY__
-extern unsigned int __mxc_cpu_type;
 
 #ifdef CONFIG_SOC_IMX6SL
 static inline bool cpu_is_imx6sl(void)
diff --git a/include/soc/imx/cpu.h b/include/soc/imx/cpu.h
new file mode 100644
index 000000000000..0669fc08a501
--- /dev/null
+++ b/include/soc/imx/cpu.h
@@ -0,0 +1,30 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
+
+#ifndef __IMX_CPU_H__
+#define __IMX_CPU_H__
+
+#define MXC_CPU_MX1		1
+#define MXC_CPU_MX21		21
+#define MXC_CPU_MX25		25
+#define MXC_CPU_MX27		27
+#define MXC_CPU_MX31		31
+#define MXC_CPU_MX35		35
+#define MXC_CPU_MX51		51
+#define MXC_CPU_MX53		53
+#define MXC_CPU_IMX6SL		0x60
+#define MXC_CPU_IMX6DL		0x61
+#define MXC_CPU_IMX6SX		0x62
+#define MXC_CPU_IMX6Q		0x63
+#define MXC_CPU_IMX6UL		0x64
+#define MXC_CPU_IMX6ULL		0x65
+/* virtual cpu id for i.mx6ulz */
+#define MXC_CPU_IMX6ULZ		0x6b
+#define MXC_CPU_IMX6SLL		0x67
+#define MXC_CPU_IMX7D		0x72
+#define MXC_CPU_IMX7ULP		0xff
+
+#ifndef __ASSEMBLY__
+extern unsigned int __mxc_cpu_type;
+#endif
+
+#endif
-- 
2.16.4