These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / arch / arm / boot / dts / imx53-qsb-common.dtsi

diff --git a/kernel/arch/arm/boot/dts/imx53-qsb-common.dtsi b/kernel/arch/arm/boot/dts/imx53-qsb-common.dtsi
index 181ae5e..53fd75c 100644 (file)
--- a/kernel/arch/arm/boot/dts/imx53-qsb-common.dtsi
+++ b/kernel/arch/arm/boot/dts/imx53-qsb-common.dtsi
@@ -147,8 +147,8 @@
 &esdhc3 {
        pinctrl-names = "default";
        pinctrl-0 = <&pinctrl_esdhc3>;
-       cd-gpios = <&gpio3 11 0>;
-       wp-gpios = <&gpio3 12 0>;
+       cd-gpios = <&gpio3 11 GPIO_ACTIVE_LOW>;
+       wp-gpios = <&gpio3 12 GPIO_ACTIVE_HIGH>;
        bus-width = <8>;
        status = "okay";
 };
@@ -228,10 +228,11 @@
                        >;
                };
 
+               /* open drain */
                pinctrl_i2c1: i2c1grp {
                        fsl,pins = <
-                               MX53_PAD_CSI0_DAT8__I2C1_SDA            0xc0000000
-                               MX53_PAD_CSI0_DAT9__I2C1_SCL            0xc0000000
+                               MX53_PAD_CSI0_DAT8__I2C1_SDA            0x400001ec
+                               MX53_PAD_CSI0_DAT9__I2C1_SCL            0x400001ec
                        >;
                };
 
@@ -295,9 +296,10 @@
 &tve {
        pinctrl-names = "default";
        pinctrl-0 = <&pinctrl_vga_sync>;
+       ddc-i2c-bus = <&i2c2>;
        fsl,tve-mode = "vga";
-       fsl,hsync-pin = <4>;
-       fsl,vsync-pin = <6>;
+       fsl,hsync-pin = <7>;    /* IPU DI1 PIN7 via EIM_OE */
+       fsl,vsync-pin = <8>;    /* IPU DI1 PIN8 via EIM_RW */
        status = "okay";
 };