Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1618234

[PATCH v3 5/9] ARM: dts: imx6qdl-icore-rqs: Replace to use simple-audio-card

Show all headers | View raw

From: Jagan Teki <jagan@amarulasolutions.com>

This patch replace fsl,imx-audio-sgtl5000 and use simple-audio-card
for Engicam i.CoreM6 RQS QDL platform boards.

Cc: Shawn Guo <shawnguo@kernel.org>
Cc: Matteo Lisi <matteo.lisi@engicam.com>
Cc: Michael Trimarchi <michael@amarulasolutions.com>
Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
---
Changes for v3:
- Newly added patch

 arch/arm/boot/dts/imx6qdl-icore-rqs.dtsi | 26 +++++++++++++++++++-------
 1 file changed, 19 insertions(+), 7 deletions(-)

diff --git a/arch/arm/boot/dts/imx6qdl-icore-rqs.dtsi b/arch/arm/boot/dts/imx6qdl-icore-rqs.dtsi
index d24e531..0e79a5b 100644
--- a/arch/arm/boot/dts/imx6qdl-icore-rqs.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-icore-rqs.dtsi
@@ -120,16 +120,28 @@
 	};
 
 	sound {
-		compatible = "fsl,imx-audio-sgtl5000";
-		model = "imx-audio-sgtl5000";
-		ssi-controller = <&ssi1>;
-		audio-codec = <&sgtl5000>;
-		audio-routing =
+		compatible = "simple-audio-card";
+		simple-audio-card,name = "imx6qdl-icore-sgtl5000";
+		simple-audio-card,format = "i2s";
+		simple-audio-card,bitclock-master = <&dailink_master>;
+		simple-audio-card,frame-master = <&dailink_master>;
+		simple-audio-card,widgets =
+			"Microphone", "Mic Jack",
+			"Line", "Line In",
+			"Line", "Line Out",
+			"Headphone", "Headphone Jack";
+		simple-audio-card,routing =
 			"MIC_IN", "Mic Jack",
 			"Mic Jack", "Mic Bias",
 			"Headphone Jack", "HP_OUT";
-		mux-int-port = <1>;
-		mux-ext-port = <4>;
+
+		simple-audio-card,cpu {
+			sound-dai = <&ssi1>;
+		};
+
+		dailink_master: simple-audio-card,codec {
+			sound-dai = <&sgtl5000>;
+		};
 	};
 };
 
-- 
1.9.1

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH v3 0/9] ARM: dts: i.MX6: Add lcdif/sound nodes on Engicam SOMs Jagan Teki <jagan@openedev.com> - 2017-04-06 20:10 +0200
  [PATCH v3 5/9] ARM: dts: imx6qdl-icore-rqs: Replace to use simple-audio-card Jagan Teki <jagan@openedev.com> - 2017-04-06 20:10 +0200
  [PATCH v3 2/9] ARM: dts: imx6ul-geam: Add Sound card with codec node Jagan Teki <jagan@openedev.com> - 2017-04-06 20:10 +0200
    Re: [PATCH v3 2/9] ARM: dts: imx6ul-geam: Add Sound card with codec  node Shawn Guo <shawnguo@kernel.org> - 2017-04-07 15:20 +0200
  [PATCH v3 6/9] ARM: dts: imx6dl-icore: Add LVDS support Jagan Teki <jagan@openedev.com> - 2017-04-06 20:10 +0200
  [PATCH v3 9/9] ARM: dts: imx6ul-isiot: Add FEC node support Jagan Teki <jagan@openedev.com> - 2017-04-06 20:10 +0200
  [PATCH v3 1/9] ARM: dts: imx6ul-isiot: Add Sound card with codec node Jagan Teki <jagan@openedev.com> - 2017-04-06 20:10 +0200
    Re: [PATCH v3 1/9] ARM: dts: imx6ul-isiot: Add Sound card with codec  node Shawn Guo <shawnguo@kernel.org> - 2017-04-07 15:20 +0200
  [PATCH v3 4/9] ARM: dts: imx6dl-icore-rqs: Add sgtl5000 codec node Jagan Teki <jagan@openedev.com> - 2017-04-06 20:10 +0200
  [PATCH v3 8/9] ARM: dts: imx6qdl-icore-rqs: Add CAN nodes Jagan Teki <jagan@openedev.com> - 2017-04-06 20:10 +0200
  [PATCH v3 3/9] ARM: dts: imx6qdl-icore: Add Sound card with codec node Jagan Teki <jagan@openedev.com> - 2017-04-06 20:10 +0200
    Re: [PATCH v3 3/9] ARM: dts: imx6qdl-icore: Add Sound card with  codec node Shawn Guo <shawnguo@kernel.org> - 2017-04-07 15:30 +0200
  [PATCH v3 7/9] ARM: dts: imx6dl-icore: Add touchscreen node Jagan Teki <jagan@openedev.com> - 2017-04-06 20:10 +0200

csiph-web