rockchip: update mmc aliases for rk3568 boards

This commit is contained in:
AmadeusGhost 2023-05-07 23:08:36 +08:00
parent 9efea60e99
commit 1769c5dfa2
6 changed files with 10 additions and 21 deletions

View File

@ -34,7 +34,7 @@
+}; +};
--- /dev/null --- /dev/null
+++ b/arch/arm/dts/rk3568-mrkaio-m68s.dts +++ b/arch/arm/dts/rk3568-mrkaio-m68s.dts
@@ -0,0 +1,268 @@ @@ -0,0 +1,263 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+ +
+#include "rk3568-evb.dts" +#include "rk3568-evb.dts"
@ -42,11 +42,6 @@
+/ { +/ {
+ model = "EZPRO Mrkaio M68S"; + model = "EZPRO Mrkaio M68S";
+ compatible = "ezpro,mrkaio-m68s", "rockchip,rk3568"; + compatible = "ezpro,mrkaio-m68s", "rockchip,rk3568";
+
+ aliases {
+ mmc0 = &sdmmc0;
+ mmc1 = &sdhci;
+ };
+}; +};
+ +
+&cpu0 { +&cpu0 {

View File

@ -34,7 +34,7 @@
+}; +};
--- /dev/null --- /dev/null
+++ b/arch/arm/dts/rk3568-opc-h68k.dts +++ b/arch/arm/dts/rk3568-opc-h68k.dts
@@ -0,0 +1,277 @@ @@ -0,0 +1,272 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+ +
+#include "rk3568-evb.dts" +#include "rk3568-evb.dts"
@ -42,11 +42,6 @@
+/ { +/ {
+ model = "HINLINK OPC-H68K Board"; + model = "HINLINK OPC-H68K Board";
+ compatible = "hinlink,opc-h68k", "rockchip,rk3568"; + compatible = "hinlink,opc-h68k", "rockchip,rk3568";
+
+ aliases {
+ mmc0 = &sdmmc0;
+ mmc1 = &sdhci;
+ };
+}; +};
+ +
+&cpu0 { +&cpu0 {

View File

@ -9,8 +9,8 @@
/ { / {
aliases { aliases {
mmc0 = &sdmmc0; mmc0 = &sdhci;
mmc1 = &sdhci; mmc1 = &sdmmc0;
led-boot = &led_work; led-boot = &led_work;
led-failsafe = &led_work; led-failsafe = &led_work;

View File

@ -8,8 +8,8 @@
/ { / {
aliases { aliases {
mmc0 = &sdmmc0; mmc0 = &sdhci;
mmc1 = &sdhci; mmc1 = &sdmmc0;
}; };
chosen { chosen {

View File

@ -18,8 +18,6 @@
compatible = "friendlyarm,nanopi-r5c","rockchip,rk3568"; compatible = "friendlyarm,nanopi-r5c","rockchip,rk3568";
aliases { aliases {
ethernet0 = &rtl8125_1;
ethernet1 = &rtl8125_2;
mmc0 = &sdmmc0; mmc0 = &sdmmc0;
mmc1 = &sdhci; mmc1 = &sdhci;

View File

@ -13,8 +13,8 @@
aliases { aliases {
ethernet0 = &gmac1; ethernet0 = &gmac1;
mmc0 = &sdmmc0; mmc0 = &sdhci;
mmc1 = &sdhci; mmc1 = &sdmmc0;
}; };
chosen: chosen { chosen: chosen {
@ -245,6 +245,7 @@
clock_in_out = "output"; clock_in_out = "output";
phy-handle = <&rgmii_phy1>; phy-handle = <&rgmii_phy1>;
phy-mode = "rgmii-id"; phy-mode = "rgmii-id";
phy-supply = <&vcc_3v3>;
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&gmac1m1_miim pinctrl-0 = <&gmac1m1_miim
&gmac1m1_tx_bus2 &gmac1m1_tx_bus2
@ -681,7 +682,7 @@
disable-wp; disable-wp;
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&sdmmc0_bus4 &sdmmc0_clk &sdmmc0_cmd &sdmmc0_det>; pinctrl-0 = <&sdmmc0_bus4 &sdmmc0_clk &sdmmc0_cmd &sdmmc0_det>;
sd-uhs-sdr104; sd-uhs-sdr50;
vmmc-supply = <&vcc3v3_sd>; vmmc-supply = <&vcc3v3_sd>;
vqmmc-supply = <&vccio_sd>; vqmmc-supply = <&vccio_sd>;
status = "okay"; status = "okay";