All of lore.kernel.org
 help / color / mirror / Atom feed
From: Jagan Teki <jagan@amarulasolutions.com>
To: Heiko Stuebner <heiko@sntech.de>,
	Rob Herring <robh+dt@kernel.org>,
	Krzysztof Kozlowski <krzysztof.kozlowski+dt@linaro.org>
Cc: linux-rockchip@lists.infradead.org, devicetree@vger.kernel.org,
	linux-arm-kernel@lists.infradead.org,
	Jagan Teki <jagan@amarulasolutions.com>,
	FUKAUMI Naoki <naoki@radxa.com>
Subject: [PATCH 6/7] arm64: dts: rockchip: Update eMMC, SD aliases for Radxa SoM boards
Date: Tue, 17 Jan 2023 16:25:03 +0530	[thread overview]
Message-ID: <20230117105504.18296-6-jagan@amarulasolutions.com> (raw)
In-Reply-To: <20230117105504.18296-1-jagan@amarulasolutions.com>

Radxa has produced Compute Modules like RK3399pro VMARC and CM3i with
onboarding eMMC flash, so the eMMC is the primary MMC device.

On the other hand, Rockchip boot orders start from eMMC from an MMC
device perspective.

Mark, the eMMC has mmc0 to satisfy the above two conditions.

Reported-by: FUKAUMI Naoki <naoki@radxa.com>
Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
---
 arch/arm64/boot/dts/rockchip/rk3399pro-vmarc-som.dtsi | 4 ++--
 arch/arm64/boot/dts/rockchip/rk3568-radxa-e25.dts     | 3 +--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/arch/arm64/boot/dts/rockchip/rk3399pro-vmarc-som.dtsi b/arch/arm64/boot/dts/rockchip/rk3399pro-vmarc-som.dtsi
index bf9eb0405b62..8b8992a8e9c0 100644
--- a/arch/arm64/boot/dts/rockchip/rk3399pro-vmarc-som.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3399pro-vmarc-som.dtsi
@@ -13,8 +13,8 @@ / {
 	compatible = "vamrs,rk3399pro-vmarc-som", "rockchip,rk3399pro";
 
 	aliases {
-		mmc0 = &sdmmc;
-		mmc1 = &sdhci;
+		mmc0 = &sdhci;
+		mmc1 = &sdmmc;
 	};
 
 	vcc3v3_pcie: vcc-pcie-regulator {
diff --git a/arch/arm64/boot/dts/rockchip/rk3568-radxa-e25.dts b/arch/arm64/boot/dts/rockchip/rk3568-radxa-e25.dts
index 8ca15b723799..6a3d964f6207 100644
--- a/arch/arm64/boot/dts/rockchip/rk3568-radxa-e25.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3568-radxa-e25.dts
@@ -8,8 +8,7 @@ / {
 	compatible = "radxa,radxa-e25", "radxa,radxa-cm3i", "rockchip,rk3568";
 
 	aliases {
-		mmc0 = &sdmmc0;
-		mmc1 = &sdhci;
+		mmc1 = &sdmmc0;
 	};
 
 	pwm-leds {
-- 
2.25.1


WARNING: multiple messages have this Message-ID (diff)
From: Jagan Teki <jagan@amarulasolutions.com>
To: Heiko Stuebner <heiko@sntech.de>,
	Rob Herring <robh+dt@kernel.org>,
	Krzysztof Kozlowski <krzysztof.kozlowski+dt@linaro.org>
Cc: linux-rockchip@lists.infradead.org, devicetree@vger.kernel.org,
	linux-arm-kernel@lists.infradead.org,
	Jagan Teki <jagan@amarulasolutions.com>,
	FUKAUMI Naoki <naoki@radxa.com>
Subject: [PATCH 6/7] arm64: dts: rockchip: Update eMMC, SD aliases for Radxa SoM boards
Date: Tue, 17 Jan 2023 16:25:03 +0530	[thread overview]
Message-ID: <20230117105504.18296-6-jagan@amarulasolutions.com> (raw)
In-Reply-To: <20230117105504.18296-1-jagan@amarulasolutions.com>

Radxa has produced Compute Modules like RK3399pro VMARC and CM3i with
onboarding eMMC flash, so the eMMC is the primary MMC device.

On the other hand, Rockchip boot orders start from eMMC from an MMC
device perspective.

Mark, the eMMC has mmc0 to satisfy the above two conditions.

Reported-by: FUKAUMI Naoki <naoki@radxa.com>
Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
---
 arch/arm64/boot/dts/rockchip/rk3399pro-vmarc-som.dtsi | 4 ++--
 arch/arm64/boot/dts/rockchip/rk3568-radxa-e25.dts     | 3 +--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/arch/arm64/boot/dts/rockchip/rk3399pro-vmarc-som.dtsi b/arch/arm64/boot/dts/rockchip/rk3399pro-vmarc-som.dtsi
index bf9eb0405b62..8b8992a8e9c0 100644
--- a/arch/arm64/boot/dts/rockchip/rk3399pro-vmarc-som.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3399pro-vmarc-som.dtsi
@@ -13,8 +13,8 @@ / {
 	compatible = "vamrs,rk3399pro-vmarc-som", "rockchip,rk3399pro";
 
 	aliases {
-		mmc0 = &sdmmc;
-		mmc1 = &sdhci;
+		mmc0 = &sdhci;
+		mmc1 = &sdmmc;
 	};
 
 	vcc3v3_pcie: vcc-pcie-regulator {
diff --git a/arch/arm64/boot/dts/rockchip/rk3568-radxa-e25.dts b/arch/arm64/boot/dts/rockchip/rk3568-radxa-e25.dts
index 8ca15b723799..6a3d964f6207 100644
--- a/arch/arm64/boot/dts/rockchip/rk3568-radxa-e25.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3568-radxa-e25.dts
@@ -8,8 +8,7 @@ / {
 	compatible = "radxa,radxa-e25", "radxa,radxa-cm3i", "rockchip,rk3568";
 
 	aliases {
-		mmc0 = &sdmmc0;
-		mmc1 = &sdhci;
+		mmc1 = &sdmmc0;
 	};
 
 	pwm-leds {
-- 
2.25.1


_______________________________________________
Linux-rockchip mailing list
Linux-rockchip@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-rockchip

WARNING: multiple messages have this Message-ID (diff)
From: Jagan Teki <jagan@amarulasolutions.com>
To: Heiko Stuebner <heiko@sntech.de>,
	Rob Herring <robh+dt@kernel.org>,
	Krzysztof Kozlowski <krzysztof.kozlowski+dt@linaro.org>
Cc: linux-rockchip@lists.infradead.org, devicetree@vger.kernel.org,
	linux-arm-kernel@lists.infradead.org,
	Jagan Teki <jagan@amarulasolutions.com>,
	FUKAUMI Naoki <naoki@radxa.com>
Subject: [PATCH 6/7] arm64: dts: rockchip: Update eMMC, SD aliases for Radxa SoM boards
Date: Tue, 17 Jan 2023 16:25:03 +0530	[thread overview]
Message-ID: <20230117105504.18296-6-jagan@amarulasolutions.com> (raw)
In-Reply-To: <20230117105504.18296-1-jagan@amarulasolutions.com>

Radxa has produced Compute Modules like RK3399pro VMARC and CM3i with
onboarding eMMC flash, so the eMMC is the primary MMC device.

On the other hand, Rockchip boot orders start from eMMC from an MMC
device perspective.

Mark, the eMMC has mmc0 to satisfy the above two conditions.

Reported-by: FUKAUMI Naoki <naoki@radxa.com>
Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
---
 arch/arm64/boot/dts/rockchip/rk3399pro-vmarc-som.dtsi | 4 ++--
 arch/arm64/boot/dts/rockchip/rk3568-radxa-e25.dts     | 3 +--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/arch/arm64/boot/dts/rockchip/rk3399pro-vmarc-som.dtsi b/arch/arm64/boot/dts/rockchip/rk3399pro-vmarc-som.dtsi
index bf9eb0405b62..8b8992a8e9c0 100644
--- a/arch/arm64/boot/dts/rockchip/rk3399pro-vmarc-som.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3399pro-vmarc-som.dtsi
@@ -13,8 +13,8 @@ / {
 	compatible = "vamrs,rk3399pro-vmarc-som", "rockchip,rk3399pro";
 
 	aliases {
-		mmc0 = &sdmmc;
-		mmc1 = &sdhci;
+		mmc0 = &sdhci;
+		mmc1 = &sdmmc;
 	};
 
 	vcc3v3_pcie: vcc-pcie-regulator {
diff --git a/arch/arm64/boot/dts/rockchip/rk3568-radxa-e25.dts b/arch/arm64/boot/dts/rockchip/rk3568-radxa-e25.dts
index 8ca15b723799..6a3d964f6207 100644
--- a/arch/arm64/boot/dts/rockchip/rk3568-radxa-e25.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3568-radxa-e25.dts
@@ -8,8 +8,7 @@ / {
 	compatible = "radxa,radxa-e25", "radxa,radxa-cm3i", "rockchip,rk3568";
 
 	aliases {
-		mmc0 = &sdmmc0;
-		mmc1 = &sdhci;
+		mmc1 = &sdmmc0;
 	};
 
 	pwm-leds {
-- 
2.25.1


_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

  parent reply	other threads:[~2023-01-17 10:55 UTC|newest]

Thread overview: 45+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-01-17 10:54 [PATCH 1/7] dt-bindings: arm: rockchip: Add meaningful comments for Radxa CM3 Jagan Teki
2023-01-17 10:54 ` Jagan Teki
2023-01-17 10:54 ` Jagan Teki
2023-01-17 10:54 ` [PATCH 2/7] arm64: dts: rockchip: Add missing CM3i fallback compatible for Radxa E25 Jagan Teki
2023-01-17 10:54   ` Jagan Teki
2023-01-17 10:54   ` Jagan Teki
2023-01-17 10:55 ` [PATCH 3/7] dt-bindings: arm: rockchip: Fix description and compatible for Radxa CM3i Jagan Teki
2023-01-17 10:55   ` Jagan Teki
2023-01-17 10:55   ` Jagan Teki
2023-01-17 11:06   ` Krzysztof Kozlowski
2023-01-17 11:06     ` Krzysztof Kozlowski
2023-01-17 11:06     ` Krzysztof Kozlowski
2023-01-17 12:55     ` Jagan Teki
2023-01-17 12:55       ` Jagan Teki
2023-01-17 12:55       ` Jagan Teki
2023-01-17 20:32       ` Rob Herring
2023-01-17 20:32         ` Rob Herring
2023-01-17 20:32         ` Rob Herring
2023-01-17 10:55 ` [PATCH 4/7] arm64: dts: rockchip: Fix compatible and model " Jagan Teki
2023-01-17 10:55   ` Jagan Teki
2023-01-17 10:55   ` Jagan Teki
2023-01-17 11:07   ` Krzysztof Kozlowski
2023-01-17 11:07     ` Krzysztof Kozlowski
2023-01-17 11:07     ` Krzysztof Kozlowski
2023-01-17 12:52     ` Jagan Teki
2023-01-17 12:52       ` Jagan Teki
2023-01-17 12:52       ` Jagan Teki
2023-01-17 12:58       ` Krzysztof Kozlowski
2023-01-17 12:58         ` Krzysztof Kozlowski
2023-01-17 12:58         ` Krzysztof Kozlowski
2023-01-18  7:20         ` Jagan Teki
2023-01-18  7:20           ` Jagan Teki
2023-01-18  7:20           ` Jagan Teki
2023-01-17 10:55 ` [PATCH 5/7] arm64: dts: rockchip: Drop unneeded " Jagan Teki
2023-01-17 10:55   ` Jagan Teki
2023-01-17 10:55   ` Jagan Teki
2023-01-17 10:55 ` Jagan Teki [this message]
2023-01-17 10:55   ` [PATCH 6/7] arm64: dts: rockchip: Update eMMC, SD aliases for Radxa SoM boards Jagan Teki
2023-01-17 10:55   ` Jagan Teki
2023-01-17 10:55 ` [PATCH 7/7] arm64: dts: rockchip: Update eMMC, SD aliases for Radxa SBC boards Jagan Teki
2023-01-17 10:55   ` Jagan Teki
2023-01-17 10:55   ` Jagan Teki
2023-01-17 11:05 ` [PATCH 1/7] dt-bindings: arm: rockchip: Add meaningful comments for Radxa CM3 Krzysztof Kozlowski
2023-01-17 11:05   ` Krzysztof Kozlowski
2023-01-17 11:05   ` Krzysztof Kozlowski

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20230117105504.18296-6-jagan@amarulasolutions.com \
    --to=jagan@amarulasolutions.com \
    --cc=devicetree@vger.kernel.org \
    --cc=heiko@sntech.de \
    --cc=krzysztof.kozlowski+dt@linaro.org \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-rockchip@lists.infradead.org \
    --cc=naoki@radxa.com \
    --cc=robh+dt@kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.