Merge tag 'armsoc-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc

[sfrench/cifs-2.6.git] / arch / arm / boot / dts / imx6qdl-sabresd.dtsi

diff --git a/arch/arm/boot/dts/imx6qdl-sabresd.dtsi b/arch/arm/boot/dts/imx6qdl-sabresd.dtsi
index 8930aec6464cdcca8053a81bb00a140ec2c08b2a..185fb17a35001e8165dc5cf77b79cd0c344868d6 100644 (file)
--- a/arch/arm/boot/dts/imx6qdl-sabresd.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-sabresd.dtsi
@@ -64,7 +64,6 @@
                regulator-max-microvolt = <3300000>;
                gpio = <&gpio2 31 GPIO_ACTIVE_HIGH>;
                enable-active-high;
-               regulator-always-on;
        };
 
        gpio-keys {
@@ -203,7 +202,7 @@
 &fec {
        pinctrl-names = "default";
        pinctrl-0 = <&pinctrl_enet>;
-       phy-mode = "rgmii";
+       phy-mode = "rgmii-id";
        phy-reset-gpios = <&gpio1 25 GPIO_ACTIVE_LOW>;
        status = "okay";
 };
@@ -250,6 +249,8 @@
                pinctrl-0 = <&pinctrl_i2c1_mma8451_int>;
                interrupt-parent = <&gpio1>;
                interrupts = <18 IRQ_TYPE_LEVEL_LOW>;
+               vdd-supply = <&reg_sensors>;
+               vddio-supply = <&reg_sensors>;
        };
 
        ov5642: camera@3c {
@@ -440,6 +441,8 @@
                pinctrl-0 = <&pinctrl_i2c3_mag3110_int>;
                interrupt-parent = <&gpio3>;
                interrupts = <16 IRQ_TYPE_EDGE_RISING>;
+               vdd-supply = <&reg_sensors>;
+               vddio-supply = <&reg_sensors>;
        };
 
        light-sensor@44 {
@@ -449,6 +452,7 @@
                pinctrl-0 = <&pinctrl_i2c3_isl29023_int>;
                interrupt-parent = <&gpio3>;
                interrupts = <9 IRQ_TYPE_EDGE_FALLING>;
+               vcc-supply = <&reg_sensors>;
        };
 };