From patchwork Wed Apr 29 09:17:21 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peng Fan X-Patchwork-Id: 11516457 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 111E192C for ; Wed, 29 Apr 2020 09:26:50 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id 9F8AE208E0 for ; Wed, 29 Apr 2020 09:26:49 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="pbSDv9lt"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=nxp.com header.i=@nxp.com header.b="PhW+st9H" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 9F8AE208E0 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=nxp.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=TMPWQ1iq4feFTqBNPj3L/r/7soSaJbEptoR/vhPZnh8=; b=pbSDv9ltoGftkI 1avZJuc1rcEE/MjFOtcYlUK/8EYYDCqart3rXAIPlGTCD7zMA/Fi6fkgEtpzAsMbJN1p0KjXBVGYG 4z0owt5oUiVitSlUhqBDegAZPjMj9x2qubo7zSrT6ApM79lP+5PVq19Qo+P021Zjov1uwecSxM6aW T6MVTb9MMOhKmD1f6NfDICTTZBC6sTEKOLSi1Hg9JYCqueKLxI6KaY72th2T9/yQAdglQSJRp2tIN p/+r4E3pJLzbsJIgc2Drt/Y/8b/IxKADMQcLCbHOZE6TvqYK8+GYnfC+q23IBHEmjsu12C9eWWfrO qPC8Cu9OY9aPCK325ElQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1jTizL-00077s-2h; Wed, 29 Apr 2020 09:26:43 +0000 Received: from mail-db8eur05on2071.outbound.protection.outlook.com ([40.107.20.71] helo=EUR05-DB8-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1jTiz5-0006ti-Gc for linux-arm-kernel@lists.infradead.org; Wed, 29 Apr 2020 09:26:29 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=B/PqYj4AKocQy71yBjCuJwFiZPP3OKmftuqmm7w+VfBdX22z17Ow6jBwt9cUR7adoFGnK0u4BuZK8KXCl06LrHHTgYd4Zjex3pnmdDAE5RMsT5EesTV3sQ4BXUTG83CSt/X3PRwTeN5+6reVmuIzJxXtZypJLG4axt8hu9Hdp8V3DwbYT+JakUWo4iidW++/ZMbznyi9jZESqAV4NR9uaPTm/IOFgqipuKDITag1Z5Zldbm2XPSf2Z01wEs+6N23c5Lb+92faJwpHqWk+36hTZte0Q5jxYJOrlgIDu2klBpv8dBHT+CanAfp9xVD/zQX32gjtpR3NbHimvCQDnd1Jg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=V0Dsla3qCd/gA4FCurjEOxs5jMcFJXa5TVJflIeGhrs=; b=EuBc71kRZ/AO3R1g/zASecLJzjQG9fx41tJzyf+3tpo2/H0epJsqhNYzNrJcE17cwD+4KhysJ6sDeTzh8MN2LG9YSuovhAndQXv+Hq1pN1awT9dN4GrLHrLqMCtR/YUjxg5TBXsUW5avM5gGAIyw+rIXRSrvHsfljBnmv6o/h5xH5F6hBcVK+pnhBpQd9u8SQlaj0yqxyw2Ty/AFXYUQMjR64OkJhjj1qOpWOLgP0A3h7MKCI+7UIPzRaQmSr8Bk3RqWBE685RfBhLlcVqd5tYGrTGLA0Ne5ALlQIT0xwI0uvesKMKsMvyWevzzzyEM2qunHqWnthHqjDeI3QeyNEQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nxp.com; dmarc=pass action=none header.from=nxp.com; dkim=pass header.d=nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=V0Dsla3qCd/gA4FCurjEOxs5jMcFJXa5TVJflIeGhrs=; b=PhW+st9HuBEMQ7VKlYWaBEAjD3gmB5+m05l4OKDfWVQeugaSl+BEZplyfQeiF5czDa1ShdDLveWIfeRlcOKAP9F1qge7spu8y8pkSHISby+q0n2bZZoGJKarIyywCS40J2VWoep9+3rODISTYKdZn7aIxEOVDNVSjRI72ozNq6Y= Authentication-Results: kernel.org; dkim=none (message not signed) header.d=none;kernel.org; dmarc=none action=none header.from=nxp.com; Received: from DB6PR0402MB2760.eurprd04.prod.outlook.com (2603:10a6:4:a1::14) by DB6PR0402MB2694.eurprd04.prod.outlook.com (2603:10a6:4:97::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2937.22; Wed, 29 Apr 2020 09:26:25 +0000 Received: from DB6PR0402MB2760.eurprd04.prod.outlook.com ([fe80::d17b:d767:19c3:b871]) by DB6PR0402MB2760.eurprd04.prod.outlook.com ([fe80::d17b:d767:19c3:b871%6]) with mapi id 15.20.2937.023; Wed, 29 Apr 2020 09:26:25 +0000 From: peng.fan@nxp.com To: shawnguo@kernel.org, s.hauer@pengutronix.de Subject: [PATCH V2 1/3] ARM: imx: use device_initcall for imx_soc_device_init Date: Wed, 29 Apr 2020 17:17:21 +0800 Message-Id: <1588151843-2133-2-git-send-email-peng.fan@nxp.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1588151843-2133-1-git-send-email-peng.fan@nxp.com> References: <1588151843-2133-1-git-send-email-peng.fan@nxp.com> X-ClientProxiedBy: SG2PR01CA0165.apcprd01.prod.exchangelabs.com (2603:1096:4:28::21) To DB6PR0402MB2760.eurprd04.prod.outlook.com (2603:10a6:4:a1::14) 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:21 +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: 2a08d7ec-7512-4a44-8062-08d7ec1f6374 X-MS-TrafficTypeDiagnostic: DB6PR0402MB2694:|DB6PR0402MB2694: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:229; 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)(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: ztvHnUZyCkut+Z0tPtnNAyBeE7XhpIh6x8rj6QCpqQRdBHVWFG65aZmdisyf0x35c2PLeZN22t27eXXlogBUGexyEc7mQSkPijEnLbNjfFAMJeMCP22eULMEi+i6Bd0XSdbuozdsJ2Zit+8aTO6M21vDhWKa5UE+hDDd0PpZBenJf0GQ/lTDOMQca1fATGbvlS3AJp+GorBD9Zr0YGqeV33vHVlk/QPFS5cElyfu4nTO24CykrEGHo6BuGEJFzLYT+SqNaFBLUETh71sebo6Uhm7hkMj+0k0BIHo4VzlmKC6qCvcCL5UvUcZrLQKG8vJwVeG0YNGFJx42i9xvIgo+Up+biKzHyhzfn1Mi/SggNv+nhi/wznlsc4GmpqHnhA1xkmyvQ2/x+pI7JFvG+gwume97FkG3LPk4c5d/UV3mV700NVkvvzEukbIPe13E56tYlbq4xb/GQO+ENLb4E9Qj40VBlksuJ65yf+m83W9FC96DQIn/3iCFb8XLHmmM4qr X-MS-Exchange-AntiSpam-MessageData: jaVxbTd627mDu6P6Cd9+hePNlngdFIX8LzU5tlQ19HEjhlmMegXgkftbelPrQi0gqCqrLtYXBjCP/hWO5QW8iZJawzBRwNi/YExDsfDlplRbE30YA6cyMN6FyQCqXhzgowfaypXUAuCSrg9ZjD0in9gI218gLm6cF0I0IPGJqdeUMJyGf1dX0hE9joDB+6Gz86pzLaVNTs3U9dxO+8dJcBV7m+eG7ZIYHIkuZxiajoQG+FUD0VAVgjYed0DQcWTB3New47QHGvymhIt7Wz4+ymD4O9T/yAecbwsJfZeMVjetu+g6q/96maDIMlZRqZNjtUCDaxeqQTFQPz3W05bwoE9DEV/uLn4fCNCTgBmhQ0s82Lvlob7wFOP/+UT8iiCFGjsJd7rPjEzGPvI+g2oZj4PcLcLEkbfEryFMlI4yE9B64z5ETqQWdlHhtrbplhMyDaZK5dCspC6EMqmuWv/WD2/FMkEoaJg+UJtXuDpH11B1iRy0xndCNvJcryxweRMpyVNVsYXfuLfJmaNKDdRpBn7dFGld/iRFnhDNP4x7aJFZ/QzNBDjPwRChjh4Rm3tBOsLvXvJlB8slpsOuMh8liVXt4JZil22xMfXF41mrd9wpDn8AHklLTajImHxlsKlLOTtc0tSziinonkGX9OZ56PAujB+TtImPunke2uUuHmqiHeeIkNM2PLeebdZePba0Do7UR5FGWuxUVl55CxOnhhfSvSeuuV0I8e+VSIj2nEMw0l7gMh1h5SL9N6lVBYFvn8bT5/78i0+2gTJ3wX2Twwo3nNs9yfX1WqRRb2cBOxg= X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2a08d7ec-7512-4a44-8062-08d7ec1f6374 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Apr 2020 09:26:25.6043 (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: ZIB/cLzQf5IrikyMznfwTOgQgDSfHPeUR/6tlOyh2MX4H1VQ1GqrOUScXcg8AGCkeROWVbU5/ofNS6RlOkAl4A== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB6PR0402MB2694 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200429_022627_552601_8C89FB9C X-CRM114-Status: GOOD ( 14.16 ) X-Spam-Score: -0.9 (/) X-Spam-Report: SpamAssassin version 3.4.4 on bombadil.infradead.org summary: Content analysis details: (-0.9 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at https://www.dnswl.org/, low trust [40.107.20.71 listed in list.dnswl.org] -0.0 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [40.107.20.71 listed in wl.mailspike.net] -0.0 SPF_PASS SPF: sender matches SPF record -0.0 SPF_HELO_PASS SPF: HELO matches SPF record 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.0 MSGID_FROM_MTA_HEADER Message-Id was added by a relay X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-arm-kernel@lists.infradead.org, Peng Fan , abel.vesa@nxp.com, Anson.Huang@nxp.com, ard.biesheuvel@linaro.org, festevam@gmail.com, linux-kernel@vger.kernel.org, linux-imx@nxp.com, kernel@pengutronix.de, git@andred.net, leonard.crestez@nxp.com, info@metux.net, allison@lohutok.net Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org From: Peng Fan This is preparation to move imx_soc_device_init to drivers/soc/imx/ There is no reason to must put dt devices under /sys/devices/soc0, they could also be under /sys/devices/platform, so we could pass NULL as parent when calling of_platform_default_populate. Following soc-imx8.c soc-imx-scu.c using device_initcall, need to change return type to int type for imx_soc_device_init. Signed-off-by: Peng Fan --- V2: Correct return value arch/arm/mach-imx/common.h | 1 - arch/arm/mach-imx/cpu.c | 21 ++++++++++++++------- arch/arm/mach-imx/mach-imx6q.c | 8 +------- arch/arm/mach-imx/mach-imx6sl.c | 8 +------- arch/arm/mach-imx/mach-imx6sx.c | 8 +------- arch/arm/mach-imx/mach-imx6ul.c | 8 +------- arch/arm/mach-imx/mach-imx7d.c | 6 ------ arch/arm/mach-imx/mach-imx7ulp.c | 2 +- 8 files changed, 19 insertions(+), 43 deletions(-) diff --git a/arch/arm/mach-imx/common.h b/arch/arm/mach-imx/common.h index db542da4fe67..707ac650f1c2 100644 --- a/arch/arm/mach-imx/common.h +++ b/arch/arm/mach-imx/common.h @@ -49,7 +49,6 @@ void imx_aips_allow_unprivileged_access(const char *compat); int mxc_device_init(void); void imx_set_soc_revision(unsigned int rev); void imx_init_revision_from_anatop(void); -struct device *imx_soc_device_init(void); void imx6_enable_rbc(bool enable); void imx_gpc_check_dt(void); void imx_gpc_set_arm_power_in_lpm(bool power_off); diff --git a/arch/arm/mach-imx/cpu.c b/arch/arm/mach-imx/cpu.c index 06f8d64b65af..5b969f31c9e9 100644 --- a/arch/arm/mach-imx/cpu.c +++ b/arch/arm/mach-imx/cpu.c @@ -83,7 +83,7 @@ void __init imx_aips_allow_unprivileged_access( } } -struct device * __init imx_soc_device_init(void) +static int __init imx_soc_device_init(void) { struct soc_device_attribute *soc_dev_attr; const char *ocotp_compat = NULL; @@ -97,7 +97,7 @@ struct device * __init imx_soc_device_init(void) soc_dev_attr = kzalloc(sizeof(*soc_dev_attr), GFP_KERNEL); if (!soc_dev_attr) - return NULL; + return -ENOMEM; soc_dev_attr->family = "Freescale i.MX"; @@ -208,18 +208,24 @@ struct device * __init imx_soc_device_init(void) soc_dev_attr->revision = kasprintf(GFP_KERNEL, "%d.%d", (imx_soc_revision >> 4) & 0xf, imx_soc_revision & 0xf); - if (!soc_dev_attr->revision) + if (!soc_dev_attr->revision) { + ret = -ENOMEM; goto free_soc; + } soc_dev_attr->serial_number = kasprintf(GFP_KERNEL, "%016llX", soc_uid); - if (!soc_dev_attr->serial_number) + if (!soc_dev_attr->serial_number) { + ret = -ENOMEM; goto free_rev; + } soc_dev = soc_device_register(soc_dev_attr); - if (IS_ERR(soc_dev)) + if (IS_ERR(soc_dev)) { + ret = PTR_ERR(soc_dev); goto free_serial_number; + } - return soc_device_to_device(soc_dev); + return 0; free_serial_number: kfree(soc_dev_attr->serial_number); @@ -227,5 +233,6 @@ struct device * __init imx_soc_device_init(void) kfree(soc_dev_attr->revision); free_soc: kfree(soc_dev_attr); - return NULL; + return ret; } +device_initcall(imx_soc_device_init); diff --git a/arch/arm/mach-imx/mach-imx6q.c b/arch/arm/mach-imx/mach-imx6q.c index 284bce1112d2..85c084a716ab 100644 --- a/arch/arm/mach-imx/mach-imx6q.c +++ b/arch/arm/mach-imx/mach-imx6q.c @@ -245,21 +245,15 @@ static void __init imx6q_axi_init(void) static void __init imx6q_init_machine(void) { - struct device *parent; - if (cpu_is_imx6q() && imx_get_soc_revision() == IMX_CHIP_REVISION_2_0) imx_print_silicon_rev("i.MX6QP", IMX_CHIP_REVISION_1_0); else imx_print_silicon_rev(cpu_is_imx6dl() ? "i.MX6DL" : "i.MX6Q", imx_get_soc_revision()); - parent = imx_soc_device_init(); - if (parent == NULL) - pr_warn("failed to initialize soc device\n"); - imx6q_enet_phy_init(); - of_platform_default_populate(NULL, NULL, parent); + of_platform_default_populate(NULL, NULL, NULL); imx_anatop_init(); cpu_is_imx6q() ? imx6q_pm_init() : imx6dl_pm_init(); diff --git a/arch/arm/mach-imx/mach-imx6sl.c b/arch/arm/mach-imx/mach-imx6sl.c index e27a6889cc56..f6e87363d605 100644 --- a/arch/arm/mach-imx/mach-imx6sl.c +++ b/arch/arm/mach-imx/mach-imx6sl.c @@ -45,13 +45,7 @@ static void __init imx6sl_init_late(void) static void __init imx6sl_init_machine(void) { - struct device *parent; - - parent = imx_soc_device_init(); - if (parent == NULL) - pr_warn("failed to initialize soc device\n"); - - of_platform_default_populate(NULL, NULL, parent); + of_platform_default_populate(NULL, NULL, NULL); if (cpu_is_imx6sl()) imx6sl_fec_init(); diff --git a/arch/arm/mach-imx/mach-imx6sx.c b/arch/arm/mach-imx/mach-imx6sx.c index d5310bf307ff..781e2a94fdd7 100644 --- a/arch/arm/mach-imx/mach-imx6sx.c +++ b/arch/arm/mach-imx/mach-imx6sx.c @@ -63,13 +63,7 @@ static inline void imx6sx_enet_init(void) static void __init imx6sx_init_machine(void) { - struct device *parent; - - parent = imx_soc_device_init(); - if (parent == NULL) - pr_warn("failed to initialize soc device\n"); - - of_platform_default_populate(NULL, NULL, parent); + of_platform_default_populate(NULL, NULL, NULL); imx6sx_enet_init(); imx_anatop_init(); diff --git a/arch/arm/mach-imx/mach-imx6ul.c b/arch/arm/mach-imx/mach-imx6ul.c index 3b0e16ccd59d..e018e716735f 100644 --- a/arch/arm/mach-imx/mach-imx6ul.c +++ b/arch/arm/mach-imx/mach-imx6ul.c @@ -55,13 +55,7 @@ static inline void imx6ul_enet_init(void) static void __init imx6ul_init_machine(void) { - struct device *parent; - - parent = imx_soc_device_init(); - if (parent == NULL) - pr_warn("failed to initialize soc device\n"); - - of_platform_default_populate(NULL, NULL, parent); + of_platform_default_populate(NULL, NULL, NULL); imx6ul_enet_init(); imx_anatop_init(); imx6ul_pm_init(); diff --git a/arch/arm/mach-imx/mach-imx7d.c b/arch/arm/mach-imx/mach-imx7d.c index ebb27592a9f7..879c35929a13 100644 --- a/arch/arm/mach-imx/mach-imx7d.c +++ b/arch/arm/mach-imx/mach-imx7d.c @@ -78,12 +78,6 @@ static inline void imx7d_enet_init(void) static void __init imx7d_init_machine(void) { - struct device *parent; - - parent = imx_soc_device_init(); - if (parent == NULL) - pr_warn("failed to initialize soc device\n"); - imx_anatop_init(); imx7d_enet_init(); } diff --git a/arch/arm/mach-imx/mach-imx7ulp.c b/arch/arm/mach-imx/mach-imx7ulp.c index bf22d19e02f6..445256e6a4a0 100644 --- a/arch/arm/mach-imx/mach-imx7ulp.c +++ b/arch/arm/mach-imx/mach-imx7ulp.c @@ -57,7 +57,7 @@ static void __init imx7ulp_init_machine(void) mxc_set_cpu_type(MXC_CPU_IMX7ULP); imx7ulp_set_revision(); - of_platform_default_populate(NULL, NULL, imx_soc_device_init()); + of_platform_default_populate(NULL, NULL, NULL); } static const char *const imx7ulp_dt_compat[] __initconst = { From patchwork Wed Apr 29 09:17:22 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peng Fan X-Patchwork-Id: 11516459 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 0BE2592C for ; Wed, 29 Apr 2020 09:27:11 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id 9861E20787 for ; Wed, 29 Apr 2020 09:27:10 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="tacqvhaW"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=nxp.com header.i=@nxp.com header.b="Ay4DoxoI" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 9861E20787 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=nxp.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=MbEVcgF2fqxsX4S9ItQrnagjA0fl2klsnOhh+qsOwg4=; b=tacqvhaWxiLO/m 2AiJshZaIeniq09qAlx9KkSz4XQR+VADxBjMIUpg8WLxbexX7aYIXXtvi6RjCwDWnZUK+ScPUZvvc dxK05yC7CLBYy/nGUmbx0f75fgbgxrdoh3KTpt66Akr/3eL2X/AXeleebK1ASphhzNxB6A035MBCE NzRohPdAkiTuXEC/2HVcO8SpWaGyFyBVy8GQuzyg2lIt/ruM22MRIuKmoGR4f+LymmNZ38dQzF0MB qpxhnn8Mb03ieug2TA9CxUACetsZnN0v8Bm/oGtPzTwerJGe/Y72aX9rwl3VJ/WqIQ0BMm9QcB4MV 0Fm8ccp1f/RDujIBQn4Q==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1jTizj-0007W1-Ae; Wed, 29 Apr 2020 09:27:07 +0000 Received: from mail-eopbgr70054.outbound.protection.outlook.com ([40.107.7.54] helo=EUR04-HE1-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1jTizA-0006xn-Tr for linux-arm-kernel@lists.infradead.org; Wed, 29 Apr 2020 09:26:34 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=b/jAyzMGUe4EvUkkeQC8iLS33O+KYoIKCOCYzDl5wno5G9LMpB45lzXWIlRoj3Qoxl4f/0ynQFXa5clF0ieqwdL/IEg+rdn5mwPXQhvN7QBKhMFdQ4U3OWZIwnGmFqzSgGYdkLeFQ6L7sPEsDMEhO6U0q1h8kIOgij1Bn6zpVByH91dwsVfweEkHKYJ3KTw5hkHybjUOfPJtNlmSeoxzAa2rQe5gE5GNY8f8+sb+2v5fSJNiggl4pZdV5fWbwcGl+mjhoyn1JMIpp5ja8RKezVbJrpoYqBV4FM2j7bmYtGuMMXLyqrjrSCBbh+vPPK9thDL7zjDTojQ+qt7IqFcVFw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=G0CMnX4vMzPYzS9g30+XGH16lJIrzgO4jK1RlzhTYEw=; b=ISVR4pg7fqXCJjYWBeK9FyHSWzT7XzBsSM08Tifj/cdXkDru4PYlJYIcR9xAL8D6IEUaj/B/Pl8J+QmQB4R1/xIIyUDylh9bTvF7wmf9VFnfAGQ3Mwppat+fMyjjuYxKZp+UdSUHQbHNbpSbdVU9GIom0G9SSB2ENKfhCRM5W6FHV1IQ/ZDH71EHVYI+EsULkPThf2hn1mzmtza0+w9A0nqSjOcYg13EXF3kaltMmBndg2o5mASvukfW3+2LTp2cpGcR44qcOOtt2FkrUEiiDY6FyTvH7S8rqwwXXf9CKlxjA9GVjD9anC0qiHdvLR8GzzbKQjHWquxa8Si4N+6/+g== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nxp.com; dmarc=pass action=none header.from=nxp.com; dkim=pass header.d=nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=G0CMnX4vMzPYzS9g30+XGH16lJIrzgO4jK1RlzhTYEw=; b=Ay4DoxoIOaCKLK2wqFc2liW7kfoC501VSX9gEHuEqkd4vNkZzvOM+9ZdlQQCAokskwBRpi6jBMFwtBl1V+lJ9lUI6GoWLcDvr/P2jz8IFagn0FFjeoQF42hY0XrnHDVeDCKrb8uM7+YLVtqjUktQjc1yYXyZYK6KLR+EZMIjeyE= Authentication-Results: kernel.org; dkim=none (message not signed) header.d=none;kernel.org; dmarc=none action=none header.from=nxp.com; Received: from DB6PR0402MB2760.eurprd04.prod.outlook.com (2603:10a6:4:a1::14) by DB6PR0402MB2694.eurprd04.prod.outlook.com (2603:10a6:4:97::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2937.22; Wed, 29 Apr 2020 09:26:30 +0000 Received: from DB6PR0402MB2760.eurprd04.prod.outlook.com ([fe80::d17b:d767:19c3:b871]) by DB6PR0402MB2760.eurprd04.prod.outlook.com ([fe80::d17b:d767:19c3:b871%6]) with mapi id 15.20.2937.023; Wed, 29 Apr 2020 09:26:30 +0000 From: peng.fan@nxp.com To: shawnguo@kernel.org, s.hauer@pengutronix.de 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> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1588151843-2133-1-git-send-email-peng.fan@nxp.com> References: <1588151843-2133-1-git-send-email-peng.fan@nxp.com> X-ClientProxiedBy: SG2PR01CA0165.apcprd01.prod.exchangelabs.com (2603:1096:4:28::21) To DB6PR0402MB2760.eurprd04.prod.outlook.com (2603:10a6:4:a1::14) 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: 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 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200429_022633_013762_009B5FB9 X-CRM114-Status: GOOD ( 11.81 ) X-Spam-Score: -0.9 (/) X-Spam-Report: SpamAssassin version 3.4.4 on bombadil.infradead.org summary: Content analysis details: (-0.9 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at https://www.dnswl.org/, low trust [40.107.7.54 listed in list.dnswl.org] -0.0 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [40.107.7.54 listed in wl.mailspike.net] -0.0 SPF_PASS SPF: sender matches SPF record -0.0 SPF_HELO_PASS SPF: HELO matches SPF record 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.0 MSGID_FROM_MTA_HEADER Message-Id was added by a relay X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-arm-kernel@lists.infradead.org, Peng Fan , abel.vesa@nxp.com, Anson.Huang@nxp.com, ard.biesheuvel@linaro.org, festevam@gmail.com, linux-kernel@vger.kernel.org, linux-imx@nxp.com, kernel@pengutronix.de, git@andred.net, leonard.crestez@nxp.com, info@metux.net, allison@lohutok.net Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org From: Peng Fan 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 --- 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 +#include #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 From patchwork Wed Apr 29 09:17:23 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peng Fan X-Patchwork-Id: 11516461 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 90B9792C for ; Wed, 29 Apr 2020 09:27:30 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id 4DB4B20731 for ; Wed, 29 Apr 2020 09:27:30 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="SrGxo+nT"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=nxp.com header.i=@nxp.com header.b="KNG5NhrI" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 4DB4B20731 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=nxp.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=1O+voen00OKtz0/LBum1zapELAgphof2+VH8F1TGWc4=; b=SrGxo+nT/wR/bG 7RvXcAE17pTtuMAbxDMwLyA4o6no8/n04JRTshg4+F7rI1jy2xqdQVXahAVIeGt87SxDtbfSfVv06 xmBk4XuL6pFYIDmgMW/U5ELSLpVNCPJBG7GAOdMcYXctJ90oRUD5Tuj26CPZS7NkrMl54v98aK3ol /r303gtdOm/WHoBr+NmFjrE8iWMbFJBjoDnk1EokKFL3hqsYnuORMNWNe1hZ98z0EA2/pYjj2YBZd DccVyTNnrK35XjjKjL1T81egkbt8CZPrbAdIRoudFuB1KVaYewxOMWiApJ6n5ZdqJg7oKx7EGVapK +JHvywSlF7beXpX0/hiQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1jTizz-0007ig-Rp; Wed, 29 Apr 2020 09:27:23 +0000 Received: from mail-db8eur05on2041.outbound.protection.outlook.com ([40.107.20.41] helo=EUR05-DB8-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1jTizF-000738-JU for linux-arm-kernel@lists.infradead.org; Wed, 29 Apr 2020 09:26:39 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=X0JC84hgDombjTHflZJMT37pX9SYpX292/M24IOxmMPxC9Dfh2JnWmw3Ki8+ABVF9WsPUU+D+Y18P6etUvOWPp8teCOqDSBd7Qr1kX8lFh83G5zlRM0owa89BGzs6q0DcksTNyRQiReewWwXJu/haWZKKtZH8LBiiHXbuavne7W6nnKU5WBr/OSc/F7aLc+whuJvrBmnMnoTX6BiICvHbEfjA8kNgGPaglugqqn/iQYBJ5OZ4FRPJgEttj3E25Ja0HXABk85+iPBSm0G1D2FkHDaDsdIM1LPiBjb38IBnh0uW2IB7p/iJKK/bg4VAnnBXJSuPnT2cCwlNZhPgCr93A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=Ly5TevOC4Pu3HBOhVV9mLms+U1Iam9gwtmmrw2h2t8g=; b=KH19zXhjqOqgEb7kgSEiGP4HzInb29VdsEHT8tcyzRWsyKWquYJGcFZ+T+QZkvaveIxvSkYmgrWTmKpvcG0W1EFCBW1cqIWpcTmRPzXSgal1/5cxvv+BTb8TPiSlyipbldDJn2/wGz0+GKh5DdFJSITybyHrN5qlViL9mLDVBrX/Glr+G9/PzaHtNScvnlHHUxZnHmj+3L0OVawpDWS5H54jB8vJt0uZkm87pnRqBN+NnkfWECQjrex8IQLd8CjNh83QCi2uly4hpdhLXtOH7oOLIqJQh6E+h9x3vv+BcQezdLu5CiBOvrDpg4yhVPNoxXJSZzQIQk1td8h/owJCPA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nxp.com; dmarc=pass action=none header.from=nxp.com; dkim=pass header.d=nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=Ly5TevOC4Pu3HBOhVV9mLms+U1Iam9gwtmmrw2h2t8g=; b=KNG5NhrIoFeGPZ3glyEu67AaHyjZpbuevquK2CNJZmNCkmD3pn1N56bB2dfx1g2vp6SPypvOFgch0DOU1hj/bZ4xcq8SM7urP8OwZ4ea4kNt7D4MwX+GWQm7Zgt1jUg+g/zwD3wRLCK8f/dDH53gaysJk6RND+/YS2uaU5g7V4o= Authentication-Results: kernel.org; dkim=none (message not signed) header.d=none;kernel.org; dmarc=none action=none header.from=nxp.com; Received: from DB6PR0402MB2760.eurprd04.prod.outlook.com (2603:10a6:4:a1::14) by DB6PR0402MB2694.eurprd04.prod.outlook.com (2603:10a6:4:97::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2937.22; Wed, 29 Apr 2020 09:26:35 +0000 Received: from DB6PR0402MB2760.eurprd04.prod.outlook.com ([fe80::d17b:d767:19c3:b871]) by DB6PR0402MB2760.eurprd04.prod.outlook.com ([fe80::d17b:d767:19c3:b871%6]) with mapi id 15.20.2937.023; Wed, 29 Apr 2020 09:26:35 +0000 From: peng.fan@nxp.com To: shawnguo@kernel.org, s.hauer@pengutronix.de Subject: [PATCH V2 3/3] soc: imx: move cpu code to drivers/soc/imx Date: Wed, 29 Apr 2020 17:17:23 +0800 Message-Id: <1588151843-2133-4-git-send-email-peng.fan@nxp.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1588151843-2133-1-git-send-email-peng.fan@nxp.com> References: <1588151843-2133-1-git-send-email-peng.fan@nxp.com> X-ClientProxiedBy: SG2PR01CA0165.apcprd01.prod.exchangelabs.com (2603:1096:4:28::21) To DB6PR0402MB2760.eurprd04.prod.outlook.com (2603:10a6:4:a1::14) 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:30 +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: b3911fcc-4a9e-4fa8-f9e6-08d7ec1f6901 X-MS-TrafficTypeDiagnostic: DB6PR0402MB2694:|DB6PR0402MB2694: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:108; 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: NiDwJ4f7h5dWjU/VLpChJeMn5trmjL0i5ArO0ADG6/5o7Gf/ohNzMqVZ4FKEj3vSbf01p99LLtEOrA8mpNNi13rwbiyY7TowqaA5LZNRpsDF2264udFzyIEW2fwAokKXIP3QRvQ1MpYBXrGM1HM4uzWfHuGpoo933Zzgy33iUCy4qBq/L3GO0/VDWlfDL87lSCSZwqAmasvdIxirDyE0Y3O3KhH7E+fdKzJ9foSlucgkzBT4FhkjkbWETtGsILekR0tXeuF+uVrH+koJVYNDMg72rkAr1/PeFhOgnPaoClm17dx7yhEtkQDAlQckq2clEJpRA8A8A4OjliNEQGGYaQcErdnYQ63xTJ46dvrMZfS0ASNjMSP2wQQess3pBUjMmq3Ew/a8HtOLrcwAbnx0fabZ0uvVQ0lvTp8Z+P67K+wQVSdC4z1TsdjnZ0mRQ4NeynEUuaBQoI73vVEL18GrLYuigyYK7DkKFFyEXowHPZ4u1cdik9wlMN1gRR9gX69c X-MS-Exchange-AntiSpam-MessageData: JaUYQcteQpB6QzaZHeJ4pAFB+v28ZEfFRfYCO5olZdz5bzNyRdnKDmaTOLFMWpzzLbhjZnr8b0KxBtcKhmaVgIjbYV0SodjJ+faxVt92Rf7igCNFLHcK6w3FPtfQ15tMxmKQ2EPUTFQEq1QeKXZxZECaTMhcXol/EyBgd4SPfWkRi5iAFur+NPimaNF/1bUZ/lQbFy4Cbx62meYHJwKokbjAUOmxNWWTyvVNO/IQEGBs1VK3zmi4ozCznOiM5RhuAWqyaTRvXT7QfYzQLcx1XlljbqUd4oVKQyKBY6VC9GpfqGd1aRn1pOLk+BXwuY92xJgIry8W3GcnEuXoyeTOaCOWZDWRtHukS7B7wiJ8ECWnpvnA6A1EYdxq4Vkkw2vWWXaibrP3jyGdv4bDJRyRBen6cC9408f4oz10Hye/M1TB3QVboEYm7X8hNp3NyEAVg7yr3du1lgED0/E3XJVSXpRVt7rHRUm0SJp1LQW1NslamhjyrY2EaNRceHNcJjUF5yZwlbOe1uCFbluSMbUGFP0bD1PmC9+l0UrncqSrb8deGzoDS0TO9lha6aod6xtPs/riW2bYjD3XEX9tRQVX6OqKvm2bXfW7bMe5tOrbuIowCf/+R0ixg00ywosm/TPsmUWQiKFgmuIy6+y59Ta8JFSo1OfA5JVV2r0U0+gdIXLh83uAEXes2qT5YEGeW5dmLQoZWgDg1mdSVN/kHC+nmvoBEOyXc+cbSTyx/PXSw1ITs2wsx9R6JuArc/lk7DNatn6YY/bP15DFbvK2+/QifnHq9Pt0aAeuAEXSc2G6F7A= X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: b3911fcc-4a9e-4fa8-f9e6-08d7ec1f6901 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Apr 2020 09:26:34.9771 (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: sq/RY3+XBxI4zMJu0PL+hvJLuOtBQ6hLXZprVKxmYuqqoXyYwdR3xKcGClrcRGIBo6Dj1jrJ3nh1VHX3IxDyFg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB6PR0402MB2694 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200429_022637_817088_8222077B X-CRM114-Status: GOOD ( 17.36 ) X-Spam-Score: -0.9 (/) X-Spam-Report: SpamAssassin version 3.4.4 on bombadil.infradead.org summary: Content analysis details: (-0.9 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at https://www.dnswl.org/, low trust [40.107.20.41 listed in list.dnswl.org] -0.0 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [40.107.20.41 listed in wl.mailspike.net] -0.0 SPF_PASS SPF: sender matches SPF record -0.0 SPF_HELO_PASS SPF: HELO matches SPF record 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.0 MSGID_FROM_MTA_HEADER Message-Id was added by a relay X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-arm-kernel@lists.infradead.org, Peng Fan , abel.vesa@nxp.com, Anson.Huang@nxp.com, ard.biesheuvel@linaro.org, festevam@gmail.com, linux-kernel@vger.kernel.org, linux-imx@nxp.com, kernel@pengutronix.de, git@andred.net, leonard.crestez@nxp.com, info@metux.net, allison@lohutok.net Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org From: Peng Fan Move the soc device register code to drivers/soc/imx to align with i.MX8. Signed-off-by: Peng Fan --- V2: Use CONFIG_ARM to guard compile arch/arm/mach-imx/cpu.c | 166 ------------------------------------------- drivers/soc/imx/Makefile | 3 + drivers/soc/imx/soc-imx.c | 176 ++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 179 insertions(+), 166 deletions(-) create mode 100644 drivers/soc/imx/soc-imx.c diff --git a/arch/arm/mach-imx/cpu.c b/arch/arm/mach-imx/cpu.c index 5b969f31c9e9..65c7224f5250 100644 --- a/arch/arm/mach-imx/cpu.c +++ b/arch/arm/mach-imx/cpu.c @@ -1,25 +1,13 @@ // SPDX-License-Identifier: GPL-2.0 #include -#include #include #include #include #include -#include -#include -#include #include "hardware.h" #include "common.h" -#define OCOTP_UID_H 0x420 -#define OCOTP_UID_L 0x410 - -#define OCOTP_ULP_UID_1 0x4b0 -#define OCOTP_ULP_UID_2 0x4c0 -#define OCOTP_ULP_UID_3 0x4d0 -#define OCOTP_ULP_UID_4 0x4e0 - unsigned int __mxc_cpu_type; static unsigned int imx_soc_revision; @@ -82,157 +70,3 @@ void __init imx_aips_allow_unprivileged_access( imx_set_aips(aips_base_addr); } } - -static int __init imx_soc_device_init(void) -{ - struct soc_device_attribute *soc_dev_attr; - const char *ocotp_compat = NULL; - struct soc_device *soc_dev; - struct device_node *root; - struct regmap *ocotp = NULL; - const char *soc_id; - u64 soc_uid = 0; - u32 val; - int ret; - - soc_dev_attr = kzalloc(sizeof(*soc_dev_attr), GFP_KERNEL); - if (!soc_dev_attr) - return -ENOMEM; - - soc_dev_attr->family = "Freescale i.MX"; - - root = of_find_node_by_path("/"); - ret = of_property_read_string(root, "model", &soc_dev_attr->machine); - of_node_put(root); - if (ret) - goto free_soc; - - switch (__mxc_cpu_type) { - case MXC_CPU_MX1: - soc_id = "i.MX1"; - break; - case MXC_CPU_MX21: - soc_id = "i.MX21"; - break; - case MXC_CPU_MX25: - soc_id = "i.MX25"; - break; - case MXC_CPU_MX27: - soc_id = "i.MX27"; - break; - case MXC_CPU_MX31: - soc_id = "i.MX31"; - break; - case MXC_CPU_MX35: - soc_id = "i.MX35"; - break; - case MXC_CPU_MX51: - soc_id = "i.MX51"; - break; - case MXC_CPU_MX53: - soc_id = "i.MX53"; - break; - case MXC_CPU_IMX6SL: - ocotp_compat = "fsl,imx6sl-ocotp"; - soc_id = "i.MX6SL"; - break; - case MXC_CPU_IMX6DL: - ocotp_compat = "fsl,imx6q-ocotp"; - soc_id = "i.MX6DL"; - break; - case MXC_CPU_IMX6SX: - ocotp_compat = "fsl,imx6sx-ocotp"; - soc_id = "i.MX6SX"; - break; - case MXC_CPU_IMX6Q: - ocotp_compat = "fsl,imx6q-ocotp"; - soc_id = "i.MX6Q"; - break; - case MXC_CPU_IMX6UL: - ocotp_compat = "fsl,imx6ul-ocotp"; - soc_id = "i.MX6UL"; - break; - case MXC_CPU_IMX6ULL: - ocotp_compat = "fsl,imx6ull-ocotp"; - soc_id = "i.MX6ULL"; - break; - case MXC_CPU_IMX6ULZ: - ocotp_compat = "fsl,imx6ull-ocotp"; - soc_id = "i.MX6ULZ"; - break; - case MXC_CPU_IMX6SLL: - ocotp_compat = "fsl,imx6sll-ocotp"; - soc_id = "i.MX6SLL"; - break; - case MXC_CPU_IMX7D: - ocotp_compat = "fsl,imx7d-ocotp"; - soc_id = "i.MX7D"; - break; - case MXC_CPU_IMX7ULP: - ocotp_compat = "fsl,imx7ulp-ocotp"; - soc_id = "i.MX7ULP"; - break; - default: - soc_id = "Unknown"; - } - soc_dev_attr->soc_id = soc_id; - - if (ocotp_compat) { - ocotp = syscon_regmap_lookup_by_compatible(ocotp_compat); - if (IS_ERR(ocotp)) - pr_err("%s: failed to find %s regmap!\n", __func__, ocotp_compat); - } - - if (!IS_ERR_OR_NULL(ocotp)) { - if (__mxc_cpu_type == MXC_CPU_IMX7ULP) { - regmap_read(ocotp, OCOTP_ULP_UID_4, &val); - soc_uid = val & 0xffff; - regmap_read(ocotp, OCOTP_ULP_UID_3, &val); - soc_uid <<= 16; - soc_uid |= val & 0xffff; - regmap_read(ocotp, OCOTP_ULP_UID_2, &val); - soc_uid <<= 16; - soc_uid |= val & 0xffff; - regmap_read(ocotp, OCOTP_ULP_UID_1, &val); - soc_uid <<= 16; - soc_uid |= val & 0xffff; - } else { - regmap_read(ocotp, OCOTP_UID_H, &val); - soc_uid = val; - regmap_read(ocotp, OCOTP_UID_L, &val); - soc_uid <<= 32; - soc_uid |= val; - } - } - - soc_dev_attr->revision = kasprintf(GFP_KERNEL, "%d.%d", - (imx_soc_revision >> 4) & 0xf, - imx_soc_revision & 0xf); - if (!soc_dev_attr->revision) { - ret = -ENOMEM; - goto free_soc; - } - - soc_dev_attr->serial_number = kasprintf(GFP_KERNEL, "%016llX", soc_uid); - if (!soc_dev_attr->serial_number) { - ret = -ENOMEM; - goto free_rev; - } - - soc_dev = soc_device_register(soc_dev_attr); - if (IS_ERR(soc_dev)) { - ret = PTR_ERR(soc_dev); - goto free_serial_number; - } - - return 0; - -free_serial_number: - kfree(soc_dev_attr->serial_number); -free_rev: - kfree(soc_dev_attr->revision); -free_soc: - kfree(soc_dev_attr); - return ret; -} -device_initcall(imx_soc_device_init); diff --git a/drivers/soc/imx/Makefile b/drivers/soc/imx/Makefile index 103e2c93c342..446143241fe7 100644 --- a/drivers/soc/imx/Makefile +++ b/drivers/soc/imx/Makefile @@ -1,4 +1,7 @@ # SPDX-License-Identifier: GPL-2.0-only +ifeq ($(CONFIG_ARM),y) +obj-$(CONFIG_ARCH_MXC) += soc-imx.o +endif obj-$(CONFIG_HAVE_IMX_GPC) += gpc.o obj-$(CONFIG_IMX_GPCV2_PM_DOMAINS) += gpcv2.o obj-$(CONFIG_SOC_IMX8M) += soc-imx8m.o diff --git a/drivers/soc/imx/soc-imx.c b/drivers/soc/imx/soc-imx.c new file mode 100644 index 000000000000..70819e03ab1e --- /dev/null +++ b/drivers/soc/imx/soc-imx.c @@ -0,0 +1,176 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Copyright 2020 NXP + */ + +#include +#include +#include +#include +#include +#include + +#include +#include + +#define OCOTP_UID_H 0x420 +#define OCOTP_UID_L 0x410 + +#define OCOTP_ULP_UID_1 0x4b0 +#define OCOTP_ULP_UID_2 0x4c0 +#define OCOTP_ULP_UID_3 0x4d0 +#define OCOTP_ULP_UID_4 0x4e0 + +static int __init imx_soc_device_init(void) +{ + struct soc_device_attribute *soc_dev_attr; + const char *ocotp_compat = NULL; + struct soc_device *soc_dev; + struct device_node *root; + struct regmap *ocotp = NULL; + const char *soc_id; + u64 soc_uid = 0; + u32 val; + int ret; + + soc_dev_attr = kzalloc(sizeof(*soc_dev_attr), GFP_KERNEL); + if (!soc_dev_attr) + return -ENOMEM; + + soc_dev_attr->family = "Freescale i.MX"; + + root = of_find_node_by_path("/"); + ret = of_property_read_string(root, "model", &soc_dev_attr->machine); + of_node_put(root); + if (ret) + goto free_soc; + + switch (__mxc_cpu_type) { + case MXC_CPU_MX1: + soc_id = "i.MX1"; + break; + case MXC_CPU_MX21: + soc_id = "i.MX21"; + break; + case MXC_CPU_MX25: + soc_id = "i.MX25"; + break; + case MXC_CPU_MX27: + soc_id = "i.MX27"; + break; + case MXC_CPU_MX31: + soc_id = "i.MX31"; + break; + case MXC_CPU_MX35: + soc_id = "i.MX35"; + break; + case MXC_CPU_MX51: + soc_id = "i.MX51"; + break; + case MXC_CPU_MX53: + soc_id = "i.MX53"; + break; + case MXC_CPU_IMX6SL: + ocotp_compat = "fsl,imx6sl-ocotp"; + soc_id = "i.MX6SL"; + break; + case MXC_CPU_IMX6DL: + ocotp_compat = "fsl,imx6q-ocotp"; + soc_id = "i.MX6DL"; + break; + case MXC_CPU_IMX6SX: + ocotp_compat = "fsl,imx6sx-ocotp"; + soc_id = "i.MX6SX"; + break; + case MXC_CPU_IMX6Q: + ocotp_compat = "fsl,imx6q-ocotp"; + soc_id = "i.MX6Q"; + break; + case MXC_CPU_IMX6UL: + ocotp_compat = "fsl,imx6ul-ocotp"; + soc_id = "i.MX6UL"; + break; + case MXC_CPU_IMX6ULL: + ocotp_compat = "fsl,imx6ull-ocotp"; + soc_id = "i.MX6ULL"; + break; + case MXC_CPU_IMX6ULZ: + ocotp_compat = "fsl,imx6ull-ocotp"; + soc_id = "i.MX6ULZ"; + break; + case MXC_CPU_IMX6SLL: + ocotp_compat = "fsl,imx6sll-ocotp"; + soc_id = "i.MX6SLL"; + break; + case MXC_CPU_IMX7D: + ocotp_compat = "fsl,imx7d-ocotp"; + soc_id = "i.MX7D"; + break; + case MXC_CPU_IMX7ULP: + ocotp_compat = "fsl,imx7ulp-ocotp"; + soc_id = "i.MX7ULP"; + break; + default: + soc_id = "Unknown"; + } + soc_dev_attr->soc_id = soc_id; + + if (ocotp_compat) { + ocotp = syscon_regmap_lookup_by_compatible(ocotp_compat); + if (IS_ERR(ocotp)) + pr_err("%s: failed to find %s regmap!\n", __func__, ocotp_compat); + } + + if (!IS_ERR_OR_NULL(ocotp)) { + if (__mxc_cpu_type == MXC_CPU_IMX7ULP) { + regmap_read(ocotp, OCOTP_ULP_UID_4, &val); + soc_uid = val & 0xffff; + regmap_read(ocotp, OCOTP_ULP_UID_3, &val); + soc_uid <<= 16; + soc_uid |= val & 0xffff; + regmap_read(ocotp, OCOTP_ULP_UID_2, &val); + soc_uid <<= 16; + soc_uid |= val & 0xffff; + regmap_read(ocotp, OCOTP_ULP_UID_1, &val); + soc_uid <<= 16; + soc_uid |= val & 0xffff; + } else { + regmap_read(ocotp, OCOTP_UID_H, &val); + soc_uid = val; + regmap_read(ocotp, OCOTP_UID_L, &val); + soc_uid <<= 32; + soc_uid |= val; + } + } + + soc_dev_attr->revision = kasprintf(GFP_KERNEL, "%d.%d", + (imx_get_soc_revision() >> 4) & 0xf, + imx_get_soc_revision() & 0xf); + if (!soc_dev_attr->revision) { + ret = -ENOMEM; + goto free_soc; + } + + soc_dev_attr->serial_number = kasprintf(GFP_KERNEL, "%016llX", soc_uid); + if (!soc_dev_attr->serial_number) { + ret = -ENOMEM; + goto free_rev; + } + + soc_dev = soc_device_register(soc_dev_attr); + if (IS_ERR(soc_dev)) { + ret = PTR_ERR(soc_dev); + goto free_serial_number; + } + + return 0; + +free_serial_number: + kfree(soc_dev_attr->serial_number); +free_rev: + kfree(soc_dev_attr->revision); +free_soc: + kfree(soc_dev_attr); + return ret; +} +device_initcall(imx_soc_device_init);