* [PATCH 0/5] ARM: DT: STI: update audio part
@ 2016-10-04 16:11 Arnaud Pouliquen
[not found] ` <1475597517-14225-1-git-send-email-arnaud.pouliquen-qxv4g6HH51o@public.gmane.org>
0 siblings, 1 reply; 8+ messages in thread
From: Arnaud Pouliquen @ 2016-10-04 16:11 UTC (permalink / raw)
To: devicetree-u79uwXL29TY76Z2rM5mHXA
Cc: kernel-F5mvAk5X5gdBDgjK7y7TUQ, Rob Herring, Mark Rutland,
Patrice Chotard, Moise Gergaud
- DT part associated to following ASoC patchset:
http://www.spinics.net/lists/alsa-devel/msg54782.html
- Enable hdmi audio card on b2120 board
- Fix some DT declarations
Arnaud Pouliquen (5):
ARM: DT: STiH407-family: sti sound card field cleaning
ARM: DT: STiH407: Add label for sti-hdmi node
ARM: DT: STiH410: Add label for sti-hdmi node
ARM: DT: STiHxxx-b2120: Add support of HDMI audio
ARM: DT: STiH410-B2260: clean unnecessary hdmi node overlay
arch/arm/boot/dts/stih407-family.dtsi | 32 ++++++--------------------------
arch/arm/boot/dts/stih407.dtsi | 2 +-
arch/arm/boot/dts/stih410-b2260.dts | 6 ------
arch/arm/boot/dts/stih410.dtsi | 2 +-
arch/arm/boot/dts/stihxxx-b2120.dtsi | 19 ++++++++++++++++++-
5 files changed, 26 insertions(+), 35 deletions(-)
--
1.9.1
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH 1/5] ARM: DT: STiH407-family: sti sound card field cleaning
[not found] ` <1475597517-14225-1-git-send-email-arnaud.pouliquen-qxv4g6HH51o@public.gmane.org>
@ 2016-10-04 16:11 ` Arnaud Pouliquen
2016-10-04 16:11 ` [PATCH 2/5] ARM: DT: STiH407: Add label for sti-hdmi node Arnaud Pouliquen
` (5 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: Arnaud Pouliquen @ 2016-10-04 16:11 UTC (permalink / raw)
To: devicetree-u79uwXL29TY76Z2rM5mHXA
Cc: kernel-F5mvAk5X5gdBDgjK7y7TUQ, Rob Herring, Mark Rutland,
Patrice Chotard, Moise Gergaud
Cleaning of some uni-players and uni-reader fields.
Associated configurations are now handled in driver based
on compatible string.
Signed-off-by: Arnaud Pouliquen <arnaud.pouliquen-qxv4g6HH51o@public.gmane.org>
---
arch/arm/boot/dts/stih407-family.dtsi | 32 ++++++--------------------------
1 file changed, 6 insertions(+), 26 deletions(-)
diff --git a/arch/arm/boot/dts/stih407-family.dtsi b/arch/arm/boot/dts/stih407-family.dtsi
index 91096a4..d29960b 100644
--- a/arch/arm/boot/dts/stih407-family.dtsi
+++ b/arch/arm/boot/dts/stih407-family.dtsi
@@ -900,7 +900,7 @@
};
sti_uni_player0: sti-uni-player@8d80000 {
- compatible = "st,sti-uni-player";
+ compatible = "st,stih407-uni-player-hdmi";
#sound-dai-cells = <0>;
st,syscfg = <&syscfg_core>;
clocks = <&clk_s_d0_flexgen CLK_PCM_0>;
@@ -910,17 +910,13 @@
reg = <0x8d80000 0x158>;
interrupts = <GIC_SPI 84 IRQ_TYPE_NONE>;
dmas = <&fdma0 2 0 1>;
- dai-name = "Uni Player #0 (HDMI)";
dma-names = "tx";
- st,uniperiph-id = <0>;
- st,version = <5>;
- st,mode = "HDMI";
status = "disabled";
};
sti_uni_player1: sti-uni-player@8d81000 {
- compatible = "st,sti-uni-player";
+ compatible = "st,stih407-uni-player-pcm-out";
#sound-dai-cells = <0>;
st,syscfg = <&syscfg_core>;
clocks = <&clk_s_d0_flexgen CLK_PCM_1>;
@@ -930,17 +926,13 @@
reg = <0x8d81000 0x158>;
interrupts = <GIC_SPI 85 IRQ_TYPE_NONE>;
dmas = <&fdma0 3 0 1>;
- dai-name = "Uni Player #1 (PIO)";
dma-names = "tx";
- st,uniperiph-id = <1>;
- st,version = <5>;
- st,mode = "PCM";
status = "disabled";
};
sti_uni_player2: sti-uni-player@8d82000 {
- compatible = "st,sti-uni-player";
+ compatible = "st,stih407-uni-player-dac";
#sound-dai-cells = <0>;
st,syscfg = <&syscfg_core>;
clocks = <&clk_s_d0_flexgen CLK_PCM_2>;
@@ -950,17 +942,13 @@
reg = <0x8d82000 0x158>;
interrupts = <GIC_SPI 86 IRQ_TYPE_NONE>;
dmas = <&fdma0 4 0 1>;
- dai-name = "Uni Player #1 (DAC)";
dma-names = "tx";
- st,uniperiph-id = <2>;
- st,version = <5>;
- st,mode = "PCM";
status = "disabled";
};
sti_uni_player3: sti-uni-player@8d85000 {
- compatible = "st,sti-uni-player";
+ compatible = "st,stih407-uni-player-spdif";
#sound-dai-cells = <0>;
st,syscfg = <&syscfg_core>;
clocks = <&clk_s_d0_flexgen CLK_SPDIFF>;
@@ -971,38 +959,30 @@
interrupts = <GIC_SPI 89 IRQ_TYPE_NONE>;
dmas = <&fdma0 7 0 1>;
dma-names = "tx";
- dai-name = "Uni Player #1 (PIO)";
- st,uniperiph-id = <3>;
- st,version = <5>;
- st,mode = "SPDIF";
status = "disabled";
};
sti_uni_reader0: sti-uni-reader@8d83000 {
- compatible = "st,sti-uni-reader";
+ compatible = "st,stih407-uni-reader-pcm_in";
#sound-dai-cells = <0>;
st,syscfg = <&syscfg_core>;
reg = <0x8d83000 0x158>;
interrupts = <GIC_SPI 87 IRQ_TYPE_NONE>;
dmas = <&fdma0 5 0 1>;
dma-names = "rx";
- dai-name = "Uni Reader #0 (PCM IN)";
- st,version = <3>;
status = "disabled";
};
sti_uni_reader1: sti-uni-reader@8d84000 {
- compatible = "st,sti-uni-reader";
+ compatible = "st,stih407-uni-reader-hdmi";
#sound-dai-cells = <0>;
st,syscfg = <&syscfg_core>;
reg = <0x8d84000 0x158>;
interrupts = <GIC_SPI 88 IRQ_TYPE_NONE>;
dmas = <&fdma0 6 0 1>;
dma-names = "rx";
- dai-name = "Uni Reader #1 (HDMI RX)";
- st,version = <3>;
status = "disabled";
};
--
1.9.1
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH 2/5] ARM: DT: STiH407: Add label for sti-hdmi node
[not found] ` <1475597517-14225-1-git-send-email-arnaud.pouliquen-qxv4g6HH51o@public.gmane.org>
2016-10-04 16:11 ` [PATCH 1/5] ARM: DT: STiH407-family: sti sound card field cleaning Arnaud Pouliquen
@ 2016-10-04 16:11 ` Arnaud Pouliquen
2016-10-04 16:11 ` [PATCH 3/5] ARM: DT: STiH410: " Arnaud Pouliquen
` (4 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: Arnaud Pouliquen @ 2016-10-04 16:11 UTC (permalink / raw)
To: devicetree-u79uwXL29TY76Z2rM5mHXA
Cc: kernel-F5mvAk5X5gdBDgjK7y7TUQ, Rob Herring, Mark Rutland,
Patrice Chotard, Moise Gergaud
Needed to declare HDMI device in sound card
Signed-off-by: Arnaud Pouliquen <arnaud.pouliquen-qxv4g6HH51o@public.gmane.org>
---
arch/arm/boot/dts/stih407.dtsi | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm/boot/dts/stih407.dtsi b/arch/arm/boot/dts/stih407.dtsi
index 291ffac..fa14983 100644
--- a/arch/arm/boot/dts/stih407.dtsi
+++ b/arch/arm/boot/dts/stih407.dtsi
@@ -102,7 +102,7 @@
<&clk_s_d2_quadfs 0>;
};
- sti-hdmi@8d04000 {
+ sti_hdmi: sti-hdmi@8d04000 {
compatible = "st,stih407-hdmi";
reg = <0x8d04000 0x1000>;
reg-names = "hdmi-reg";
--
1.9.1
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH 3/5] ARM: DT: STiH410: Add label for sti-hdmi node
[not found] ` <1475597517-14225-1-git-send-email-arnaud.pouliquen-qxv4g6HH51o@public.gmane.org>
2016-10-04 16:11 ` [PATCH 1/5] ARM: DT: STiH407-family: sti sound card field cleaning Arnaud Pouliquen
2016-10-04 16:11 ` [PATCH 2/5] ARM: DT: STiH407: Add label for sti-hdmi node Arnaud Pouliquen
@ 2016-10-04 16:11 ` Arnaud Pouliquen
2016-10-04 16:11 ` [PATCH 4/5] ARM: DT: STiHxxx-b2120: Add support of HDMI audio Arnaud Pouliquen
` (3 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: Arnaud Pouliquen @ 2016-10-04 16:11 UTC (permalink / raw)
To: devicetree-u79uwXL29TY76Z2rM5mHXA
Cc: kernel-F5mvAk5X5gdBDgjK7y7TUQ, Rob Herring, Mark Rutland,
Patrice Chotard, Moise Gergaud
Needed to declare HDMI device in sound card
Signed-off-by: Arnaud Pouliquen <arnaud.pouliquen-qxv4g6HH51o@public.gmane.org>
---
arch/arm/boot/dts/stih410.dtsi | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm/boot/dts/stih410.dtsi b/arch/arm/boot/dts/stih410.dtsi
index a3ef734..281a124 100644
--- a/arch/arm/boot/dts/stih410.dtsi
+++ b/arch/arm/boot/dts/stih410.dtsi
@@ -193,7 +193,7 @@
<&clk_s_d2_quadfs 0>;
};
- sti-hdmi@8d04000 {
+ sti_hdmi: sti-hdmi@8d04000 {
compatible = "st,stih407-hdmi";
reg = <0x8d04000 0x1000>;
reg-names = "hdmi-reg";
--
1.9.1
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH 4/5] ARM: DT: STiHxxx-b2120: Add support of HDMI audio
[not found] ` <1475597517-14225-1-git-send-email-arnaud.pouliquen-qxv4g6HH51o@public.gmane.org>
` (2 preceding siblings ...)
2016-10-04 16:11 ` [PATCH 3/5] ARM: DT: STiH410: " Arnaud Pouliquen
@ 2016-10-04 16:11 ` Arnaud Pouliquen
2016-10-04 16:11 ` [PATCH 5/5] ARM: DT: STiH410-B2260: clean unnecessary hdmi node overlay Arnaud Pouliquen
` (2 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: Arnaud Pouliquen @ 2016-10-04 16:11 UTC (permalink / raw)
To: devicetree-u79uwXL29TY76Z2rM5mHXA
Cc: kernel-F5mvAk5X5gdBDgjK7y7TUQ, Rob Herring, Mark Rutland,
Patrice Chotard, Moise Gergaud
Add new dai link in sound card to support HDMI output
Signed-off-by: Arnaud Pouliquen <arnaud.pouliquen-qxv4g6HH51o@public.gmane.org>
---
arch/arm/boot/dts/stihxxx-b2120.dtsi | 19 ++++++++++++++++++-
1 file changed, 18 insertions(+), 1 deletion(-)
diff --git a/arch/arm/boot/dts/stihxxx-b2120.dtsi b/arch/arm/boot/dts/stihxxx-b2120.dtsi
index ed2b7a9..313c1f8 100644
--- a/arch/arm/boot/dts/stihxxx-b2120.dtsi
+++ b/arch/arm/boot/dts/stihxxx-b2120.dtsi
@@ -135,6 +135,10 @@
};
};
+ sti_uni_player0: sti-uni-player@8d80000 {
+ status = "okay";
+ };
+
sti_uni_player2: sti-uni-player@8d82000 {
status = "okay";
};
@@ -155,9 +159,22 @@
status = "okay";
simple-audio-card,dai-link@0 {
+ /* HDMI */
+ format = "i2s";
+ mclk-fs = <128>;
+ cpu {
+ sound-dai = <&sti_uni_player0>;
+ };
+
+ codec {
+ sound-dai = <&sti_hdmi>;
+ };
+ };
+ simple-audio-card,dai-link@1 {
/* DAC */
format = "i2s";
mclk-fs = <256>;
+ frame-inversion = <1>;
cpu {
sound-dai = <&sti_uni_player2>;
};
@@ -166,7 +183,7 @@
sound-dai = <&sti_sasg_codec 1>;
};
};
- simple-audio-card,dai-link@1 {
+ simple-audio-card,dai-link@2 {
/* SPDIF */
format = "left_j";
mclk-fs = <128>;
--
1.9.1
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH 5/5] ARM: DT: STiH410-B2260: clean unnecessary hdmi node overlay
[not found] ` <1475597517-14225-1-git-send-email-arnaud.pouliquen-qxv4g6HH51o@public.gmane.org>
` (3 preceding siblings ...)
2016-10-04 16:11 ` [PATCH 4/5] ARM: DT: STiHxxx-b2120: Add support of HDMI audio Arnaud Pouliquen
@ 2016-10-04 16:11 ` Arnaud Pouliquen
2016-10-18 15:44 ` [PATCH 0/5] ARM: DT: STI: update audio part Patrice Chotard
2016-10-19 12:55 ` [STLinux Kernel] " Peter Griffin
6 siblings, 0 replies; 8+ messages in thread
From: Arnaud Pouliquen @ 2016-10-04 16:11 UTC (permalink / raw)
To: devicetree-u79uwXL29TY76Z2rM5mHXA
Cc: kernel-F5mvAk5X5gdBDgjK7y7TUQ, Rob Herring, Mark Rutland,
Patrice Chotard, Moise Gergaud
sti-hdmi is already enabled in stih410.dtsi. So no need to declare it here.
Signed-off-by: Arnaud Pouliquen <arnaud.pouliquen-qxv4g6HH51o@public.gmane.org>
---
arch/arm/boot/dts/stih410-b2260.dts | 6 ------
1 file changed, 6 deletions(-)
diff --git a/arch/arm/boot/dts/stih410-b2260.dts b/arch/arm/boot/dts/stih410-b2260.dts
index ef2ff2f..511a109 100644
--- a/arch/arm/boot/dts/stih410-b2260.dts
+++ b/arch/arm/boot/dts/stih410-b2260.dts
@@ -174,12 +174,6 @@
status = "okay";
};
- sti-display-subsystem {
- sti_hdmi: sti-hdmi@8d04000 {
- status = "okay";
- };
- };
-
miphy28lp_phy: miphy28lp@9b22000 {
phy_port1: port@9b2a000 {
--
1.9.1
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [PATCH 0/5] ARM: DT: STI: update audio part
[not found] ` <1475597517-14225-1-git-send-email-arnaud.pouliquen-qxv4g6HH51o@public.gmane.org>
` (4 preceding siblings ...)
2016-10-04 16:11 ` [PATCH 5/5] ARM: DT: STiH410-B2260: clean unnecessary hdmi node overlay Arnaud Pouliquen
@ 2016-10-18 15:44 ` Patrice Chotard
2016-10-19 12:55 ` [STLinux Kernel] " Peter Griffin
6 siblings, 0 replies; 8+ messages in thread
From: Patrice Chotard @ 2016-10-18 15:44 UTC (permalink / raw)
To: Arnaud Pouliquen, devicetree-u79uwXL29TY76Z2rM5mHXA
Cc: kernel-F5mvAk5X5gdBDgjK7y7TUQ, Rob Herring, Mark Rutland, Moise Gergaud
Hi Arnaud
On 10/04/2016 06:11 PM, Arnaud Pouliquen wrote:
> - DT part associated to following ASoC patchset:
> http://www.spinics.net/lists/alsa-devel/msg54782.html
> - Enable hdmi audio card on b2120 board
> - Fix some DT declarations
>
> Arnaud Pouliquen (5):
> ARM: DT: STiH407-family: sti sound card field cleaning
> ARM: DT: STiH407: Add label for sti-hdmi node
> ARM: DT: STiH410: Add label for sti-hdmi node
> ARM: DT: STiHxxx-b2120: Add support of HDMI audio
> ARM: DT: STiH410-B2260: clean unnecessary hdmi node overlay
>
> arch/arm/boot/dts/stih407-family.dtsi | 32 ++++++--------------------------
> arch/arm/boot/dts/stih407.dtsi | 2 +-
> arch/arm/boot/dts/stih410-b2260.dts | 6 ------
> arch/arm/boot/dts/stih410.dtsi | 2 +-
> arch/arm/boot/dts/stihxxx-b2120.dtsi | 19 ++++++++++++++++++-
> 5 files changed, 26 insertions(+), 35 deletions(-)
>
For the series
Acked-by: Patrice Chotard <patrice.chotard-qxv4g6HH51o@public.gmane.org>
Applied on sti-dt-for-4.10 branch
Thanks
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [STLinux Kernel] [PATCH 0/5] ARM: DT: STI: update audio part
[not found] ` <1475597517-14225-1-git-send-email-arnaud.pouliquen-qxv4g6HH51o@public.gmane.org>
` (5 preceding siblings ...)
2016-10-18 15:44 ` [PATCH 0/5] ARM: DT: STI: update audio part Patrice Chotard
@ 2016-10-19 12:55 ` Peter Griffin
6 siblings, 0 replies; 8+ messages in thread
From: Peter Griffin @ 2016-10-19 12:55 UTC (permalink / raw)
To: Arnaud Pouliquen
Cc: devicetree-u79uwXL29TY76Z2rM5mHXA, Mark Rutland, Rob Herring,
Moise Gergaud, kernel-F5mvAk5X5gdBDgjK7y7TUQ
On Tue, 04 Oct 2016, Arnaud Pouliquen wrote:
> - DT part associated to following ASoC patchset:
> http://www.spinics.net/lists/alsa-devel/msg54782.html
> - Enable hdmi audio card on b2120 board
> - Fix some DT declarations
>
> Arnaud Pouliquen (5):
> ARM: DT: STiH407-family: sti sound card field cleaning
> ARM: DT: STiH407: Add label for sti-hdmi node
> ARM: DT: STiH410: Add label for sti-hdmi node
> ARM: DT: STiHxxx-b2120: Add support of HDMI audio
> ARM: DT: STiH410-B2260: clean unnecessary hdmi node overlay
>
> arch/arm/boot/dts/stih407-family.dtsi | 32 ++++++--------------------------
> arch/arm/boot/dts/stih407.dtsi | 2 +-
> arch/arm/boot/dts/stih410-b2260.dts | 6 ------
> arch/arm/boot/dts/stih410.dtsi | 2 +-
> arch/arm/boot/dts/stihxxx-b2120.dtsi | 19 ++++++++++++++++++-
> 5 files changed, 26 insertions(+), 35 deletions(-)
>
For the series: -
Acked-by: Peter Griffin <peter.griffin-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2016-10-19 12:55 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-10-04 16:11 [PATCH 0/5] ARM: DT: STI: update audio part Arnaud Pouliquen
[not found] ` <1475597517-14225-1-git-send-email-arnaud.pouliquen-qxv4g6HH51o@public.gmane.org>
2016-10-04 16:11 ` [PATCH 1/5] ARM: DT: STiH407-family: sti sound card field cleaning Arnaud Pouliquen
2016-10-04 16:11 ` [PATCH 2/5] ARM: DT: STiH407: Add label for sti-hdmi node Arnaud Pouliquen
2016-10-04 16:11 ` [PATCH 3/5] ARM: DT: STiH410: " Arnaud Pouliquen
2016-10-04 16:11 ` [PATCH 4/5] ARM: DT: STiHxxx-b2120: Add support of HDMI audio Arnaud Pouliquen
2016-10-04 16:11 ` [PATCH 5/5] ARM: DT: STiH410-B2260: clean unnecessary hdmi node overlay Arnaud Pouliquen
2016-10-18 15:44 ` [PATCH 0/5] ARM: DT: STI: update audio part Patrice Chotard
2016-10-19 12:55 ` [STLinux Kernel] " Peter Griffin
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.