From: "Lothar Waßmann" <LW@KARO-electronics.de>
To: Fabio Estevam <fabio.estevam@nxp.com>,
Mark Rutland <mark.rutland@arm.com>,
Rob Herring <robh+dt@kernel.org>,
Russell King <linux@armlinux.org.uk>,
Sascha Hauer <kernel@pengutronix.de>,
Shawn Guo <shawnguo@kernel.org>,
devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org
Cc: "Lothar Waßmann" <LW@KARO-electronics.de>
Subject: [PATCH 07/12] ARM: dts: imx6-tx6: convert to using simple-audio-card
Date: Wed, 11 Oct 2017 13:50:30 +0200 [thread overview]
Message-ID: <1507722635-30801-8-git-send-email-LW@KARO-electronics.de> (raw)
In-Reply-To: <1507722635-30801-1-git-send-email-LW@KARO-electronics.de>
Convert the DTS sound setup to use the simple-audio-card driver.
Signed-off-by: Lothar Waßmann <LW@KARO-electronics.de>
---
arch/arm/boot/dts/imx6qdl-tx6.dtsi | 50 ++++++++++++++++++++++++++++++++------
1 file changed, 42 insertions(+), 8 deletions(-)
diff --git a/arch/arm/boot/dts/imx6qdl-tx6.dtsi b/arch/arm/boot/dts/imx6qdl-tx6.dtsi
index c6b2d63..e0dbf8b 100644
--- a/arch/arm/boot/dts/imx6qdl-tx6.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-tx6.dtsi
@@ -43,6 +43,7 @@
#include <dt-bindings/input/input.h>
#include <dt-bindings/interrupt-controller/irq.h>
#include <dt-bindings/pwm/pwm.h>
+#include <dt-bindings/sound/fsl-imx-audmux.h>
/ {
aliases {
@@ -183,24 +184,56 @@
};
sound {
- compatible = "karo,imx6qdl-tx6qdl-sgtl5000",
- "fsl,imx-audio-sgtl5000";
- model = "sgtl5000-audio";
+ compatible = "karo,imx6qdl-tx6-sgtl5000",
+ "simple-audio-card";
+ simple-audio-card,name = "imx6qdl-tx6-sgtl5000-audio";
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_audmux>;
- ssi-controller = <&ssi1>;
- audio-codec = <&sgtl5000>;
- audio-routing =
+ simple-audio-card,format = "i2s";
+ simple-audio-card,bitclock-master = <&codec_dai>;
+ simple-audio-card,frame-master = <&codec_dai>;
+ 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 = <5>;
+
+ cpu_dai: simple-audio-card,cpu {
+ sound-dai = <&ssi1>;
+ };
+
+ codec_dai: simple-audio-card,codec {
+ sound-dai = <&sgtl5000>;
+ };
};
};
&audmux {
status = "okay";
+
+ ssi1 {
+ fsl,audmux-port = <0>;
+ fsl,port-config = <
+ (IMX_AUDMUX_V2_PTCR_SYN |
+ IMX_AUDMUX_V2_PTCR_TFSEL(4) |
+ IMX_AUDMUX_V2_PTCR_TCSEL(4) |
+ IMX_AUDMUX_V2_PTCR_TFSDIR |
+ IMX_AUDMUX_V2_PTCR_TCLKDIR)
+ IMX_AUDMUX_V2_PDCR_RXDSEL(4)
+ >;
+ };
+
+ pins5 {
+ fsl,audmux-port = <4>;
+ fsl,port-config = <
+ IMX_AUDMUX_V2_PTCR_SYN
+ IMX_AUDMUX_V2_PDCR_RXDSEL(0)
+ >;
+ };
};
&can1 {
@@ -298,6 +331,7 @@
sgtl5000: sgtl5000@0a {
compatible = "fsl,sgtl5000";
+ #sound-dai-cells = <0>;
reg = <0x0a>;
VDDA-supply = <®_2v5>;
VDDIO-supply = <®_3v3>;
--
2.1.4
next prev parent reply other threads:[~2017-10-11 11:55 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-10-11 11:50 [PATCH 0/12] ARM: dts: imx6: Update dts files for the Ka-Ro TX6 module series Lothar Waßmann
2017-10-11 11:50 ` [PATCH 01/12] ARM: dts: imx6-tx6: update model property to match current module HW revision Lothar Waßmann
2017-10-11 11:50 ` [PATCH 02/12] ARM: dts: imx6-tx6: remove obsolete eeti,egalax_ts Lothar Waßmann
2017-10-11 11:50 ` [PATCH 03/12] ARM: dts: imx6-tx6: remove obsolete ipu1 alias Lothar Waßmann
2017-10-11 11:50 ` [PATCH 04/12] ARM: dts: imx6-tx6: add trickle-charge config for DS1339 Lothar Waßmann
2017-10-11 11:50 ` [PATCH 05/12] ARM: dts: imx6-tx6: improve ethernet related pinctrl setup Lothar Waßmann
2017-10-11 11:50 ` [PATCH 06/12] ARM: dts: imx6-tx6: specify ethernet phy reset duration Lothar Waßmann
2017-10-11 11:50 ` Lothar Waßmann [this message]
2017-10-11 11:50 ` [PATCH 08/12] ARM: dts: imx6-tx6: add support for I2C bus recovery Lothar Waßmann
2017-10-11 11:50 ` [PATCH 09/12] ARM: dts: imx6-tx6: move display configuration to .dtsi file Lothar Waßmann
2017-10-11 15:11 ` Philipp Zabel
2017-10-11 11:50 ` [PATCH 10/12] ARM: dts: imx6-tx6: add a .dtsi file for the MB7 baseboard Lothar Waßmann
2017-10-11 11:50 ` [PATCH 11/12] ARM: dts: imx: add support for TX6QP Lothar Waßmann
2017-10-11 11:50 ` [PATCH 12/12] ARM: dts: imx: add support for TX6 modules on MB7 baseboard Lothar Waßmann
2017-10-17 8:53 [PATCHv2 00/12] ARM: dts: imx6: Update dts files for the Ka-Ro TX6 module series Lothar Waßmann
2017-10-17 8:53 ` [PATCH 07/12] ARM: dts: imx6-tx6: convert to using simple-audio-card Lothar Waßmann
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=1507722635-30801-8-git-send-email-LW@KARO-electronics.de \
--to=lw@karo-electronics.de \
--cc=devicetree@vger.kernel.org \
--cc=fabio.estevam@nxp.com \
--cc=kernel@pengutronix.de \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux@armlinux.org.uk \
--cc=mark.rutland@arm.com \
--cc=robh+dt@kernel.org \
--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).