devicetree.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Jagan Teki <jagan@openedev.com>
To: Shawn Guo <shawnguo@kernel.org>
Cc: devicetree@vger.kernel.org, Matteo Lisi <matteo.lisi@engicam.com>,
	linux-kernel@vger.kernel.org,
	Jagan Teki <jagan@amarulasolutions.com>,
	Sascha Hauer <kernel@pengutronix.de>,
	Fabio Estevam <fabio.estevam@nxp.com>,
	Michael Trimarchi <michael@amarulasolutions.com>,
	linux-arm-kernel@lists.infradead.org
Subject: [PATCH v3 5/9] ARM: dts: imx6qdl-icore-rqs: Replace to use simple-audio-card
Date: Thu,  6 Apr 2017 23:32:11 +0530	[thread overview]
Message-ID: <1491501735-1649-6-git-send-email-jagan@openedev.com> (raw)
In-Reply-To: <1491501735-1649-1-git-send-email-jagan@openedev.com>

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

  parent reply	other threads:[~2017-04-06 18:02 UTC|newest]

Thread overview: 20+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-04-06 18:02 [PATCH v3 0/9] ARM: dts: i.MX6: Add lcdif/sound nodes on Engicam SOMs Jagan Teki
     [not found] ` <1491501735-1649-1-git-send-email-jagan-oRp2ZoJdM/RWk0Htik3J/w@public.gmane.org>
2017-04-06 18:02   ` [PATCH v3 1/9] ARM: dts: imx6ul-isiot: Add Sound card with codec node Jagan Teki
     [not found]     ` <1491501735-1649-2-git-send-email-jagan-oRp2ZoJdM/RWk0Htik3J/w@public.gmane.org>
2017-04-07 13:16       ` Shawn Guo
2017-06-14 14:47         ` Jagan Teki
     [not found]           ` <CAMty3ZDj3XgeZwUTXTTX2svoXaNWJ3GJtbNAt9+jj+n8Z4640w-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2017-06-15  2:20             ` Shawn Guo
2017-06-15  4:51               ` Jagan Teki
2017-06-15  7:15                 ` Shawn Guo
2017-06-15  7:31                   ` Jagan Teki
     [not found]                     ` <CAMty3ZCwkP=EaFcSdA--yQNN9ebjE9JptfwWjQpceXqDq-xkyA-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2017-06-15  7:51                       ` Shawn Guo
2017-06-15 13:15                         ` Jagan Teki
2017-04-06 18:02   ` [PATCH v3 2/9] ARM: dts: imx6ul-geam: " Jagan Teki
     [not found]     ` <1491501735-1649-3-git-send-email-jagan-oRp2ZoJdM/RWk0Htik3J/w@public.gmane.org>
2017-04-07 13:19       ` Shawn Guo
2017-04-06 18:02   ` [PATCH v3 7/9] ARM: dts: imx6dl-icore: Add touchscreen node Jagan Teki
2017-04-06 18:02   ` [PATCH v3 9/9] ARM: dts: imx6ul-isiot: Add FEC node support Jagan Teki
2017-04-06 18:02 ` [PATCH v3 3/9] ARM: dts: imx6qdl-icore: Add Sound card with codec node Jagan Teki
     [not found]   ` <1491501735-1649-4-git-send-email-jagan-oRp2ZoJdM/RWk0Htik3J/w@public.gmane.org>
2017-04-07 13:23     ` Shawn Guo
2017-04-06 18:02 ` [PATCH v3 4/9] ARM: dts: imx6dl-icore-rqs: Add sgtl5000 " Jagan Teki
2017-04-06 18:02 ` Jagan Teki [this message]
2017-04-06 18:02 ` [PATCH v3 6/9] ARM: dts: imx6dl-icore: Add LVDS support Jagan Teki
2017-04-06 18:02 ` [PATCH v3 8/9] ARM: dts: imx6qdl-icore-rqs: Add CAN nodes Jagan Teki

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1491501735-1649-6-git-send-email-jagan@openedev.com \
    --to=jagan@openedev.com \
    --cc=devicetree@vger.kernel.org \
    --cc=fabio.estevam@nxp.com \
    --cc=jagan@amarulasolutions.com \
    --cc=kernel@pengutronix.de \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=matteo.lisi@engicam.com \
    --cc=michael@amarulasolutions.com \
    --cc=shawnguo@kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
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).