2014-02-19 08:47:01

by Xiubo Li

Subject: [PATCH v2 0/4] Add audio card DT node support for Vybird-TWR board

Add audio card DT node support for Vybird-TWR board.


Xiubo Li (4):
ARM: dts: vf610: Add edma mux Tx and Rx support for SAI node.
ARM: dts: vf610-twr: Enable SAI ALSA SoC DAI device
ARM: dts: vf610-twr: Enable SGTL5000 codec.
ARM: dts: vf610-twr: Add simple-card support.

arch/arm/boot/dts/vf610-twr.dts | 71 +++++++++++++++++++++++++++++++++++++++++
arch/arm/boot/dts/vf610.dtsi | 3 ++
2 files changed, 74 insertions(+)

--
1.8.4

2014-02-19 08:47:10

by Xiubo Li

Subject: [PATCH v2 1/4] ARM: dts: vf610: Add edma mux Tx and Rx support for SAI node.

This patch adds the SAI's edma mux Tx and Rx support.

Signed-off-by: Xiubo Li <[email protected]>
Cc: Shawn Guo <[email protected]>
---
arch/arm/boot/dts/vf610.dtsi | 3 +++
1 file changed, 3 insertions(+)

diff --git a/arch/arm/boot/dts/vf610.dtsi b/arch/arm/boot/dts/vf610.dtsi
index 91a7757..f08df47 100644
--- a/arch/arm/boot/dts/vf610.dtsi
+++ b/arch/arm/boot/dts/vf610.dtsi
@@ -169,6 +169,9 @@
interrupts = <0 86 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&clks VF610_CLK_SAI2>;
clock-names = "sai";
+ dma-names = "tx", "rx";
+ dmas = <&edma0 0 21>,
+ <&edma0 0 20>;
status = "disabled";
};

--
1.8.4

2014-02-19 08:47:18

by Xiubo Li

Subject: [PATCH v2 2/4] ARM: dts: vf610-twr: Enable SAI ALSA SoC DAI device

This patch adds and enables the SAI device.

Signed-off-by: Xiubo Li <[email protected]>
Cc: Shawn Guo <[email protected]>
---
arch/arm/boot/dts/vf610-twr.dts | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)

diff --git a/arch/arm/boot/dts/vf610-twr.dts b/arch/arm/boot/dts/vf610-twr.dts
index e3a3805..bcee3bb 100644
--- a/arch/arm/boot/dts/vf610-twr.dts
+++ b/arch/arm/boot/dts/vf610-twr.dts
@@ -121,6 +121,18 @@
>;
};

+ pinctrl_sai2: sai2grp {
+ fsl,pins = <
+ VF610_PAD_PTA16__SAI2_TX_BCLK 0x02ed
+ VF610_PAD_PTA18__SAI2_TX_DATA 0x02ee
+ VF610_PAD_PTA19__SAI2_TX_SYNC 0x02ed
+ VF610_PAD_PTA21__SAI2_RX_BCLK 0x02ed
+ VF610_PAD_PTA22__SAI2_RX_DATA 0x02ed
+ VF610_PAD_PTA23__SAI2_RX_SYNC 0x02ed
+ VF610_PAD_PTB18__EXT_AUDIO_MCLK 0x02ed
+ >;
+ };
+
pinctrl_uart1: uart1grp {
fsl,pins = <
VF610_PAD_PTB4__UART1_TX 0x21a2
@@ -130,6 +142,12 @@
};
};

+&sai2 {
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_sai2>;
+ status = "okay";
+};
+
&uart1 {
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_uart1>;
--
1.8.4

2014-02-19 08:47:29

by Xiubo Li

Subject: [PATCH v2 4/4] ARM: dts: vf610-twr: Add simple-card support.

This patch adds and enables simple-card support in DT node.

Signed-off-by: Xiubo Li <[email protected]>
Cc: Shawn Guo <[email protected]>
---
arch/arm/boot/dts/vf610-twr.dts | 31 +++++++++++++++++++++++++++++++
1 file changed, 31 insertions(+)

diff --git a/arch/arm/boot/dts/vf610-twr.dts b/arch/arm/boot/dts/vf610-twr.dts
index 0f4bff5..a553aa2 100644
--- a/arch/arm/boot/dts/vf610-twr.dts
+++ b/arch/arm/boot/dts/vf610-twr.dts
@@ -48,6 +48,35 @@
regulator-always-on;
};
};
+
+ sound {
+ compatible = "simple-audio-card";
+ simple-audio-card,format = "i2s";
+ simple-audio-card,widgets =
+ "Microphone", "Microphone Jack",
+ "Headphone", "Headphone Jack",
+ "Speaker", "Speaker Ext",
+ "Line", "Line In Jack";
+ simple-audio-card,routing =
+ "MIC_IN", "Microphone Jack",
+ "Microphone Jack", "Mic Bias",
+ "LINE_IN", "Line In Jack",
+ "Headphone Jack", "HP_OUT",
+ "Speaker Ext", "LINE_OUT";
+
+ simple-audio-card,cpu {
+ sound-dai = <&sai2>;
+ master-clkdir-out;
+ frame-master;
+ bitclock-master;
+ };
+
+ simple-audio-card,codec {
+ sound-dai = <&codec>;
+ frame-master;
+ bitclock-master;
+ };
+ };
};

&dspi0 {
@@ -88,6 +117,7 @@
status = "okay";

codec: sgtl5000@0a {
+ #sound-dai-cells = <0>;
compatible = "fsl,sgtl5000";
reg = <0x0a>;
VDDA-supply = <&reg_3p3v>;
@@ -165,6 +195,7 @@
};

&sai2 {
+ #sound-dai-cells = <0>;
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_sai2>;
status = "okay";
--
1.8.4

2014-02-19 08:47:33

by Xiubo Li

Subject: [PATCH v2 3/4] ARM: dts: vf610-twr: Enable SGTL5000 codec.

This patch adds and enables SGTL5000 codec support.

Signed-off-by: Xiubo Li <[email protected]>
Cc: Shawn Guo <[email protected]>
---
arch/arm/boot/dts/vf610-twr.dts | 22 ++++++++++++++++++++++
1 file changed, 22 insertions(+)

diff --git a/arch/arm/boot/dts/vf610-twr.dts b/arch/arm/boot/dts/vf610-twr.dts
index bcee3bb..0f4bff5 100644
--- a/arch/arm/boot/dts/vf610-twr.dts
+++ b/arch/arm/boot/dts/vf610-twr.dts
@@ -34,6 +34,20 @@
};
};

+ regulators {
+ compatible = "simple-bus";
+ #address-cells = <1>;
+ #size-cells = <0>;
+
+ reg_3p3v: regulator@0 {
+ compatible = "regulator-fixed";
+ reg = <0>;
+ regulator-name = "3P3V";
+ regulator-min-microvolt = <3300000>;
+ regulator-max-microvolt = <3300000>;
+ regulator-always-on;
+ };
+ };
};

&dspi0 {
@@ -72,6 +86,14 @@
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_i2c0>;
status = "okay";
+
+ codec: sgtl5000@0a {
+ compatible = "fsl,sgtl5000";
+ reg = <0x0a>;
+ VDDA-supply = <&reg_3p3v>;
+ VDDIO-supply = <&reg_3p3v>;
+ clocks = <&clks VF610_CLK_SAI2>;
+ };
};

&iomuxc {
--
1.8.4

2014-02-20 01:37:27

by Shawn Guo

Subject: Re: [PATCH v2 0/4] Add audio card DT node support for Vybird-TWR board

On Wed, Feb 19, 2014 at 03:42:27PM +0800, Xiubo Li wrote:
> Xiubo Li (4):
> ARM: dts: vf610: Add edma mux Tx and Rx support for SAI node.
> ARM: dts: vf610-twr: Enable SAI ALSA SoC DAI device
> ARM: dts: vf610-twr: Enable SGTL5000 codec.
> ARM: dts: vf610-twr: Add simple-card support.

Applied all, thanks.