| From 1023f39b57220b2b495b32a8f8a768ce28a1c6f9 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Fri, 12 Apr 2024 16:42:30 +0800 |
| Subject: arm64: dts: meson: fix S4 power-controller node |
| |
| From: Xianwei Zhao <xianwei.zhao@amlogic.com> |
| |
| [ Upstream commit 72907de9051dc2aa7b55c2a020e2872184ac17cd ] |
| |
| 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@amlogic.com> |
| Reviewed-by: Neil Armstrong <neil.armstrong@linaro.org> |
| Link: https://lore.kernel.org/r/20240412-fix-secpwr-s4-v2-1-3802fd936d77@amlogic.com |
| Signed-off-by: Neil Armstrong <neil.armstrong@linaro.org> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| 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 ce90b35686a21..10896f9df682d 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 { |
| -- |
| 2.43.0 |
| |
