[PATCH 0/8] ARM: at91: sama5d3: enable sound support

[PATCH 0/8] ARM: at91: sama5d3: enable sound support

[Bo Shen]

This patch add sound support on sama5d3xek board.

This patch series based on the following patch set:
  clk: at91: better support for the PCKs
  http://comments.gmane.org/gmane.linux.kernel/1664477


Bo Shen (5):
  ARM: at91: sama5d3: add DMA property for SSC devices
  ARM: at91: sama5d3: disable sound by default
  ARM: at91: sama5d3: correct the sound compatible string
  ARM: at91: sama5d3: add the missing property
  ARM: at91: sama5d3: clock for ssc from rk pin

Boris BREZILLON (3):
  ASoC: atmel: support CCF based clks
  ASoC: atmel: document clock properties of the wm8904 driver
  ARM: at91/dt: add clock properties to the wm8904 codec node

 .../devicetree/bindings/sound/atmel-wm8904.txt     |  2 ++
 arch/arm/boot/dts/sama5d3.dtsi                     |  6 ++++++
 arch/arm/boot/dts/sama5d3xmb.dtsi                  | 11 +++++++++-
 sound/soc/atmel/atmel_wm8904.c                     | 25 +++++++++++-----------
 4 files changed, 31 insertions(+), 13 deletions(-)

-- 
1.8.5.2

[PATCH 1/8] ARM: at91: sama5d3: add DMA property for SSC devices

[Bo Shen]

Add DMA property for SSC devices on SAMA5D3 SoC.

Signed-off-by: Bo Shen <voice.shen@atmel.com>
---

 arch/arm/boot/dts/sama5d3.dtsi | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/arch/arm/boot/dts/sama5d3.dtsi b/arch/arm/boot/dts/sama5d3.dtsi
index 3d5faf8..3e753e1 100644
--- a/arch/arm/boot/dts/sama5d3.dtsi
+++ b/arch/arm/boot/dts/sama5d3.dtsi
@@ -113,6 +113,9 @@
 				compatible = "atmel,at91sam9g45-ssc";
 				reg = <0xf0008000 0x4000>;
 				interrupts = <38 IRQ_TYPE_LEVEL_HIGH 4>;
+				dmas = <&dma0 2 AT91_DMA_CFG_PER_ID(13)>,
+				       <&dma0 2 AT91_DMA_CFG_PER_ID(14)>;
+				dma-names = "tx", "rx";
 				pinctrl-names = "default";
 				pinctrl-0 = <&pinctrl_ssc0_tx &pinctrl_ssc0_rx>;
 				clocks = <&ssc0_clk>;
@@ -231,6 +234,9 @@
 				compatible = "atmel,at91sam9g45-ssc";
 				reg = <0xf800c000 0x4000>;
 				interrupts = <39 IRQ_TYPE_LEVEL_HIGH 4>;
+				dmas = <&dma1 2 AT91_DMA_CFG_PER_ID(3)>,
+				       <&dma1 2 AT91_DMA_CFG_PER_ID(4)>;
+				dma-names = "tx", "rx";
 				pinctrl-names = "default";
 				pinctrl-0 = <&pinctrl_ssc1_tx &pinctrl_ssc1_rx>;
 				clocks = <&ssc1_clk>;
-- 
1.8.5.2

Re: [PATCH 1/8] ARM: at91: sama5d3: add DMA property for SSC devices

[Nicolas Ferre]

On 17/03/2014 10:45, Bo Shen :
> Add DMA property for SSC devices on SAMA5D3 SoC.
> 
> Signed-off-by: Bo Shen <voice.shen-AIFe0yeh4nAAvxtiuMwx3w@public.gmane.org>

Acked-by: Nicolas Ferre <nicolas.ferre-AIFe0yeh4nAAvxtiuMwx3w@public.gmane.org>

> ---
> 
>  arch/arm/boot/dts/sama5d3.dtsi | 6 ++++++
>  1 file changed, 6 insertions(+)
> 
> diff --git a/arch/arm/boot/dts/sama5d3.dtsi b/arch/arm/boot/dts/sama5d3.dtsi
> index 3d5faf8..3e753e1 100644
> --- a/arch/arm/boot/dts/sama5d3.dtsi
> +++ b/arch/arm/boot/dts/sama5d3.dtsi
> @@ -113,6 +113,9 @@
>  				compatible = "atmel,at91sam9g45-ssc";
>  				reg = <0xf0008000 0x4000>;
>  				interrupts = <38 IRQ_TYPE_LEVEL_HIGH 4>;
> +				dmas = <&dma0 2 AT91_DMA_CFG_PER_ID(13)>,
> +				       <&dma0 2 AT91_DMA_CFG_PER_ID(14)>;
> +				dma-names = "tx", "rx";
>  				pinctrl-names = "default";
>  				pinctrl-0 = <&pinctrl_ssc0_tx &pinctrl_ssc0_rx>;
>  				clocks = <&ssc0_clk>;
> @@ -231,6 +234,9 @@
>  				compatible = "atmel,at91sam9g45-ssc";
>  				reg = <0xf800c000 0x4000>;
>  				interrupts = <39 IRQ_TYPE_LEVEL_HIGH 4>;
> +				dmas = <&dma1 2 AT91_DMA_CFG_PER_ID(3)>,
> +				       <&dma1 2 AT91_DMA_CFG_PER_ID(4)>;
> +				dma-names = "tx", "rx";
>  				pinctrl-names = "default";
>  				pinctrl-0 = <&pinctrl_ssc1_tx &pinctrl_ssc1_rx>;
>  				clocks = <&ssc1_clk>;
> 


-- 
Nicolas Ferre
--
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

[PATCH 2/8] ARM: at91: sama5d3: disable sound by default

[Bo Shen]

Make the sound device in disabled status by default

Signed-off-by: Bo Shen <voice.shen-AIFe0yeh4nAAvxtiuMwx3w@public.gmane.org>
---

 arch/arm/boot/dts/sama5d3xmb.dtsi | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/arch/arm/boot/dts/sama5d3xmb.dtsi b/arch/arm/boot/dts/sama5d3xmb.dtsi
index dba739b..2938605 100644
--- a/arch/arm/boot/dts/sama5d3xmb.dtsi
+++ b/arch/arm/boot/dts/sama5d3xmb.dtsi
@@ -170,5 +170,7 @@
 
 		atmel,ssc-controller = <&ssc0>;
 		atmel,audio-codec = <&wm8904>;
+
+		status = "disabled";
 	};
 };
-- 
1.8.5.2

--
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

Re: [PATCH 2/8] ARM: at91: sama5d3: disable sound by default

[Nicolas Ferre]

On 17/03/2014 10:45, Bo Shen :
> Make the sound device in disabled status by default
> 
> Signed-off-by: Bo Shen <voice.shen-AIFe0yeh4nAAvxtiuMwx3w@public.gmane.org>

Acked-by: Nicolas Ferre <nicolas.ferre-AIFe0yeh4nAAvxtiuMwx3w@public.gmane.org>

> ---
> 
>  arch/arm/boot/dts/sama5d3xmb.dtsi | 2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/arch/arm/boot/dts/sama5d3xmb.dtsi b/arch/arm/boot/dts/sama5d3xmb.dtsi
> index dba739b..2938605 100644
> --- a/arch/arm/boot/dts/sama5d3xmb.dtsi
> +++ b/arch/arm/boot/dts/sama5d3xmb.dtsi
> @@ -170,5 +170,7 @@
>  
>  		atmel,ssc-controller = <&ssc0>;
>  		atmel,audio-codec = <&wm8904>;
> +
> +		status = "disabled";
>  	};
>  };
> 


-- 
Nicolas Ferre
--
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

Re: [PATCH 0/8] ARM: at91: sama5d3: enable sound support

[Nicolas Ferre]

On 17/03/2014 10:45, Bo Shen :
> This patch add sound support on sama5d3xek board.
> 
> This patch series based on the following patch set:
>   clk: at91: better support for the PCKs
>   http://comments.gmane.org/gmane.linux.kernel/1664477
> 
> 
> Bo Shen (5):
>   ARM: at91: sama5d3: add DMA property for SSC devices
>   ARM: at91: sama5d3: disable sound by default
>   ARM: at91: sama5d3: correct the sound compatible string
>   ARM: at91: sama5d3: add the missing property
>   ARM: at91: sama5d3: clock for ssc from rk pin
> 
> Boris BREZILLON (3):
>   ASoC: atmel: support CCF based clks
>   ASoC: atmel: document clock properties of the wm8904 driver
>   ARM: at91/dt: add clock properties to the wm8904 codec node

Hi Voice and Boris,

For this series I am a little bit puzzled: should I take the ASoC part
of it? I see no acknowledgement from Mark and I also read some messages
still discussing about CCF and wm8904 afterwards.

So, I take the 5 patches by Voice Shen and tell me what is the proper
sequence with this wm8904 work.

I will be happy to stack more patches about this topic during the 3.16
development phase.


Otherwise, the 5 patches by Voice go into at91-3.16-dt branch.

Thanks, bye.


>  .../devicetree/bindings/sound/atmel-wm8904.txt     |  2 ++
>  arch/arm/boot/dts/sama5d3.dtsi                     |  6 ++++++
>  arch/arm/boot/dts/sama5d3xmb.dtsi                  | 11 +++++++++-
>  sound/soc/atmel/atmel_wm8904.c                     | 25 +++++++++++-----------
>  4 files changed, 31 insertions(+), 13 deletions(-)
> 


-- 
Nicolas Ferre
--
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

Re: [PATCH 0/8] ARM: at91: sama5d3: enable sound support

[Mark Brown]

[-- Attachment #1.1: Type: text/plain, Size: 429 bytes --]

On Fri, Apr 18, 2014 at 10:35:02PM +0200, Nicolas Ferre wrote:

> For this series I am a little bit puzzled: should I take the ASoC part
> of it? I see no acknowledgement from Mark and I also read some messages
> still discussing about CCF and wm8904 afterwards.

I've not seen these patches, judging by where this message went they
weren't sent to the address in MAINTAINERS (broonie@kernel.org) but to
my work address instead.

[-- Attachment #1.2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]

[-- Attachment #2: Type: text/plain, Size: 0 bytes --]

Re: [PATCH 0/8] ARM: at91: sama5d3: enable sound support

[Boris BREZILLON]

On 18/04/2014 22:35, Nicolas Ferre wrote:
> On 17/03/2014 10:45, Bo Shen :
>> This patch add sound support on sama5d3xek board.
>>
>> This patch series based on the following patch set:
>>   clk: at91: better support for the PCKs
>>   http://comments.gmane.org/gmane.linux.kernel/1664477
>>
>>
>> Bo Shen (5):
>>   ARM: at91: sama5d3: add DMA property for SSC devices
>>   ARM: at91: sama5d3: disable sound by default
>>   ARM: at91: sama5d3: correct the sound compatible string
>>   ARM: at91: sama5d3: add the missing property
>>   ARM: at91: sama5d3: clock for ssc from rk pin
>>
>> Boris BREZILLON (3):
>>   ASoC: atmel: support CCF based clks
>>   ASoC: atmel: document clock properties of the wm8904 driver
>>   ARM: at91/dt: add clock properties to the wm8904 codec node
> Hi Voice and Boris,
>
> For this series I am a little bit puzzled: should I take the ASoC part
> of it? I see no acknowledgement from Mark and I also read some messages
> still discussing about CCF and wm8904 afterwards.
>
> So, I take the 5 patches by Voice Shen and tell me what is the proper
> sequence with this wm8904 work.

Bo was waiting for the "move sam9n12 SoC to the CCF" (which has been
submitted earlier this week) series before sending a new version of his
"wm8904: add CCF support" series.

Best Regards,

Boris

> I will be happy to stack more patches about this topic during the 3.16
> development phase.
>
>
> Otherwise, the 5 patches by Voice go into at91-3.16-dt branch.
>
> Thanks, bye.
>
>
>>  .../devicetree/bindings/sound/atmel-wm8904.txt     |  2 ++
>>  arch/arm/boot/dts/sama5d3.dtsi                     |  6 ++++++
>>  arch/arm/boot/dts/sama5d3xmb.dtsi                  | 11 +++++++++-
>>  sound/soc/atmel/atmel_wm8904.c                     | 25 +++++++++++-----------
>>  4 files changed, 31 insertions(+), 13 deletions(-)
>>
>

Re: [PATCH 0/8] ARM: at91: sama5d3: enable sound support

[Nicolas Ferre]

On 19/04/2014 00:06, Boris BREZILLON :
> 
> On 18/04/2014 22:35, Nicolas Ferre wrote:
>> On 17/03/2014 10:45, Bo Shen :
>>> This patch add sound support on sama5d3xek board.
>>>
>>> This patch series based on the following patch set:
>>>   clk: at91: better support for the PCKs
>>>   http://comments.gmane.org/gmane.linux.kernel/1664477
>>>
>>>
>>> Bo Shen (5):
>>>   ARM: at91: sama5d3: add DMA property for SSC devices
>>>   ARM: at91: sama5d3: disable sound by default
>>>   ARM: at91: sama5d3: correct the sound compatible string
>>>   ARM: at91: sama5d3: add the missing property
>>>   ARM: at91: sama5d3: clock for ssc from rk pin
>>>
>>> Boris BREZILLON (3):
>>>   ASoC: atmel: support CCF based clks
>>>   ASoC: atmel: document clock properties of the wm8904 driver
>>>   ARM: at91/dt: add clock properties to the wm8904 codec node
>> Hi Voice and Boris,
>>
>> For this series I am a little bit puzzled: should I take the ASoC part
>> of it? I see no acknowledgement from Mark and I also read some messages
>> still discussing about CCF and wm8904 afterwards.
>>
>> So, I take the 5 patches by Voice Shen and tell me what is the proper
>> sequence with this wm8904 work.
> 
> Bo was waiting for the "move sam9n12 SoC to the CCF" (which has been
> submitted earlier this week) series before sending a new version of his
> "wm8904: add CCF support" series.

Ok, that makes perfect sense.
So I have the whole dependency graph in mind now: we will have fun
stacking everything in the proper order ;-)

Thanks for the clarification, Bye.


>> I will be happy to stack more patches about this topic during the 3.16
>> development phase.
>>
>>
>> Otherwise, the 5 patches by Voice go into at91-3.16-dt branch.
>>
>> Thanks, bye.
>>
>>
>>>  .../devicetree/bindings/sound/atmel-wm8904.txt     |  2 ++
>>>  arch/arm/boot/dts/sama5d3.dtsi                     |  6 ++++++
>>>  arch/arm/boot/dts/sama5d3xmb.dtsi                  | 11 +++++++++-
>>>  sound/soc/atmel/atmel_wm8904.c                     | 25 +++++++++++-----------
>>>  4 files changed, 31 insertions(+), 13 deletions(-)
>>>
>>
> 
> 
> 


-- 
Nicolas Ferre

[PATCH 3/8] ARM: at91: sama5d3: correct the sound compatible string

[Bo Shen]

As the sama5d3 dtsi file in go into mainline before sound driver,
and, the sound compatible string is changed when go into mainline.
Add this patch to correct the sound compatible string.

Signed-off-by: Bo Shen <voice.shen@atmel.com>
---

 arch/arm/boot/dts/sama5d3xmb.dtsi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm/boot/dts/sama5d3xmb.dtsi b/arch/arm/boot/dts/sama5d3xmb.dtsi
index 2938605..e1bd5767 100644
--- a/arch/arm/boot/dts/sama5d3xmb.dtsi
+++ b/arch/arm/boot/dts/sama5d3xmb.dtsi
@@ -156,7 +156,7 @@
 	};
 
 	sound {
-		compatible = "atmel,sama5d3ek-wm8904";
+		compatible = "atmel,asoc-wm8904";
 		pinctrl-names = "default";
 		pinctrl-0 = <&pinctrl_pck0_as_audio_mck>;
 
-- 
1.8.5.2

Re: [PATCH 3/8] ARM: at91: sama5d3: correct the sound compatible string

[Nicolas Ferre]

On 17/03/2014 10:45, Bo Shen :
> As the sama5d3 dtsi file in go into mainline before sound driver,
> and, the sound compatible string is changed when go into mainline.
> Add this patch to correct the sound compatible string.
> 
> Signed-off-by: Bo Shen <voice.shen@atmel.com>

Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com>

> ---
> 
>  arch/arm/boot/dts/sama5d3xmb.dtsi | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/arch/arm/boot/dts/sama5d3xmb.dtsi b/arch/arm/boot/dts/sama5d3xmb.dtsi
> index 2938605..e1bd5767 100644
> --- a/arch/arm/boot/dts/sama5d3xmb.dtsi
> +++ b/arch/arm/boot/dts/sama5d3xmb.dtsi
> @@ -156,7 +156,7 @@
>  	};
>  
>  	sound {
> -		compatible = "atmel,sama5d3ek-wm8904";
> +		compatible = "atmel,asoc-wm8904";
>  		pinctrl-names = "default";
>  		pinctrl-0 = <&pinctrl_pck0_as_audio_mck>;
>  
> 


-- 
Nicolas Ferre

[PATCH 4/8] ARM: at91: sama5d3: add the missing property

[Bo Shen]

If without the MICBIAS routing, the record don't work.
Add the missing MICBIAS routing to let record from mic working.

Signed-off-by: Bo Shen <voice.shen@atmel.com>
---

 arch/arm/boot/dts/sama5d3xmb.dtsi | 1 +
 1 file changed, 1 insertion(+)

diff --git a/arch/arm/boot/dts/sama5d3xmb.dtsi b/arch/arm/boot/dts/sama5d3xmb.dtsi
index e1bd5767..0600153 100644
--- a/arch/arm/boot/dts/sama5d3xmb.dtsi
+++ b/arch/arm/boot/dts/sama5d3xmb.dtsi
@@ -166,6 +166,7 @@
 			"Headphone Jack", "HPOUTR",
 			"IN2L", "Line In Jack",
 			"IN2R", "Line In Jack",
+			"MICBIAS", "IN1L",
 			"IN1L", "Mic";
 
 		atmel,ssc-controller = <&ssc0>;
-- 
1.8.5.2

Re: [PATCH 4/8] ARM: at91: sama5d3: add the missing property

[Nicolas Ferre]

On 17/03/2014 10:45, Bo Shen :
> If without the MICBIAS routing, the record don't work.
> Add the missing MICBIAS routing to let record from mic working.
> 
> Signed-off-by: Bo Shen <voice.shen@atmel.com>

Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com>

> ---
> 
>  arch/arm/boot/dts/sama5d3xmb.dtsi | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/arch/arm/boot/dts/sama5d3xmb.dtsi b/arch/arm/boot/dts/sama5d3xmb.dtsi
> index e1bd5767..0600153 100644
> --- a/arch/arm/boot/dts/sama5d3xmb.dtsi
> +++ b/arch/arm/boot/dts/sama5d3xmb.dtsi
> @@ -166,6 +166,7 @@
>  			"Headphone Jack", "HPOUTR",
>  			"IN2L", "Line In Jack",
>  			"IN2R", "Line In Jack",
> +			"MICBIAS", "IN1L",
>  			"IN1L", "Mic";
>  
>  		atmel,ssc-controller = <&ssc0>;
> 


-- 
Nicolas Ferre

[PATCH 5/8] ARM: at91: sama5d3: clock for ssc from rk pin

[Bo Shen]

According to hardware design the clock for SSC device is from rk pin.

Signed-off-by: Bo Shen <voice.shen@atmel.com>
---

 arch/arm/boot/dts/sama5d3xmb.dtsi | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/arch/arm/boot/dts/sama5d3xmb.dtsi b/arch/arm/boot/dts/sama5d3xmb.dtsi
index 0600153..306eef0 100644
--- a/arch/arm/boot/dts/sama5d3xmb.dtsi
+++ b/arch/arm/boot/dts/sama5d3xmb.dtsi
@@ -32,6 +32,10 @@
 				};
 			};
 
+			ssc0: ssc@f0008000 {
+				atmel,clk-from-rk-pin;
+			};
+
 			/*
 			 * i2c0 conflicts with ISI:
 			 * disable it to allow the use of ISI
-- 
1.8.5.2

Re: [PATCH 5/8] ARM: at91: sama5d3: clock for ssc from rk pin

[Nicolas Ferre]

On 17/03/2014 10:45, Bo Shen :
> According to hardware design the clock for SSC device is from rk pin.
> 
> Signed-off-by: Bo Shen <voice.shen@atmel.com>

Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com>

> ---
> 
>  arch/arm/boot/dts/sama5d3xmb.dtsi | 4 ++++
>  1 file changed, 4 insertions(+)
> 
> diff --git a/arch/arm/boot/dts/sama5d3xmb.dtsi b/arch/arm/boot/dts/sama5d3xmb.dtsi
> index 0600153..306eef0 100644
> --- a/arch/arm/boot/dts/sama5d3xmb.dtsi
> +++ b/arch/arm/boot/dts/sama5d3xmb.dtsi
> @@ -32,6 +32,10 @@
>  				};
>  			};
>  
> +			ssc0: ssc@f0008000 {
> +				atmel,clk-from-rk-pin;
> +			};
> +
>  			/*
>  			 * i2c0 conflicts with ISI:
>  			 * disable it to allow the use of ISI
> 


-- 
Nicolas Ferre

[PATCH 7/8] ASoC: atmel: document clock properties of the wm8904 driver

[Bo Shen]

From: Boris BREZILLON <b.brezillon@overkiz.com>

Signed-off-by: Boris BREZILLON <b.brezillon@overkiz.com>
Signed-off-by: Bo Shen <voice.shen@atmel.com>
---

 Documentation/devicetree/bindings/sound/atmel-wm8904.txt | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Documentation/devicetree/bindings/sound/atmel-wm8904.txt b/Documentation/devicetree/bindings/sound/atmel-wm8904.txt
index 8bbe50c..aca341c 100644
--- a/Documentation/devicetree/bindings/sound/atmel-wm8904.txt
+++ b/Documentation/devicetree/bindings/sound/atmel-wm8904.txt
@@ -3,6 +3,8 @@ Atmel ASoC driver with wm8904 audio codec complex
 Required properties:
   - compatible: "atmel,asoc-wm8904"
   - atmel,model: The user-visible name of this sound complex.
+  - clocks: A list of clocks needed by the wm8904 chip.
+  - clock-output-names: Driver related clock names. Shall contain "pck0".
   - atmel,audio-routing: A list of the connections between audio components.
     Each entry is a pair of strings, the first being the connection's sink,
     the second being the connection's source. Valid names for sources and
-- 
1.8.5.2

Re: [PATCH 7/8] ASoC: atmel: document clock properties of the wm8904 driver

[Bo Shen]

On 03/17/2014 05:45 PM, Bo Shen wrote:
> From: Boris BREZILLON <b.brezillon@overkiz.com>
>
> Signed-off-by: Boris BREZILLON <b.brezillon@overkiz.com>
> Signed-off-by: Bo Shen <voice.shen@atmel.com>

Oh, sorry for my SOB. Please remove it when apply.

> ---
>
>   Documentation/devicetree/bindings/sound/atmel-wm8904.txt | 2 ++
>   1 file changed, 2 insertions(+)
>
> diff --git a/Documentation/devicetree/bindings/sound/atmel-wm8904.txt b/Documentation/devicetree/bindings/sound/atmel-wm8904.txt
> index 8bbe50c..aca341c 100644
> --- a/Documentation/devicetree/bindings/sound/atmel-wm8904.txt
> +++ b/Documentation/devicetree/bindings/sound/atmel-wm8904.txt
> @@ -3,6 +3,8 @@ Atmel ASoC driver with wm8904 audio codec complex
>   Required properties:
>     - compatible: "atmel,asoc-wm8904"
>     - atmel,model: The user-visible name of this sound complex.
> +  - clocks: A list of clocks needed by the wm8904 chip.
> +  - clock-output-names: Driver related clock names. Shall contain "pck0".
>     - atmel,audio-routing: A list of the connections between audio components.
>       Each entry is a pair of strings, the first being the connection's sink,
>       the second being the connection's source. Valid names for sources and
>

Best Regards,
Bo Shen

Re: [PATCH 7/8] ASoC: atmel: document clock properties of the wm8904 driver

[Mark Rutland]

On Mon, Mar 17, 2014 at 09:45:40AM +0000, Bo Shen wrote:
> From: Boris BREZILLON <b.brezillon@overkiz.com>
> 
> Signed-off-by: Boris BREZILLON <b.brezillon@overkiz.com>
> Signed-off-by: Bo Shen <voice.shen@atmel.com>
> ---
> 
>  Documentation/devicetree/bindings/sound/atmel-wm8904.txt | 2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/Documentation/devicetree/bindings/sound/atmel-wm8904.txt b/Documentation/devicetree/bindings/sound/atmel-wm8904.txt
> index 8bbe50c..aca341c 100644
> --- a/Documentation/devicetree/bindings/sound/atmel-wm8904.txt
> +++ b/Documentation/devicetree/bindings/sound/atmel-wm8904.txt
> @@ -3,6 +3,8 @@ Atmel ASoC driver with wm8904 audio codec complex
>  Required properties:
>    - compatible: "atmel,asoc-wm8904"
>    - atmel,model: The user-visible name of this sound complex.
> +  - clocks: A list of clocks needed by the wm8904 chip.
> +  - clock-output-names: Driver related clock names. Shall contain "pck0".

The word "driver"  doesn't need to appear in biding documents, and this
fails to describe what it sets out to. How about the following:

- clocks: a list of phandle + clock-specifier pairs, one for each entry
  in clock-names.
- clock-names: Should contain "pck0"

Thanks,
Mark.

Re: [PATCH 7/8] ASoC: atmel: document clock properties of the wm8904 driver

[boris brezillon]

Hello Mark,

Le 17/03/2014 11:02, Mark Rutland a écrit :
> On Mon, Mar 17, 2014 at 09:45:40AM +0000, Bo Shen wrote:
>> From: Boris BREZILLON <b.brezillon-ZNYIgs0QAGpBDgjK7y7TUQ@public.gmane.org>
>>
>> Signed-off-by: Boris BREZILLON <b.brezillon-ZNYIgs0QAGpBDgjK7y7TUQ@public.gmane.org>
>> Signed-off-by: Bo Shen <voice.shen-AIFe0yeh4nAAvxtiuMwx3w@public.gmane.org>
>> ---
>>
>>   Documentation/devicetree/bindings/sound/atmel-wm8904.txt | 2 ++
>>   1 file changed, 2 insertions(+)
>>
>> diff --git a/Documentation/devicetree/bindings/sound/atmel-wm8904.txt b/Documentation/devicetree/bindings/sound/atmel-wm8904.txt
>> index 8bbe50c..aca341c 100644
>> --- a/Documentation/devicetree/bindings/sound/atmel-wm8904.txt
>> +++ b/Documentation/devicetree/bindings/sound/atmel-wm8904.txt
>> @@ -3,6 +3,8 @@ Atmel ASoC driver with wm8904 audio codec complex
>>   Required properties:
>>     - compatible: "atmel,asoc-wm8904"
>>     - atmel,model: The user-visible name of this sound complex.
>> +  - clocks: A list of clocks needed by the wm8904 chip.
>> +  - clock-output-names: Driver related clock names. Shall contain "pck0".
> The word "driver"  doesn't need to appear in biding documents, and this
> fails to describe what it sets out to. How about the following:
>
> - clocks: a list of phandle + clock-specifier pairs, one for each entry
>    in clock-names.
Agreed.
> - clock-names: Should contain "pck0"
After thinking a bit more about it, this can be any programmable clk (pckX).

I'll fix it.

Thanks.

Best Regards,

Boris

>
> Thanks,
> Mark.

--
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

Re: [PATCH 7/8] ASoC: atmel: document clock properties of the wm8904 driver

[Mark Rutland]

On Mon, Mar 17, 2014 at 10:18:08AM +0000, boris brezillon wrote:
> Hello Mark,
> 
> Le 17/03/2014 11:02, Mark Rutland a écrit :
> > On Mon, Mar 17, 2014 at 09:45:40AM +0000, Bo Shen wrote:
> >> From: Boris BREZILLON <b.brezillon@overkiz.com>
> >>
> >> Signed-off-by: Boris BREZILLON <b.brezillon@overkiz.com>
> >> Signed-off-by: Bo Shen <voice.shen@atmel.com>
> >> ---
> >>
> >>   Documentation/devicetree/bindings/sound/atmel-wm8904.txt | 2 ++
> >>   1 file changed, 2 insertions(+)
> >>
> >> diff --git a/Documentation/devicetree/bindings/sound/atmel-wm8904.txt b/Documentation/devicetree/bindings/sound/atmel-wm8904.txt
> >> index 8bbe50c..aca341c 100644
> >> --- a/Documentation/devicetree/bindings/sound/atmel-wm8904.txt
> >> +++ b/Documentation/devicetree/bindings/sound/atmel-wm8904.txt
> >> @@ -3,6 +3,8 @@ Atmel ASoC driver with wm8904 audio codec complex
> >>   Required properties:
> >>     - compatible: "atmel,asoc-wm8904"
> >>     - atmel,model: The user-visible name of this sound complex.
> >> +  - clocks: A list of clocks needed by the wm8904 chip.
> >> +  - clock-output-names: Driver related clock names. Shall contain "pck0".
> > The word "driver"  doesn't need to appear in biding documents, and this
> > fails to describe what it sets out to. How about the following:
> >
> > - clocks: a list of phandle + clock-specifier pairs, one for each entry
> >    in clock-names.
> Agreed.
> > - clock-names: Should contain "pck0"
> After thinking a bit more about it, this can be any programmable clk (pckX).

Huh?

The clock-names property describes the names of the inputs to the
device, from the view of the device, not the names of the clocks fed
into those inputs.

What are the names of the clock input lines on the wm8904?

Cheers,
Mark.

Re: [PATCH 7/8] ASoC: atmel: document clock properties of the wm8904 driver

[Boris BREZILLON]

Le 17/03/2014 11:48, Mark Rutland a écrit :
> On Mon, Mar 17, 2014 at 10:18:08AM +0000, boris brezillon wrote:
>> Hello Mark,
>>
>> Le 17/03/2014 11:02, Mark Rutland a écrit :
>>> On Mon, Mar 17, 2014 at 09:45:40AM +0000, Bo Shen wrote:
>>>> From: Boris BREZILLON <b.brezillon@overkiz.com>
>>>>
>>>> Signed-off-by: Boris BREZILLON <b.brezillon@overkiz.com>
>>>> Signed-off-by: Bo Shen <voice.shen@atmel.com>
>>>> ---
>>>>
>>>>    Documentation/devicetree/bindings/sound/atmel-wm8904.txt | 2 ++
>>>>    1 file changed, 2 insertions(+)
>>>>
>>>> diff --git a/Documentation/devicetree/bindings/sound/atmel-wm8904.txt b/Documentation/devicetree/bindings/sound/atmel-wm8904.txt
>>>> index 8bbe50c..aca341c 100644
>>>> --- a/Documentation/devicetree/bindings/sound/atmel-wm8904.txt
>>>> +++ b/Documentation/devicetree/bindings/sound/atmel-wm8904.txt
>>>> @@ -3,6 +3,8 @@ Atmel ASoC driver with wm8904 audio codec complex
>>>>    Required properties:
>>>>      - compatible: "atmel,asoc-wm8904"
>>>>      - atmel,model: The user-visible name of this sound complex.
>>>> +  - clocks: A list of clocks needed by the wm8904 chip.
>>>> +  - clock-output-names: Driver related clock names. Shall contain "pck0".
>>> The word "driver"  doesn't need to appear in biding documents, and this
>>> fails to describe what it sets out to. How about the following:
>>>
>>> - clocks: a list of phandle + clock-specifier pairs, one for each entry
>>>     in clock-names.
>> Agreed.
>>> - clock-names: Should contain "pck0"
>> After thinking a bit more about it, this can be any programmable clk (pckX).
> Huh?
>
> The clock-names property describes the names of the inputs to the
> device, from the view of the device, not the names of the clocks fed
> into those inputs.
>
> What are the names of the clock input lines on the wm8904?

mclk, and you're right, this is how we should name the clk (I just got
influenced by the existing driver, which was requesting pck0).

This gives the following:

- clock-names: Should contain "mclk"

Do you agree ?

>
> Cheers,
> Mark.

Re: [PATCH 7/8] ASoC: atmel: document clock properties of the wm8904 driver

[Mark Rutland]

On Mon, Mar 17, 2014 at 11:24:41AM +0000, Boris BREZILLON wrote:
> Le 17/03/2014 11:48, Mark Rutland a écrit :
> > On Mon, Mar 17, 2014 at 10:18:08AM +0000, boris brezillon wrote:
> >> Hello Mark,
> >>
> >> Le 17/03/2014 11:02, Mark Rutland a écrit :
> >>> On Mon, Mar 17, 2014 at 09:45:40AM +0000, Bo Shen wrote:
> >>>> From: Boris BREZILLON <b.brezillon@overkiz.com>
> >>>>
> >>>> Signed-off-by: Boris BREZILLON <b.brezillon@overkiz.com>
> >>>> Signed-off-by: Bo Shen <voice.shen@atmel.com>
> >>>> ---
> >>>>
> >>>>    Documentation/devicetree/bindings/sound/atmel-wm8904.txt | 2 ++
> >>>>    1 file changed, 2 insertions(+)
> >>>>
> >>>> diff --git a/Documentation/devicetree/bindings/sound/atmel-wm8904.txt b/Documentation/devicetree/bindings/sound/atmel-wm8904.txt
> >>>> index 8bbe50c..aca341c 100644
> >>>> --- a/Documentation/devicetree/bindings/sound/atmel-wm8904.txt
> >>>> +++ b/Documentation/devicetree/bindings/sound/atmel-wm8904.txt
> >>>> @@ -3,6 +3,8 @@ Atmel ASoC driver with wm8904 audio codec complex
> >>>>    Required properties:
> >>>>      - compatible: "atmel,asoc-wm8904"
> >>>>      - atmel,model: The user-visible name of this sound complex.
> >>>> +  - clocks: A list of clocks needed by the wm8904 chip.
> >>>> +  - clock-output-names: Driver related clock names. Shall contain "pck0".
> >>> The word "driver"  doesn't need to appear in biding documents, and this
> >>> fails to describe what it sets out to. How about the following:
> >>>
> >>> - clocks: a list of phandle + clock-specifier pairs, one for each entry
> >>>     in clock-names.
> >> Agreed.
> >>> - clock-names: Should contain "pck0"
> >> After thinking a bit more about it, this can be any programmable clk (pckX).
> > Huh?
> >
> > The clock-names property describes the names of the inputs to the
> > device, from the view of the device, not the names of the clocks fed
> > into those inputs.
> >
> > What are the names of the clock input lines on the wm8904?
> 
> mclk, and you're right, this is how we should name the clk (I just got
> influenced by the existing driver, which was requesting pck0).
> 
> This gives the following:
> 
> - clock-names: Should contain "mclk"
> 
> Do you agree ?

That sounds right to me.

Cheers,
Mark.

Re: [PATCH 7/8] ASoC: atmel: document clock properties of the wm8904 driver

[Mark Brown]

[-- Attachment #1: Type: text/plain, Size: 491 bytes --]

On Mon, Mar 17, 2014 at 05:45:40PM +0800, Bo Shen wrote:

>    - compatible: "atmel,asoc-wm8904"
>    - atmel,model: The user-visible name of this sound complex.
> +  - clocks: A list of clocks needed by the wm8904 chip.
> +  - clock-output-names: Driver related clock names. Shall contain "pck0".

If this is a clock for the CODEC it should be documented as part of the
binding for the CODEC and connected to the CODEC in the device tree
rather than being part of a machine driver binding.

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]

Re: [PATCH 7/8] ASoC: atmel: document clock properties of the wm8904 driver

[Boris BREZILLON]

Hello Mark,

Le 17/03/2014 12:55, Mark Brown a écrit :
> On Mon, Mar 17, 2014 at 05:45:40PM +0800, Bo Shen wrote:
>
>>     - compatible: "atmel,asoc-wm8904"
>>     - atmel,model: The user-visible name of this sound complex.
>> +  - clocks: A list of clocks needed by the wm8904 chip.
>> +  - clock-output-names: Driver related clock names. Shall contain "pck0".
> If this is a clock for the CODEC it should be documented as part of the
> binding for the CODEC and connected to the CODEC in the device tree
> rather than being part of a machine driver binding.

Tell me if I'm mistaken, but doing this would implies a lot of changes.
The current wm8904 driver does not handle clk retrieval and configuration,
and I'm afraid that introducing these concepts would break other drivers 
(those
connecting to a wm8904 codec).

Do you see a simple alternative to this approach (or is there something 
I misunderstood
in your suggestion) ?

How about adding CCF support as proposed in this series and think about 
a cleaner
solution for a future release ?

Best Regards,

Boris

Re: [PATCH 7/8] ASoC: atmel: document clock properties of the wm8904 driver

[Mark Brown]

[-- Attachment #1: Type: text/plain, Size: 984 bytes --]

On Mon, Mar 17, 2014 at 02:44:00PM +0100, Boris BREZILLON wrote:
> Le 17/03/2014 12:55, Mark Brown a écrit :
> >On Mon, Mar 17, 2014 at 05:45:40PM +0800, Bo Shen wrote:

> >If this is a clock for the CODEC it should be documented as part of the
> >binding for the CODEC and connected to the CODEC in the device tree
> >rather than being part of a machine driver binding.

> Tell me if I'm mistaken, but doing this would implies a lot of changes.
> The current wm8904 driver does not handle clk retrieval and configuration,
> and I'm afraid that introducing these concepts would break other drivers
> (those
> connecting to a wm8904 codec).

Currently the only mainline users of the device are the Atmel drivers.

> How about adding CCF support as proposed in this series and think about a
> cleaner
> solution for a future release ?

No, DT is an ABI so you can't do that - once something is in DT we're
stuck supporting it so we can't do quick hacks so easily.

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]

Re: [PATCH 7/8] ASoC: atmel: document clock properties of the wm8904 driver

[Bo Shen]

Hi Mark,

On 03/17/2014 07:55 PM, Mark Brown wrote:
> On Mon, Mar 17, 2014 at 05:45:40PM +0800, Bo Shen wrote:
>
>>     - compatible: "atmel,asoc-wm8904"
>>     - atmel,model: The user-visible name of this sound complex.
>> +  - clocks: A list of clocks needed by the wm8904 chip.
>> +  - clock-output-names: Driver related clock names. Shall contain "pck0".
>
> If this is a clock for the CODEC it should be documented as part of the
> binding for the CODEC and connected to the CODEC in the device tree
> rather than being part of a machine driver binding.

This is a optional clock for CODEC which depends on hardware design. 
There are 3 options for this clock, wm8904 as an example.
1. Using internal FLL, so won't use this clock.
2. Using external oscillator, no need to retrieve this clock.
3. Using SoC provide this clock (we use this case).

After considering these 3 options, if we put this into CODEC driver to 
do it, I think it will be more complicate to do logic judgement. Do you 
think so?

And, in machine driver, it will depends on the clock option to decide 
whether to call snd_soc_dai_set_pll and snd_soc_dai_set_sysclk.

And also the <Documentation/soud/alsa/soc/machine.txt> mentions the 
machine drivers responsibility (one is for clocking) as following:
--->8---
The ASoC machine (or board) driver is the code that glues together all the
component drivers (e.g. codecs, platforms and DAIs). It also describes the
relationships between each componnent which include audio paths, GPIOs,
interrupts, clocking, jacks and voltage regulators.
---8<---

So, I think put this into machine driver will be better. Do you have any 
other idea? Or if I misunderstand something, please point it out.

Thanks.

Best Regards,
Bo Shen

Re: [PATCH 7/8] ASoC: atmel: document clock properties of the wm8904 driver

[Mark Brown]

[-- Attachment #1: Type: text/plain, Size: 2080 bytes --]

On Wed, Mar 19, 2014 at 01:57:23PM +0800, Bo Shen wrote:
> On 03/17/2014 07:55 PM, Mark Brown wrote:

> >If this is a clock for the CODEC it should be documented as part of the
> >binding for the CODEC and connected to the CODEC in the device tree
> >rather than being part of a machine driver binding.

> This is a optional clock for CODEC which depends on hardware design. There
> are 3 options for this clock, wm8904 as an example.
> 1. Using internal FLL, so won't use this clock.
> 2. Using external oscillator, no need to retrieve this clock.
> 3. Using SoC provide this clock (we use this case).

> After considering these 3 options, if we put this into CODEC driver to do
> it, I think it will be more complicate to do logic judgement. Do you think
> so?

There shouldn't be any meaningful complexity from the above cases -
cases 2 and 3 are the same and if the clock isn't used at all then it
can be omitted.  If the FLL is clocked from MCLK then the CODEC driver
should be able to work out how to configure it easily, the device isn't 
like a digital hub CODEC with lots of clocking options.

> And, in machine driver, it will depends on the clock option to decide
> whether to call snd_soc_dai_set_pll and snd_soc_dai_set_sysclk.

Some if not all of this logic can be eaten by the CODEC driver,
especially with a simple device like this.  Realistically the device is
either going to be clocked from MCLK (with the rate telling us if we
need the FLL) or from BCLK (if it's slave and there's no MCLK).

> And also the <Documentation/soud/alsa/soc/machine.txt> mentions the machine
> drivers responsibility (one is for clocking) as following:
> --->8---
> The ASoC machine (or board) driver is the code that glues together all the
> component drivers (e.g. codecs, platforms and DAIs). It also describes the
> relationships between each componnent which include audio paths, GPIOs,
> interrupts, clocking, jacks and voltage regulators.
> ---8<---

That's a Linux specific consideration which shouldn't play any part in
DT design.

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]

Re: [PATCH 7/8] ASoC: atmel: document clock properties of the wm8904 driver

[Bo Shen]

Hi Mark,

On 03/19/2014 06:28 PM, Mark Brown wrote:
> On Wed, Mar 19, 2014 at 01:57:23PM +0800, Bo Shen wrote:
>> On 03/17/2014 07:55 PM, Mark Brown wrote:
>
>>> If this is a clock for the CODEC it should be documented as part of the
>>> binding for the CODEC and connected to the CODEC in the device tree
>>> rather than being part of a machine driver binding.
>
>> This is a optional clock for CODEC which depends on hardware design. There
>> are 3 options for this clock, wm8904 as an example.
>> 1. Using internal FLL, so won't use this clock.
>> 2. Using external oscillator, no need to retrieve this clock.
>> 3. Using SoC provide this clock (we use this case).
>
>> After considering these 3 options, if we put this into CODEC driver to do
>> it, I think it will be more complicate to do logic judgement. Do you think
>> so?
>
> There shouldn't be any meaningful complexity from the above cases -
> cases 2 and 3 are the same and if the clock isn't used at all then it
> can be omitted.  If the FLL is clocked from MCLK then the CODEC driver
> should be able to work out how to configure it easily, the device isn't
> like a digital hub CODEC with lots of clocking options.

For this, in my mind, I think we need add following parameters in DT.
1. sysclk_src_from_fll --> we need do nothing.
2. sysclk_src_from_mclk
    2.1 use_external_xtal --> we need clock_frequency
    2.2 !use_external_xtal --> we need retrieve clock and clock_frequency.

So, the dt may looks like:
for case 1:
wm8904: wm8904@1a {
	reg = <0x1a>;
	sysclk_src_from_fll;
}

for case 2.1:
wm8904: wm8904@1a {
	reg = <0x1a>;
	sysclk_src_from_mclk;
	use_external_xtal;
	clock_frequency = 12000000;
}

for case 2.2:
wm8904: wm8904@1a {
	reg = <0x1a>;
	sysclk_src_from_mclk;
	clocks = <&pck0>;
	clock-names = "mclk";
	clock_frequency = 32768;
}

Does this acceptable? Or any other better suggestion for this?

Best Regards,
Bo Shen

--
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

Re: [PATCH 7/8] ASoC: atmel: document clock properties of the wm8904 driver

[Mark Brown]

[-- Attachment #1: Type: text/plain, Size: 709 bytes --]

On Thu, Mar 20, 2014 at 10:37:53AM +0800, Bo Shen wrote:

> For this, in my mind, I think we need add following parameters in DT.
> 1. sysclk_src_from_fll --> we need do nothing.

No, how would this work?  If nothing else the FLL needs configuration.

> 2. sysclk_src_from_mclk
>    2.1 use_external_xtal --> we need clock_frequency
>    2.2 !use_external_xtal --> we need retrieve clock and clock_frequency.

No, this is all handled in the clock binding.  If there's a fixed rate
clock the device tree should have a fixed rate clock provided.

> Does this acceptable? Or any other better suggestion for this?

Just have the device tree describe the hardware and provide a way of
specifying an optional MCLK.

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]

Re: [PATCH 7/8] ASoC: atmel: document clock properties of the wm8904 driver

[Bo Shen]

Hi Mark Brown,

On 03/20/2014 09:47 PM, Mark Brown wrote:
> On Thu, Mar 20, 2014 at 10:37:53AM +0800, Bo Shen wrote:
>
>> For this, in my mind, I think we need add following parameters in DT.
>> 1. sysclk_src_from_fll --> we need do nothing.
>
> No, how would this work?  If nothing else the FLL needs configuration.

Only configure it in machine driver. Then no DT operation.

>> 2. sysclk_src_from_mclk
>>     2.1 use_external_xtal --> we need clock_frequency
>>     2.2 !use_external_xtal --> we need retrieve clock and clock_frequency.
>
> No, this is all handled in the clock binding.  If there's a fixed rate
> clock the device tree should have a fixed rate clock provided.
>
>> Does this acceptable? Or any other better suggestion for this?
>
> Just have the device tree describe the hardware and provide a way of
> specifying an optional MCLK.
>

I will implement an RFC patch, please help review it. Thanks.

Best Regards,
Bo Shen

[PATCH 8/8] ARM: at91/dt: add clock properties to the wm8904 codec node

[Bo Shen]

From: Boris BREZILLON <b.brezillon@overkiz.com>

Signed-off-by: Boris BREZILLON <b.brezillon@overkiz.com>
Signed-off-by: Bo Shen <voice.shen@atmel.com>
---

 arch/arm/boot/dts/sama5d3xmb.dtsi | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/arch/arm/boot/dts/sama5d3xmb.dtsi b/arch/arm/boot/dts/sama5d3xmb.dtsi
index 306eef0..d9bb413 100644
--- a/arch/arm/boot/dts/sama5d3xmb.dtsi
+++ b/arch/arm/boot/dts/sama5d3xmb.dtsi
@@ -163,6 +163,8 @@
 		compatible = "atmel,asoc-wm8904";
 		pinctrl-names = "default";
 		pinctrl-0 = <&pinctrl_pck0_as_audio_mck>;
+		clocks = <&pck0>;
+		clock-names = "pck0";
 
 		atmel,model = "wm8904 @ SAMA5D3EK";
 		atmel,audio-routing =
-- 
1.8.5.2

Re: [PATCH 8/8] ARM: at91/dt: add clock properties to the wm8904 codec node

[Bo Shen]

On 03/17/2014 05:45 PM, Bo Shen wrote:
> From: Boris BREZILLON <b.brezillon@overkiz.com>
>
> Signed-off-by: Boris BREZILLON <b.brezillon@overkiz.com>
> Signed-off-by: Bo Shen <voice.shen@atmel.com>

Oh, sorry for my SOB. Please remove it when apply.

> ---
>
>   arch/arm/boot/dts/sama5d3xmb.dtsi | 2 ++
>   1 file changed, 2 insertions(+)
>
> diff --git a/arch/arm/boot/dts/sama5d3xmb.dtsi b/arch/arm/boot/dts/sama5d3xmb.dtsi
> index 306eef0..d9bb413 100644
> --- a/arch/arm/boot/dts/sama5d3xmb.dtsi
> +++ b/arch/arm/boot/dts/sama5d3xmb.dtsi
> @@ -163,6 +163,8 @@
>   		compatible = "atmel,asoc-wm8904";
>   		pinctrl-names = "default";
>   		pinctrl-0 = <&pinctrl_pck0_as_audio_mck>;
> +		clocks = <&pck0>;
> +		clock-names = "pck0";
>
>   		atmel,model = "wm8904 @ SAMA5D3EK";
>   		atmel,audio-routing =
>

Best Regards,
Bo Shen