From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail.naobsd.org (sakura.naobsd.org [160.16.200.221]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 296AE42AA0 for ; Thu, 20 Jun 2024 21:18:30 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=160.16.200.221 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718918315; cv=none; b=GqO1TMdHMmC17UfQFrrdXkAOkBggptFXJ95tvCFA7961tK8Zjz5VBMPiHBTuiiKgglTebV76PX6hmjNQ6j+hhCobUKKKzy3u+4+HW1tgQIn7dnqccwt8mjSCDGGLcC15XQeMxCD6l9XBS7yRs6zIzAax17tQOq+l+yjFRq7p470= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718918315; c=relaxed/simple; bh=3LO9QKxiDb2ax2fFwknbS8Esl3H/FJ0E4VrY+N4Io0A=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=SlPdTEH5LfEncu/t0FCpd34sKXq8TDgP8740d7LIrIsF43qNxZi0pAeaky9zDc98ShimTb2dP6SPG+o8QAW/BMGjL0/YibGgbsxCuGMCG/Fy3Yx9/Dizvw8PdeXQ1eQIIcnP/eenONrKBAHP97FFWSJbopjh0i2QOz4Y4rHCSkA= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=fail (p=none dis=none) header.from=radxa.com; spf=fail smtp.mailfrom=radxa.com; arc=none smtp.client-ip=160.16.200.221 Authentication-Results: smtp.subspace.kernel.org; dmarc=fail (p=none dis=none) header.from=radxa.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=radxa.com 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 Precedence: bulk X-Mailing-List: devicetree@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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; }; -- 2.43.0