target/linux/rockchip/patches-6.1/025-v6.3-arm64-dts-rockchip-Update-eMMC-SD.patch

   1 From c80992abd2877590059e9cb254213c16824e2106 Mon Sep 17 00:00:00 2001
   2 From: Jagan Teki <jagan@amarulasolutions.com>
   3 Date: Wed, 18 Jan 2023 13:34:53 +0530
   4 Subject: [PATCH] arm64: dts: rockchip: Update eMMC, SD aliases for Radxa SoM
   5  boards
   6
   7 Radxa has produced Compute Modules like RK3399pro VMARC and CM3i with
   8 onboarding eMMC flash, so the eMMC is the primary MMC device.
   9
  10 On the other hand, Rockchip boot orders start from eMMC from an MMC
  11 device perspective.
  12
  13 Mark, the eMMC has mmc0 to satisfy the above two conditions.
  14
  15 Reported-by: FUKAUMI Naoki <naoki@radxa.com>
  16 Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
  17 Link: https://lore.kernel.org/r/20230118080454.11643-1-jagan@amarulasolutions.com
  18 Signed-off-by: Heiko Stuebner <heiko@sntech.de>
  19 ---
  20  arch/arm64/boot/dts/rockchip/rk3399pro-vmarc-som.dtsi | 4 ++--
  21  arch/arm64/boot/dts/rockchip/rk3568-radxa-e25.dts     | 3 +--
  22  2 files changed, 3 insertions(+), 4 deletions(-)
  23
  24 --- a/arch/arm64/boot/dts/rockchip/rk3399pro-vmarc-som.dtsi
  25 +++ b/arch/arm64/boot/dts/rockchip/rk3399pro-vmarc-som.dtsi
  26 @@ -13,8 +13,8 @@
  27         compatible = "vamrs,rk3399pro-vmarc-som", "rockchip,rk3399pro";
  28
  29         aliases {
  30 -               mmc0 = &sdmmc;
  31 -               mmc1 = &sdhci;
  32 +               mmc0 = &sdhci;
  33 +               mmc1 = &sdmmc;
  34         };
  35
  36         vcc3v3_pcie: vcc-pcie-regulator {
  37 --- a/arch/arm64/boot/dts/rockchip/rk3568-radxa-e25.dts
  38 +++ b/arch/arm64/boot/dts/rockchip/rk3568-radxa-e25.dts
  39 @@ -8,8 +8,7 @@
  40         compatible = "radxa,e25", "rockchip,rk3568";
  41
  42         aliases {
  43 -               mmc0 = &sdmmc0;
  44 -               mmc1 = &sdhci;
  45 +               mmc1 = &sdmmc0;
  46         };
  47
  48         pwm-leds {