Skip to contentSkip to conversation

ARM: dts: imx6: ventana: fix include typo

PATCH New Tim Harvey 2 participants 6 messages May 22, 2014 – Jun 3, 2014

Subsystems (2)
Device tree bindings Arm i.MX and Layerscape
lore
Share & tools
lore

Tim Harvey

author
#0 lore raw

PATCH 1/3 ARM: dts: imx6: ventana: fix include typo

Fix typo and include the right dtsi file for the gw51xx board.

Signed-off-by Tim Harvey <[email protected]>
---
 arch/arm/boot/dts/imx6q-gw51xx.dts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/boot/dts/imx6q-gw51xx.dts +1 -1
index af4929a..0e1406e 100644
@@ -11,7 +11,7 @@
 
 /dts-v1/;
 #include "imx6q.dtsi"
-#include "imx6qdl-gw54xx.dtsi"
+#include "imx6qdl-gw51xx.dtsi"
 
 / {
 	model = "Gateworks Ventana i.MX6 Quad GW51XX";
Signature · 1 line
1.8.3.2
author
#1 lore raw

PATCH 2/3 ARM: dts: imx6: ventana: change sound device name

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.

Signed-off-by Tim Harvey <[email protected]>
---
 arch/arm/boot/dts/imx6q-gw5400-a.dts  | 4 ++--
 arch/arm/boot/dts/imx6qdl-gw52xx.dtsi | 4 ++--
 arch/arm/boot/dts/imx6qdl-gw53xx.dtsi | 4 ++--
 arch/arm/boot/dts/imx6qdl-gw54xx.dtsi | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)
arch/arm/boot/dts/imx6q-gw5400-a.dts +2 -2
index e51bb3f..1ead807 100644
@@ -115,9 +115,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 =
arch/arm/boot/dts/imx6qdl-gw52xx.dtsi +2 -2
index 035d3a8..fd9f6b7 100644
@@ -114,9 +114,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 =
arch/arm/boot/dts/imx6qdl-gw53xx.dtsi +2 -2
index c8e5ae0..4b9aeb1 100644
@@ -117,9 +117,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 =
arch/arm/boot/dts/imx6qdl-gw54xx.dtsi +2 -2
index 2795dfc..8e1a869 100644
@@ -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 =
Signature · 1 line
1.8.3.2
author
#2 lore raw

PATCH 3/3 ARM: dts: imx6: ventana: update model to reflect Dual/Solo CPU types

In reply to Tim Harvey

The imx6dl dts supports both DualLite and Solo CPU variants The imx6q dts supports both Dual and Quad CPU variants

Signed-off-by Tim Harvey <[email protected]>
---
 arch/arm/boot/dts/imx6dl-gw51xx.dts | 2 +-
 arch/arm/boot/dts/imx6dl-gw52xx.dts | 2 +-
 arch/arm/boot/dts/imx6dl-gw53xx.dts | 2 +-
 arch/arm/boot/dts/imx6dl-gw54xx.dts | 2 +-
 arch/arm/boot/dts/imx6q-gw51xx.dts  | 2 +-
 arch/arm/boot/dts/imx6q-gw52xx.dts  | 2 +-
 arch/arm/boot/dts/imx6q-gw53xx.dts  | 2 +-
 arch/arm/boot/dts/imx6q-gw54xx.dts  | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)
arch/arm/boot/dts/imx6dl-gw51xx.dts +1 -1
index 4bd055f..b2bd022 100644
@@ -14,6 +14,6 @@
 #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";
 };
arch/arm/boot/dts/imx6dl-gw52xx.dts +1 -1
index c913605..a2e0b73 100644
@@ -14,6 +14,6 @@
 #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";
 };
arch/arm/boot/dts/imx6dl-gw53xx.dts +1 -1
index 61818a1..6844b70 100644
@@ -14,6 +14,6 @@
 #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";
 };
arch/arm/boot/dts/imx6dl-gw54xx.dts +1 -1
index ab38b67..be91541 100644
@@ -14,6 +14,6 @@
 #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";
 };
arch/arm/boot/dts/imx6q-gw51xx.dts +1 -1
index 0e1406e..8e8bcd8 100644
@@ -14,6 +14,6 @@
 #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";
 };
arch/arm/boot/dts/imx6q-gw52xx.dts +1 -1
index 5f71ddb..a12c47e 100644
@@ -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";
 };
arch/arm/boot/dts/imx6q-gw53xx.dts +1 -1
index 360c316..d76aaa8 100644
@@ -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";
 };
arch/arm/boot/dts/imx6q-gw54xx.dts +1 -1
index ab518d6..6e8f53e 100644
@@ -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";
 };
Signature · 1 line
1.8.3.2
author
#4 lore raw

PATCH 1/3 ARM: dts: imx6: ventana: fix include typo

Quoted 7 lines · Shawn Guo
Quoted 3 lines · Tim Harvey

Fix typo and include the right dtsi file for the gw51xx board.

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

Applied all 3, thanks.

Shawn,

Thanks. Have you not pushed your tree? I don't see them anywhere in
git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux.git

Thanks,

Tim

#5 lore raw

PATCH 1/3 ARM: dts: imx6: ventana: fix include typo

Quoted 5 lines · Tim Harvey
Quoted 4 lines · Shawn Guo
Quoted 2 lines · Tim Harvey

Fix typo and include the right dtsi file for the gw51xx board.

Quoted 8 lines
Quoted 3 lines
Quoted 1 line
Signed-off-by Tim Harvey <[email protected]>

Applied all 3, thanks.

Shawn,

Thanks. Have you not pushed your tree? I don't see them anywhere in
git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux.git

Just pushed out. Sorry for the delay.

Shawn