From patchwork Tue Mar 29 22:05:43 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chris Packham X-Patchwork-Id: 12795286 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 6F2CFC433EF for ; Tue, 29 Mar 2022 22:07:40 +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=kHZTVnZiGCTWqG6zjUsN+QX46XZzFUgyi2+PDSqAlHs=; b=rOkU+2uupyJsiN Uy1SWusAyJatdE2jfwbTNIo0wIp+wmZ3Rtd3Ggm4ob9uhfyuwJ+tBVUUKZ6pRBzsqiiQob0ByUwF5 zu91ut24SHCFvbOLxyLjzxn+MjCUT7eL9QplAmfxcNdo4Fgw+wBKcvk66Bje//b47gxXZRXUs5621 TBGDgkBrybBRKxX6TnAvwVrDt/V267yL0lssfKekL/1yfcj3y0yLEBAP5OH0NIV7J1ZJ2NDwCz1SH 2ItSGJKQoWgmBZiweKcxtvloIYoA4rFV9df1Sd25jwRq6VXLlGokvETsgSGZl/sYSpoi0CxQcUe9R NIsBI4vHLK06fjo4oB1A==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1nZJys-00Dbmv-5i; Tue, 29 Mar 2022 22:06:26 +0000 Received: from gate2.alliedtelesis.co.nz ([2001:df5:b000:5::4]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1nZJye-00Dbk2-D6 for linux-arm-kernel@lists.infradead.org; Tue, 29 Mar 2022 22:06:14 +0000 Received: from svr-chch-seg1.atlnz.lc (mmarshal3.atlnz.lc [10.32.18.43]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by gate2.alliedtelesis.co.nz (Postfix) with ESMTPS id D9A432C028E; Tue, 29 Mar 2022 22:06:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=alliedtelesis.co.nz; s=mail181024; t=1648591567; bh=+KY8feI/T4ziV/soVuNNWaZAzKUMzJlXyuVQ043AKzk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=wNOCEeX19xkHKF6EiRw6h9DDOnt7JpAhCEOcYxL0hBqv+5EJKIwGNF0G3qj4paJC1 7FmM4P4VqIJnBQ5uStEqFkyoDsShiSHDZvcQ01orZD6Q3Y3sUvppiRFezAu/85eJdJ +cGE/JXkV0Scf2U3X6U5/PSU8qL4UDEc/B8C6aSN2QlSVygumzdavMuqEti1UtKkke hZdU+nOSfWgANpkcE05sEL52X/RGTT00TwNwB874Lbz9v9HfKhEJI+6m/fjkWnhxBv wzix8Pdlcut3erQLA7+x+xzdVosbR0mWczt63rFDIPKqFz3hNfjh9ZsiUyit/aViVN 24t3iH3zwFRXA== Received: from pat.atlnz.lc (Not Verified[10.32.16.33]) by svr-chch-seg1.atlnz.lc with Trustwave SEG (v8, 2, 6, 11305) id ; Wed, 30 Mar 2022 11:06:07 +1300 Received: from chrisp-dl.ws.atlnz.lc (chrisp-dl.ws.atlnz.lc [10.33.22.30]) by pat.atlnz.lc (Postfix) with ESMTP id 828D813EE41; Wed, 30 Mar 2022 11:06:07 +1300 (NZDT) Received: by chrisp-dl.ws.atlnz.lc (Postfix, from userid 1030) id 872E82A2678; Wed, 30 Mar 2022 11:06:03 +1300 (NZDT) From: Chris Packham To: ulf.hansson@linaro.org, robh+dt@kernel.org, krzk+dt@kernel.org, huziji@marvell.com, andrew@lunn.ch, gregory.clement@bootlin.com, sebastian.hesselbarth@gmail.com Cc: linux-mmc@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Chris Packham Subject: [PATCH v5 1/2] arm64: dts: marvell: Update sdhci node names to match schema Date: Wed, 30 Mar 2022 11:05:43 +1300 Message-Id: <20220329220544.2132135-2-chris.packham@alliedtelesis.co.nz> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220329220544.2132135-1-chris.packham@alliedtelesis.co.nz> References: <20220329220544.2132135-1-chris.packham@alliedtelesis.co.nz> MIME-Version: 1.0 X-SEG-SpamProfiler-Analysis: v=2.3 cv=Cfh2G4jl c=1 sm=1 tr=0 a=KLBiSEs5mFS1a/PbTCJxuA==:117 a=o8Y5sQTvuykA:10 a=VwQbUJbxAAAA:8 a=AgHtZ1O-xYyxAwoHFCcA:9 a=AjGcO6oz07-iQ99wixmX:22 X-SEG-SpamProfiler-Score: 0 x-atlnz-ls: pat X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220329_150612_782437_080FFC3E X-CRM114-Status: GOOD ( 11.76 ) 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 Update the node names of the sdhci@ interfaces to be mmc@ to match the node name enforced by the mmc-controller.yaml schema. Signed-off-by: Chris Packham Acked-by: Krzysztof Kozlowski --- Notes: This has been sent separately [1] but on Krzysztof's advice I've included it in v3 of this series. [1] - https://lore.kernel.org/linux-arm-kernel/20220321212007.2961581-1-chris.packham@alliedtelesis.co.nz/ Changes in v5: - None Changes in v4: - None Changes in v3: - New arch/arm64/boot/dts/marvell/armada-37xx.dtsi | 4 ++-- arch/arm64/boot/dts/marvell/armada-ap80x.dtsi | 2 +- arch/arm64/boot/dts/marvell/armada-cp11x.dtsi | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/arm64/boot/dts/marvell/armada-37xx.dtsi b/arch/arm64/boot/dts/marvell/armada-37xx.dtsi index 30233de58bb3..78adb803df26 100644 --- a/arch/arm64/boot/dts/marvell/armada-37xx.dtsi +++ b/arch/arm64/boot/dts/marvell/armada-37xx.dtsi @@ -434,7 +434,7 @@ rwtm: mailbox@b0000 { #mbox-cells = <1>; }; - sdhci1: sdhci@d0000 { + sdhci1: mmc@d0000 { compatible = "marvell,armada-3700-sdhci", "marvell,sdhci-xenon"; reg = <0xd0000 0x300>, @@ -445,7 +445,7 @@ sdhci1: sdhci@d0000 { status = "disabled"; }; - sdhci0: sdhci@d8000 { + sdhci0: mmc@d8000 { compatible = "marvell,armada-3700-sdhci", "marvell,sdhci-xenon"; reg = <0xd8000 0x300>, diff --git a/arch/arm64/boot/dts/marvell/armada-ap80x.dtsi b/arch/arm64/boot/dts/marvell/armada-ap80x.dtsi index 6614472100c2..a06a0a889c43 100644 --- a/arch/arm64/boot/dts/marvell/armada-ap80x.dtsi +++ b/arch/arm64/boot/dts/marvell/armada-ap80x.dtsi @@ -250,7 +250,7 @@ watchdog: watchdog@610000 { interrupts = ; }; - ap_sdhci0: sdhci@6e0000 { + ap_sdhci0: mmc@6e0000 { compatible = "marvell,armada-ap806-sdhci"; reg = <0x6e0000 0x300>; interrupts = ; diff --git a/arch/arm64/boot/dts/marvell/armada-cp11x.dtsi b/arch/arm64/boot/dts/marvell/armada-cp11x.dtsi index 3bd2182817fb..d6c0990a267d 100644 --- a/arch/arm64/boot/dts/marvell/armada-cp11x.dtsi +++ b/arch/arm64/boot/dts/marvell/armada-cp11x.dtsi @@ -493,7 +493,7 @@ CP11X_LABEL(trng): trng@760000 { status = "okay"; }; - CP11X_LABEL(sdhci0): sdhci@780000 { + CP11X_LABEL(sdhci0): mmc@780000 { compatible = "marvell,armada-cp110-sdhci"; reg = <0x780000 0x300>; interrupts = <27 IRQ_TYPE_LEVEL_HIGH>;