mirror of
https://github.com/torvalds/linux
synced 2024-10-09 21:05:10 +00:00
arm64: dts: rockchip: move mmc aliases to board dts on rk3399
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@kernel.org> Signed-off-by: Heiko Stuebner <heiko.stuebner@theobroma-systems.com> Link: https://lore.kernel.org/r/20210324122235.1059292-7-heiko@sntech.de
This commit is contained in:
Heiko Stuebner
Heiko Stuebner
parent
751a78a8bd
commit
5dcbe7e386
|
|
@ -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 = <
|
||||
|
|
|
|||
|
|
@ -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";
|
||||
};
|
||||
|
|
|
|||
|
|
@ -10,6 +10,11 @@
|
|||
#include "rk3399-op1-opp.dtsi"
|
||||
|
||||
/ {
|
||||
aliases {
|
||||
mmc0 = &sdmmc;
|
||||
mmc1 = &sdhci;
|
||||
};
|
||||
|
||||
chosen {
|
||||
stdout-path = "serial2:115200n8";
|
||||
};
|
||||
|
|
|
|||
|
|
@ -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";
|
||||
};
|
||||
|
|
|
|||
|
|
@ -11,6 +11,12 @@
|
|||
#include "rk3399-opp.dtsi"
|
||||
|
||||
/ {
|
||||
aliases {
|
||||
mmc0 = &sdio0;
|
||||
mmc1 = &sdmmc;
|
||||
mmc2 = &sdhci;
|
||||
};
|
||||
|
||||
chosen {
|
||||
stdout-path = "serial2:1500000n8";
|
||||
};
|
||||
|
|
|
|||
|
|
@ -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";
|
||||
|
|
|
|||
|
|
@ -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";
|
||||
};
|
||||
|
|
|
|||
|
|
@ -17,6 +17,12 @@
|
|||
#include "rk3399-opp.dtsi"
|
||||
|
||||
/ {
|
||||
aliases {
|
||||
mmc0 = &sdio0;
|
||||
mmc1 = &sdmmc;
|
||||
mmc2 = &sdhci;
|
||||
};
|
||||
|
||||
chosen {
|
||||
stdout-path = "serial2:1500000n8";
|
||||
};
|
||||
|
|
|
|||
|
|
@ -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";
|
||||
};
|
||||
|
|
|
|||
|
|
@ -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";
|
||||
};
|
||||
|
|
|
|||
|
|
@ -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";
|
||||
};
|
||||
|
|
|
|||
|
|
@ -8,6 +8,10 @@
|
|||
#include "rk3399-opp.dtsi"
|
||||
|
||||
/ {
|
||||
aliases {
|
||||
mmc0 = &sdhci;
|
||||
};
|
||||
|
||||
leds {
|
||||
compatible = "gpio-leds";
|
||||
pinctrl-names = "default";
|
||||
|
|
|
|||
|
|
@ -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";
|
||||
|
|
|
|||
|
|
@ -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";
|
||||
};
|
||||
|
|
|
|||
|
|
@ -11,6 +11,11 @@
|
|||
#include "rk3399-opp.dtsi"
|
||||
|
||||
/ {
|
||||
aliases {
|
||||
mmc0 = &sdmmc;
|
||||
mmc1 = &sdhci;
|
||||
};
|
||||
|
||||
chosen {
|
||||
stdout-path = "serial2:1500000n8";
|
||||
};
|
||||
|
|
|
|||
|
|
@ -10,6 +10,10 @@
|
|||
/ {
|
||||
model = "Radxa ROCK Pi 4B";
|
||||
compatible = "radxa,rockpi4b", "radxa,rockpi4", "rockchip,rk3399";
|
||||
|
||||
aliases {
|
||||
mmc2 = &sdio0;
|
||||
};
|
||||
};
|
||||
|
||||
&sdio0 {
|
||||
|
|
|
|||
|
|
@ -11,6 +11,10 @@
|
|||
/ {
|
||||
model = "Radxa ROCK Pi 4C";
|
||||
compatible = "radxa,rockpi4c", "radxa,rockpi4", "rockchip,rk3399";
|
||||
|
||||
aliases {
|
||||
mmc2 = &sdio0;
|
||||
};
|
||||
};
|
||||
|
||||
&sdio0 {
|
||||
|
|
|
|||
|
|
@ -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>;
|
||||
|
|
|
|||
|
|
@ -10,6 +10,12 @@
|
|||
#include "rk3399-opp.dtsi"
|
||||
|
||||
/ {
|
||||
aliases {
|
||||
mmc0 = &sdio0;
|
||||
mmc1 = &sdmmc;
|
||||
mmc2 = &sdhci;
|
||||
};
|
||||
|
||||
chosen {
|
||||
stdout-path = "serial2:1500000n8";
|
||||
};
|
||||
|
|
|
|||
|
|
@ -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>;
|
||||
|
|
|
|||
|
|
@ -11,6 +11,11 @@
|
|||
/ {
|
||||
compatible = "rockchip,rk3399-sapphire", "rockchip,rk3399";
|
||||
|
||||
aliases {
|
||||
mmc0 = &sdmmc;
|
||||
mmc1 = &sdhci;
|
||||
};
|
||||
|
||||
chosen {
|
||||
stdout-path = "serial2:1500000n8";
|
||||
};
|
||||
|
|
|
|||
|
|
@ -29,9 +29,6 @@ aliases {
|
|||
i2c6 = &i2c6;
|
||||
i2c7 = &i2c7;
|
||||
i2c8 = &i2c8;
|
||||
mmc0 = &sdio0;
|
||||
mmc1 = &sdmmc;
|
||||
mmc2 = &sdhci;
|
||||
serial0 = &uart0;
|
||||
serial1 = &uart1;
|
||||
serial2 = &uart2;
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
Loading…
Reference in a new issue