[PATCH v2 0/3] Update eMMC alias for Radxa ROCK 5 Model A and Model B DTS

[PATCH v2 0/3] Update eMMC alias for Radxa ROCK 5 Model A and Model B DTS

[Christopher Obbard]

The MMC aliases for the Radxa ROCK 5 Model A and Model B do not match the other
Rockchip devices: mmc0 is usually the eMMC. In the initial devicetree series,
I incorrectly set the alias for the eMMC to mmc1 to match the vendor kernel.

Update the alias for the eMMC to mmc0 to better match other Rockchip devices.

While we are here, remove an empty line to keep good style across the tree.

Changes in v2:
- Use correctly line length for commit messages

v1: https://lore.kernel.org/linux-rockchip/20230110155252.189300-1-chris.obbard@collabora.com/

Christopher Obbard (3):
  arm64: dts: rockchip: Update sdhci alias for rock-5a
  arm64: dts: rockchip: Remove empty line from rock-5a
  arm64: dts: rockchip: Update sdhci alias for rock-5b

 arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts  | 2 +-
 arch/arm64/boot/dts/rockchip/rk3588s-rock-5a.dts | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

--
2.39.0

[PATCH v2 1/3] arm64: dts: rockchip: Update sdhci alias for rock-5a

[Christopher Obbard]

In the previous version, the sdhci alias was set to mmc1: an artifact
leftover from the port from vendor kernel. Update the alias to mmc0 to
match the device's boot order.

Fixes: a4a8f1afb360 ("arm64: dts: rockchip: Add rock-5a board")
Signed-off-by: Christopher Obbard <chris.obbard@collabora.com>
---
 arch/arm64/boot/dts/rockchip/rk3588s-rock-5a.dts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-rock-5a.dts b/arch/arm64/boot/dts/rockchip/rk3588s-rock-5a.dts
index 409a43d059d8..c85af1334c05 100644
--- a/arch/arm64/boot/dts/rockchip/rk3588s-rock-5a.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3588s-rock-5a.dts
@@ -11,7 +11,7 @@ / {
 	compatible = "radxa,rock-5a", "rockchip,rk3588s";
 
 	aliases {
-		mmc1 = &sdhci;
+		mmc0 = &sdhci;
 		serial2 = &uart2;
 	};
 
-- 
2.39.0

[PATCH v2 2/3] arm64: dts: rockchip: Remove empty line from rock-5a

[Christopher Obbard]

There is a line which is empty. Remove it.

Fixes: a4a8f1afb360 ("arm64: dts: rockchip: Add rock-5a board")
Signed-off-by: Christopher Obbard <chris.obbard@collabora.com>
---
 arch/arm64/boot/dts/rockchip/rk3588s-rock-5a.dts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-rock-5a.dts b/arch/arm64/boot/dts/rockchip/rk3588s-rock-5a.dts
index c85af1334c05..6432b586bf5a 100644
--- a/arch/arm64/boot/dts/rockchip/rk3588s-rock-5a.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3588s-rock-5a.dts
@@ -52,7 +52,6 @@ rtl8211f {
 		rtl8211f_rst: rtl8211f-rst {
 			rockchip,pins = <3 RK_PB7 RK_FUNC_GPIO &pcfg_pull_none>;
 		};
-
 	};
 };
 
-- 
2.39.0

[PATCH v2 3/3] arm64: dts: rockchip: Update sdhci alias for rock-5b

[Christopher Obbard]

In the previous version, the sdhci alias was set to mmc1: an artifact
leftover from the port from vendor kernel. Update the alias to mmc0 to
match the device's boot order.

Fixes: 6fb2d1549786 ("arm64: dts: rockchip: Add rock-5b board")
Signed-off-by: Christopher Obbard <chris.obbard@collabora.com>
---
 arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts b/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts
index d2f1e963ce06..95805cb0adfa 100644
--- a/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts
@@ -9,7 +9,7 @@ / {
 	compatible = "radxa,rock-5b", "rockchip,rk3588";
 
 	aliases {
-		mmc1 = &sdhci;
+		mmc0 = &sdhci;
 		serial2 = &uart2;
 	};
 
-- 
2.39.0

Re: [PATCH v2 0/3] Update eMMC alias for Radxa ROCK 5 Model A and Model B DTS

[Heiko Stuebner]

On Tue, 10 Jan 2023 19:53:49 +0000, Christopher Obbard wrote:
> The MMC aliases for the Radxa ROCK 5 Model A and Model B do not match the other
> Rockchip devices: mmc0 is usually the eMMC. In the initial devicetree series,
> I incorrectly set the alias for the eMMC to mmc1 to match the vendor kernel.
> 
> Update the alias for the eMMC to mmc0 to better match other Rockchip devices.
> 
> While we are here, remove an empty line to keep good style across the tree.
> 
> [...]

Applied, thanks!

[1/3] arm64: dts: rockchip: Update sdhci alias for rock-5a
      commit: 991f136c9f8de181b25cef056ab5fe7f49413919
[2/3] arm64: dts: rockchip: Remove empty line from rock-5a
      commit: 304c8a759953fb4a6cd399cf78f87501d7fd8bbc
[3/3] arm64: dts: rockchip: Update sdhci alias for rock-5b
      commit: 6fb13f888f2a6155fe4c19d14721e8909eda9b52

Best regards,
-- 
Heiko Stuebner <heiko@sntech.de>