Re: [PATCH v2] ARM: dts: ls1021a: audio: Add dts nodes for audio on LS1021A
On Wed, Jul 15, 2015 at 04:02:46PM +0800, Alison Wang wrote: > This patch adds dts nodes for audio on LS1021A. > > Signed-off-by: Alison Wang > Signed-off-by: Shawn Guo Applied, thanks. -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH v2] ARM: dts: ls1021a: audio: Add dts nodes for audio on LS1021A
On Wed, Jul 15, 2015 at 04:02:46PM +0800, Alison Wang wrote: This patch adds dts nodes for audio on LS1021A. Signed-off-by: Alison Wang alison.w...@freescale.com Signed-off-by: Shawn Guo shawn...@kernel.org Applied, thanks. -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
[PATCH v2] ARM: dts: ls1021a: audio: Add dts nodes for audio on LS1021A
This patch adds dts nodes for audio on LS1021A.
Signed-off-by: Alison Wang
Signed-off-by: Shawn Guo
---
Changes since v1:
- Remove "clocks" container, and use a unit node name.
arch/arm/boot/dts/ls1021a-qds.dts | 69 +++
arch/arm/boot/dts/ls1021a-twr.dts | 61 ++
arch/arm/boot/dts/ls1021a.dtsi| 14
3 files changed, 138 insertions(+), 6 deletions(-)
diff --git a/arch/arm/boot/dts/ls1021a-qds.dts
b/arch/arm/boot/dts/ls1021a-qds.dts
index f14731b..f5f4194 100644
--- a/arch/arm/boot/dts/ls1021a-qds.dts
+++ b/arch/arm/boot/dts/ls1021a-qds.dts
@@ -58,6 +58,55 @@
enet0_sgmii_phy = _phy1c;
enet1_sgmii_phy = _phy1d;
};
+
+ sys_mclk: clock-mclk {
+ compatible = "fixed-clock";
+ #clock-cells = <0>;
+ clock-frequency = <24576000>;
+ };
+
+ 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 = <330>;
+ regulator-max-microvolt = <330>;
+ 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 = <>;
+ frame-master;
+ bitclock-master;
+ };
+
+ simple-audio-card,codec {
+ sound-dai = <>;
+ frame-master;
+ bitclock-master;
+ };
+ };
};
{
@@ -83,6 +132,7 @@
status = "okay";
pca9547: mux@77 {
+ compatible = "nxp,pca9547";
reg = <0x77>;
#address-cells = <1>;
#size-cells = <0>;
@@ -137,6 +187,21 @@
reg = <0x4c>;
};
};
+
+ i2c@4 {
+ #address-cells = <1>;
+ #size-cells = <0>;
+ reg = <0x4>;
+
+ codec: sgtl5000@2a {
+ #sound-dai-cells = <0>;
+ compatible = "fsl,sgtl5000";
+ reg = <0x2a>;
+ VDDA-supply = <_3p3v>;
+ VDDIO-supply = <_3p3v>;
+ clocks = <_mclk 1>;
+ };
+ };
};
};
@@ -235,6 +300,10 @@
};
};
+ {
+ status = "okay";
+};
+
{
status = "okay";
};
diff --git a/arch/arm/boot/dts/ls1021a-twr.dts
b/arch/arm/boot/dts/ls1021a-twr.dts
index a2c591e..db41e4f 100644
--- a/arch/arm/boot/dts/ls1021a-twr.dts
+++ b/arch/arm/boot/dts/ls1021a-twr.dts
@@ -56,6 +56,55 @@
enet0_sgmii_phy = _phy2;
enet1_sgmii_phy = _phy0;
};
+
+ sys_mclk: clock-mclk {
+ compatible = "fixed-clock";
+ #clock-cells = <0>;
+ clock-frequency = <24576000>;
+ };
+
+ 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 = <330>;
+ regulator-max-microvolt = <330>;
+ 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",
+
[PATCH v2] ARM: dts: ls1021a: audio: Add dts nodes for audio on LS1021A
This patch adds dts nodes for audio on LS1021A.
Signed-off-by: Alison Wang alison.w...@freescale.com
Signed-off-by: Shawn Guo shawn...@kernel.org
---
Changes since v1:
- Remove clocks container, and use a unit node name.
arch/arm/boot/dts/ls1021a-qds.dts | 69 +++
arch/arm/boot/dts/ls1021a-twr.dts | 61 ++
arch/arm/boot/dts/ls1021a.dtsi| 14
3 files changed, 138 insertions(+), 6 deletions(-)
diff --git a/arch/arm/boot/dts/ls1021a-qds.dts
b/arch/arm/boot/dts/ls1021a-qds.dts
index f14731b..f5f4194 100644
--- a/arch/arm/boot/dts/ls1021a-qds.dts
+++ b/arch/arm/boot/dts/ls1021a-qds.dts
@@ -58,6 +58,55 @@
enet0_sgmii_phy = sgmii_phy1c;
enet1_sgmii_phy = sgmii_phy1d;
};
+
+ sys_mclk: clock-mclk {
+ compatible = fixed-clock;
+ #clock-cells = 0;
+ clock-frequency = 24576000;
+ };
+
+ 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 = 330;
+ regulator-max-microvolt = 330;
+ 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;
+ frame-master;
+ bitclock-master;
+ };
+
+ simple-audio-card,codec {
+ sound-dai = codec;
+ frame-master;
+ bitclock-master;
+ };
+ };
};
dspi0 {
@@ -83,6 +132,7 @@
status = okay;
pca9547: mux@77 {
+ compatible = nxp,pca9547;
reg = 0x77;
#address-cells = 1;
#size-cells = 0;
@@ -137,6 +187,21 @@
reg = 0x4c;
};
};
+
+ i2c@4 {
+ #address-cells = 1;
+ #size-cells = 0;
+ reg = 0x4;
+
+ codec: sgtl5000@2a {
+ #sound-dai-cells = 0;
+ compatible = fsl,sgtl5000;
+ reg = 0x2a;
+ VDDA-supply = reg_3p3v;
+ VDDIO-supply = reg_3p3v;
+ clocks = sys_mclk 1;
+ };
+ };
};
};
@@ -235,6 +300,10 @@
};
};
+sai2 {
+ status = okay;
+};
+
uart0 {
status = okay;
};
diff --git a/arch/arm/boot/dts/ls1021a-twr.dts
b/arch/arm/boot/dts/ls1021a-twr.dts
index a2c591e..db41e4f 100644
--- a/arch/arm/boot/dts/ls1021a-twr.dts
+++ b/arch/arm/boot/dts/ls1021a-twr.dts
@@ -56,6 +56,55 @@
enet0_sgmii_phy = sgmii_phy2;
enet1_sgmii_phy = sgmii_phy0;
};
+
+ sys_mclk: clock-mclk {
+ compatible = fixed-clock;
+ #clock-cells = 0;
+ clock-frequency = 24576000;
+ };
+
+ 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 = 330;
+ regulator-max-microvolt = 330;
+ 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,
+
