Subject: [PATCH] arm64: dts: meson: fix S4 power-controller node

From: Xianwei Zhao <[email protected]>

The power-controller module works well by adding its parent
node secure-monitor.

Signed-off-by: Xianwei Zhao <[email protected]>
---
arch/arm64/boot/dts/amlogic/meson-s4.dtsi | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/arch/arm64/boot/dts/amlogic/meson-s4.dtsi b/arch/arm64/boot/dts/amlogic/meson-s4.dtsi
index ce90b35686a2..24d00dce4969 100644
--- a/arch/arm64/boot/dts/amlogic/meson-s4.dtsi
+++ b/arch/arm64/boot/dts/amlogic/meson-s4.dtsi
@@ -65,10 +65,13 @@ xtal: xtal-clk {
#clock-cells = <0>;
};

- pwrc: power-controller {
- compatible = "amlogic,meson-s4-pwrc";
- #power-domain-cells = <1>;
- status = "okay";
+ sm: secure-monitor {
+ compatible = "amlogic,meson-gxbb-sm";
+
+ pwrc: power-controller {
+ compatible = "amlogic,meson-s4-pwrc";
+ #power-domain-cells = <1>;
+ };
};

soc {

---
base-commit: 4cece764965020c22cff7665b18a012006359095
change-id: 20240408-fix-secpwr-s4-a99ff960d0ae

Best regards,
--
Xianwei Zhao <[email protected]>




2024-04-08 17:28:18

by Martin Blumenstingl

[permalink] [raw]
Subject: Re: [PATCH] arm64: dts: meson: fix S4 power-controller node

On Mon, Apr 8, 2024 at 5:26 AM Xianwei Zhao via B4 Relay
<[email protected]> wrote:
>
> From: Xianwei Zhao <[email protected]>
>
> The power-controller module works well by adding its parent
> node secure-monitor.
>

Please add a Fixes tag here with the original commit where the
incorrectly placed node was added.
> Signed-off-by: Xianwei Zhao <[email protected]>
> ---
> arch/arm64/boot/dts/amlogic/meson-s4.dtsi | 11 +++++++----
> 1 file changed, 7 insertions(+), 4 deletions(-)
>
> diff --git a/arch/arm64/boot/dts/amlogic/meson-s4.dtsi b/arch/arm64/boot/dts/amlogic/meson-s4.dtsi
> index ce90b35686a2..24d00dce4969 100644
> --- a/arch/arm64/boot/dts/amlogic/meson-s4.dtsi
> +++ b/arch/arm64/boot/dts/amlogic/meson-s4.dtsi
> @@ -65,10 +65,13 @@ xtal: xtal-clk {
> #clock-cells = <0>;
> };
>
> - pwrc: power-controller {
> - compatible = "amlogic,meson-s4-pwrc";
> - #power-domain-cells = <1>;
> - status = "okay";
> + sm: secure-monitor {
> + compatible = "amlogic,meson-gxbb-sm";
> +
> + pwrc: power-controller {
> + compatible = "amlogic,meson-s4-pwrc";
> + #power-domain-cells = <1>;
> + };
In Documentation/devicetree/bindings/firmware/amlogic,meson-gxbb-sm.yaml
the hierarchy is:
firmware {
secure-monitor {
power-controller {
...
}
}
}

Is this patch correct (and the documentation needs to be adapted) or
is the documentation correct (and this patch has to be adapted)?

2024-04-09 08:24:12

by Xianwei Zhao

[permalink] [raw]
Subject: Re: [PATCH] arm64: dts: meson: fix S4 power-controller node

Hi Martin,
Thanks for your review.

On 2024/4/9 01:27, Martin Blumenstingl wrote:
> [ EXTERNAL EMAIL ]
>
> On Mon, Apr 8, 2024 at 5:26 AM Xianwei Zhao via B4 Relay
> <[email protected]> wrote:
>>
>> From: Xianwei Zhao <[email protected]>
>>
>> The power-controller module works well by adding its parent
>> node secure-monitor.
>>
>
> Please add a Fixes tag here with the original commit where the
> incorrectly placed node was added.

Will add Fixes tag.

>> Signed-off-by: Xianwei Zhao <[email protected]>
>> ---
>> arch/arm64/boot/dts/amlogic/meson-s4.dtsi | 11 +++++++----
>> 1 file changed, 7 insertions(+), 4 deletions(-)
>>
>> diff --git a/arch/arm64/boot/dts/amlogic/meson-s4.dtsi b/arch/arm64/boot/dts/amlogic/meson-s4.dtsi
>> index ce90b35686a2..24d00dce4969 100644
>> --- a/arch/arm64/boot/dts/amlogic/meson-s4.dtsi
>> +++ b/arch/arm64/boot/dts/amlogic/meson-s4.dtsi
>> @@ -65,10 +65,13 @@ xtal: xtal-clk {
>> #clock-cells = <0>;
>> };
>>
>> - pwrc: power-controller {
>> - compatible = "amlogic,meson-s4-pwrc";
>> - #power-domain-cells = <1>;
>> - status = "okay";
>> + sm: secure-monitor {
>> + compatible = "amlogic,meson-gxbb-sm";
>> +
>> + pwrc: power-controller {
>> + compatible = "amlogic,meson-s4-pwrc";
>> + #power-domain-cells = <1>;
>> + };
> In Documentation/devicetree/bindings/firmware/amlogic,meson-gxbb-sm.yaml
> the hierarchy is:
> firmware {
> secure-monitor {
> power-controller {
> ...
> }
> }
> }
>
> Is this patch correct (and the documentation needs to be adapted) or
> is the documentation correct (and this patch has to be adapted)?

Will add firmware node to adapt documentation.