diff mbox series

[2/7] ARM: dts: s5pv210: Adjust I2S entries to match spec

Message ID CY4PR04MB056784D54ADDBB4F57F82D4ACB189@CY4PR04MB0567.namprd04.prod.outlook.com
State New
Headers show
Series [1/7] ARM: dts: s5pv210: Split memory nodes to match spec | expand

Commit Message

Jonathan Bakker March 23, 2022, 3:03 p.m. UTC
Based on the device tree spec, clocks should be ordered tx/rx.
Re-order from rx/tx to avoid warnings when running make dtbs_check

Additionally, the number of #sound-dai-cells should be 1, not 0

Signed-off-by: Jonathan Bakker <xc-racer2@live.ca>
---
 arch/arm/boot/dts/s5pv210-aries.dtsi |  2 +-
 arch/arm/boot/dts/s5pv210.dtsi       | 18 +++++++++---------
 2 files changed, 10 insertions(+), 10 deletions(-)

Comments

Krzysztof Kozlowski March 23, 2022, 3:14 p.m. UTC | #1
On 23/03/2022 16:03, Jonathan Bakker wrote:
> Based on the device tree spec, clocks should be ordered tx/rx.
> Re-order from rx/tx to avoid warnings when running make dtbs_check
> 
> Additionally, the number of #sound-dai-cells should be 1, not 0
> 
> Signed-off-by: Jonathan Bakker <xc-racer2@live.ca>
> ---
>  arch/arm/boot/dts/s5pv210-aries.dtsi |  2 +-
>  arch/arm/boot/dts/s5pv210.dtsi       | 18 +++++++++---------
>  2 files changed, 10 insertions(+), 10 deletions(-)
> 
> diff --git a/arch/arm/boot/dts/s5pv210-aries.dtsi b/arch/arm/boot/dts/s5pv210-aries.dtsi
> index 70ff56daf4cb..503b5a50ef1a 100644
> --- a/arch/arm/boot/dts/s5pv210-aries.dtsi
> +++ b/arch/arm/boot/dts/s5pv210-aries.dtsi
> @@ -644,7 +644,7 @@
>  };
>  
>  &i2s0 {
> -	dmas = <&pdma0 9>, <&pdma0 10>, <&pdma0 11>;
> +	dmas = <&pdma0 10>, <&pdma0 9>, <&pdma0 11>;
>  	status = "okay";

Except that fix that's the same commit as here:
https://lore.kernel.org/all/20200907161141.31034-26-krzk@kernel.org/
so just extend it.

sound-dai-cells should go to a separate commit. But are you sure they
are correct? The Fascinate 4G seems to be using them as cells=0.


Best regards,
Krzysztof
Krzysztof Kozlowski March 23, 2022, 3:15 p.m. UTC | #2
On 23/03/2022 16:14, Krzysztof Kozlowski wrote:
> On 23/03/2022 16:03, Jonathan Bakker wrote:
>> Based on the device tree spec, clocks should be ordered tx/rx.
>> Re-order from rx/tx to avoid warnings when running make dtbs_check
>>
>> Additionally, the number of #sound-dai-cells should be 1, not 0
>>
>> Signed-off-by: Jonathan Bakker <xc-racer2@live.ca>
>> ---
>>  arch/arm/boot/dts/s5pv210-aries.dtsi |  2 +-
>>  arch/arm/boot/dts/s5pv210.dtsi       | 18 +++++++++---------
>>  2 files changed, 10 insertions(+), 10 deletions(-)
>>
>> diff --git a/arch/arm/boot/dts/s5pv210-aries.dtsi b/arch/arm/boot/dts/s5pv210-aries.dtsi
>> index 70ff56daf4cb..503b5a50ef1a 100644
>> --- a/arch/arm/boot/dts/s5pv210-aries.dtsi
>> +++ b/arch/arm/boot/dts/s5pv210-aries.dtsi
>> @@ -644,7 +644,7 @@
>>  };
>>  
>>  &i2s0 {
>> -	dmas = <&pdma0 9>, <&pdma0 10>, <&pdma0 11>;
>> +	dmas = <&pdma0 10>, <&pdma0 9>, <&pdma0 11>;
>>  	status = "okay";
> 
> Except that fix that's the same commit as here:
> https://lore.kernel.org/all/20200907161141.31034-26-krzk@kernel.org/
> so just extend it.
> 
> sound-dai-cells should go to a separate commit. But are you sure they
> are correct? The Fascinate 4G seems to be using them as cells=0.

See my previous patch and discussion:
https://lore.kernel.org/all/20200907161141.31034-10-krzk@kernel.org/


Best regards,
Krzysztof
Jonathan Bakker March 23, 2022, 5:24 p.m. UTC | #3
Hi Krzysztof,

On 2022-03-23 8:15 a.m., Krzysztof Kozlowski wrote:
> On 23/03/2022 16:14, Krzysztof Kozlowski wrote:
>> On 23/03/2022 16:03, Jonathan Bakker wrote:
>>> Based on the device tree spec, clocks should be ordered tx/rx.
>>> Re-order from rx/tx to avoid warnings when running make dtbs_check
>>>
>>> Additionally, the number of #sound-dai-cells should be 1, not 0
>>>
>>> Signed-off-by: Jonathan Bakker <xc-racer2@live.ca>
>>> ---
>>>  arch/arm/boot/dts/s5pv210-aries.dtsi |  2 +-
>>>  arch/arm/boot/dts/s5pv210.dtsi       | 18 +++++++++---------
>>>  2 files changed, 10 insertions(+), 10 deletions(-)
>>>
>>> diff --git a/arch/arm/boot/dts/s5pv210-aries.dtsi b/arch/arm/boot/dts/s5pv210-aries.dtsi
>>> index 70ff56daf4cb..503b5a50ef1a 100644
>>> --- a/arch/arm/boot/dts/s5pv210-aries.dtsi
>>> +++ b/arch/arm/boot/dts/s5pv210-aries.dtsi
>>> @@ -644,7 +644,7 @@
>>>  };
>>>  
>>>  &i2s0 {
>>> -	dmas = <&pdma0 9>, <&pdma0 10>, <&pdma0 11>;
>>> +	dmas = <&pdma0 10>, <&pdma0 9>, <&pdma0 11>;
>>>  	status = "okay";
>>
>> Except that fix that's the same commit as here:
>> https://lore.kernel.org/all/20200907161141.31034-26-krzk@kernel.org/
>> so just extend it.
>>
>> sound-dai-cells should go to a separate commit. But are you sure they
>> are correct? The Fascinate 4G seems to be using them as cells=0.
> 
> See my previous patch and discussion:
> https://lore.kernel.org/all/20200907161141.31034-10-krzk@kernel.org/
> 

Thanks, I'd totally forgotten about this series from the past.  I'll re-test
those commits and submit your copies of them in v2 if that's OK with you and
that they're confirmed functional?

Jonathan

> 
> Best regards,
> Krzysztof
>
Krzysztof Kozlowski March 24, 2022, 11:49 a.m. UTC | #4
On 23/03/2022 18:24, Jonathan Bakker wrote:
> Hi Krzysztof,
> 
> On 2022-03-23 8:15 a.m., Krzysztof Kozlowski wrote:
>> On 23/03/2022 16:14, Krzysztof Kozlowski wrote:
>>> On 23/03/2022 16:03, Jonathan Bakker wrote:
>>>> Based on the device tree spec, clocks should be ordered tx/rx.
>>>> Re-order from rx/tx to avoid warnings when running make dtbs_check
>>>>
>>>> Additionally, the number of #sound-dai-cells should be 1, not 0
>>>>
>>>> Signed-off-by: Jonathan Bakker <xc-racer2@live.ca>
>>>> ---
>>>>  arch/arm/boot/dts/s5pv210-aries.dtsi |  2 +-
>>>>  arch/arm/boot/dts/s5pv210.dtsi       | 18 +++++++++---------
>>>>  2 files changed, 10 insertions(+), 10 deletions(-)
>>>>
>>>> diff --git a/arch/arm/boot/dts/s5pv210-aries.dtsi b/arch/arm/boot/dts/s5pv210-aries.dtsi
>>>> index 70ff56daf4cb..503b5a50ef1a 100644
>>>> --- a/arch/arm/boot/dts/s5pv210-aries.dtsi
>>>> +++ b/arch/arm/boot/dts/s5pv210-aries.dtsi
>>>> @@ -644,7 +644,7 @@
>>>>  };
>>>>  
>>>>  &i2s0 {
>>>> -	dmas = <&pdma0 9>, <&pdma0 10>, <&pdma0 11>;
>>>> +	dmas = <&pdma0 10>, <&pdma0 9>, <&pdma0 11>;
>>>>  	status = "okay";
>>>
>>> Except that fix that's the same commit as here:
>>> https://lore.kernel.org/all/20200907161141.31034-26-krzk@kernel.org/
>>> so just extend it.
>>>
>>> sound-dai-cells should go to a separate commit. But are you sure they
>>> are correct? The Fascinate 4G seems to be using them as cells=0.
>>
>> See my previous patch and discussion:
>> https://lore.kernel.org/all/20200907161141.31034-10-krzk@kernel.org/
>>
> 
> Thanks, I'd totally forgotten about this series from the past.  I'll re-test
> those commits and submit your copies of them in v2 if that's OK with you and
> that they're confirmed functional?

My dma fixes change lacked this aries fix. The sound-dai-cells needed
more rethinking.


Best regards,
Krzysztof
Krzysztof Kozlowski April 21, 2023, 9:44 a.m. UTC | #5
On 24/03/2022 12:49, Krzysztof Kozlowski wrote:
> On 23/03/2022 18:24, Jonathan Bakker wrote:
>> Hi Krzysztof,
>>
>> On 2022-03-23 8:15 a.m., Krzysztof Kozlowski wrote:
>>> On 23/03/2022 16:14, Krzysztof Kozlowski wrote:
>>>> On 23/03/2022 16:03, Jonathan Bakker wrote:
>>>>> Based on the device tree spec, clocks should be ordered tx/rx.
>>>>> Re-order from rx/tx to avoid warnings when running make dtbs_check
>>>>>
>>>>> Additionally, the number of #sound-dai-cells should be 1, not 0
>>>>>
>>>>> Signed-off-by: Jonathan Bakker <xc-racer2@live.ca>
>>>>> ---
>>>>>  arch/arm/boot/dts/s5pv210-aries.dtsi |  2 +-
>>>>>  arch/arm/boot/dts/s5pv210.dtsi       | 18 +++++++++---------
>>>>>  2 files changed, 10 insertions(+), 10 deletions(-)
>>>>>
>>>>> diff --git a/arch/arm/boot/dts/s5pv210-aries.dtsi b/arch/arm/boot/dts/s5pv210-aries.dtsi
>>>>> index 70ff56daf4cb..503b5a50ef1a 100644
>>>>> --- a/arch/arm/boot/dts/s5pv210-aries.dtsi
>>>>> +++ b/arch/arm/boot/dts/s5pv210-aries.dtsi
>>>>> @@ -644,7 +644,7 @@
>>>>>  };
>>>>>  
>>>>>  &i2s0 {
>>>>> -	dmas = <&pdma0 9>, <&pdma0 10>, <&pdma0 11>;
>>>>> +	dmas = <&pdma0 10>, <&pdma0 9>, <&pdma0 11>;
>>>>>  	status = "okay";
>>>>
>>>> Except that fix that's the same commit as here:
>>>> https://lore.kernel.org/all/20200907161141.31034-26-krzk@kernel.org/
>>>> so just extend it.
>>>>
>>>> sound-dai-cells should go to a separate commit. But are you sure they
>>>> are correct? The Fascinate 4G seems to be using them as cells=0.
>>>
>>> See my previous patch and discussion:
>>> https://lore.kernel.org/all/20200907161141.31034-10-krzk@kernel.org/
>>>
>>
>> Thanks, I'd totally forgotten about this series from the past.  I'll re-test
>> those commits and submit your copies of them in v2 if that's OK with you and
>> that they're confirmed functional?
> 
> My dma fixes change lacked this aries fix. The sound-dai-cells needed
> more rethinking.
> 

Hi Jonathan,

Any plans for checking/fixing/testing and resending the sound-dai-cells
fixes?

Best regards,
Krzysztof
Jonathan Bakker May 3, 2023, 2:33 a.m. UTC | #6
On 2023-04-21 02:44, Krzysztof Kozlowski wrote:
> On 24/03/2022 12:49, Krzysztof Kozlowski wrote:
>> On 23/03/2022 18:24, Jonathan Bakker wrote:
>>> Hi Krzysztof,
>>>
>>> On 2022-03-23 8:15 a.m., Krzysztof Kozlowski wrote:
>>>> On 23/03/2022 16:14, Krzysztof Kozlowski wrote:
>>>>> On 23/03/2022 16:03, Jonathan Bakker wrote:
>>>>>> Based on the device tree spec, clocks should be ordered tx/rx.
>>>>>> Re-order from rx/tx to avoid warnings when running make dtbs_check
>>>>>>
>>>>>> Additionally, the number of #sound-dai-cells should be 1, not 0
>>>>>>
>>>>>> Signed-off-by: Jonathan Bakker <xc-racer2@live.ca>
>>>>>> ---
>>>>>>  arch/arm/boot/dts/s5pv210-aries.dtsi |  2 +-
>>>>>>  arch/arm/boot/dts/s5pv210.dtsi       | 18 +++++++++---------
>>>>>>  2 files changed, 10 insertions(+), 10 deletions(-)
>>>>>>
>>>>>> diff --git a/arch/arm/boot/dts/s5pv210-aries.dtsi b/arch/arm/boot/dts/s5pv210-aries.dtsi
>>>>>> index 70ff56daf4cb..503b5a50ef1a 100644
>>>>>> --- a/arch/arm/boot/dts/s5pv210-aries.dtsi
>>>>>> +++ b/arch/arm/boot/dts/s5pv210-aries.dtsi
>>>>>> @@ -644,7 +644,7 @@
>>>>>>  };
>>>>>>  
>>>>>>  &i2s0 {
>>>>>> -	dmas = <&pdma0 9>, <&pdma0 10>, <&pdma0 11>;
>>>>>> +	dmas = <&pdma0 10>, <&pdma0 9>, <&pdma0 11>;
>>>>>>  	status = "okay";
>>>>>
>>>>> Except that fix that's the same commit as here:
>>>>> https://lore.kernel.org/all/20200907161141.31034-26-krzk@kernel.org/
>>>>> so just extend it.
>>>>>
>>>>> sound-dai-cells should go to a separate commit. But are you sure they
>>>>> are correct? The Fascinate 4G seems to be using them as cells=0.
>>>>
>>>> See my previous patch and discussion:
>>>> https://lore.kernel.org/all/20200907161141.31034-10-krzk@kernel.org/
>>>>
>>>
>>> Thanks, I'd totally forgotten about this series from the past.  I'll re-test
>>> those commits and submit your copies of them in v2 if that's OK with you and
>>> that they're confirmed functional?
>>
>> My dma fixes change lacked this aries fix. The sound-dai-cells needed
>> more rethinking.
>>
> 
> Hi Jonathan,
> 
> Any plans for checking/fixing/testing and resending the sound-dai-cells
> fixes?
> 
> Best regards,
> Krzysztof
> 

Oops, I forgot about this again...  Unfortunately, I don't really have the time
right now to do so, and don't know when or if I will.

Thanks,
Jonathan
diff mbox series

Patch

diff --git a/arch/arm/boot/dts/s5pv210-aries.dtsi b/arch/arm/boot/dts/s5pv210-aries.dtsi
index 70ff56daf4cb..503b5a50ef1a 100644
--- a/arch/arm/boot/dts/s5pv210-aries.dtsi
+++ b/arch/arm/boot/dts/s5pv210-aries.dtsi
@@ -644,7 +644,7 @@ 
 };
 
 &i2s0 {
-	dmas = <&pdma0 9>, <&pdma0 10>, <&pdma0 11>;
+	dmas = <&pdma0 10>, <&pdma0 9>, <&pdma0 11>;
 	status = "okay";
 };
 
diff --git a/arch/arm/boot/dts/s5pv210.dtsi b/arch/arm/boot/dts/s5pv210.dtsi
index 353ba7b09a0c..56c1d9a19570 100644
--- a/arch/arm/boot/dts/s5pv210.dtsi
+++ b/arch/arm/boot/dts/s5pv210.dtsi
@@ -239,8 +239,8 @@ 
 			reg = <0xeee30000 0x1000>;
 			interrupt-parent = <&vic2>;
 			interrupts = <16>;
-			dma-names = "rx", "tx", "tx-sec";
-			dmas = <&pdma1 9>, <&pdma1 10>, <&pdma1 11>;
+			dma-names = "tx", "rx", "tx-sec";
+			dmas = <&pdma1 10>, <&pdma1 9>, <&pdma1 11>;
 			clock-names = "iis",
 				      "i2s_opclk0",
 				      "i2s_opclk1";
@@ -250,7 +250,7 @@ 
 			samsung,idma-addr = <0xc0010000>;
 			pinctrl-names = "default";
 			pinctrl-0 = <&i2s0_bus>;
-			#sound-dai-cells = <0>;
+			#sound-dai-cells = <1>;
 			status = "disabled";
 		};
 
@@ -259,13 +259,13 @@ 
 			reg = <0xe2100000 0x1000>;
 			interrupt-parent = <&vic2>;
 			interrupts = <17>;
-			dma-names = "rx", "tx";
-			dmas = <&pdma1 12>, <&pdma1 13>;
+			dma-names = "tx", "rx";
+			dmas = <&pdma1 13>, <&pdma1 12>;
 			clock-names = "iis", "i2s_opclk0";
 			clocks = <&clocks CLK_I2S1>, <&clocks SCLK_AUDIO1>;
 			pinctrl-names = "default";
 			pinctrl-0 = <&i2s1_bus>;
-			#sound-dai-cells = <0>;
+			#sound-dai-cells = <1>;
 			status = "disabled";
 		};
 
@@ -274,13 +274,13 @@ 
 			reg = <0xe2a00000 0x1000>;
 			interrupt-parent = <&vic2>;
 			interrupts = <18>;
-			dma-names = "rx", "tx";
-			dmas = <&pdma1 14>, <&pdma1 15>;
+			dma-names = "tx", "rx";
+			dmas = <&pdma1 15>, <&pdma1 14>;
 			clock-names = "iis", "i2s_opclk0";
 			clocks = <&clocks CLK_I2S2>, <&clocks SCLK_AUDIO2>;
 			pinctrl-names = "default";
 			pinctrl-0 = <&i2s2_bus>;
-			#sound-dai-cells = <0>;
+			#sound-dai-cells = <1>;
 			status = "disabled";
 		};