ARM: dts: rockchip: use hdmi-ddc for ddc bus in rk3288

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

diff --git a/arch/arm/boot/dts/rk3288-popmetal.dts b/arch/arm/boot/dts/rk3288-popmetal.dts
index e240771818d32465879080f1635441e70b5fef14..6089a827238828f313e41818bb0361547ad3cfe7 100644 (file)
--- a/arch/arm/boot/dts/rk3288-popmetal.dts
+++ b/arch/arm/boot/dts/rk3288-popmetal.dts
@@ -79,22 +79,6 @@
                };
        };
 
-       io_domains: io-domains {
-               compatible = "rockchip,rk3288-io-voltage-domain";
-               rockchip,grf = <&grf>;
-
-               audio-supply = <&vcca_33>;
-               bb-supply = <&vcc_io>;
-               dvp-supply = <&vcc18_dvp>;
-               flash0-supply = <&vcc_flash>;
-               flash1-supply = <&vcc_lan>;
-               gpio30-supply = <&vcc_io>;
-               gpio1830-supply = <&vcc_io>;
-               lcdc-supply = <&vcc_io>;
-               sdcard-supply = <&vccio_sd>;
-               wifi-supply = <&vccio_wl>;
-       };
-
        ir: ir-receiver {
                compatible = "gpio-ir-receiver";
                gpios = <&gpio0 6 GPIO_ACTIVE_LOW>;
@@ -186,6 +170,7 @@
        vmmc-supply = <&vcc_sd>;
        vqmmc-supply = <&vccio_sd>;
        status = "okay";
+       supports-sd;
 };
 
 &gmac {
@@ -204,8 +189,16 @@
        status = "ok";
 };
 
+&gpu {
+       mali-supply = <&vdd_gpu>;
+       status = "okay";
+};
+
 &hdmi {
-       ddc-i2c-bus = <&i2c5>;
+       status = "okay";
+};
+
+&hevc_service {
        status = "okay";
 };
 
@@ -436,7 +429,22 @@
        status = "okay";
 };
 
-&i2c5 {
+&io_domains {
+       status = "okay";
+
+       audio-supply = <&vcca_33>;
+       bb-supply = <&vcc_io>;
+       dvp-supply = <&vcc18_dvp>;
+       flash0-supply = <&vcc_flash>;
+       flash1-supply = <&vcc_lan>;
+       gpio30-supply = <&vcc_io>;
+       gpio1830-supply = <&vcc_io>;
+       lcdc-supply = <&vcc_io>;
+       sdcard-supply = <&vccio_sd>;
+       wifi-supply = <&vccio_wl>;
+};
+
+&rga {
        status = "okay";
 };
 
@@ -506,6 +514,10 @@
        status = "okay";
 };
 
+&vpu_service {
+       status = "okay";
+};
+
 &uart0 {
        status = "okay";
 };
@@ -529,3 +541,16 @@
 &usbphy {
        status = "okay";
 };
+
+&usb_host0_ehci {
+       no-relinquish-port;
+       status = "okay";
+};
+
+&usb_host1 {
+       status = "okay";
+};
+
+&usb_otg {
+       status= "okay";
+};