From: Peter Ujfalusi <peter.ujfalusi@ti.com>
To: <tony@atomide.com>
Cc: <linux-omap@vger.kernel.org>, <devicetree@vger.kernel.org>,
<linux-arm-kernel@lists.infradead.org>,
<linux-kernel@vger.kernel.org>, <balbi@ti.com>
Subject: [PATCH v2 03/20] ARM: DTS: am437x-sk-evm: Switch using simple-audio-card for audio support
Date: Thu, 2 Jul 2015 17:06:18 +0300 [thread overview]
Message-ID: <1435845995-19085-4-git-send-email-peter.ujfalusi@ti.com> (raw)
In-Reply-To: <1435845995-19085-1-git-send-email-peter.ujfalusi@ti.com>
The sound support consist only Headset output on the board and can be
handled by "simple-audio-card".
Also enable the Line-In route as the board has support for it.
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
Tested-by: Felipe Balbi <balbi@ti.com>
---
arch/arm/boot/dts/am437x-sk-evm.dts | 33 +++++++++++++++++++++++++--------
1 file changed, 25 insertions(+), 8 deletions(-)
diff --git a/arch/arm/boot/dts/am437x-sk-evm.dts b/arch/arm/boot/dts/am437x-sk-evm.dts
index b5de6b0d622c..22af44894c66 100644
--- a/arch/arm/boot/dts/am437x-sk-evm.dts
+++ b/arch/arm/boot/dts/am437x-sk-evm.dts
@@ -32,14 +32,29 @@
};
sound {
- compatible = "ti,da830-evm-audio";
- ti,model = "AM437x-SK-EVM";
- ti,audio-codec = <&tlv320aic3106>;
- ti,mcasp-controller = <&mcasp1>;
- ti,codec-clock-rate = <24000000>;
- ti,audio-routing =
- "Headphone Jack", "HPLOUT",
- "Headphone Jack", "HPROUT";
+ compatible = "simple-audio-card";
+ simple-audio-card,name = "AM437x-SK-EVM";
+ simple-audio-card,widgets =
+ "Headphone", "Headphone Jack",
+ "Line", "Line In";
+ simple-audio-card,routing =
+ "Headphone Jack", "HPLOUT",
+ "Headphone Jack", "HPROUT",
+ "LINE1L", "Line In",
+ "LINE1R", "Line In";
+ simple-audio-card,format = "dsp_b";
+ simple-audio-card,bitclock-master = <&sound_master>;
+ simple-audio-card,frame-master = <&sound_master>;
+ simple-audio-card,bitclock-inversion;
+
+ simple-audio-card,cpu {
+ sound-dai = <&mcasp1>;
+ };
+
+ sound_master: simple-audio-card,codec {
+ sound-dai = <&tlv320aic3106>;
+ system-clock-frequency = <24000000>;
+ };
};
matrix_keypad: matrix_keypad@0 {
@@ -489,6 +504,7 @@
};
tlv320aic3106: tlv320aic3106@1b {
+ #sound-dai-cells = <0>;
compatible = "ti,tlv320aic3106";
reg = <0x1b>;
status = "okay";
@@ -649,6 +665,7 @@
};
&mcasp1 {
+ #sound-dai-cells = <0>;
pinctrl-names = "default", "sleep";
pinctrl-0 = <&mcasp1_pins>;
pinctrl-1 = <&mcasp1_pins_sleep>;
--
2.4.5
next prev parent reply other threads:[~2015-07-02 14:11 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-07-02 14:06 [PATCH v2 00/20] ARM: DTS: am335x/am43xx: Audio support and fixes for audio Peter Ujfalusi
2015-07-02 14:06 ` [PATCH v2 01/20] ARM: omap2plus_defconfig: Enable audio related config options Peter Ujfalusi
2015-07-02 14:20 ` Felipe Balbi
2015-07-02 14:06 ` [PATCH v2 02/20] ARM: DTS: am437x-sk-evm: Add sleep pin settings for mcasp1 Peter Ujfalusi
2015-07-02 14:06 ` Peter Ujfalusi [this message]
2015-07-02 14:06 ` [PATCH v2 04/20] ARM: DTS: am43xx-epos-evm: Add gpio-hog for configuring the display/audio mux Peter Ujfalusi
2015-07-02 14:06 ` [PATCH v2 05/20] ARM: DTS: am43xx-epos-evm: Add regulator for VBAT and DCDC4 of tps65218 Peter Ujfalusi
2015-07-02 14:06 ` [PATCH v2 06/20] ARM: DTS: am43xx-epos-evm: McASP1 node for audio support Peter Ujfalusi
2015-07-02 14:06 ` [PATCH v2 07/20] ARM: DTS: am43xx-epos-evm: Add node for tlv320aic3111 audio codec Peter Ujfalusi
2015-07-02 14:06 ` [PATCH v2 08/20] ARM: DTS: am43xx-epos-evm: Enable analog audio via simple-card Peter Ujfalusi
2015-07-02 14:06 ` [PATCH v2 09/20] ARM: DTS: am437x-gp-evm: Add gpio-hog for configuring the display/audio mux Peter Ujfalusi
2015-07-02 14:06 ` [PATCH v2 10/20] ARM: DTS: am437x-gp-evm: Rename fixed regulator vmmcsd_fixed to evm_v3_3d Peter Ujfalusi
2015-07-02 14:06 ` [PATCH v2 11/20] ARM: DTS: am437x-gp-evm: Add node for tlv320aic3106 audio codec Peter Ujfalusi
2015-07-02 14:06 ` [PATCH v2 12/20] ARM: DTS: am437x-gp-evm: McASP1 node for audio support Peter Ujfalusi
2015-07-02 14:06 ` [PATCH v2 13/20] ARM: DTS: am437x-gp-evm: Enable analog audio via simple-card Peter Ujfalusi
2015-07-02 14:06 ` [PATCH v2 14/20] ARM: DTS: am335x-evmsk: Fix mcasp1 node's indentation Peter Ujfalusi
2015-07-02 14:06 ` [PATCH v2 15/20] ARM: DTS: am335x-evmsk: Add sleep pin settings for mcasp1 Peter Ujfalusi
2015-07-02 14:06 ` [PATCH v2 16/20] ARM: DTS: am335x-evmsk: Switch using simple-audio-card for audio support Peter Ujfalusi
2015-07-02 14:06 ` [PATCH v2 17/20] ARM: DTS: am335x-evm: Fix mcasp1 node's indentation Peter Ujfalusi
2015-07-02 14:06 ` [PATCH v2 18/20] ARM: DTS: am335x-evm: Rename pinctrl section for McASP1 Peter Ujfalusi
2015-07-02 14:06 ` [PATCH v2 19/20] ARM: DTS: am335x-evm: Add sleep pin settings for mcasp1 Peter Ujfalusi
2015-07-02 14:06 ` [PATCH v2 20/20] ARM: DTS: am335x-evm: Switch using simple-audio-card for audio support Peter Ujfalusi
2015-07-14 11:29 ` [PATCH v2 00/20] ARM: DTS: am335x/am43xx: Audio support and fixes for audio 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=1435845995-19085-4-git-send-email-peter.ujfalusi@ti.com \
--to=peter.ujfalusi@ti.com \
--cc=balbi@ti.com \
--cc=devicetree@vger.kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-omap@vger.kernel.org \
--cc=tony@atomide.com \
/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).