From patchwork Thu Jun 20 21:14:25 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: FUKAUMI Naoki X-Patchwork-Id: 13706391 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 02065C27C79 for ; Thu, 20 Jun 2024 21:18:25 +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=Apz6vraXo04rG7w2doQ4jkdA6QRjyHF+QglDHRCI+TY=; b=y59wtZudb1f9HE voSNElKHqpB1zTr5rAflx0uC2D6akxF3SR66iN0al02olox/DcsySfmgaX5H8Jm04/m2JOvrGWnaT 7fxzVqyKFH0SXG4T9I6YfSauKhFDdv6u7o7RJWDB6nn5soN27pdhK8UNSuCY0Ft/lsy3ceybQq9mR t/jOqUWVaUo6ApShkYAKV0ldnDUfnPRBw/ffV3Yhvp7/QWDSzi9BDeRcSz48TXEYASAWWe2W7rJ4c bMyDXrLmEhGyCwBGpPtsTCuMibieLFqyBWsmcLcflppf1Mi5jZbd+ySRDR2cjIoT2++LBkvswqvm4 Wr+gdQZZBgWFOU78EAtQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1sKPAf-00000006juH-3ws8; Thu, 20 Jun 2024 21:18:17 +0000 Received: from casper.infradead.org ([2001:8b0:10b:1236::1]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1sKPAe-00000006jtM-2VXH for linux-rockchip@bombadil.infradead.org; Thu, 20 Jun 2024 21:18:16 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=Content-Transfer-Encoding:MIME-Version: Message-ID:Date:Subject:Cc:To:From:Sender:Reply-To:Content-Type:Content-ID: Content-Description:In-Reply-To:References; bh=lJd62AC/jVnl3P8tpAN9cbdKdc+YHDMNf5bWwoCtLrQ=; b=VD+ZJPsWFYSgBAGM/ZUhcPvOjh IATnmAjZRz4EGBbGvaUpy39Wef5fprL59/Uv9vi3ofGLV0ZmbewpYtyM9GKo3UgosC88j1nhN2kbN +WnkX3CYh4BX3UGZkSBcqgc0rsoYWaZUa1o2hARrRvDBPtTjbgXikt8r3ZE1IrgcAyrrCYvYbnSDo 8iegMp6sEl2xFN68ykeb9cOQhmJ2QIIOuuICgPujiLRIZnmI8JtSi+aV5uhFp1v0nwQssH1bSM3eN h8P7YbwI+t/YeKB+lCej3m7ibfcGnO4RL7UQ1fSgqGk8ZeHuvvH5x+OkzGPJb8tEu1h3L7nMiQ3aZ KexLJe6A==; Received: from sakura.naobsd.org ([160.16.200.221] helo=mail.naobsd.org) by casper.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1sKPAZ-00000006TtA-1YqM for linux-rockchip@lists.infradead.org; Thu, 20 Jun 2024 21:18:15 +0000 Received: from secure.fukaumi.org ([10.0.0.2]) by mail.naobsd.org (8.14.4/8.14.4/Debian-4.1ubuntu1.1) with ESMTP id 45KLEZdV028893; Fri, 21 Jun 2024 06:14:35 +0900 From: FUKAUMI Naoki To: heiko@sntech.de Cc: jonas@kwiboo.se, devicetree@vger.kernel.org, linux-rockchip@lists.infradead.org, FUKAUMI Naoki Subject: [PATCH] arm64: dts: rockchip: fix mmc aliases for Radxa ZERO 3E/3W Date: Fri, 21 Jun 2024 06:14:25 +0900 Message-ID: <20240620211425.1161-1-naoki@radxa.com> X-Mailer: git-send-email 2.43.0 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240620_221811_900063_4D012C86 X-CRM114-Status: UNSURE ( 8.58 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-rockchip@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Upstream kernel work for Rockchip platforms List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "Linux-rockchip" Errors-To: linux-rockchip-bounces+linux-rockchip=archiver.kernel.org@lists.infradead.org align with other Radxa products. - mmc0 is eMMC - mmc1 is microSD for ZERO 3E, there is no eMMC, but aliases should start at 0, so mmc0 is microSD as exception. Fixes: 1a5c8d307c83 ("arm64: dts: rockchip: Add Radxa ZERO 3W/3E") Signed-off-by: FUKAUMI Naoki Changes in v2: - microSD is mmc0 instead of mmc1 for ZERO 3E --- arch/arm64/boot/dts/rockchip/rk3566-radxa-zero-3.dtsi | 4 ---- arch/arm64/boot/dts/rockchip/rk3566-radxa-zero-3e.dts | 1 + arch/arm64/boot/dts/rockchip/rk3566-radxa-zero-3w.dts | 3 ++- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/arch/arm64/boot/dts/rockchip/rk3566-radxa-zero-3.dtsi b/arch/arm64/boot/dts/rockchip/rk3566-radxa-zero-3.dtsi index 623d5939d194..081be841b286 100644 --- a/arch/arm64/boot/dts/rockchip/rk3566-radxa-zero-3.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3566-radxa-zero-3.dtsi @@ -6,10 +6,6 @@ #include "rk3566.dtsi" / { - aliases { - mmc0 = &sdmmc0; - }; - chosen { stdout-path = "serial2:1500000n8"; }; diff --git a/arch/arm64/boot/dts/rockchip/rk3566-radxa-zero-3e.dts b/arch/arm64/boot/dts/rockchip/rk3566-radxa-zero-3e.dts index e166d66990b9..95af8210a08f 100644 --- a/arch/arm64/boot/dts/rockchip/rk3566-radxa-zero-3e.dts +++ b/arch/arm64/boot/dts/rockchip/rk3566-radxa-zero-3e.dts @@ -10,6 +10,7 @@ / { aliases { ethernet0 = &gmac1; + mmc0 = $sdmmc0; }; }; diff --git a/arch/arm64/boot/dts/rockchip/rk3566-radxa-zero-3w.dts b/arch/arm64/boot/dts/rockchip/rk3566-radxa-zero-3w.dts index 9bf4f464915f..f92475c59deb 100644 --- a/arch/arm64/boot/dts/rockchip/rk3566-radxa-zero-3w.dts +++ b/arch/arm64/boot/dts/rockchip/rk3566-radxa-zero-3w.dts @@ -9,7 +9,8 @@ / { compatible = "radxa,zero-3w", "rockchip,rk3566"; aliases { - mmc1 = &sdhci; + mmc0 = &sdhci; + mmc1 = &sdmmc0; mmc2 = &sdmmc1; };