From: Steffen Hemer <s.hemer@phytec.de>
To: <linux-omap@vger.kernel.org>
Cc: <upstream@lists.phytec.de>, <krzysztof.kozlowski+dt@linaro.org>,
<robh+dt@kernel.org>, <tony@atomide.com>, <bcousson@baylibre.com>
Subject: [PATCH 2/8] ARM: dts: am335x-wega: Fix audio codec by using simple-audio-card driver.
Date: Tue, 14 Feb 2023 14:22:56 +0100 [thread overview]
Message-ID: <20230214132302.39087-2-s.hemer@phytec.de> (raw)
In-Reply-To: <20230214132302.39087-1-s.hemer@phytec.de>
Sound did not work with the previous EVM sound card binding, EVM dts
switched to using 'simple-audio-card', so this fixes audio codec by using
simple-audio-card driver.
Signed-off-by: Steffen Hemer <s.hemer@phytec.de>
---
arch/arm/boot/dts/am335x-wega.dtsi | 46 ++++++++++++++++++++----------
1 file changed, 31 insertions(+), 15 deletions(-)
diff --git a/arch/arm/boot/dts/am335x-wega.dtsi b/arch/arm/boot/dts/am335x-wega.dtsi
index f957fea8208e..6c5d26bbe952 100644
--- a/arch/arm/boot/dts/am335x-wega.dtsi
+++ b/arch/arm/boot/dts/am335x-wega.dtsi
@@ -8,8 +8,34 @@ / {
model = "Phytec AM335x phyBOARD-WEGA";
compatible = "phytec,am335x-wega", "phytec,am335x-phycore-som", "ti,am33xx";
- sound: sound_iface {
- compatible = "ti,da830-evm-audio";
+ sound: sound-iface {
+ compatible = "simple-audio-card";
+ simple-audio-card,name = "snd-wega";
+ simple-audio-card,format = "i2s";
+ simple-audio-card,bitclock-master = <&sound_iface_main>;
+ simple-audio-card,frame-master = <&sound_iface_main>;
+ simple-audio-card,mclk-fs = <32>;
+ simple-audio-card,widgets =
+ "Line", "Line In",
+ "Line", "Line Out",
+ "Speaker", "Speaker";
+ simple-audio-card,routing =
+ "Line Out", "LLOUT",
+ "Line Out", "RLOUT",
+ "Speaker", "SPOP",
+ "Speaker", "SPOM",
+ "LINE1L", "Line In",
+ "LINE1R", "Line In";
+
+ simple-audio-card,cpu {
+ sound-dai = <&mcasp0>;
+ };
+
+ sound_iface_main: simple-audio-card,codec {
+ sound-dai = <&tlv320aic3007>;
+ clocks = <&mcasp0_fck>;
+ };
+
};
vcc3v3: fixedregulator1 {
@@ -36,6 +62,7 @@ AM33XX_PADCONF(AM335X_PIN_MCASP0_AXR1, PIN_OUTPUT_PULLDOWN, MUX_MODE0)
&i2c0 {
tlv320aic3007: tlv320aic3007@18 {
+ #sound-dai-cells = <0>;
compatible = "ti,tlv320aic3007";
reg = <0x18>;
AVDD-supply = <&vcc3v3>;
@@ -47,6 +74,7 @@ tlv320aic3007: tlv320aic3007@18 {
};
&mcasp0 {
+ #sound-dai-cells = <0>;
pinctrl-names = "default";
pinctrl-0 = <&mcasp0_pins>;
op-mode = <0>; /* DAVINCI_MCASP_IIS_MODE */
@@ -59,19 +87,6 @@ &mcasp0 {
status = "okay";
};
-&sound {
- ti,model = "AM335x-Wega";
- ti,audio-codec = <&tlv320aic3007>;
- ti,mcasp-controller = <&mcasp0>;
- ti,audio-routing =
- "Line Out", "LLOUT",
- "Line Out", "RLOUT",
- "LINE1L", "Line In",
- "LINE1R", "Line In";
- clocks = <&mcasp0_fck>;
- clock-names = "mclk";
- status = "okay";
-};
/* CAN Busses */
&am33xx_pinmux {
--
2.34.1
next prev parent reply other threads:[~2023-02-14 13:23 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-02-14 13:22 [PATCH 1/8] ARM: dts: am335x-phycore-som: Add alias for TPS65910 RTC Steffen Hemer
2023-02-14 13:22 ` Steffen Hemer [this message]
2023-02-14 13:22 ` [PATCH 3/8] ARM: dts: am335x-wega: Change node name of sound card, remove underscores Steffen Hemer
2023-02-14 13:22 ` [PATCH 4/8] ARM: dts: am335x-pcm-935: Remove underscore in node names Steffen Hemer
2023-02-14 13:22 ` [PATCH 5/8] ARM: dts: am335x-regor: " Steffen Hemer
2023-02-14 13:23 ` [PATCH 6/8] ARM: dts: am335x-phycore-som: " Steffen Hemer
2023-02-14 13:23 ` [PATCH 7/8] ARM: dts: am335x-pcm-953: Remove superseded/invalid LED trigger Steffen Hemer
2023-02-14 13:23 ` [PATCH 8/8] ARM: dts: am335x-phycore-som: Remove superseded/invalid GPMC NAND type Steffen Hemer
2023-03-27 8:18 ` [PATCH 1/8] ARM: dts: am335x-phycore-som: Add alias for TPS65910 RTC Tony Lindgren
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=20230214132302.39087-2-s.hemer@phytec.de \
--to=s.hemer@phytec.de \
--cc=bcousson@baylibre.com \
--cc=krzysztof.kozlowski+dt@linaro.org \
--cc=linux-omap@vger.kernel.org \
--cc=robh+dt@kernel.org \
--cc=tony@atomide.com \
--cc=upstream@lists.phytec.de \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.