From 4d6540d21c857e4493aa0b78d163c5e45decb518 Mon Sep 17 00:00:00 2001 From: luka Date: Mon, 2 Jun 2014 21:23:29 +0000 Subject: [PATCH] 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 git-svn-id: svn://svn.openwrt.org/openwrt/trunk@40987 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- target/linux/imx6/files-3.10/arch/arm/boot/dts/imx6dl-gw51xx.dts | 2 +- target/linux/imx6/files-3.10/arch/arm/boot/dts/imx6dl-gw52xx.dts | 2 +- target/linux/imx6/files-3.10/arch/arm/boot/dts/imx6dl-gw53xx.dts | 2 +- target/linux/imx6/files-3.10/arch/arm/boot/dts/imx6dl-gw54xx.dts | 2 +- target/linux/imx6/files-3.10/arch/arm/boot/dts/imx6q-gw51xx.dts | 2 +- target/linux/imx6/files-3.10/arch/arm/boot/dts/imx6q-gw52xx.dts | 2 +- target/linux/imx6/files-3.10/arch/arm/boot/dts/imx6q-gw53xx.dts | 2 +- target/linux/imx6/files-3.10/arch/arm/boot/dts/imx6q-gw54xx.dts | 2 +- target/linux/imx6/files-3.10/arch/arm/boot/dts/imx6qdl-gw52xx.dtsi | 4 ++-- target/linux/imx6/files-3.10/arch/arm/boot/dts/imx6qdl-gw53xx.dtsi | 4 ++-- target/linux/imx6/files-3.10/arch/arm/boot/dts/imx6qdl-gw54xx.dtsi | 4 ++-- 11 files changed, 14 insertions(+), 14 deletions(-) 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 07f0acd6a1..113f1c6389 100644 --- 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 cafbc069d7..816a2425a5 100644 --- 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 fe2b0291e1..967925701b 100644 --- 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 6a0ad02890..76c760bac5 100644 --- 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 4c2f8c4022..84b08f927b 100644 --- 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 18bf17dd8c..6e0558e316 100644 --- 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 4453cb5673..4f9319a4e2 100644 --- 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 c85133930b..abbf1aae41 100644 --- 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 5524782ad7..186ed9d204 100644 --- 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 40e6b4e56a..e7ae350ffd 100644 --- 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 e27b27ae92..6f66caa789 100644 --- 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 = -- 2.11.0