Merge tag 'media/v5.8-3' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab...

[linux-2.6-microblaze.git] / arch / arm / boot / dts / rk3229-xms6.dts

diff --git a/arch/arm/boot/dts/rk3229-xms6.dts b/arch/arm/boot/dts/rk3229-xms6.dts
index 933ef69..263393a 100644 (file)
--- a/arch/arm/boot/dts/rk3229-xms6.dts
+++ b/arch/arm/boot/dts/rk3229-xms6.dts
@@ -33,12 +33,18 @@
        power-led {
                compatible = "gpio-leds";
 
-               blue {
+               blue_led: led-0 {
                        gpios = <&gpio3 21 GPIO_ACTIVE_HIGH>;
                        default-state = "on";
                };
        };
 
+       sdio_pwrseq: sdio-pwrseq {
+               compatible = "mmc-pwrseq-simple";
+               reset-gpios = <&gpio2 26 GPIO_ACTIVE_LOW>,
+                             <&gpio2 29 GPIO_ACTIVE_LOW>;
+       };
+
        vcc_host: vcc-host-regulator {
                compatible = "regulator-fixed";
                enable-active-high;
@@ -131,7 +137,6 @@
 
 &emmc {
        cap-mmc-highspeed;
-       disable-wp;
        non-removable;
        status = "okay";
 };
@@ -202,6 +207,16 @@
        status = "okay";
 };
 
+&sdio {
+       bus-width = <4>;
+       cap-sd-highspeed;
+       cap-sdio-irq;
+       mmc-pwrseq = <&sdio_pwrseq>;
+       non-removable;
+       vqmmc-supply = <&vccio_1v8>;
+       status = "okay";
+};
+
 &sdmmc {
        cap-mmc-highspeed;
        disable-wp;