From patchwork Fri Apr 1 17:24:27 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?QXLEsW7DpyDDnE5BTA==?= X-Patchwork-Id: 12798517 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 13F8BC433F5 for ; Fri, 1 Apr 2022 17:26:32 +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: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=IlBjAK/Oj4uXcc686Lr26mmS4RXqZNPaqwVPBeaMRik=; b=e/sDPQ8MqjNQaB TsZAsjmetVppjfogUMDDbkW1dnLib8ePqxcnFbhaHdvg4FtV2Vg3JTBbcH9lAa4VZfJfe6qkiLMyV 1jcEdaKdBktGtfiaIG3hQhqaciqhYIcGMX0nA+pOgwDeNLI0ksp2FDQSmHRP6EiwU+UcaKbXFqnfo sBzvgs3PSvkBWj39QkUDyFrIOCwmfYmSWb9sRGVvuMDg35QCwlGP8KMg54wzuCk+tktJ9atexBBJF hQRvani2gNJCsMoKliHQb+VmIGHMJgsO7h4m/9TFuYhqRhiYyO18zNdfLveW8OrEHSZtgRzqXkhR1 /NCn8mRCZVYfZmPTMVUQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1naL1e-006hAi-9K; Fri, 01 Apr 2022 17:25:30 +0000 Received: from sender4-op-o14.zoho.com ([136.143.188.14]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1naL1T-006h76-La for linux-arm-kernel@lists.infradead.org; Fri, 01 Apr 2022 17:25:21 +0000 ARC-Seal: i=1; a=rsa-sha256; t=1648833899; cv=none; d=zohomail.com; s=zohoarc; b=A+qVXCI8B/v/0h/89awxMV8kULVcp1PZrXFsVavkmLBPAOtWtHKYGp85PIeX0eaIPrp+0+PgKMfjJPGLAGKiTY+7aoTerK7WPmkpcq5w6bT+wxnnb287rT0/QZ6DoUmCNKWnTPzjakm6N5pjwhkEoVAcFEFn3ar+EQI38Ypazy8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1648833899; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:MIME-Version:Message-ID:Subject:To; bh=o5HN4+D5UQ9euR0BVh4ZToQJDW/64+Gz9slpGZrQ7b0=; b=guv5aZD5o1M2LJfUSxYNJxrYsHvldaMeCw6hTDtLB1eoZ9nF+Mv3+60XJnQ2TFDhA8fff6rMRp2HBmuBRhP0pth5XesgIFjxSOU/YrbPrLqMK7eFOExjliXDnucdjYAXOvlvky3jf+b/5dqThNUwom/8izBcZI2a2XGbemrkHTI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass header.i=arinc9.com; spf=pass smtp.mailfrom=arinc.unal@arinc9.com; dmarc=pass header.from= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; t=1648833899; s=zmail; d=arinc9.com; i=arinc.unal@arinc9.com; h=From:From:To:To:Cc:Cc:Subject:Subject:Date:Message-Id:Message-Id:MIME-Version:Content-Type:Content-Transfer-Encoding:Reply-To; bh=o5HN4+D5UQ9euR0BVh4ZToQJDW/64+Gz9slpGZrQ7b0=; b=IXK/gkmJRb7yKtYwtcMvkRYxsiqUITMf3libtsxsaO+jpZASqrRFCoZhmHkiGRrs BJa1f89MdYmryvNK5tZQv3lsycDtG6+lM4Nat5O8Vj/7VdU+6ZIDjX9U5jpEbiWU9kJ uH30VD3/MqHez5BhjM4GcSGkFcpTSINUjk2Af+fo= Received: from arinc9-PC.localdomain (85.117.236.245 [85.117.236.245]) by mx.zohomail.com with SMTPS id 1648833897593238.78338422234162; Fri, 1 Apr 2022 10:24:57 -0700 (PDT) From: =?utf-8?b?QXLEsW7DpyDDnE5BTA==?= To: Florian Fainelli , =?utf-8?b?UmFmYcWCIE1pxYJlY2tp?= , Hauke Mehrtens , Rob Herring , Scott Branden , Christian Lamparter Cc: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org, bcm-kernel-feedback-list@broadcom.com, =?utf-8?b?QXLEsW7DpyDDnE5BTA==?= Subject: [PATCH 1/2] dt-bindings: arm: bcm: fix BCM53012 and BCM53016 SoC strings Date: Fri, 1 Apr 2022 20:24:27 +0300 Message-Id: <20220401172427.2806-1-arinc.unal@arinc9.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-ZohoMailClient: External X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220401_102519_796194_C05DF90F X-CRM114-Status: GOOD ( 11.27 ) 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 Fix inaccurate SoC strings brcm,brcm53012 and brcm,brcm53016 to respectively brcm,bcm53012 and brcm,bcm53016. Create a new description for BCM53016 and move Meraki MR32 under it. Fixes: 4cb5201fcb5d ("dt-bindings: arm: bcm: Convert BCM4708 to YAML") Fixes: a2e385f5374d ("dt-bindings: ARM: add bindings for the Meraki MR32") Signed-off-by: Arınç ÜNAL --- brcm,bcm53012 string was silently changed to brcm,brcm53012 after converting to YAML. Let me know if this was intentional. Arınç --- .../devicetree/bindings/arm/bcm/brcm,bcm4708.yaml | 9 +++++++-- arch/arm/boot/dts/bcm53016-meraki-mr32.dts | 2 +- arch/arm/boot/dts/bcm953012er.dts | 2 +- arch/arm/boot/dts/bcm953012hr.dts | 2 +- arch/arm/boot/dts/bcm953012k.dts | 2 +- 5 files changed, 11 insertions(+), 6 deletions(-) diff --git a/Documentation/devicetree/bindings/arm/bcm/brcm,bcm4708.yaml b/Documentation/devicetree/bindings/arm/bcm/brcm,bcm4708.yaml index 434d3c6db61e..8a97ee048053 100644 --- a/Documentation/devicetree/bindings/arm/bcm/brcm,bcm4708.yaml +++ b/Documentation/devicetree/bindings/arm/bcm/brcm,bcm4708.yaml @@ -83,9 +83,14 @@ properties: - brcm,bcm953012er - brcm,bcm953012hr - brcm,bcm953012k + - const: brcm,bcm53012 + - const: brcm,bcm4708 + + - description: BCM53016 based boards + items: + - enum: - meraki,mr32 - - const: brcm,brcm53012 - - const: brcm,brcm53016 + - const: brcm,bcm53016 - const: brcm,bcm4708 additionalProperties: true diff --git a/arch/arm/boot/dts/bcm53016-meraki-mr32.dts b/arch/arm/boot/dts/bcm53016-meraki-mr32.dts index 66c64a6ec414..daca63f25134 100644 --- a/arch/arm/boot/dts/bcm53016-meraki-mr32.dts +++ b/arch/arm/boot/dts/bcm53016-meraki-mr32.dts @@ -13,7 +13,7 @@ #include / { - compatible = "meraki,mr32", "brcm,brcm53016", "brcm,bcm4708"; + compatible = "meraki,mr32", "brcm,bcm53016", "brcm,bcm4708"; model = "Meraki MR32"; chosen { diff --git a/arch/arm/boot/dts/bcm953012er.dts b/arch/arm/boot/dts/bcm953012er.dts index 52feca0fb906..dd63a148a16b 100644 --- a/arch/arm/boot/dts/bcm953012er.dts +++ b/arch/arm/boot/dts/bcm953012er.dts @@ -37,7 +37,7 @@ / { model = "NorthStar Enterprise Router (BCM953012ER)"; - compatible = "brcm,bcm953012er", "brcm,brcm53012", "brcm,bcm4708"; + compatible = "brcm,bcm953012er", "brcm,bcm53012", "brcm,bcm4708"; memory@0 { device_type = "memory"; diff --git a/arch/arm/boot/dts/bcm953012hr.dts b/arch/arm/boot/dts/bcm953012hr.dts index 9140be7ec053..b070b69466bd 100644 --- a/arch/arm/boot/dts/bcm953012hr.dts +++ b/arch/arm/boot/dts/bcm953012hr.dts @@ -37,7 +37,7 @@ / { model = "NorthStar HR (BCM953012HR)"; - compatible = "brcm,bcm953012hr", "brcm,brcm53012", "brcm,bcm4708"; + compatible = "brcm,bcm953012hr", "brcm,bcm53012", "brcm,bcm4708"; aliases { ethernet0 = &gmac0; diff --git a/arch/arm/boot/dts/bcm953012k.dts b/arch/arm/boot/dts/bcm953012k.dts index de40bd59a5fa..f1e6bcaa1edd 100644 --- a/arch/arm/boot/dts/bcm953012k.dts +++ b/arch/arm/boot/dts/bcm953012k.dts @@ -36,7 +36,7 @@ / { model = "NorthStar SVK (BCM953012K)"; - compatible = "brcm,bcm953012k", "brcm,brcm53012", "brcm,bcm4708"; + compatible = "brcm,bcm953012k", "brcm,bcm53012", "brcm,bcm4708"; aliases { serial0 = &uart0;