arm64: dts: rockchip: move mmc aliases to board dts on

A patch from »ARM: dts: rockchip: move rk322x mmcx aliases to board dts« in state Mainline for linux-kernel

From: Heiko Stuebner <heiko.stuebner@...> Date: Tue, 23 Mar 2021 15:42:50 +0100

Commit-Message

As suggested by Arnd Bergmann, the newly added mmc aliases should be board specific, so move them from the general dtsi to the individual boards. Suggested-by: Arnd Bergmann <arnd@...> Signed-off-by: Heiko Stuebner <heiko.stuebner@...>

Patch-Comment

arch/arm64/boot/dts/rockchip/rk3399-evb.dts | 4 ++++ arch/arm64/boot/dts/rockchip/rk3399-firefly.dts | 6 ++++++ arch/arm64/boot/dts/rockchip/rk3399-gru.dtsi | 5 +++++ arch/arm64/boot/dts/rockchip/rk3399-hugsun-x99.dts | 6 ++++++ arch/arm64/boot/dts/rockchip/rk3399-khadas-edge.dtsi | 6 ++++++ arch/arm64/boot/dts/rockchip/rk3399-kobol-helios64.dts | 5 +++++ arch/arm64/boot/dts/rockchip/rk3399-leez-p710.dts | 6 ++++++ arch/arm64/boot/dts/rockchip/rk3399-nanopi4.dtsi | 6 ++++++ arch/arm64/boot/dts/rockchip/rk3399-orangepi.dts | 6 ++++++ arch/arm64/boot/dts/rockchip/rk3399-pinebook-pro.dts | 6 ++++++ arch/arm64/boot/dts/rockchip/rk3399-puma-haikou.dts | 4 ++++ arch/arm64/boot/dts/rockchip/rk3399-puma.dtsi | 4 ++++ arch/arm64/boot/dts/rockchip/rk3399-roc-pc-mezzanine.dts | 4 ++++ arch/arm64/boot/dts/rockchip/rk3399-roc-pc.dtsi | 5 +++++ arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dtsi | 5 +++++ arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4b.dts | 4 ++++ arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4c.dts | 4 ++++ arch/arm64/boot/dts/rockchip/rk3399-rock960.dtsi | 6 ++++++ arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dtsi | 6 ++++++ arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator.dts | 4 ++++ arch/arm64/boot/dts/rockchip/rk3399-sapphire.dtsi | 5 +++++ arch/arm64/boot/dts/rockchip/rk3399.dtsi | 3 --- arch/arm64/boot/dts/rockchip/rk3399pro-vmarc-som.dtsi | 5 +++++ 23 files changed, 112 insertions(+), 3 deletions(-)

Statistics

  • 112 lines added
  • 3 lines removed

Changes

----------------- arch/arm64/boot/dts/rockchip/rk3399-evb.dts ------------------
index 694b0d08d644..7b717ebec8ff 100644
@@ -11,6 +11,10 @@ / {
model = "Rockchip RK3399 Evaluation Board";
compatible = "rockchip,rk3399-evb", "rockchip,rk3399";
+ aliases {
+ mmc0 = &sdhci;
+ };
+
backlight: backlight {
compatible = "pwm-backlight";
brightness-levels = <
--------------- arch/arm64/boot/dts/rockchip/rk3399-firefly.dts ----------------
index 6db18808b9c5..45254be1350d 100644
@@ -13,6 +13,12 @@ / {
model = "Firefly-RK3399 Board";
compatible = "firefly,firefly-rk3399", "rockchip,rk3399";
+ aliases {
+ mmc0 = &sdio0;
+ mmc1 = &sdmmc;
+ mmc2 = &sdhci;
+ };
+
chosen {
stdout-path = "serial2:1500000n8";
};
----------------- arch/arm64/boot/dts/rockchip/rk3399-gru.dtsi -----------------
index 32dcaf210085..4002742fed4c 100644
@@ -10,6 +10,11 @@
#include "rk3399-op1-opp.dtsi"
/ {
+ aliases {
+ mmc0 = &sdmmc;
+ mmc1 = &sdhci;
+ };
+
chosen {
stdout-path = "serial2:115200n8";
};
-------------- arch/arm64/boot/dts/rockchip/rk3399-hugsun-x99.dts --------------
index 341d074ed996..bee45c17e2ca 100644
@@ -9,6 +9,12 @@ / {
model = "Hugsun X99 TV BOX";
compatible = "hugsun,x99", "rockchip,rk3399";
+ aliases {
+ mmc0 = &sdio0;
+ mmc1 = &sdmmc;
+ mmc2 = &sdhci;
+ };
+
chosen {
stdout-path = "serial2:1500000n8";
};
------------- arch/arm64/boot/dts/rockchip/rk3399-khadas-edge.dtsi -------------
index 635afdd99122..d5c7648c841d 100644
@@ -11,6 +11,12 @@
#include "rk3399-opp.dtsi"
/ {
+ aliases {
+ mmc0 = &sdio0;
+ mmc1 = &sdmmc;
+ mmc2 = &sdhci;
+ };
+
chosen {
stdout-path = "serial2:1500000n8";
};
------------ arch/arm64/boot/dts/rockchip/rk3399-kobol-helios64.dts ------------
index 66c725a34220..19485b552bc4 100644
@@ -18,6 +18,11 @@ / {
model = "Kobol Helios64";
compatible = "kobol,helios64", "rockchip,rk3399";
+ aliases {
+ mmc0 = &sdmmc;
+ mmc1 = &sdhci;
+ };
+
avdd_1v8_s0: avdd-1v8-s0 {
compatible = "regulator-fixed";
regulator-name = "avdd_1v8_s0";
-------------- arch/arm64/boot/dts/rockchip/rk3399-leez-p710.dts ---------------
index 1fa80ac15464..7c93f840bc64 100644
@@ -13,6 +13,12 @@ / {
model = "Leez RK3399 P710";
compatible = "leez,p710", "rockchip,rk3399";
+ aliases {
+ mmc0 = &sdio0;
+ mmc1 = &sdmmc;
+ mmc2 = &sdhci;
+ };
+
chosen {
stdout-path = "serial2:1500000n8";
};
--------------- arch/arm64/boot/dts/rockchip/rk3399-nanopi4.dtsi ---------------
index 48ed4aaa37f3..16fd58c4a80f 100644
@@ -17,6 +17,12 @@
#include "rk3399-opp.dtsi"
/ {
+ aliases {
+ mmc0 = &sdio0;
+ mmc1 = &sdmmc;
+ mmc2 = &sdhci;
+ };
+
chosen {
stdout-path = "serial2:1500000n8";
};
--------------- arch/arm64/boot/dts/rockchip/rk3399-orangepi.dts ---------------
index ad7c4d00888f..04b54abea3cc 100644
@@ -15,6 +15,12 @@ / {
model = "Orange Pi RK3399 Board";
compatible = "rockchip,rk3399-orangepi", "rockchip,rk3399";
+ aliases {
+ mmc0 = &sdio0;
+ mmc1 = &sdmmc;
+ mmc2 = &sdhci;
+ };
+
chosen {
stdout-path = "serial2:1500000n8";
};
------------- arch/arm64/boot/dts/rockchip/rk3399-pinebook-pro.dts -------------
index 219b7507a10f..2b5f001ff4a6 100644
@@ -18,6 +18,12 @@ / {
model = "Pine64 Pinebook Pro";
compatible = "pine64,pinebook-pro", "rockchip,rk3399";
+ aliases {
+ mmc0 = &sdio0;
+ mmc1 = &sdmmc;
+ mmc2 = &sdhci;
+ };
+
chosen {
stdout-path = "serial2:1500000n8";
};
------------- arch/arm64/boot/dts/rockchip/rk3399-puma-haikou.dts --------------
index 42a488b74e0e..545de88d756f 100644
@@ -10,6 +10,10 @@ / {
model = "Theobroma Systems RK3399-Q7 SoM";
compatible = "tsd,rk3399-puma-haikou", "rockchip,rk3399";
+ aliases {
+ mmc1 = &sdmmc;
+ };
+
chosen {
stdout-path = "serial0:115200n8";
};
---------------- arch/arm64/boot/dts/rockchip/rk3399-puma.dtsi -----------------
index 6aad90e23141..c635b01e67df 100644
@@ -8,6 +8,10 @@
#include "rk3399-opp.dtsi"
/ {
+ aliases {
+ mmc0 = &sdhci;
+ };
+
leds {
compatible = "gpio-leds";
pinctrl-names = "default";
----------- arch/arm64/boot/dts/rockchip/rk3399-roc-pc-mezzanine.dts -----------
index 754627d97144..9447c8724b65 100644
@@ -11,6 +11,10 @@ / {
model = "Firefly ROC-RK3399-PC Mezzanine Board";
compatible = "firefly,roc-rk3399-pc-mezzanine", "rockchip,rk3399";
+ aliases {
+ mmc2 = &sdio0;
+ };
+
/* MP8009 PoE PD */
poe_12v: poe-12v {
compatible = "regulator-fixed";
--------------- arch/arm64/boot/dts/rockchip/rk3399-roc-pc.dtsi ----------------
index 20309076dbac..c172f5a803e7 100644
@@ -13,6 +13,11 @@ / {
model = "Firefly ROC-RK3399-PC Board";
compatible = "firefly,roc-rk3399-pc", "rockchip,rk3399";
+ aliases {
+ mmc0 = &sdmmc;
+ mmc1 = &sdhci;
+ };
+
chosen {
stdout-path = "serial2:1500000n8";
};
-------------- arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dtsi --------------
index fb7599f07af4..7d0a7c697703 100644
@@ -11,6 +11,11 @@
#include "rk3399-opp.dtsi"
/ {
+ aliases {
+ mmc0 = &sdmmc;
+ mmc1 = &sdhci;
+ };
+
chosen {
stdout-path = "serial2:1500000n8";
};
-------------- arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4b.dts --------------
index f0055ce2fda0..6c63e617063c 100644
@@ -10,6 +10,10 @@
/ {
model = "Radxa ROCK Pi 4B";
compatible = "radxa,rockpi4b", "radxa,rockpi4", "rockchip,rk3399";
+
+ aliases {
+ mmc2 = &sdio0;
+ };
};
&sdio0 {
-------------- arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4c.dts --------------
index 4c7ebb1c5d2d..99169bcd51c0 100644
@@ -11,6 +11,10 @@
/ {
model = "Radxa ROCK Pi 4C";
compatible = "radxa,rockpi4c", "radxa,rockpi4", "rockchip,rk3399";
+
+ aliases {
+ mmc2 = &sdio0;
+ };
};
&sdio0 {
--------------- arch/arm64/boot/dts/rockchip/rk3399-rock960.dtsi ---------------
index 5e3ac589bc54..25dc61c26a94 100644
@@ -9,6 +9,12 @@
#include "rk3399-opp.dtsi"
/ {
+ aliases {
+ mmc0 = &sdio0;
+ mmc1 = &sdmmc;
+ mmc2 = &sdhci;
+ };
+
sdio_pwrseq: sdio-pwrseq {
compatible = "mmc-pwrseq-simple";
clocks = <&rk808 1>;
-------------- arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dtsi --------------
index d42c75c6dcbd..6bff8db7d33e 100644
@@ -10,6 +10,12 @@
#include "rk3399-opp.dtsi"
/ {
+ aliases {
+ mmc0 = &sdio0;
+ mmc1 = &sdmmc;
+ mmc2 = &sdhci;
+ };
+
chosen {
stdout-path = "serial2:1500000n8";
};
---------- arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator.dts ----------
index 73e269a8ae0c..f6b2199a42bd 100644
@@ -10,6 +10,10 @@ / {
model = "Excavator-RK3399 Board";
compatible = "rockchip,rk3399-sapphire-excavator", "rockchip,rk3399";
+ aliases {
+ mmc2 = &sdio0;
+ };
+
adc-keys {
compatible = "adc-keys";
io-channels = <&saradc 1>;
-------------- arch/arm64/boot/dts/rockchip/rk3399-sapphire.dtsi ---------------
index 701a567d7638..46b0f97a0b1c 100644
@@ -11,6 +11,11 @@
/ {
compatible = "rockchip,rk3399-sapphire", "rockchip,rk3399";
+ aliases {
+ mmc0 = &sdmmc;
+ mmc1 = &sdhci;
+ };
+
chosen {
stdout-path = "serial2:1500000n8";
};
------------------- arch/arm64/boot/dts/rockchip/rk3399.dtsi -------------------
index 98cec9387300..d620a683bff3 100644
@@ -29,9 +29,6 @@ aliases {
i2c6 = &i2c6;
i2c7 = &i2c7;
i2c8 = &i2c8;
- mmc0 = &sdio0;
- mmc1 = &sdmmc;
- mmc2 = &sdhci;
serial0 = &uart0;
serial1 = &uart1;
serial2 = &uart2;
------------ arch/arm64/boot/dts/rockchip/rk3399pro-vmarc-som.dtsi -------------
index 7257494d2831..c0074b3ed4af 100644
@@ -12,6 +12,11 @@
/ {
compatible = "vamrs,rk3399pro-vmarc-som", "rockchip,rk3399pro";
+ aliases {
+ mmc0 = &sdmmc;
+ mmc1 = &sdhci;
+ };
+
vcc3v3_pcie: vcc-pcie-regulator {
compatible = "regulator-fixed";
enable-active-high;
 
 

Recent Patches

About Us

Sed lacus. Donec lectus. Nullam pretium nibh ut turpis. Nam bibendum. In nulla tortor, elementum vel, tempor at, varius non, purus. Mauris vitae nisl nec metus placerat consectetuer.

Read More...