Merge tag 'block-5.14-2021-08-07' of git://git.kernel.dk/linux-block

[linux-2.6-microblaze.git] / arch / arm / boot / dts / rk3188-bqedison2qc.dts

diff --git a/arch/arm/boot/dts/rk3188-bqedison2qc.dts b/arch/arm/boot/dts/rk3188-bqedison2qc.dts
index ad1afd4..85d3fce 100644 (file)
--- a/arch/arm/boot/dts/rk3188-bqedison2qc.dts
+++ b/arch/arm/boot/dts/rk3188-bqedison2qc.dts
@@ -13,6 +13,12 @@
        model = "BQ Edison2 Quad-Core";
        compatible = "mundoreader,bq-edison2qc", "rockchip,rk3188";
 
+       aliases {
+               mmc0 = &mmc0;
+               mmc1 = &mmc1;
+               mmc2 = &emmc;
+       };
+
        memory@60000000 {
                device_type = "memory";
                reg = <0x60000000 0x80000000>;
@@ -58,20 +64,25 @@
 
        lvds-encoder {
                compatible = "ti,sn75lvds83", "lvds-encoder";
-               #address-cells = <1>;
-               #size-cells = <0>;
 
-               port@0 {
-                       reg = <0>;
-                       lvds_in_vop0: endpoint {
-                               remote-endpoint = <&vop0_out_lvds>;
+               ports {
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+
+                       port@0 {
+                               reg = <0>;
+
+                               lvds_in_vop0: endpoint {
+                                       remote-endpoint = <&vop0_out_lvds>;
+                               };
                        };
-               };
 
-               port@1 {
-                       reg = <1>;
-                       lvds_out_panel: endpoint {
-                               remote-endpoint = <&panel_in_lvds>;
+                       port@1 {
+                               reg = <1>;
+
+                               lvds_out_panel: endpoint {
+                                       remote-endpoint = <&panel_in_lvds>;
+                               };
                        };
                };
        };
@@ -465,7 +476,7 @@
        non-removable;
        pinctrl-names = "default";
        pinctrl-0 = <&sd1_clk>, <&sd1_cmd>, <&sd1_bus4>;
-       vmmcq-supply = <&vccio_wl>;
+       vqmmc-supply = <&vccio_wl>;
        #address-cells = <1>;
        #size-cells = <0>;
        status = "okay";