| Message ID | 20231122125643.1717160-6-adeep@lexina.in (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | soc: amlogic: add new meson-gx-socinfo-sm driver | expand |
Hello Viacheslav, On Wed, Nov 22, 2023 at 03:56:43PM +0300, Viacheslav Bocharov wrote: > Add links to secure-monitor in soc driver section for A1, AXG, GX, G12 > Amlogic family. > > Signed-off-by: Viacheslav Bocharov <adeep@lexina.in> > --- > arch/arm64/boot/dts/amlogic/meson-a1.dtsi | 1 + > arch/arm64/boot/dts/amlogic/meson-axg.dtsi | 1 + > arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi | 1 + > arch/arm64/boot/dts/amlogic/meson-gx.dtsi | 1 + > 4 files changed, 4 insertions(+) > > diff --git a/arch/arm64/boot/dts/amlogic/meson-a1.dtsi b/arch/arm64/boot/dts/amlogic/meson-a1.dtsi > index 648e7f49424f..449b328d62b1 100644 > --- a/arch/arm64/boot/dts/amlogic/meson-a1.dtsi > +++ b/arch/arm64/boot/dts/amlogic/meson-a1.dtsi > @@ -407,6 +407,7 @@ hwrng: rng@5118 { > sec_AO: ao-secure@5a20 { > compatible = "amlogic,meson-gx-ao-secure", "syscon"; > reg = <0x0 0x5a20 0x0 0x140>; > + secure-monitor = <&sm>; I suppose it's better and more consistent to use the same hierarchy pattern as Secure PWRC uses: to be a child of Secure Monitor. Please see the example below from meson-a1.dtsi: sm: secure-monitor { compatible = "amlogic,meson-gxbb-sm"; pwrc: power-controller { compatible = "amlogic,meson-a1-pwrc"; #power-domain-cells = <1>; }; }; > amlogic,has-chip-id; > }; > > diff --git a/arch/arm64/boot/dts/amlogic/meson-axg.dtsi b/arch/arm64/boot/dts/amlogic/meson-axg.dtsi > index a49aa62e3f9f..6e80bdc525e5 100644 > --- a/arch/arm64/boot/dts/amlogic/meson-axg.dtsi > +++ b/arch/arm64/boot/dts/amlogic/meson-axg.dtsi > @@ -1660,6 +1660,7 @@ mux { > sec_AO: ao-secure@140 { > compatible = "amlogic,meson-gx-ao-secure", "syscon"; > reg = <0x0 0x140 0x0 0x140>; > + secure-monitor = <&sm>; > amlogic,has-chip-id; > }; > > diff --git a/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi > index ff68b911b729..0a6b703b0dc0 100644 > --- a/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi > +++ b/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi > @@ -2026,6 +2026,7 @@ cec_AO: cec@100 { > sec_AO: ao-secure@140 { > compatible = "amlogic,meson-gx-ao-secure", "syscon"; > reg = <0x0 0x140 0x0 0x140>; > + secure-monitor = <&sm>; > amlogic,has-chip-id; > }; > > diff --git a/arch/arm64/boot/dts/amlogic/meson-gx.dtsi b/arch/arm64/boot/dts/amlogic/meson-gx.dtsi > index 2673f0dbafe7..656e08b3d872 100644 > --- a/arch/arm64/boot/dts/amlogic/meson-gx.dtsi > +++ b/arch/arm64/boot/dts/amlogic/meson-gx.dtsi > @@ -471,6 +471,7 @@ cec_AO: cec@100 { > sec_AO: ao-secure@140 { > compatible = "amlogic,meson-gx-ao-secure", "syscon"; > reg = <0x0 0x140 0x0 0x140>; > + secure-monitor = <&sm>; > amlogic,has-chip-id; > }; > > -- > 2.34.1 > > > _______________________________________________ > linux-amlogic mailing list > linux-amlogic@lists.infradead.org > http://lists.infradead.org/mailman/listinfo/linux-amlogic
diff --git a/arch/arm64/boot/dts/amlogic/meson-a1.dtsi b/arch/arm64/boot/dts/amlogic/meson-a1.dtsi index 648e7f49424f..449b328d62b1 100644 --- a/arch/arm64/boot/dts/amlogic/meson-a1.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-a1.dtsi @@ -407,6 +407,7 @@ hwrng: rng@5118 { sec_AO: ao-secure@5a20 { compatible = "amlogic,meson-gx-ao-secure", "syscon"; reg = <0x0 0x5a20 0x0 0x140>; + secure-monitor = <&sm>; amlogic,has-chip-id; }; diff --git a/arch/arm64/boot/dts/amlogic/meson-axg.dtsi b/arch/arm64/boot/dts/amlogic/meson-axg.dtsi index a49aa62e3f9f..6e80bdc525e5 100644 --- a/arch/arm64/boot/dts/amlogic/meson-axg.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-axg.dtsi @@ -1660,6 +1660,7 @@ mux { sec_AO: ao-secure@140 { compatible = "amlogic,meson-gx-ao-secure", "syscon"; reg = <0x0 0x140 0x0 0x140>; + secure-monitor = <&sm>; amlogic,has-chip-id; }; diff --git a/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi index ff68b911b729..0a6b703b0dc0 100644 --- a/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi @@ -2026,6 +2026,7 @@ cec_AO: cec@100 { sec_AO: ao-secure@140 { compatible = "amlogic,meson-gx-ao-secure", "syscon"; reg = <0x0 0x140 0x0 0x140>; + secure-monitor = <&sm>; amlogic,has-chip-id; }; diff --git a/arch/arm64/boot/dts/amlogic/meson-gx.dtsi b/arch/arm64/boot/dts/amlogic/meson-gx.dtsi index 2673f0dbafe7..656e08b3d872 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gx.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-gx.dtsi @@ -471,6 +471,7 @@ cec_AO: cec@100 { sec_AO: ao-secure@140 { compatible = "amlogic,meson-gx-ao-secure", "syscon"; reg = <0x0 0x140 0x0 0x140>; + secure-monitor = <&sm>; amlogic,has-chip-id; };
Add links to secure-monitor in soc driver section for A1, AXG, GX, G12 Amlogic family. Signed-off-by: Viacheslav Bocharov <adeep@lexina.in> --- arch/arm64/boot/dts/amlogic/meson-a1.dtsi | 1 + arch/arm64/boot/dts/amlogic/meson-axg.dtsi | 1 + arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi | 1 + arch/arm64/boot/dts/amlogic/meson-gx.dtsi | 1 + 4 files changed, 4 insertions(+)