cleanup after merge of FSL 3.10.17 tree

[karo-tx-linux.git] / arch / arm / boot / dts / imx6sl-evk.dts

diff --git a/arch/arm/boot/dts/imx6sl-evk.dts b/arch/arm/boot/dts/imx6sl-evk.dts
index 951e3178576bde20e59b955670bd61b878d16947..a8d9a93fab85fd5031eb8c164fc676823392e0b2 100644 (file)
--- a/arch/arm/boot/dts/imx6sl-evk.dts
+++ b/arch/arm/boot/dts/imx6sl-evk.dts
@@ -91,11 +91,6 @@
                mux-int-port = <2>;
                mux-ext-port = <3>;
        };
-
-       pxp_v4l2_out {
-               compatible = "fsl,imx6sl-pxp-v4l2";
-               status = "okay";
-       };
 };
 
 &audmux {
@@ -479,46 +474,6 @@
        status = "okay";
 };
 
-&lcdif {
-       pinctrl-names = "default";
-       pinctrl-0 = <&pinctrl_lcdif_dat_0
-                    &pinctrl_lcdif_ctrl_0>;
-       lcd-supply = <&reg_lcd_3v3>;
-       display = <&display>;
-       status = "okay";
-
-       display: display {
-               bits-per-pixel = <16>;
-               bus-width = <24>;
-
-               display-timings {
-                       native-mode = <&timing0>;
-                       timing0: timing0 {
-                               clock-frequency = <33500000>;
-                               hactive = <800>;
-                               vactive = <480>;
-                               hback-porch = <89>;
-                               hfront-porch = <164>;
-                               vback-porch = <23>;
-                               vfront-porch = <10>;
-                               hsync-len = <10>;
-                               vsync-len = <10>;
-                               hsync-active = <0>;
-                               vsync-active = <0>;
-                               de-active = <1>;
-                               pixelclk-active = <0>;
-                       };
-               };
-       };
-};
-
-&pwm1 {
-       pinctrl-names = "default", "sleep";
-       pinctrl-0 = <&pinctrl_pwm1_0>;
-       pinctrl-1 = <&pinctrl_pwm1_0_sleep>;
-       status = "okay";
-};
-
 &ssi2 {
        fsl,mode = "i2s-slave";
        status = "okay";
@@ -574,7 +529,3 @@
        cd-gpios = <&gpio3 22 0>;
        status = "okay";
 };
-
-&pxp {
-       status = "okay";
-};