diff mbox series

ARM: dts: qcom: apq8026-samsung-matisse-wifi: Enable ADSP

Message ID 20221125223400.94515-1-matti.lehtimaki@gmail.com
State New
Headers
Series ARM: dts: qcom: apq8026-samsung-matisse-wifi: Enable ADSP |

Commit Message

Matti Lehtimäki Nov. 25, 2022, 10:34 p.m. UTC 
  Configure the reserved memory for ADSP and enable it.

Signed-off-by: Matti Lehtimäki <matti.lehtimaki@gmail.com>
---
 arch/arm/boot/dts/qcom-apq8026-samsung-matisse-wifi.dts | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

Comments

Konrad Dybcio Nov. 28, 2022, 2:41 p.m. UTC | #1 
On 25.11.2022 23:34, Matti Lehtimäki wrote:
> Configure the reserved memory for ADSP and enable it.
> 
> Signed-off-by: Matti Lehtimäki <matti.lehtimaki@gmail.com>
> ---
>  arch/arm/boot/dts/qcom-apq8026-samsung-matisse-wifi.dts | 7 ++++++-
>  1 file changed, 6 insertions(+), 1 deletion(-)
> 
> diff --git a/arch/arm/boot/dts/qcom-apq8026-samsung-matisse-wifi.dts b/arch/arm/boot/dts/qcom-apq8026-samsung-matisse-wifi.dts
> index 1c52337af560..859e91c16c61 100644
> --- a/arch/arm/boot/dts/qcom-apq8026-samsung-matisse-wifi.dts
> +++ b/arch/arm/boot/dts/qcom-apq8026-samsung-matisse-wifi.dts
> @@ -133,7 +133,8 @@ wcnss@d200000 {
>  			no-map;
>  		};
>  
> -		adsp@d900000 {
> +		/delete-node/ adsp@dc00000;
Please delete nodes by referencing the label like so:

/delete-node/ &adsp_region;

Konrad
> +		adsp_region: adsp@d900000 {
>  			reg = <0x0d900000 0x1800000>;
>  			no-map;
>  		};
> @@ -169,6 +170,10 @@ rmtfs@fd80000 {
>  	};
>  };
>  
> +&adsp {
> +	status = "okay";
> +};
> +
>  &blsp1_i2c2 {
>  	status = "okay";
>
Matti Lehtimäki Nov. 28, 2022, 5:01 p.m. UTC | #2 
On 28.11.2022 16.41, Konrad Dybcio wrote:
> 
> On 25.11.2022 23:34, Matti Lehtimäki wrote:
>> diff --git a/arch/arm/boot/dts/qcom-apq8026-samsung-matisse-wifi.dts b/arch/arm/boot/dts/qcom-apq8026-samsung-matisse-wifi.dts
>> index 1c52337af560..859e91c16c61 100644
>> --- a/arch/arm/boot/dts/qcom-apq8026-samsung-matisse-wifi.dts
>> +++ b/arch/arm/boot/dts/qcom-apq8026-samsung-matisse-wifi.dts
>> @@ -133,7 +133,8 @@ wcnss@d200000 {
>>   			no-map;
>>   		};
>>   
>> -		adsp@d900000 {
>> +		/delete-node/ adsp@dc00000;
> Please delete nodes by referencing the label like so:
> 
> /delete-node/ &adsp_region;

When I created the devicetree I was asked to do the opposite for the
smem_region [1] which I had originally deleted using the label near top 
of the
file but then moved next to the relevant node, where I cannot use label
when deleting it. Should the smem_region also be moved to the top of the
file if I move this delete-node there so the file would be consistent?

[1] 
https://lore.kernel.org/linux-arm-msm/CAA8EJpqUH_v1GXEYF62Z3DBtFu_305_h4D36aCnBr38bo5HoJw@mail.gmail.com/
Konrad Dybcio Nov. 28, 2022, 8:59 p.m. UTC | #3 
On 28.11.2022 18:01, Matti Lehtimäki wrote:
> On 28.11.2022 16.41, Konrad Dybcio wrote:
>>
>> On 25.11.2022 23:34, Matti Lehtimäki wrote:
>>> diff --git a/arch/arm/boot/dts/qcom-apq8026-samsung-matisse-wifi.dts b/arch/arm/boot/dts/qcom-apq8026-samsung-matisse-wifi.dts
>>> index 1c52337af560..859e91c16c61 100644
>>> --- a/arch/arm/boot/dts/qcom-apq8026-samsung-matisse-wifi.dts
>>> +++ b/arch/arm/boot/dts/qcom-apq8026-samsung-matisse-wifi.dts
>>> @@ -133,7 +133,8 @@ wcnss@d200000 {
>>>               no-map;
>>>           };
>>>   -        adsp@d900000 {
>>> +        /delete-node/ adsp@dc00000;
>> Please delete nodes by referencing the label like so:
>>
>> /delete-node/ &adsp_region;
> 
> When I created the devicetree I was asked to do the opposite for the
> smem_region [1] which I had originally deleted using the label near top of the
> file but then moved next to the relevant node, where I cannot use label
> when deleting it. Should the smem_region also be moved to the top of the
> file if I move this delete-node there so the file would be consistent?
In [1] you were asked to move the delete-node statement, not to alter
the argument. Referencing nodes by label is allowed globally in the DTS.
The removal should stay inside reserved-memory.

Konrad
> 
> [1] https://lore.kernel.org/linux-arm-msm/CAA8EJpqUH_v1GXEYF62Z3DBtFu_305_h4D36aCnBr38bo5HoJw@mail.gmail.com/
Luca Weiss Nov. 28, 2022, 9:06 p.m. UTC | #4 
On Montag, 28. November 2022 21:59:06 CET Konrad Dybcio wrote:
> On 28.11.2022 18:01, Matti Lehtimäki wrote:
> > On 28.11.2022 16.41, Konrad Dybcio wrote:
> >> On 25.11.2022 23:34, Matti Lehtimäki wrote:
> >>> diff --git a/arch/arm/boot/dts/qcom-apq8026-samsung-matisse-wifi.dts
> >>> b/arch/arm/boot/dts/qcom-apq8026-samsung-matisse-wifi.dts index
> >>> 1c52337af560..859e91c16c61 100644
> >>> --- a/arch/arm/boot/dts/qcom-apq8026-samsung-matisse-wifi.dts
> >>> +++ b/arch/arm/boot/dts/qcom-apq8026-samsung-matisse-wifi.dts
> >>> @@ -133,7 +133,8 @@ wcnss@d200000 {
> >>>               no-map;
> >>>           };
> >>>   -        adsp@d900000 {
> >>> +        /delete-node/ adsp@dc00000;
> >> 
> >> Please delete nodes by referencing the label like so:
> >> 
> >> /delete-node/ &adsp_region;
> > 
> > When I created the devicetree I was asked to do the opposite for the
> > smem_region [1] which I had originally deleted using the label near top of
> > the file but then moved next to the relevant node, where I cannot use
> > label when deleting it. Should the smem_region also be moved to the top
> > of the file if I move this delete-node there so the file would be
> > consistent?
> In [1] you were asked to move the delete-node statement, not to alter
> the argument. Referencing nodes by label is allowed globally in the DTS.
> The removal should stay inside reserved-memory.

Having e.g. this doesn't build, you get "syntax error" error

  reserved-memory {
      /delete-node/ &venus_region;
  };

Not sure exactly why, but that's the reason everything's outside of the root 
node if you use labels (don't ask me why labels lead to syntax error but 
specifying the name manually works)

> 
> Konrad
> 
> > [1]
> > https://lore.kernel.org/linux-arm-msm/CAA8EJpqUH_v1GXEYF62Z3DBtFu_305_h4D
> > 36aCnBr38bo5HoJw@mail.gmail.com/
Konrad Dybcio Nov. 28, 2022, 9:12 p.m. UTC | #5 
On 28.11.2022 22:06, Luca Weiss wrote:
> On Montag, 28. November 2022 21:59:06 CET Konrad Dybcio wrote:
>> On 28.11.2022 18:01, Matti Lehtimäki wrote:
>>> On 28.11.2022 16.41, Konrad Dybcio wrote:
>>>> On 25.11.2022 23:34, Matti Lehtimäki wrote:
>>>>> diff --git a/arch/arm/boot/dts/qcom-apq8026-samsung-matisse-wifi.dts
>>>>> b/arch/arm/boot/dts/qcom-apq8026-samsung-matisse-wifi.dts index
>>>>> 1c52337af560..859e91c16c61 100644
>>>>> --- a/arch/arm/boot/dts/qcom-apq8026-samsung-matisse-wifi.dts
>>>>> +++ b/arch/arm/boot/dts/qcom-apq8026-samsung-matisse-wifi.dts
>>>>> @@ -133,7 +133,8 @@ wcnss@d200000 {
>>>>>               no-map;
>>>>>           };
>>>>>   -        adsp@d900000 {
>>>>> +        /delete-node/ adsp@dc00000;
>>>>
>>>> Please delete nodes by referencing the label like so:
>>>>
>>>> /delete-node/ &adsp_region;
>>>
>>> When I created the devicetree I was asked to do the opposite for the
>>> smem_region [1] which I had originally deleted using the label near top of
>>> the file but then moved next to the relevant node, where I cannot use
>>> label when deleting it. Should the smem_region also be moved to the top
>>> of the file if I move this delete-node there so the file would be
>>> consistent?
>> In [1] you were asked to move the delete-node statement, not to alter
>> the argument. Referencing nodes by label is allowed globally in the DTS.
>> The removal should stay inside reserved-memory.
> 
> Having e.g. this doesn't build, you get "syntax error" error
> 
>   reserved-memory {
>       /delete-node/ &venus_region;
>   };
> 
> Not sure exactly why, but that's the reason everything's outside of the root 
> node if you use labels (don't ask me why labels lead to syntax error but 
> specifying the name manually works)
> 
Hm.. The DT spec does not seem to limit where this syntax should work..
Perhaps it's a bug in DTC then.

Unless it does and I simply don't see it.

Konrad
>>
>> Konrad
>>
>>> [1]
>>> https://lore.kernel.org/linux-arm-msm/CAA8EJpqUH_v1GXEYF62Z3DBtFu_305_h4D
>>> 36aCnBr38bo5HoJw@mail.gmail.com/
> 
> 
> 
>
diff mbox series

Patch

diff --git a/arch/arm/boot/dts/qcom-apq8026-samsung-matisse-wifi.dts b/arch/arm/boot/dts/qcom-apq8026-samsung-matisse-wifi.dts
index 1c52337af560..859e91c16c61 100644
--- a/arch/arm/boot/dts/qcom-apq8026-samsung-matisse-wifi.dts
+++ b/arch/arm/boot/dts/qcom-apq8026-samsung-matisse-wifi.dts
@@ -133,7 +133,8 @@  wcnss@d200000 {
 			no-map;
 		};
 
-		adsp@d900000 {
+		/delete-node/ adsp@dc00000;
+		adsp_region: adsp@d900000 {
 			reg = <0x0d900000 0x1800000>;
 			no-map;
 		};
@@ -169,6 +170,10 @@  rmtfs@fd80000 {
 	};
 };
 
+&adsp {
+	status = "okay";
+};
+
 &blsp1_i2c2 {
 	status = "okay";