Merge branch 'linux-linaro-lsk-v4.4-android' of git://git.linaro.org/kernel/linux...

[firefly-linux-kernel-4.4.55.git] / arch / arm / boot / dts / rk3288-veyron.dtsi

diff --git a/arch/arm/boot/dts/rk3288-veyron.dtsi b/arch/arm/boot/dts/rk3288-veyron.dtsi
index 5e61f07724d42a5e6c40e41d8f5f72029feec3de..4c1f921d9c8c616c6b7a66796276c1ae1bd5f4a3 100644 (file)
--- a/arch/arm/boot/dts/rk3288-veyron.dtsi
+++ b/arch/arm/boot/dts/rk3288-veyron.dtsi
@@ -83,19 +83,6 @@
                reset-gpios = <&gpio2 9 GPIO_ACTIVE_HIGH>;
        };
 
-       io_domains: io-domains {
-               compatible = "rockchip,rk3288-io-voltage-domain";
-               rockchip,grf = <&grf>;
-
-               bb-supply = <&vcc33_io>;
-               dvp-supply = <&vcc_18>;
-               flash0-supply = <&vcc18_flashio>;
-               gpio1830-supply = <&vcc33_io>;
-               gpio30-supply = <&vcc33_io>;
-               lcdc-supply = <&vcc33_lcd>;
-               wifi-supply = <&vcc18_wl>;
-       };
-
        sdio_pwrseq: sdio-pwrseq {
                compatible = "mmc-pwrseq-simple";
                clocks = <&rk808 RK808_CLKOUT1>;
@@ -146,7 +133,6 @@
 &emmc {
        status = "okay";
 
-       broken-cd;
        bus-width = <8>;
        cap-mmc-highspeed;
        rockchip,default-sample-phase = <158>;
@@ -340,6 +326,18 @@
        i2c-scl-rising-time-ns = <1000>;
 };
 
+&io_domains {
+       status = "okay";
+
+       bb-supply = <&vcc33_io>;
+       dvp-supply = <&vcc_18>;
+       flash0-supply = <&vcc18_flashio>;
+       gpio1830-supply = <&vcc33_io>;
+       gpio30-supply = <&vcc33_io>;
+       lcdc-supply = <&vcc33_lcd>;
+       wifi-supply = <&vcc18_wl>;
+};
+
 &pwm1 {
        status = "okay";
 };
@@ -347,7 +345,6 @@
 &sdio0 {
        status = "okay";
 
-       broken-cd;
        bus-width = <4>;
        cap-sd-highspeed;
        cap-sdio-irq;