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

Neil Armstrong neil.armstrong at linaro.org
Fri Apr 12 06:05:17 PDT 2024


On 12/04/2024 10:42, Xianwei Zhao via B4 Relay wrote:
> From: Xianwei Zhao <xianwei.zhao at amlogic.com>
> 
> The power-controller module works well by adding its parent
> node secure-monitor.
> 
> Fixes: 085f7a298a14 ("arm64: dts: add support for S4 power domain controller")
> Signed-off-by: Xianwei Zhao <xianwei.zhao at amlogic.com>
> ---
> Changes in v2:
> - Add fixes tags in commit message.
> - Add firmware node to adapt documentation.
> - Link to v1: https://lore.kernel.org/r/20240408-fix-secpwr-s4-v1-1-01aa7ee72c52@amlogic.com
> ---
>   arch/arm64/boot/dts/amlogic/meson-s4.dtsi | 13 +++++++++----
>   1 file changed, 9 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..10896f9df682 100644
> --- a/arch/arm64/boot/dts/amlogic/meson-s4.dtsi
> +++ b/arch/arm64/boot/dts/amlogic/meson-s4.dtsi
> @@ -65,10 +65,15 @@ xtal: xtal-clk {
>   		#clock-cells = <0>;
>   	};
>   
> -	pwrc: power-controller {
> -		compatible = "amlogic,meson-s4-pwrc";
> -		#power-domain-cells = <1>;
> -		status = "okay";
> +	firmware {
> +		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,

Reviewed-by: Neil Armstrong <neil.armstrong at linaro.org>



More information about the linux-amlogic mailing list