Merge origin/master into drm-misc-fixes

[karo-tx-linux.git] / arch / arm / boot / dts / imx6ul-tx6ul.dtsi

diff --git a/arch/arm/boot/dts/imx6ul-tx6ul.dtsi b/arch/arm/boot/dts/imx6ul-tx6ul.dtsi
index c784a0b75ca0e83c4e9e2a610f3617a94adbe08a..ec745eb3b6a853b1aab6eb7faab14c30e68bcdf7 100644 (file)
--- a/arch/arm/boot/dts/imx6ul-tx6ul.dtsi
+++ b/arch/arm/boot/dts/imx6ul-tx6ul.dtsi
@@ -173,8 +173,7 @@
                regulator-max-microvolt = <3300000>;
                pinctrl-names = "default";
                pinctrl-0 = <&pinctrl_flexcan_xcvr>;
-               gpio = <&gpio3 5 GPIO_ACTIVE_HIGH>;
-               enable-active-low;
+               gpio = <&gpio3 5 GPIO_ACTIVE_LOW>;
        };
 
        reg_lcd_pwr: regulator-lcdpwr {
@@ -308,7 +307,7 @@
        pinctrl-names = "default";
        pinctrl-0 = <&pinctrl_enet1 &pinctrl_enet1_mdio &pinctrl_etnphy0_rst>;
        phy-mode = "rmii";
-       phy-reset-gpios = <&gpio5 6 GPIO_ACTIVE_HIGH>;
+       phy-reset-gpios = <&gpio5 6 GPIO_ACTIVE_LOW>;
        phy-supply = <&reg_3v3_etn>;
        phy-handle = <&etnphy0>;
        status = "okay";
@@ -343,7 +342,7 @@
        pinctrl-names = "default";
        pinctrl-0 = <&pinctrl_enet2 &pinctrl_etnphy1_rst>;
        phy-mode = "rmii";
-       phy-reset-gpios = <&gpio4 28 GPIO_ACTIVE_HIGH>;
+       phy-reset-gpios = <&gpio4 28 GPIO_ACTIVE_LOW>;
        phy-supply = <&reg_3v3_etn>;
        phy-handle = <&etnphy1>;
        status = "disabled";