Merge tag 'ceph-for-4.9-rc1' of git://github.com/ceph/ceph-client

[cascardo/linux.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 720717b..56dd377 100644 (file)
--- a/arch/arm/boot/dts/rk3288-popmetal.dts
+++ b/arch/arm/boot/dts/rk3288-popmetal.dts
@@ -77,22 +77,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>;
@@ -403,12 +387,16 @@
                interrupts = <1 IRQ_TYPE_EDGE_RISING>;
                pinctrl-names = "default";
                pinctrl-0 = <&comp_int>;
+               vdd-supply = <&vcc_io>;
+               vid-supply = <&vcc_io>;
        };
 
-       l3g4200d: l3g4200d@68 {
+       l3g4200d: l3g4200d@69 {
                compatible = "st,l3g4200d-gyro";
                st,drdy-int-pin = <2>;
-               reg = <0x6b>;
+               reg = <0x69>;
+               vdd-supply = <&vcc_io>;
+               vddio-supply = <&vcc_io>;
        };
 
        mma8452: mma8452@1d {
@@ -437,6 +425,21 @@
        status = "okay";
 };
 
+&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>;
+};
+
 &pinctrl {
        ak8963 {
                comp_int: comp-int {
@@ -526,3 +529,7 @@
 &usbphy {
        status = "okay";
 };
+
+&usb_otg {
+       status = "okay";
+};