imx6: update 3.10 ventana dts

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 an
   not baseboard specific.
 - update model descriptions for all processor variants

Signed-off-by: Tim Harvey <tharvey@gateworks.com>
SVN-Revision: 40987

diff --git a/target/linux/imx6/files-3.10/arch/arm/boot/dts/imx6dl-gw51xx.dts b/target/linux/imx6/files-3.10/arch/arm/boot/dts/imx6dl-gw51xx.dts
index 07f0acd6a1b20f58dfd34047772e69f5837c2136..113f1c6389d7643f4fe1dfb6713aa64ff269a359 100644 (file)
--- a/target/linux/imx6/files-3.10/arch/arm/boot/dts/imx6dl-gw51xx.dts
+++ b/target/linux/imx6/files-3.10/arch/arm/boot/dts/imx6dl-gw51xx.dts
@@ -14,7 +14,7 @@
 #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";
 };
 

diff --git a/target/linux/imx6/files-3.10/arch/arm/boot/dts/imx6dl-gw52xx.dts b/target/linux/imx6/files-3.10/arch/arm/boot/dts/imx6dl-gw52xx.dts
index cafbc069d78607ae0a7c584098cf45187b8263cc..816a2425a51b47dee8b450f87f1404bfd4c35041 100644 (file)
--- a/target/linux/imx6/files-3.10/arch/arm/boot/dts/imx6dl-gw52xx.dts
+++ b/target/linux/imx6/files-3.10/arch/arm/boot/dts/imx6dl-gw52xx.dts
@@ -14,7 +14,7 @@
 #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";
 };
 

diff --git a/target/linux/imx6/files-3.10/arch/arm/boot/dts/imx6dl-gw53xx.dts b/target/linux/imx6/files-3.10/arch/arm/boot/dts/imx6dl-gw53xx.dts
index fe2b0291e1413707dec7d408d7b38899f4501471..967925701b707b1c1c64694605eacc65137596f5 100644 (file)
--- a/target/linux/imx6/files-3.10/arch/arm/boot/dts/imx6dl-gw53xx.dts
+++ b/target/linux/imx6/files-3.10/arch/arm/boot/dts/imx6dl-gw53xx.dts
@@ -14,7 +14,7 @@
 #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";
 };
 

diff --git a/target/linux/imx6/files-3.10/arch/arm/boot/dts/imx6dl-gw54xx.dts b/target/linux/imx6/files-3.10/arch/arm/boot/dts/imx6dl-gw54xx.dts
index 6a0ad02890859a0a2e515607c6f4d3bcaca57010..76c760bac5a313c321ee743a2c8767f1866be932 100644 (file)
--- a/target/linux/imx6/files-3.10/arch/arm/boot/dts/imx6dl-gw54xx.dts
+++ b/target/linux/imx6/files-3.10/arch/arm/boot/dts/imx6dl-gw54xx.dts
@@ -14,7 +14,7 @@
 #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";
 };
 

diff --git a/target/linux/imx6/files-3.10/arch/arm/boot/dts/imx6q-gw51xx.dts b/target/linux/imx6/files-3.10/arch/arm/boot/dts/imx6q-gw51xx.dts
index 4c2f8c402274125bbbadf277fd54fc251ddfae6e..84b08f927b1210d2396138258b7d079253f1d981 100644 (file)
--- a/target/linux/imx6/files-3.10/arch/arm/boot/dts/imx6q-gw51xx.dts
+++ b/target/linux/imx6/files-3.10/arch/arm/boot/dts/imx6q-gw51xx.dts
@@ -14,7 +14,7 @@
 #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";
 };
 

diff --git a/target/linux/imx6/files-3.10/arch/arm/boot/dts/imx6q-gw52xx.dts b/target/linux/imx6/files-3.10/arch/arm/boot/dts/imx6q-gw52xx.dts
index 18bf17dd8cdabf2ba74f20573e4431f4ed7433b4..6e0558e3168f76ca510904111afbfac2a280afc6 100644 (file)
--- a/target/linux/imx6/files-3.10/arch/arm/boot/dts/imx6q-gw52xx.dts
+++ b/target/linux/imx6/files-3.10/arch/arm/boot/dts/imx6q-gw52xx.dts
@@ -14,7 +14,7 @@
 #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";
 };
 

diff --git a/target/linux/imx6/files-3.10/arch/arm/boot/dts/imx6q-gw53xx.dts b/target/linux/imx6/files-3.10/arch/arm/boot/dts/imx6q-gw53xx.dts
index 4453cb56737db93a16cc753c73cf4dc73819b22d..4f9319a4e2521e6b7f2fe38022a1dd45789e770e 100644 (file)
--- a/target/linux/imx6/files-3.10/arch/arm/boot/dts/imx6q-gw53xx.dts
+++ b/target/linux/imx6/files-3.10/arch/arm/boot/dts/imx6q-gw53xx.dts
@@ -14,7 +14,7 @@
 #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";
 };
 

diff --git a/target/linux/imx6/files-3.10/arch/arm/boot/dts/imx6q-gw54xx.dts b/target/linux/imx6/files-3.10/arch/arm/boot/dts/imx6q-gw54xx.dts
index c85133930b6a5d102543538291a18c542835e70d..abbf1aae414c55efa9afb563db02307eab43127d 100644 (file)
--- a/target/linux/imx6/files-3.10/arch/arm/boot/dts/imx6q-gw54xx.dts
+++ b/target/linux/imx6/files-3.10/arch/arm/boot/dts/imx6q-gw54xx.dts
@@ -14,7 +14,7 @@
 #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";
 };
 

diff --git a/target/linux/imx6/files-3.10/arch/arm/boot/dts/imx6qdl-gw52xx.dtsi b/target/linux/imx6/files-3.10/arch/arm/boot/dts/imx6qdl-gw52xx.dtsi
index 5524782ad715c116a83cbfc0e4b301a021d1c149..186ed9d204323883b57ad7284ed89eb7c3d8f9da 100644 (file)
--- a/target/linux/imx6/files-3.10/arch/arm/boot/dts/imx6qdl-gw52xx.dtsi
+++ b/target/linux/imx6/files-3.10/arch/arm/boot/dts/imx6qdl-gw52xx.dtsi
@@ -101,9 +101,9 @@
        };
 
        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 =

diff --git a/target/linux/imx6/files-3.10/arch/arm/boot/dts/imx6qdl-gw53xx.dtsi b/target/linux/imx6/files-3.10/arch/arm/boot/dts/imx6qdl-gw53xx.dtsi
index 40e6b4e56acac360df2a297e5ab58b1e51c22129..e7ae350ffd46ec992d7cda7a6b66a8f75be8c20f 100644 (file)
--- a/target/linux/imx6/files-3.10/arch/arm/boot/dts/imx6qdl-gw53xx.dtsi
+++ b/target/linux/imx6/files-3.10/arch/arm/boot/dts/imx6qdl-gw53xx.dtsi
@@ -107,9 +107,9 @@
        };
 
        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 =

diff --git a/target/linux/imx6/files-3.10/arch/arm/boot/dts/imx6qdl-gw54xx.dtsi b/target/linux/imx6/files-3.10/arch/arm/boot/dts/imx6qdl-gw54xx.dtsi
index e27b27ae92fa503617982eec9c87d34fd6592978..6f66caa789ff14cdc4789ec0fe792cbb1c388aca 100644 (file)
--- a/target/linux/imx6/files-3.10/arch/arm/boot/dts/imx6qdl-gw54xx.dtsi
+++ b/target/linux/imx6/files-3.10/arch/arm/boot/dts/imx6qdl-gw54xx.dtsi
@@ -98,9 +98,9 @@
        };
 
        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 =