diff mbox

[1/2] arc: axs10x: Add DT bindings for I2S audio playback

Message ID 7ed6deaf1ae6d5819364c793835aa30316077a7e.1487787376.git.joabreu@synopsys.com
State New
Headers show

Commit Message

Jose Abreu Feb. 22, 2017, 6:19 p.m. UTC
This patch adds the necessary DT bindings to get HDMI audio
output in ARC AXS10x SDP. The bindings for I2S controller were
added as well as the bindings for simple audio card.

Signed-off-by: Jose Abreu <joabreu@synopsys.com>
Cc: Carlos Palminha <palminha@synopsys.com>
Cc: Alexey Brodkin <abrodkin@synopsys.com>
Cc: Rob Herring <robh+dt@kernel.org>
Cc: Vineet Gupta <vgupta@synopsys.com>
Cc: devicetree@vger.kernel.org
Cc: linux-snps-arc@lists.infradead.org
Cc: linux-kernel@vger.kernel.org
---
 arch/arc/boot/dts/axs10x_mb.dtsi | 22 ++++++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

Comments

Vineet Gupta April 24, 2017, 5:36 p.m. UTC | #1
On 04/21/2017 03:15 AM, Jose Abreu wrote:
> This patch adds the necessary DT bindings to get HDMI audio
> output in ARC AXS10x SDP. The bindings for I2S controller were
> added as well as the bindings for simple audio card.

Are these waiting on Rob or is it OK for me to pick these up for 4.12 ?

-Vineet

>
> Signed-off-by: Jose Abreu <joabreu@synopsys.com>
> Acked-by: Alexey Brodkin <abrodkin@synopsys.com>
> Cc: Carlos Palminha <palminha@synopsys.com>
> Cc: Alexey Brodkin <abrodkin@synopsys.com>
> Cc: Rob Herring <robh+dt@kernel.org>
> Cc: Vineet Gupta <vgupta@synopsys.com>
> Cc: devicetree@vger.kernel.org
> Cc: linux-snps-arc@lists.infradead.org
> Cc: linux-kernel@vger.kernel.org
> ---
>  arch/arc/boot/dts/axs10x_mb.dtsi | 22 ++++++++++++++++++----
>  1 file changed, 18 insertions(+), 4 deletions(-)
>
> diff --git a/arch/arc/boot/dts/axs10x_mb.dtsi b/arch/arc/boot/dts/axs10x_mb.dtsi
> index d6c1bbc..9d882b1 100644
> --- a/arch/arc/boot/dts/axs10x_mb.dtsi
> +++ b/arch/arc/boot/dts/axs10x_mb.dtsi
> @@ -149,12 +149,13 @@
>  			interrupts = <14>;
>  		};
>  
> -		i2c@0x1e000 {
> -			compatible = "snps,designware-i2c";
> +		i2s: i2s@1e000 {
> +			compatible = "snps,designware-i2s";
>  			reg = <0x1e000 0x100>;
> -			clock-frequency = <400000>;
> -			clocks = <&i2cclk>;
> +			clocks = <&i2sclk 0>;
> +			clock-names = "i2sclk";
>  			interrupts = <15>;
> +			#sound-dai-cells = <0>;
>  		};
>  
>  		i2c@0x1f000 {
> @@ -174,6 +175,7 @@
>  				adi,input-colorspace = "rgb";
>  				adi,input-clock = "1x";
>  				adi,clock-delay = <0x03>;
> +				#sound-dai-cells = <0>;
>  
>  				ports {
>  					#address-cells = <1>;
> @@ -295,5 +297,17 @@
>  				};
>  			};
>  		};
> +
> +		sound_playback {
> +			compatible = "simple-audio-card";
> +			simple-audio-card,name = "AXS10x HDMI Audio";
> +			simple-audio-card,format = "i2s";
> +			simple-audio-card,cpu {
> +				sound-dai = <&i2s>;
> +			};
> +			simple-audio-card,codec {
> +				sound-dai = <&adv7511>;
> +			};
> +		};
>  	};
>  };
Jose Abreu April 26, 2017, 8:55 a.m. UTC | #2
Hi Vineet,


On 24-04-2017 18:36, Vineet Gupta wrote:
> On 04/21/2017 03:15 AM, Jose Abreu wrote:
>> This patch adds the necessary DT bindings to get HDMI audio
>> output in ARC AXS10x SDP. The bindings for I2S controller were
>> added as well as the bindings for simple audio card.
> Are these waiting on Rob or is it OK for me to pick these up for 4.12 ?

Yes, I was waiting for Rob ack but he has been silent. It would
be nice if these went for 4.12.

Best regards,
Jose Miguel Abreu

>
> -Vineet
>
>> Signed-off-by: Jose Abreu <joabreu@synopsys.com>
>> Acked-by: Alexey Brodkin <abrodkin@synopsys.com>
>> Cc: Carlos Palminha <palminha@synopsys.com>
>> Cc: Alexey Brodkin <abrodkin@synopsys.com>
>> Cc: Rob Herring <robh+dt@kernel.org>
>> Cc: Vineet Gupta <vgupta@synopsys.com>
>> Cc: devicetree@vger.kernel.org
>> Cc: linux-snps-arc@lists.infradead.org
>> Cc: linux-kernel@vger.kernel.org
>> ---
>>  arch/arc/boot/dts/axs10x_mb.dtsi | 22 ++++++++++++++++++----
>>  1 file changed, 18 insertions(+), 4 deletions(-)
>>
>> diff --git a/arch/arc/boot/dts/axs10x_mb.dtsi b/arch/arc/boot/dts/axs10x_mb.dtsi
>> index d6c1bbc..9d882b1 100644
>> --- a/arch/arc/boot/dts/axs10x_mb.dtsi
>> +++ b/arch/arc/boot/dts/axs10x_mb.dtsi
>> @@ -149,12 +149,13 @@
>>  			interrupts = <14>;
>>  		};
>>  
>> -		i2c@0x1e000 {
>> -			compatible = "snps,designware-i2c";
>> +		i2s: i2s@1e000 {
>> +			compatible = "snps,designware-i2s";
>>  			reg = <0x1e000 0x100>;
>> -			clock-frequency = <400000>;
>> -			clocks = <&i2cclk>;
>> +			clocks = <&i2sclk 0>;
>> +			clock-names = "i2sclk";
>>  			interrupts = <15>;
>> +			#sound-dai-cells = <0>;
>>  		};
>>  
>>  		i2c@0x1f000 {
>> @@ -174,6 +175,7 @@
>>  				adi,input-colorspace = "rgb";
>>  				adi,input-clock = "1x";
>>  				adi,clock-delay = <0x03>;
>> +				#sound-dai-cells = <0>;
>>  
>>  				ports {
>>  					#address-cells = <1>;
>> @@ -295,5 +297,17 @@
>>  				};
>>  			};
>>  		};
>> +
>> +		sound_playback {
>> +			compatible = "simple-audio-card";
>> +			simple-audio-card,name = "AXS10x HDMI Audio";
>> +			simple-audio-card,format = "i2s";
>> +			simple-audio-card,cpu {
>> +				sound-dai = <&i2s>;
>> +			};
>> +			simple-audio-card,codec {
>> +				sound-dai = <&adv7511>;
>> +			};
>> +		};
>>  	};
>>  };
Vineet Gupta April 26, 2017, 11:31 p.m. UTC | #3
On 04/26/2017 01:55 AM, Jose Abreu wrote:
> Hi Vineet,
>
>
> On 24-04-2017 18:36, Vineet Gupta wrote:
>> On 04/21/2017 03:15 AM, Jose Abreu wrote:
>>> This patch adds the necessary DT bindings to get HDMI audio
>>> output in ARC AXS10x SDP. The bindings for I2S controller were
>>> added as well as the bindings for simple audio card.
>> Are these waiting on Rob or is it OK for me to pick these up for 4.12 ?
> Yes, I was waiting for Rob ack but he has been silent. It would
> be nice if these went for 4.12.

Ok lets wait another couple of days before I pick those up.
In the mean time, can you please restest the series against 4.11-rcX and report
here that patches are still valid and do as intended !

Thx,
-Vineet
Jose Abreu April 27, 2017, 6:42 p.m. UTC | #4
Hi Vineet,


On 27-04-2017 00:31, Vineet Gupta wrote:
> On 04/26/2017 01:55 AM, Jose Abreu wrote:
>> Hi Vineet,
>>
>>
>> On 24-04-2017 18:36, Vineet Gupta wrote:
>>> On 04/21/2017 03:15 AM, Jose Abreu wrote:
>>>> This patch adds the necessary DT bindings to get HDMI audio
>>>> output in ARC AXS10x SDP. The bindings for I2S controller were
>>>> added as well as the bindings for simple audio card.
>>> Are these waiting on Rob or is it OK for me to pick these up for 4.12 ?
>> Yes, I was waiting for Rob ack but he has been silent. It would
>> be nice if these went for 4.12.
> Ok lets wait another couple of days before I pick those up.
> In the mean time, can you please restest the series against 4.11-rcX and report
> here that patches are still valid and do as intended !

I tested based on drm-next of today (which is based on 4.11-rc7)
and the patches work okay.

Best regards,
Jose Miguel Abreu

>
> Thx,
> -Vineet
Vineet Gupta April 27, 2017, 7:13 p.m. UTC | #5
On 04/27/2017 11:42 AM, Jose Abreu wrote:
> Hi Vineet,
>
>
> On 27-04-2017 00:31, Vineet Gupta wrote:
>> On 04/26/2017 01:55 AM, Jose Abreu wrote:
>>> Hi Vineet,
>>>
>>>
>>> On 24-04-2017 18:36, Vineet Gupta wrote:
>>>> On 04/21/2017 03:15 AM, Jose Abreu wrote:
>>>>> This patch adds the necessary DT bindings to get HDMI audio
>>>>> output in ARC AXS10x SDP. The bindings for I2S controller were
>>>>> added as well as the bindings for simple audio card.
>>>> Are these waiting on Rob or is it OK for me to pick these up for 4.12 ?
>>> Yes, I was waiting for Rob ack but he has been silent. It would
>>> be nice if these went for 4.12.
>> Ok lets wait another couple of days before I pick those up.
>> In the mean time, can you please restest the series against 4.11-rcX and report
>> here that patches are still valid and do as intended !
> I tested based on drm-next of today (which is based on 4.11-rc7)
> and the patches work okay.

Pushed to for-curr for 4.12 !

Thx,
-Vineet
diff mbox

Patch

diff --git a/arch/arc/boot/dts/axs10x_mb.dtsi b/arch/arc/boot/dts/axs10x_mb.dtsi
index d6c1bbc..9d882b1 100644
--- a/arch/arc/boot/dts/axs10x_mb.dtsi
+++ b/arch/arc/boot/dts/axs10x_mb.dtsi
@@ -149,12 +149,13 @@ 
 			interrupts = <14>;
 		};
 
-		i2c@0x1e000 {
-			compatible = "snps,designware-i2c";
+		i2s: i2s@1e000 {
+			compatible = "snps,designware-i2s";
 			reg = <0x1e000 0x100>;
-			clock-frequency = <400000>;
-			clocks = <&i2cclk>;
+			clocks = <&i2sclk 0>;
+			clock-names = "i2sclk";
 			interrupts = <15>;
+			#sound-dai-cells = <0>;
 		};
 
 		i2c@0x1f000 {
@@ -174,6 +175,7 @@ 
 				adi,input-colorspace = "rgb";
 				adi,input-clock = "1x";
 				adi,clock-delay = <0x03>;
+				#sound-dai-cells = <0>;
 
 				ports {
 					#address-cells = <1>;
@@ -295,5 +297,17 @@ 
 				};
 			};
 		};
+
+		sound_playback {
+			compatible = "simple-audio-card";
+			simple-audio-card,name = "AXS10x HDMI Audio";
+			simple-audio-card,format = "i2s";
+			simple-audio-card,cpu {
+				sound-dai = <&i2s>;
+			};
+			simple-audio-card,codec {
+				sound-dai = <&adv7511>;
+			};
+		};
 	};
 };