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

linux-arm-kernel.lists.infradead.org archive mirror
 help / color / mirror / Atom feed

* [PATCH 1/3] ARM: dts: imx6: ventana: fix include typo
@ 2014-05-22  6:04 Tim Harvey
  2014-05-22  6:04 ` [PATCH 2/3] ARM: dts: imx6: ventana: change sound device name Tim Harvey
                   ` (2 more replies)
  0 siblings, 3 replies; 6+ messages in thread
From: Tim Harvey @ 2014-05-22  6:04 UTC (permalink / raw)
  To: linux-arm-kernel

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

Signed-off-by: Tim Harvey <tharvey@gateworks.com>
---
 arch/arm/boot/dts/imx6q-gw51xx.dts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm/boot/dts/imx6q-gw51xx.dts b/arch/arm/boot/dts/imx6q-gw51xx.dts
index af4929a..0e1406e 100644
--- a/arch/arm/boot/dts/imx6q-gw51xx.dts
+++ b/arch/arm/boot/dts/imx6q-gw51xx.dts
@@ -11,7 +11,7 @@
 
 /dts-v1/;
 #include "imx6q.dtsi"
-#include "imx6qdl-gw54xx.dtsi"
+#include "imx6qdl-gw51xx.dtsi"
 
 / {
 	model = "Gateworks Ventana i.MX6 Quad GW51XX";
-- 
1.8.3.2

^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [PATCH 2/3] ARM: dts: imx6: ventana: change sound device name
  2014-05-22  6:04 [PATCH 1/3] ARM: dts: imx6: ventana: fix include typo Tim Harvey
@ 2014-05-22  6:04 ` Tim Harvey
  2014-05-22  6:04 ` [PATCH 3/3] ARM: dts: imx6: ventana: update model to reflect Dual/Solo CPU types Tim Harvey
  2014-05-29  7:44 ` [PATCH 1/3] ARM: dts: imx6: ventana: fix include typo Shawn Guo
  2 siblings, 0 replies; 6+ messages in thread
From: Tim Harvey @ 2014-05-22  6:04 UTC (permalink / raw)
  To: linux-arm-kernel

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 <tharvey@gateworks.com>
---
 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(-)

diff --git a/arch/arm/boot/dts/imx6q-gw5400-a.dts b/arch/arm/boot/dts/imx6q-gw5400-a.dts
index e51bb3f..1ead807 100644
--- a/arch/arm/boot/dts/imx6q-gw5400-a.dts
+++ b/arch/arm/boot/dts/imx6q-gw5400-a.dts
@@ -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 =
diff --git a/arch/arm/boot/dts/imx6qdl-gw52xx.dtsi b/arch/arm/boot/dts/imx6qdl-gw52xx.dtsi
index 035d3a8..fd9f6b7 100644
--- a/arch/arm/boot/dts/imx6qdl-gw52xx.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-gw52xx.dtsi
@@ -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 =
diff --git a/arch/arm/boot/dts/imx6qdl-gw53xx.dtsi b/arch/arm/boot/dts/imx6qdl-gw53xx.dtsi
index c8e5ae0..4b9aeb1 100644
--- a/arch/arm/boot/dts/imx6qdl-gw53xx.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-gw53xx.dtsi
@@ -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 =
diff --git a/arch/arm/boot/dts/imx6qdl-gw54xx.dtsi b/arch/arm/boot/dts/imx6qdl-gw54xx.dtsi
index 2795dfc..8e1a869 100644
--- a/arch/arm/boot/dts/imx6qdl-gw54xx.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-gw54xx.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 =
-- 
1.8.3.2

^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [PATCH 3/3] ARM: dts: imx6: ventana: update model to reflect Dual/Solo CPU types
  2014-05-22  6:04 [PATCH 1/3] ARM: dts: imx6: ventana: fix include typo Tim Harvey
  2014-05-22  6:04 ` [PATCH 2/3] ARM: dts: imx6: ventana: change sound device name Tim Harvey
@ 2014-05-22  6:04 ` Tim Harvey
  2014-05-29  7:44 ` [PATCH 1/3] ARM: dts: imx6: ventana: fix include typo Shawn Guo
  2 siblings, 0 replies; 6+ messages in thread
From: Tim Harvey @ 2014-05-22  6:04 UTC (permalink / raw)
  To: linux-arm-kernel

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 <tharvey@gateworks.com>
---
 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(-)

diff --git a/arch/arm/boot/dts/imx6dl-gw51xx.dts b/arch/arm/boot/dts/imx6dl-gw51xx.dts
index 4bd055f..b2bd022 100644
--- a/arch/arm/boot/dts/imx6dl-gw51xx.dts
+++ b/arch/arm/boot/dts/imx6dl-gw51xx.dts
@@ -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";
 };
diff --git a/arch/arm/boot/dts/imx6dl-gw52xx.dts b/arch/arm/boot/dts/imx6dl-gw52xx.dts
index c913605..a2e0b73 100644
--- a/arch/arm/boot/dts/imx6dl-gw52xx.dts
+++ b/arch/arm/boot/dts/imx6dl-gw52xx.dts
@@ -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";
 };
diff --git a/arch/arm/boot/dts/imx6dl-gw53xx.dts b/arch/arm/boot/dts/imx6dl-gw53xx.dts
index 61818a1..6844b70 100644
--- a/arch/arm/boot/dts/imx6dl-gw53xx.dts
+++ b/arch/arm/boot/dts/imx6dl-gw53xx.dts
@@ -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";
 };
diff --git a/arch/arm/boot/dts/imx6dl-gw54xx.dts b/arch/arm/boot/dts/imx6dl-gw54xx.dts
index ab38b67..be91541 100644
--- a/arch/arm/boot/dts/imx6dl-gw54xx.dts
+++ b/arch/arm/boot/dts/imx6dl-gw54xx.dts
@@ -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";
 };
diff --git a/arch/arm/boot/dts/imx6q-gw51xx.dts b/arch/arm/boot/dts/imx6q-gw51xx.dts
index 0e1406e..8e8bcd8 100644
--- a/arch/arm/boot/dts/imx6q-gw51xx.dts
+++ b/arch/arm/boot/dts/imx6q-gw51xx.dts
@@ -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";
 };
diff --git a/arch/arm/boot/dts/imx6q-gw52xx.dts b/arch/arm/boot/dts/imx6q-gw52xx.dts
index 5f71ddb..a12c47e 100644
--- a/arch/arm/boot/dts/imx6q-gw52xx.dts
+++ b/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/arch/arm/boot/dts/imx6q-gw53xx.dts b/arch/arm/boot/dts/imx6q-gw53xx.dts
index 360c316..d76aaa8 100644
--- a/arch/arm/boot/dts/imx6q-gw53xx.dts
+++ b/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/arch/arm/boot/dts/imx6q-gw54xx.dts b/arch/arm/boot/dts/imx6q-gw54xx.dts
index ab518d6..6e8f53e 100644
--- a/arch/arm/boot/dts/imx6q-gw54xx.dts
+++ b/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";
 };
 
-- 
1.8.3.2

^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [PATCH 1/3] ARM: dts: imx6: ventana: fix include typo
  2014-05-22  6:04 [PATCH 1/3] ARM: dts: imx6: ventana: fix include typo Tim Harvey
  2014-05-22  6:04 ` [PATCH 2/3] ARM: dts: imx6: ventana: change sound device name Tim Harvey
  2014-05-22  6:04 ` [PATCH 3/3] ARM: dts: imx6: ventana: update model to reflect Dual/Solo CPU types Tim Harvey
@ 2014-05-29  7:44 ` Shawn Guo
  2014-06-02 18:55   ` Tim Harvey
  2 siblings, 1 reply; 6+ messages in thread
From: Shawn Guo @ 2014-05-29  7:44 UTC (permalink / raw)
  To: linux-arm-kernel

On Wed, May 21, 2014 at 11:04:53PM -0700, Tim Harvey wrote:
> Fix typo and include the right dtsi file for the gw51xx board.
> 
> Signed-off-by: Tim Harvey <tharvey@gateworks.com>

Applied all 3, thanks.

^ permalink raw reply	[flat|nested] 6+ messages in thread

* [PATCH 1/3] ARM: dts: imx6: ventana: fix include typo
  2014-05-29  7:44 ` [PATCH 1/3] ARM: dts: imx6: ventana: fix include typo Shawn Guo
@ 2014-06-02 18:55   ` Tim Harvey
  2014-06-03  7:49     ` Shawn Guo
  0 siblings, 1 reply; 6+ messages in thread
From: Tim Harvey @ 2014-06-02 18:55 UTC (permalink / raw)
  To: linux-arm-kernel

On Thu, May 29, 2014 at 12:44 AM, Shawn Guo <shawn.guo@freescale.com> wrote:
>
> On Wed, May 21, 2014 at 11:04:53PM -0700, Tim Harvey wrote:
> > Fix typo and include the right dtsi file for the gw51xx board.
> >
> > Signed-off-by: Tim Harvey <tharvey@gateworks.com>
>
> 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

^ permalink raw reply	[flat|nested] 6+ messages in thread

* [PATCH 1/3] ARM: dts: imx6: ventana: fix include typo
  2014-06-02 18:55   ` Tim Harvey
@ 2014-06-03  7:49     ` Shawn Guo
  0 siblings, 0 replies; 6+ messages in thread
From: Shawn Guo @ 2014-06-03  7:49 UTC (permalink / raw)
  To: linux-arm-kernel

On Mon, Jun 02, 2014 at 11:55:12AM -0700, Tim Harvey wrote:
> On Thu, May 29, 2014 at 12:44 AM, Shawn Guo <shawn.guo@freescale.com> wrote:
> >
> > On Wed, May 21, 2014 at 11:04:53PM -0700, Tim Harvey wrote:
> > > Fix typo and include the right dtsi file for the gw51xx board.
> > >
> > > Signed-off-by: Tim Harvey <tharvey@gateworks.com>
> >
> > 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

^ permalink raw reply	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2014-06-03  7:49 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-05-22  6:04 [PATCH 1/3] ARM: dts: imx6: ventana: fix include typo Tim Harvey
2014-05-22  6:04 ` [PATCH 2/3] ARM: dts: imx6: ventana: change sound device name Tim Harvey
2014-05-22  6:04 ` [PATCH 3/3] ARM: dts: imx6: ventana: update model to reflect Dual/Solo CPU types Tim Harvey
2014-05-29  7:44 ` [PATCH 1/3] ARM: dts: imx6: ventana: fix include typo Shawn Guo
2014-06-02 18:55   ` Tim Harvey
2014-06-03  7:49     ` Shawn Guo

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).