From mboxrd@z Thu Jan 1 00:00:00 1970 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 mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id F1CC3C433F5 for ; Wed, 6 Oct 2021 08:21:51 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id D6F846125F for ; Wed, 6 Oct 2021 08:21:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237735AbhJFIXm convert rfc822-to-8bit (ORCPT ); Wed, 6 Oct 2021 04:23:42 -0400 Received: from ni.piap.pl ([195.187.100.5]:42118 "EHLO ni.piap.pl" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237730AbhJFIXl (ORCPT ); Wed, 6 Oct 2021 04:23:41 -0400 From: Krzysztof =?utf-8?Q?Ha=C5=82asa?= To: Shawn Guo , Sascha Hauer Cc: Pengutronix Kernel Team , Fabio Estevam , NXP Linux Team , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH v2] CONFIG_SOC_IMX6Q = i.MX6 Quad/Dual/DualLite/Solo Date: Wed, 06 Oct 2021 10:21:48 +0200 Message-ID: MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8BIT Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Print i.MX6 "Dual" and "Solo" names in addition to the "Quad" and "DualLite" for SOC_IMX6Q. Signed-off-by: Krzysztof Hałasa diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig index b407b024dde3..b6f2f2ea8e65 100644 --- a/arch/arm/mach-imx/Kconfig +++ b/arch/arm/mach-imx/Kconfig @@ -143,7 +143,7 @@ config SOC_IMX6 select PL310_ERRATA_769419 if CACHE_L2X0 config SOC_IMX6Q - bool "i.MX6 Quad/Dual/DualLite support" + bool "i.MX6 Quad/Dual/DualLite/Solo support" select ARM_ERRATA_764369 if SMP select ARM_ERRATA_754322 select ARM_ERRATA_775420 @@ -153,7 +153,8 @@ config SOC_IMX6Q select SOC_IMX6 help - This enables support for Freescale i.MX6 Quad processor. + This enables support for Freescale i.MX6 Quad/Dual/DualLite/Solo + processors. config SOC_IMX6SL bool "i.MX6 SoloLite support" diff --git a/arch/arm/mach-imx/mach-imx6q.c b/arch/arm/mach-imx/mach-imx6q.c index 11dcc369ec14..8cc8a2ed1d12 100644 --- a/arch/arm/mach-imx/mach-imx6q.c +++ b/arch/arm/mach-imx/mach-imx6q.c @@ -217,7 +217,7 @@ static const char * const imx6q_dt_compat[] __initconst = { NULL, }; -DT_MACHINE_START(IMX6Q, "Freescale i.MX6 Quad/DualLite (Device Tree)") +DT_MACHINE_START(IMX6Q, "Freescale i.MX6 Quad/Dual/DualLite/Solo (Device Tree)") .l2c_aux_val = 0, .l2c_aux_mask = ~0, .smp = smp_ops(imx_smp_ops), -- Krzysztof "Chris" Hałasa Sieć Badawcza Łukasiewicz Przemysłowy Instytut Automatyki i Pomiarów PIAP Al. Jerozolimskie 202, 02-486 Warszawa From mboxrd@z Thu Jan 1 00:00:00 1970 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 mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 709F6C433EF for ; Wed, 6 Oct 2021 08:23:52 +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 3F7AE61029 for ; Wed, 6 Oct 2021 08:23:52 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 3F7AE61029 Authentication-Results: mail.kernel.org; dmarc=fail (p=quarantine dis=none) header.from=piap.pl Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=lists.infradead.org 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: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:In-Reply-To:References: List-Owner; bh=MTWXUNWyC29KSAUhd5mmLDUyGxRQ7AhLqMF/ZK0BY8c=; b=RdVhS8o10Ab55E OnhIHoffZpO4+ykxj6v3mqxdfx2usfuG+44hwDaDq4RawgWV8aYrmym7aSxqtIzzBRCsqMBzbaKKZ lLbD6+JpErEjg3We81/ztR9Ta+mcPgXyx6+3EZw+q0hv4+JT/+gZ/H2eKfjsyqPUJHwwwz4rCXSQg VS4YzLFerSsBzFRjGI2U4nM9M7wKbS9Ruqd1TDaZ3a9/wPcXo5Fp1mdbo+y44s2FTYXai8iAvfshz f4g6l1LtVqmUdXY/kmEnIeSQCQmL8yAaOLPmsDV/LwSDyQiMV+07ySrKTyaWQB3JdQbOVctBY81wq bI29sgdqiQ1ysgHOuNPA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1mY2BW-00DRvV-H5; Wed, 06 Oct 2021 08:21:54 +0000 Received: from ni.piap.pl ([195.187.100.5]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1mY2BS-00DRtM-5H for linux-arm-kernel@lists.infradead.org; Wed, 06 Oct 2021 08:21:51 +0000 From: Krzysztof =?utf-8?Q?Ha=C5=82asa?= To: Shawn Guo , Sascha Hauer Cc: Pengutronix Kernel Team , Fabio Estevam , NXP Linux Team , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH v2] CONFIG_SOC_IMX6Q = i.MX6 Quad/Dual/DualLite/Solo Date: Wed, 06 Oct 2021 10:21:48 +0200 Message-ID: MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20211006_012150_415558_9242A1EF X-CRM114-Status: UNSURE ( 5.57 ) X-CRM114-Notice: Please train this message. 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: , Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org UHJpbnQgaS5NWDYgIkR1YWwiIGFuZCAiU29sbyIgbmFtZXMgaW4gYWRkaXRpb24gdG8gdGhlICJR dWFkIiBhbmQKIkR1YWxMaXRlIiBmb3IgU09DX0lNWDZRLgoKU2lnbmVkLW9mZi1ieTogS3J6eXN6 dG9mIEhhxYJhc2EgPGtoYWxhc2FAcGlhcC5wbD4KCmRpZmYgLS1naXQgYS9hcmNoL2FybS9tYWNo LWlteC9LY29uZmlnIGIvYXJjaC9hcm0vbWFjaC1pbXgvS2NvbmZpZwppbmRleCBiNDA3YjAyNGRk ZTMuLmI2ZjJmMmVhOGU2NSAxMDA2NDQKLS0tIGEvYXJjaC9hcm0vbWFjaC1pbXgvS2NvbmZpZwor KysgYi9hcmNoL2FybS9tYWNoLWlteC9LY29uZmlnCkBAIC0xNDMsNyArMTQzLDcgQEAgY29uZmln IFNPQ19JTVg2CiAJc2VsZWN0IFBMMzEwX0VSUkFUQV83Njk0MTkgaWYgQ0FDSEVfTDJYMAogCiBj b25maWcgU09DX0lNWDZRCi0JYm9vbCAiaS5NWDYgUXVhZC9EdWFsL0R1YWxMaXRlIHN1cHBvcnQi CisJYm9vbCAiaS5NWDYgUXVhZC9EdWFsL0R1YWxMaXRlL1NvbG8gc3VwcG9ydCIKIAlzZWxlY3Qg QVJNX0VSUkFUQV83NjQzNjkgaWYgU01QCiAJc2VsZWN0IEFSTV9FUlJBVEFfNzU0MzIyCiAJc2Vs ZWN0IEFSTV9FUlJBVEFfNzc1NDIwCkBAIC0xNTMsNyArMTUzLDggQEAgY29uZmlnIFNPQ19JTVg2 UQogCXNlbGVjdCBTT0NfSU1YNgogCiAJaGVscAotCSAgVGhpcyBlbmFibGVzIHN1cHBvcnQgZm9y IEZyZWVzY2FsZSBpLk1YNiBRdWFkIHByb2Nlc3Nvci4KKwkgIFRoaXMgZW5hYmxlcyBzdXBwb3J0 IGZvciBGcmVlc2NhbGUgaS5NWDYgUXVhZC9EdWFsL0R1YWxMaXRlL1NvbG8KKwkgIHByb2Nlc3Nv cnMuCiAKIGNvbmZpZyBTT0NfSU1YNlNMCiAJYm9vbCAiaS5NWDYgU29sb0xpdGUgc3VwcG9ydCIK ZGlmZiAtLWdpdCBhL2FyY2gvYXJtL21hY2gtaW14L21hY2gtaW14NnEuYyBiL2FyY2gvYXJtL21h Y2gtaW14L21hY2gtaW14NnEuYwppbmRleCAxMWRjYzM2OWVjMTQuLjhjYzhhMmVkMWQxMiAxMDA2 NDQKLS0tIGEvYXJjaC9hcm0vbWFjaC1pbXgvbWFjaC1pbXg2cS5jCisrKyBiL2FyY2gvYXJtL21h Y2gtaW14L21hY2gtaW14NnEuYwpAQCAtMjE3LDcgKzIxNyw3IEBAIHN0YXRpYyBjb25zdCBjaGFy ICogY29uc3QgaW14NnFfZHRfY29tcGF0W10gX19pbml0Y29uc3QgPSB7CiAJTlVMTCwKIH07CiAK LURUX01BQ0hJTkVfU1RBUlQoSU1YNlEsICJGcmVlc2NhbGUgaS5NWDYgUXVhZC9EdWFsTGl0ZSAo RGV2aWNlIFRyZWUpIikKK0RUX01BQ0hJTkVfU1RBUlQoSU1YNlEsICJGcmVlc2NhbGUgaS5NWDYg UXVhZC9EdWFsL0R1YWxMaXRlL1NvbG8gKERldmljZSBUcmVlKSIpCiAJLmwyY19hdXhfdmFsIAk9 IDAsCiAJLmwyY19hdXhfbWFzawk9IH4wLAogCS5zbXAJCT0gc21wX29wcyhpbXhfc21wX29wcyks CgotLSAKS3J6eXN6dG9mICJDaHJpcyIgSGHFgmFzYQoKU2llxIcgQmFkYXdjemEgxYF1a2FzaWV3 aWN6ClByemVteXPFgm93eSBJbnN0eXR1dCBBdXRvbWF0eWtpIGkgUG9taWFyw7N3IFBJQVAKQWwu IEplcm96b2xpbXNraWUgMjAyLCAwMi00ODYgV2Fyc3phd2EKCl9fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fCmxpbnV4LWFybS1rZXJuZWwgbWFpbGluZyBsaXN0 CmxpbnV4LWFybS1rZXJuZWxAbGlzdHMuaW5mcmFkZWFkLm9yZwpodHRwOi8vbGlzdHMuaW5mcmFk ZWFkLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2xpbnV4LWFybS1rZXJuZWwK