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


Groups > linux.kernel > #1176028

[PATCH v2 16/20] ARM: DTS: am335x-evmsk: Switch using simple-audio-card for audio support

From Peter Ujfalusi <peter.ujfalusi@ti.com>
Newsgroups linux.kernel
Subject [PATCH v2 16/20] ARM: DTS: am335x-evmsk: Switch using simple-audio-card for audio support
Date 2015-07-02 16:20 +0200
Message-ID <pHNvk-3Pj-31@gated-at.bofh.it> (permalink)
References <pHNlE-3HS-7@gated-at.bofh.it>
Organization linux.* mail to news gateway

Show all headers | View raw


The sound support consist only Headset output on the board and can be
handled by "simple-audio-card"

Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
---
 arch/arm/boot/dts/am335x-evmsk.dts | 30 ++++++++++++++++++++++--------
 1 file changed, 22 insertions(+), 8 deletions(-)

diff --git a/arch/arm/boot/dts/am335x-evmsk.dts b/arch/arm/boot/dts/am335x-evmsk.dts
index 8abfe2a2ff4a..315bb02c9920 100644
--- a/arch/arm/boot/dts/am335x-evmsk.dts
+++ b/arch/arm/boot/dts/am335x-evmsk.dts
@@ -141,14 +141,26 @@
 	};
 
 	sound {
-		compatible = "ti,da830-evm-audio";
-		ti,model = "AM335x-EVMSK";
-		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 = "AM335x-EVMSK";
+		simple-audio-card,widgets =
+			"Headphone", "Headphone Jack";
+		simple-audio-card,routing =
+			"Headphone Jack",	"HPLOUT",
+			"Headphone Jack",	"HPROUT";
+		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>;
+		};
 	};
 
 	panel {
@@ -471,6 +483,7 @@
 	};
 
 	tlv320aic3106: tlv320aic3106@1b {
+		#sound-dai-cells = <0>;
 		compatible = "ti,tlv320aic3106";
 		reg = <0x1b>;
 		status = "okay";
@@ -670,6 +683,7 @@
 };
 
 &mcasp1 {
+	#sound-dai-cells = <0>;
 	pinctrl-names = "default", "sleep";
 	pinctrl-0 = <&mcasp1_pins>;
 	pinctrl-1 = <&mcasp1_pins_sleep>;
-- 
2.4.5

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

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


Thread

[PATCH v2 00/20] ARM: DTS: am335x/am43xx: Audio support and fixes for audio Peter Ujfalusi <peter.ujfalusi@ti.com> - 2015-07-02 16:10 +0200
  [PATCH v2 15/20] ARM: DTS: am335x-evmsk: Add sleep pin settings for mcasp1 Peter Ujfalusi <peter.ujfalusi@ti.com> - 2015-07-02 16:10 +0200
  [PATCH v2 17/20] ARM: DTS: am335x-evm: Fix mcasp1 node's indentation Peter Ujfalusi <peter.ujfalusi@ti.com> - 2015-07-02 16:10 +0200
  [PATCH v2 18/20] ARM: DTS: am335x-evm: Rename pinctrl section for McASP1 Peter Ujfalusi <peter.ujfalusi@ti.com> - 2015-07-02 16:10 +0200
  [PATCH v2 05/20] ARM: DTS: am43xx-epos-evm: Add regulator for VBAT and DCDC4 of tps65218 Peter Ujfalusi <peter.ujfalusi@ti.com> - 2015-07-02 16:20 +0200
  [PATCH v2 12/20] ARM: DTS: am437x-gp-evm: McASP1 node for audio support Peter Ujfalusi <peter.ujfalusi@ti.com> - 2015-07-02 16:20 +0200
  [PATCH v2 11/20] ARM: DTS: am437x-gp-evm: Add node for tlv320aic3106 audio codec Peter Ujfalusi <peter.ujfalusi@ti.com> - 2015-07-02 16:20 +0200
  [PATCH v2 03/20] ARM: DTS: am437x-sk-evm: Switch using simple-audio-card for audio support Peter Ujfalusi <peter.ujfalusi@ti.com> - 2015-07-02 16:20 +0200
  [PATCH v2 01/20] ARM: omap2plus_defconfig: Enable audio related config options Peter Ujfalusi <peter.ujfalusi@ti.com> - 2015-07-02 16:20 +0200
  [PATCH v2 16/20] ARM: DTS: am335x-evmsk: Switch using simple-audio-card for audio support Peter Ujfalusi <peter.ujfalusi@ti.com> - 2015-07-02 16:20 +0200
  [PATCH v2 14/20] ARM: DTS: am335x-evmsk: Fix mcasp1 node's indentation Peter Ujfalusi <peter.ujfalusi@ti.com> - 2015-07-02 16:20 +0200
  [PATCH v2 10/20] ARM: DTS: am437x-gp-evm: Rename fixed regulator vmmcsd_fixed to evm_v3_3d Peter Ujfalusi <peter.ujfalusi@ti.com> - 2015-07-02 16:20 +0200
  [PATCH v2 04/20] ARM: DTS: am43xx-epos-evm: Add gpio-hog for configuring the display/audio mux Peter Ujfalusi <peter.ujfalusi@ti.com> - 2015-07-02 16:20 +0200
  [PATCH v2 02/20] ARM: DTS: am437x-sk-evm: Add sleep pin settings for mcasp1 Peter Ujfalusi <peter.ujfalusi@ti.com> - 2015-07-02 16:20 +0200
  [PATCH v2 13/20] ARM: DTS: am437x-gp-evm: Enable analog audio via simple-card Peter Ujfalusi <peter.ujfalusi@ti.com> - 2015-07-02 16:20 +0200

csiph-web