imx6: update 3.14 ventana dts with upstream fixes

update the Ventana DTS files with upstream fixes:
 - The 'model' property in the imx-audio-sgtl5000 binding specifies the
   user-visible name of the audio device. This should be something common and
   not baseboard specific.
 - removed obsolete crts
 - fix include typo: The imx6q-gw51xx needs to include imx6qdl-gw51xx.dtsi
 - fix gw52xx clock for sgtl5000 ananlog audio codec
 - fix LVDS mapping for Ventana GW52xx/GW53xx/GW54xx
 - add LVDS backlight for Ventana
 - update model descriptions for all processor variants

Signed-off-by: Tim Harvey <[email protected]>

SVN-Revision: 40988

target/linux/imx6/patches-3.14/0003-ARM-dts-add-Gateworks-Ventana-support.patch

@@ -82,7 +82,7 @@ Signed-off-by: Shawn Guo <[email protected]>
 +#include "imx6qdl-gw51xx.dtsi"
 +
 +/ {
-+	model = "Gateworks Ventana i.MX6 DualLite GW51XX";
++	model = "Gateworks Ventana i.MX6 DualLite/Solo GW51XX";
 +	compatible = "gw,imx6dl-gw51xx", "gw,ventana", "fsl,imx6dl";
 +};
 --- /dev/null
@@ -104,7 +104,7 @@ Signed-off-by: Shawn Guo <[email protected]>
 +#include "imx6qdl-gw52xx.dtsi"
 +
 +/ {
-+	model = "Gateworks Ventana i.MX6 DualLite GW52XX";
++	model = "Gateworks Ventana i.MX6 DualLite/Solo GW52XX";
 +	compatible = "gw,imx6dl-gw52xx", "gw,ventana", "fsl,imx6dl";
 +};
 --- /dev/null
@@ -126,7 +126,7 @@ Signed-off-by: Shawn Guo <[email protected]>
 +#include "imx6qdl-gw53xx.dtsi"
 +
 +/ {
-+	model = "Gateworks Ventana i.MX6 DualLite GW53XX";
++	model = "Gateworks Ventana i.MX6 DualLite/Solo GW53XX";
 +	compatible = "gw,imx6dl-gw53xx", "gw,ventana", "fsl,imx6dl";
 +};
 --- /dev/null
@@ -148,7 +148,7 @@ Signed-off-by: Shawn Guo <[email protected]>
 +#include "imx6qdl-gw54xx.dtsi"
 +
 +/ {
-+	model = "Gateworks Ventana i.MX6 DualLite GW54XX";
++	model = "Gateworks Ventana i.MX6 DualLite/Solo GW54XX";
 +	compatible = "gw,imx6dl-gw54xx", "gw,ventana", "fsl,imx6dl";
 +};
 --- /dev/null
@@ -167,10 +167,10 @@ Signed-off-by: Shawn Guo <[email protected]>
 +
 +/dts-v1/;
 +#include "imx6q.dtsi"
-+#include "imx6qdl-gw54xx.dtsi"
++#include "imx6qdl-gw51xx.dtsi"
 +
 +/ {
-+	model = "Gateworks Ventana i.MX6 Quad GW51XX";
++	model = "Gateworks Ventana i.MX6 Dual/Quad GW51XX";
 +	compatible = "gw,imx6q-gw51xx", "gw,ventana", "fsl,imx6q";
 +};
 --- /dev/null
@@ -192,7 +192,7 @@ Signed-off-by: Shawn Guo <[email protected]>
 +#include "imx6qdl-gw52xx.dtsi"
 +
 +/ {
-+	model = "Gateworks Ventana i.MX6 Quad GW52XX";
++	model = "Gateworks Ventana i.MX6 Dual/Quad GW52XX";
 +	compatible = "gw,imx6q-gw52xx", "gw,ventana", "fsl,imx6q";
 +};
 +
@@ -218,7 +218,7 @@ Signed-off-by: Shawn Guo <[email protected]>
 +#include "imx6qdl-gw53xx.dtsi"
 +
 +/ {
-+	model = "Gateworks Ventana i.MX6 Quad GW53XX";
++	model = "Gateworks Ventana i.MX6 Dual/Quad GW53XX";
 +	compatible = "gw,imx6q-gw53xx", "gw,ventana", "fsl,imx6q";
 +};
 +
@@ -227,7 +227,7 @@ Signed-off-by: Shawn Guo <[email protected]>
 +};
 --- /dev/null
 +++ b/arch/arm/boot/dts/imx6q-gw5400-a.dts
-@@ -0,0 +1,546 @@
+@@ -0,0 +1,543 @@
 +/*
 + * Copyright 2013 Gateworks Corporation
 + *
@@ -345,9 +345,9 @@ Signed-off-by: Shawn Guo <[email protected]>
 +	};
 +
 +	sound {
-+		compatible = "fsl,imx6q-sabrelite-sgtl5000",
++		compatible = "fsl,imx6q-ventana-sgtl5000",
 +			     "fsl,imx-audio-sgtl5000";
-+		model = "imx6q-sabrelite-sgtl5000";
++		model = "sgtl5000-audio";
 +		ssi-controller = <&ssi1>;
 +		audio-codec = <&codec>;
 +		audio-routing =
@@ -717,9 +717,6 @@ Signed-off-by: Shawn Guo <[email protected]>
 +
 +&ldb {
 +	status = "okay";
-+	lvds-channel@0 {
-+		crtcs = <&ipu1 0>, <&ipu1 1>, <&ipu2 0>, <&ipu2 1>;
-+	};
 +};
 +
 +&pcie {
@@ -793,7 +790,7 @@ Signed-off-by: Shawn Guo <[email protected]>
 +#include "imx6qdl-gw54xx.dtsi"
 +
 +/ {
-+	model = "Gateworks Ventana i.MX6 Quad GW54XX";
++	model = "Gateworks Ventana i.MX6 Dual/Quad GW54XX";
 +	compatible = "gw,imx6q-gw54xx", "gw,ventana", "fsl,imx6q";
 +};
 +
@@ -1179,7 +1176,7 @@ Signed-off-by: Shawn Guo <[email protected]>
 +};
 --- /dev/null
 +++ b/arch/arm/boot/dts/imx6qdl-gw52xx.dtsi
-@@ -0,0 +1,490 @@
+@@ -0,0 +1,528 @@
 +/*
 + * Copyright 2013 Gateworks Corporation
 + *
@@ -1209,6 +1206,14 @@ Signed-off-by: Shawn Guo <[email protected]>
 +		bootargs = "console=ttymxc1,115200";
 +	};
 +
++	backlight {
++		compatible = "pwm-backlight";
++		pwms = <&pwm4 0 5000000>;
++		brightness-levels = <0 4 8 16 32 64 128 255>;
++		default-brightness-level = <7>;
++		status = "okay";
++	};
++
 +	leds {
 +		compatible = "gpio-leds";
 +
@@ -1296,9 +1301,9 @@ Signed-off-by: Shawn Guo <[email protected]>
 +	};
 +
 +	sound {
-+		compatible = "fsl,imx6q-sabrelite-sgtl5000",
++		compatible = "fsl,imx6q-ventana-sgtl5000",
 +			     "fsl,imx-audio-sgtl5000";
-+		model = "imx6q-sabrelite-sgtl5000";
++		model = "sgtl5000-audio";
 +		ssi-controller = <&ssi1>;
 +		audio-codec = <&codec>;
 +		audio-routing =
@@ -1458,7 +1463,7 @@ Signed-off-by: Shawn Guo <[email protected]>
 +	codec: sgtl5000@0a {
 +		compatible = "fsl,sgtl5000";
 +		reg = <0x0a>;
-+		clocks = <&clks 169>;
++		clocks = <&clks 201>;
 +		VDDA-supply = <&reg_1p8v>;
 +		VDDIO-supply = <&reg_3p3v>;
 +	};
@@ -1576,6 +1581,12 @@ Signed-off-by: Shawn Guo <[email protected]>
 +			>;
 +		};
 +
++		pinctrl_pwm4: pwm4grp {
++			fsl,pins = <
++				MX6QDL_PAD_SD1_CMD__PWM4_OUT		0x1b0b1
++			>;
++		};
++
 +		pinctrl_uart1: uart1grp {
 +			fsl,pins = <
 +				MX6QDL_PAD_SD3_DAT7__UART1_TX_DATA	0x1b0b1
@@ -1618,8 +1629,26 @@ Signed-off-by: Shawn Guo <[email protected]>
 +
 +&ldb {
 +	status = "okay";
++
 +	lvds-channel@0 {
-+		crtcs = <&ipu1 0>, <&ipu1 1>;
++		fsl,data-mapping = "spwg";
++		fsl,data-width = <18>;
++		status = "okay";
++
++		display-timings {
++			native-mode = <&timing0>;
++			timing0: hsd100pxn1 {
++				clock-frequency = <65000000>;
++				hactive = <1024>;
++				vactive = <768>;
++				hback-porch = <220>;
++				hfront-porch = <40>;
++				vback-porch = <21>;
++				vfront-porch = <7>;
++				hsync-len = <60>;
++				vsync-len = <10>;
++			};
++		};
 +	};
 +};
 +
@@ -1628,6 +1657,12 @@ Signed-off-by: Shawn Guo <[email protected]>
 +	status = "okay";
 +};
 +
++&pwm4 {
++	pinctrl-names = "default";
++	pinctrl-0 = <&pinctrl_pwm4>;
++	status = "okay";
++};
++
 +&ssi1 {
 +	fsl,mode = "i2s-slave";
 +	status = "okay";
@@ -1672,7 +1707,7 @@ Signed-off-by: Shawn Guo <[email protected]>
 +};
 --- /dev/null
 +++ b/arch/arm/boot/dts/imx6qdl-gw53xx.dtsi
-@@ -0,0 +1,553 @@
+@@ -0,0 +1,573 @@
 +/*
 + * Copyright 2013 Gateworks Corporation
 + *
@@ -1705,6 +1740,14 @@ Signed-off-by: Shawn Guo <[email protected]>
 +		bootargs = "console=ttymxc1,115200";
 +	};
 +
++	backlight {
++		compatible = "pwm-backlight";
++		pwms = <&pwm4 0 5000000>;
++		brightness-levels = <0 4 8 16 32 64 128 255>;
++		default-brightness-level = <7>;
++		status = "okay";
++	};
++
 +	leds {
 +		compatible = "gpio-leds";
 +
@@ -1792,9 +1835,9 @@ Signed-off-by: Shawn Guo <[email protected]>
 +	};
 +
 +	sound {
-+		compatible = "fsl,imx6q-sabrelite-sgtl5000",
++		compatible = "fsl,imx6q-ventana-sgtl5000",
 +			     "fsl,imx-audio-sgtl5000";
-+		model = "imx6q-sabrelite-sgtl5000";
++		model = "sgtl5000-audio";
 +		ssi-controller = <&ssi1>;
 +		audio-codec = <&codec>;
 +		audio-routing =
@@ -2109,6 +2152,12 @@ Signed-off-by: Shawn Guo <[email protected]>
 +			>;
 +		};
 +
++		pinctrl_pwm4: pwm4grp {
++			fsl,pins = <
++				MX6QDL_PAD_SD1_CMD__PWM4_OUT		0x1b0b1
++			>;
++		};
++
 +		pinctrl_uart1: uart1grp {
 +			fsl,pins = <
 +				MX6QDL_PAD_SD3_DAT7__UART1_TX_DATA	0x1b0b1
@@ -2152,7 +2201,7 @@ Signed-off-by: Shawn Guo <[email protected]>
 +&ldb {
 +	status = "okay";
 +
-+	lvds-channel@1 {
++	lvds-channel@0 {
 +		fsl,data-mapping = "spwg";
 +		fsl,data-width = <18>;
 +		status = "okay";
@@ -2183,6 +2232,12 @@ Signed-off-by: Shawn Guo <[email protected]>
 +	};
 +};
 +
++&pwm4 {
++	pinctrl-names = "default";
++	pinctrl-0 = <&pinctrl_pwm4>;
++	status = "okay";
++};
++
 +&ssi1 {
 +	fsl,mode = "i2s-slave";
 +	status = "okay";
@@ -2228,7 +2283,7 @@ Signed-off-by: Shawn Guo <[email protected]>
 +};
 --- /dev/null
 +++ b/arch/arm/boot/dts/imx6qdl-gw54xx.dtsi
-@@ -0,0 +1,580 @@
+@@ -0,0 +1,600 @@
 +/*
 + * Copyright 2013 Gateworks Corporation
 + *
@@ -2261,6 +2316,14 @@ Signed-off-by: Shawn Guo <[email protected]>
 +		bootargs = "console=ttymxc1,115200";
 +	};
 +
++	backlight {
++		compatible = "pwm-backlight";
++		pwms = <&pwm4 0 5000000>;
++		brightness-levels = <0 4 8 16 32 64 128 255>;
++		default-brightness-level = <7>;
++		status = "okay";
++	};
++
 +	leds {
 +		compatible = "gpio-leds";
 +
@@ -2338,9 +2401,9 @@ Signed-off-by: Shawn Guo <[email protected]>
 +	};
 +
 +	sound {
-+		compatible = "fsl,imx6q-sabrelite-sgtl5000",
++		compatible = "fsl,imx6q-ventana-sgtl5000",
 +			     "fsl,imx-audio-sgtl5000";
-+		model = "imx6q-sabrelite-sgtl5000";
++		model = "sgtl5000-audio";
 +		ssi-controller = <&ssi1>;
 +		audio-codec = <&codec>;
 +		audio-routing =
@@ -2687,6 +2750,12 @@ Signed-off-by: Shawn Guo <[email protected]>
 +			>;
 +		};
 +
++		pinctrl_pwm4: pwm4grp {
++			fsl,pins = <
++				MX6QDL_PAD_SD1_CMD__PWM4_OUT		0x1b0b1
++			>;
++		};
++
 +		pinctrl_uart1: uart1grp {
 +			fsl,pins = <
 +				MX6QDL_PAD_SD3_DAT7__UART1_TX_DATA	0x1b0b1
@@ -2730,7 +2799,7 @@ Signed-off-by: Shawn Guo <[email protected]>
 +&ldb {
 +	status = "okay";
 +
-+	lvds-channel@1 {
++	lvds-channel@0 {
 +		fsl,data-mapping = "spwg";
 +		fsl,data-width = <18>;
 +		status = "okay";
@@ -2761,6 +2830,12 @@ Signed-off-by: Shawn Guo <[email protected]>
 +	};
 +};
 +
++&pwm4 {
++	pinctrl-names = "default";
++	pinctrl-0 = <&pinctrl_pwm4>;
++	status = "okay";
++};
++
 +&ssi1 {
 +	fsl,mode = "i2s-slave";
 +	status = "okay";