| Message ID | 20240412-fix-secpwr-s4-v2-1-3802fd936d77@amlogic.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [v2] arm64: dts: meson: fix S4 power-controller node | expand |
On 12/04/2024 10:42, Xianwei Zhao via B4 Relay wrote: > From: Xianwei Zhao <xianwei.zhao@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@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@linaro.org>
Hi, On Fri, 12 Apr 2024 16:42:30 +0800, Xianwei Zhao wrote: > The power-controller module works well by adding its parent > node secure-monitor. > > Thanks, Applied to https://git.kernel.org/pub/scm/linux/kernel/git/amlogic/linux.git (v6.10/arm64-dt) [1/1] arm64: dts: meson: fix S4 power-controller node https://git.kernel.org/amlogic/c/72907de9051dc2aa7b55c2a020e2872184ac17cd These changes has been applied on the intermediate git tree [1]. The v6.10/arm64-dt branch will then be sent via a formal Pull Request to the Linux SoC maintainers for inclusion in their intermediate git branches in order to be sent to Linus during the next merge window, or sooner if it's a set of fixes. In the cases of fixes, those will be merged in the current release candidate kernel and as soon they appear on the Linux master branch they will be backported to the previous Stable and Long-Stable kernels [2]. The intermediate git branches are merged daily in the linux-next tree [3], people are encouraged testing these pre-release kernels and report issues on the relevant mailing-lists. If problems are discovered on those changes, please submit a signed-off-by revert patch followed by a corrective changeset. [1] https://git.kernel.org/pub/scm/linux/kernel/git/amlogic/linux.git [2] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git [3] https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git
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 {