* [PATCH 0/4] Add sound in SAM9x5 DTS
@ 2013-08-12 12:30 Richard Genoud
2013-08-12 12:30 ` [PATCH 1/4] ARM: AT91: DTS: sam9x5: add SSC DMA parameters Richard Genoud
` (4 more replies)
0 siblings, 5 replies; 6+ messages in thread
From: Richard Genoud @ 2013-08-12 12:30 UTC (permalink / raw)
To: Nicolas Ferre; +Cc: linux-arm-kernel, linux-kernel, Richard Genoud
As the sam9x5-wm8731 machine driver has been merged, we have now to add
the device tree nodes...
And here they are !
(Based on next-20130812)
Tested on at91sam9g35-ek
[I didn't add the DT list, as far as there's no new binding, we don't
have to bother themi, right ?]
Richard Genoud (4):
ARM: AT91: DTS: sam9x5: add SSC DMA parameters
ARM: AT91: DTS: sam9x5ek: add WM8731 codec
ARM: AT91: DTS: sam9x5ek: enable SSC
ARM: AT91: DTS: sam9x5ek: add sound configuration
arch/arm/boot/dts/at91sam9x5.dtsi | 3 +++
arch/arm/boot/dts/at91sam9x5ek.dtsi | 24 ++++++++++++++++++++++++
2 files changed, 27 insertions(+)
--
1.7.10.4
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH 1/4] ARM: AT91: DTS: sam9x5: add SSC DMA parameters
2013-08-12 12:30 [PATCH 0/4] Add sound in SAM9x5 DTS Richard Genoud
@ 2013-08-12 12:30 ` Richard Genoud
2013-08-12 12:31 ` [PATCH 2/4] ARM: AT91: DTS: sam9x5ek: add WM8731 codec Richard Genoud
` (3 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: Richard Genoud @ 2013-08-12 12:30 UTC (permalink / raw)
To: Nicolas Ferre; +Cc: linux-arm-kernel, linux-kernel, Richard Genoud
Signed-off-by: Richard Genoud <richard.genoud@gmail.com>
---
arch/arm/boot/dts/at91sam9x5.dtsi | 3 +++
1 file changed, 3 insertions(+)
diff --git a/arch/arm/boot/dts/at91sam9x5.dtsi b/arch/arm/boot/dts/at91sam9x5.dtsi
index 57d45f5..cf78ac0 100644
--- a/arch/arm/boot/dts/at91sam9x5.dtsi
+++ b/arch/arm/boot/dts/at91sam9x5.dtsi
@@ -542,6 +542,9 @@
compatible = "atmel,at91sam9g45-ssc";
reg = <0xf0010000 0x4000>;
interrupts = <28 IRQ_TYPE_LEVEL_HIGH 5>;
+ dmas = <&dma0 1 AT91_DMA_CFG_PER_ID(13)>,
+ <&dma0 1 AT91_DMA_CFG_PER_ID(14)>;
+ dma-names = "tx", "rx";
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_ssc0_tx &pinctrl_ssc0_rx>;
status = "disabled";
--
1.7.10.4
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 2/4] ARM: AT91: DTS: sam9x5ek: add WM8731 codec
2013-08-12 12:30 [PATCH 0/4] Add sound in SAM9x5 DTS Richard Genoud
2013-08-12 12:30 ` [PATCH 1/4] ARM: AT91: DTS: sam9x5: add SSC DMA parameters Richard Genoud
@ 2013-08-12 12:31 ` Richard Genoud
2013-08-12 12:31 ` [PATCH 3/4] ARM: AT91: DTS: sam9x5ek: enable SSC Richard Genoud
` (2 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: Richard Genoud @ 2013-08-12 12:31 UTC (permalink / raw)
To: Nicolas Ferre; +Cc: linux-arm-kernel, linux-kernel, Richard Genoud
The WM8731 codec on sam9x5ek board is on i2c, address 1A
Signed-off-by: Richard Genoud <richard.genoud@gmail.com>
Acked-by: Mark Brown <broonie@linaro.org>
---
arch/arm/boot/dts/at91sam9x5ek.dtsi | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/arch/arm/boot/dts/at91sam9x5ek.dtsi b/arch/arm/boot/dts/at91sam9x5ek.dtsi
index d107241..e6fb309 100644
--- a/arch/arm/boot/dts/at91sam9x5ek.dtsi
+++ b/arch/arm/boot/dts/at91sam9x5ek.dtsi
@@ -59,6 +59,11 @@
i2c0: i2c@f8010000 {
status = "okay";
+
+ wm8731: wm8731@1a {
+ compatible = "wm8731";
+ reg = <0x1a>;
+ };
};
pinctrl@fffff400 {
--
1.7.10.4
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 3/4] ARM: AT91: DTS: sam9x5ek: enable SSC
2013-08-12 12:30 [PATCH 0/4] Add sound in SAM9x5 DTS Richard Genoud
2013-08-12 12:30 ` [PATCH 1/4] ARM: AT91: DTS: sam9x5: add SSC DMA parameters Richard Genoud
2013-08-12 12:31 ` [PATCH 2/4] ARM: AT91: DTS: sam9x5ek: add WM8731 codec Richard Genoud
@ 2013-08-12 12:31 ` Richard Genoud
2013-08-12 12:31 ` [PATCH 4/4] ARM: AT91: DTS: sam9x5ek: add sound configuration Richard Genoud
2013-08-21 10:26 ` [PATCH 0/4] Add sound in SAM9x5 DTS Nicolas Ferre
4 siblings, 0 replies; 6+ messages in thread
From: Richard Genoud @ 2013-08-12 12:31 UTC (permalink / raw)
To: Nicolas Ferre; +Cc: linux-arm-kernel, linux-kernel, Richard Genoud
Enable the SSC needed for the WM8731 codec
Signed-off-by: Richard Genoud <richard.genoud@gmail.com>
---
arch/arm/boot/dts/at91sam9x5ek.dtsi | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/arch/arm/boot/dts/at91sam9x5ek.dtsi b/arch/arm/boot/dts/at91sam9x5ek.dtsi
index e6fb309..f3e83f7 100644
--- a/arch/arm/boot/dts/at91sam9x5ek.dtsi
+++ b/arch/arm/boot/dts/at91sam9x5ek.dtsi
@@ -95,6 +95,10 @@
watchdog@fffffe40 {
status = "okay";
};
+
+ ssc0: ssc@f0010000 {
+ status = "okay";
+ };
};
usb0: ohci@00600000 {
--
1.7.10.4
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 4/4] ARM: AT91: DTS: sam9x5ek: add sound configuration
2013-08-12 12:30 [PATCH 0/4] Add sound in SAM9x5 DTS Richard Genoud
` (2 preceding siblings ...)
2013-08-12 12:31 ` [PATCH 3/4] ARM: AT91: DTS: sam9x5ek: enable SSC Richard Genoud
@ 2013-08-12 12:31 ` Richard Genoud
2013-08-21 10:26 ` [PATCH 0/4] Add sound in SAM9x5 DTS Nicolas Ferre
4 siblings, 0 replies; 6+ messages in thread
From: Richard Genoud @ 2013-08-12 12:31 UTC (permalink / raw)
To: Nicolas Ferre; +Cc: linux-arm-kernel, linux-kernel, Richard Genoud
The sam9x5ek board has 2 jacks:
headphone wired on RHPOUT/LHPOUT of the wm8731
line in wired on LLINEIN/RLINEIN of the wm8731
Signed-off-by: Richard Genoud <richard.genoud@gmail.com>
---
arch/arm/boot/dts/at91sam9x5ek.dtsi | 15 +++++++++++++++
1 file changed, 15 insertions(+)
diff --git a/arch/arm/boot/dts/at91sam9x5ek.dtsi b/arch/arm/boot/dts/at91sam9x5ek.dtsi
index f3e83f7..9afe15b 100644
--- a/arch/arm/boot/dts/at91sam9x5ek.dtsi
+++ b/arch/arm/boot/dts/at91sam9x5ek.dtsi
@@ -113,4 +113,19 @@
status = "okay";
};
};
+
+ sound {
+ compatible = "atmel,sam9x5-wm8731-audio";
+
+ atmel,model = "wm8731 @ AT91SAM9X5EK";
+
+ atmel,audio-routing =
+ "Headphone Jack", "RHPOUT",
+ "Headphone Jack", "LHPOUT",
+ "LLINEIN", "Line In Jack",
+ "RLINEIN", "Line In Jack";
+
+ atmel,ssc-controller = <&ssc0>;
+ atmel,audio-codec = <&wm8731>;
+ };
};
--
1.7.10.4
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH 0/4] Add sound in SAM9x5 DTS
2013-08-12 12:30 [PATCH 0/4] Add sound in SAM9x5 DTS Richard Genoud
` (3 preceding siblings ...)
2013-08-12 12:31 ` [PATCH 4/4] ARM: AT91: DTS: sam9x5ek: add sound configuration Richard Genoud
@ 2013-08-21 10:26 ` Nicolas Ferre
4 siblings, 0 replies; 6+ messages in thread
From: Nicolas Ferre @ 2013-08-21 10:26 UTC (permalink / raw)
To: Richard Genoud; +Cc: linux-arm-kernel, linux-kernel
On 12/08/2013 14:30, Richard Genoud :
> As the sam9x5-wm8731 machine driver has been merged, we have now to add
> the device tree nodes...
> And here they are !
>
> (Based on next-20130812)
> Tested on at91sam9g35-ek
>
> [I didn't add the DT list, as far as there's no new binding, we don't
> have to bother themi, right ?]
Yep!
On the whole series:
Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Stacked on top of at91-3.12-dt
Thanks a lot Richard!
> Richard Genoud (4):
> ARM: AT91: DTS: sam9x5: add SSC DMA parameters
> ARM: AT91: DTS: sam9x5ek: add WM8731 codec
> ARM: AT91: DTS: sam9x5ek: enable SSC
> ARM: AT91: DTS: sam9x5ek: add sound configuration
>
> arch/arm/boot/dts/at91sam9x5.dtsi | 3 +++
> arch/arm/boot/dts/at91sam9x5ek.dtsi | 24 ++++++++++++++++++++++++
> 2 files changed, 27 insertions(+)
>
--
Nicolas Ferre
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2013-08-21 10:26 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-08-12 12:30 [PATCH 0/4] Add sound in SAM9x5 DTS Richard Genoud
2013-08-12 12:30 ` [PATCH 1/4] ARM: AT91: DTS: sam9x5: add SSC DMA parameters Richard Genoud
2013-08-12 12:31 ` [PATCH 2/4] ARM: AT91: DTS: sam9x5ek: add WM8731 codec Richard Genoud
2013-08-12 12:31 ` [PATCH 3/4] ARM: AT91: DTS: sam9x5ek: enable SSC Richard Genoud
2013-08-12 12:31 ` [PATCH 4/4] ARM: AT91: DTS: sam9x5ek: add sound configuration Richard Genoud
2013-08-21 10:26 ` [PATCH 0/4] Add sound in SAM9x5 DTS Nicolas Ferre
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).