| Message ID | 20240509-b4-upstream-j721s2-of-upstream-v2-4-149563cd4901@ti.com |
|---|---|
| State | Superseded |
| Delegated to: | Tom Rini |
| Headers | show |
| Series | Enable OF_UPSTREAM for J721s2 and AM68 | expand |
Hi Manorit On 09/05/24 15:23, Manorit Chawdhry wrote: > Create an SoC R5 dtsi file that could be used at board level R5 files. This > would help in keeping the SoC level changes in sync across board files. > > Signed-off-by: Manorit Chawdhry <m-chawdhry@ti.com> > --- > arch/arm/dts/k3-am68-sk-r5-base-board.dts | 78 +----------------------- > arch/arm/dts/k3-j721s2-r5-common-proc-board.dts | 78 +----------------------- > arch/arm/dts/k3-j721s2-r5.dtsi | 81 +++++++++++++++++++++++++ > board/ti/j721s2/MAINTAINERS | 1 + > 4 files changed, 84 insertions(+), 154 deletions(-) > > diff --git a/arch/arm/dts/k3-am68-sk-r5-base-board.dts b/arch/arm/dts/k3-am68-sk-r5-base-board.dts > index 038b08dc3e01..3b2d7af2e528 100644 > --- a/arch/arm/dts/k3-am68-sk-r5-base-board.dts > +++ b/arch/arm/dts/k3-am68-sk-r5-base-board.dts > @@ -9,80 +9,4 @@ > #include "k3-j721s2-ddr-evm-lp4-4266.dtsi" > #include "k3-j721s2-ddr.dtsi" > #include "k3-am68-sk-base-board-u-boot.dtsi" > - > -/ { > - chosen { > - tick-timer = &mcu_timer0; > - }; > - > - aliases { > - remoteproc0 = &sysctrler; > - remoteproc1 = &a72_0; > - }; > - > - a72_0: a72@0 { > - compatible = "ti,am654-rproc"; > - reg = <0x0 0x00a90000 0x0 0x10>; > - power-domains = <&k3_pds 61 TI_SCI_PD_EXCLUSIVE>, > - <&k3_pds 202 TI_SCI_PD_EXCLUSIVE>, > - <&k3_pds 4 TI_SCI_PD_EXCLUSIVE>; > - resets = <&k3_reset 202 0>; > - clocks = <&k3_clks 61 1>; > - assigned-clocks = <&k3_clks 61 1>, <&k3_clks 202 0>; > - assigned-clock-parents = <&k3_clks 61 2>; > - assigned-clock-rates = <200000000>, <2000000000>; > - ti,sci = <&sms>; > - ti,sci-proc-id = <32>; > - ti,sci-host-id = <10>; > - bootph-pre-ram; > - }; > - > - dm_tifs: dm-tifs { > - compatible = "ti,j721e-dm-sci"; > - ti,host-id = <3>; > - ti,secure-host; > - mbox-names = "rx", "tx"; > - mboxes= <&secure_proxy_mcu 21>, > - <&secure_proxy_mcu 23>; > - bootph-pre-ram; > - }; > -}; > - > -&mcu_timer0 { > - clock-frequency = <250000000>; > - bootph-pre-ram; > -}; > - > -&secure_proxy_mcu { > - bootph-pre-ram; > - status = "okay"; > -}; > - > -&secure_proxy_sa3 { > - bootph-pre-ram; > - status = "okay"; > -}; > - > -&cbass_mcu_wakeup { > - sysctrler: sysctrler { > - compatible = "ti,am654-system-controller"; > - mboxes= <&secure_proxy_mcu 4>, <&secure_proxy_mcu 5>, <&secure_proxy_sa3 5>; > - mbox-names = "tx", "rx", "boot_notify"; > - bootph-pre-ram; > - }; > -}; > - > -&sms { > - mboxes= <&secure_proxy_mcu 8>, <&secure_proxy_mcu 6>, <&secure_proxy_mcu 5>; > - mbox-names = "tx", "rx", "notify"; > - ti,host-id = <4>; > - ti,secure-host; > -}; > - > -&mcu_ringacc { > - ti,sci = <&dm_tifs>; > -}; > - > -&mcu_udmap { > - ti,sci = <&dm_tifs>; > -}; > +#include "k3-j721s2-r5.dtsi" > diff --git a/arch/arm/dts/k3-j721s2-r5-common-proc-board.dts b/arch/arm/dts/k3-j721s2-r5-common-proc-board.dts > index 03bd680f4421..e92b1917df4e 100644 > --- a/arch/arm/dts/k3-j721s2-r5-common-proc-board.dts > +++ b/arch/arm/dts/k3-j721s2-r5-common-proc-board.dts > @@ -9,80 +9,4 @@ > #include "k3-j721s2-ddr-evm-lp4-4266.dtsi" > #include "k3-j721s2-ddr.dtsi" > #include "k3-j721s2-common-proc-board-u-boot.dtsi" > - > -/ { > - chosen { > - tick-timer = &mcu_timer0; > - }; > - > - aliases { > - remoteproc0 = &sysctrler; > - remoteproc1 = &a72_0; > - }; > - > - a72_0: a72@0 { > - compatible = "ti,am654-rproc"; > - reg = <0x0 0x00a90000 0x0 0x10>; > - power-domains = <&k3_pds 61 TI_SCI_PD_EXCLUSIVE>, > - <&k3_pds 202 TI_SCI_PD_EXCLUSIVE>, > - <&k3_pds 4 TI_SCI_PD_EXCLUSIVE>; > - resets = <&k3_reset 202 0>; > - clocks = <&k3_clks 61 1>; > - assigned-clocks = <&k3_clks 61 1>, <&k3_clks 202 0>; > - assigned-clock-parents = <&k3_clks 61 2>; > - assigned-clock-rates = <200000000>, <2000000000>; > - ti,sci = <&sms>; > - ti,sci-proc-id = <32>; > - ti,sci-host-id = <10>; > - bootph-pre-ram; > - }; > - > - dm_tifs: dm-tifs { > - compatible = "ti,j721e-dm-sci"; > - ti,host-id = <3>; > - ti,secure-host; > - mbox-names = "rx", "tx"; > - mboxes= <&secure_proxy_mcu 21>, > - <&secure_proxy_mcu 23>; > - bootph-pre-ram; > - }; > -}; > - > -&mcu_timer0 { > - clock-frequency = <250000000>; > - bootph-pre-ram; > -}; > - > -&secure_proxy_sa3 { > - bootph-pre-ram; > - status = "okay"; > -}; > - > -&secure_proxy_mcu { > - bootph-pre-ram; > - status = "okay"; > -}; > - > -&cbass_mcu_wakeup { > - sysctrler: sysctrler { > - compatible = "ti,am654-system-controller"; > - mboxes= <&secure_proxy_mcu 4>, <&secure_proxy_mcu 5>, <&secure_proxy_sa3 5>; > - mbox-names = "tx", "rx", "boot_notify"; > - bootph-pre-ram; > - }; > -}; > - > -&sms { > - mboxes= <&secure_proxy_mcu 8>, <&secure_proxy_mcu 6>, <&secure_proxy_mcu 5>; > - mbox-names = "tx", "rx", "notify"; > - ti,host-id = <4>; > - ti,secure-host; > -}; > - > -&mcu_ringacc { > - ti,sci = <&dm_tifs>; > -}; > - > -&mcu_udmap { > - ti,sci = <&dm_tifs>; > -}; > +#include "k3-j721s2-r5.dtsi" > diff --git a/arch/arm/dts/k3-j721s2-r5.dtsi b/arch/arm/dts/k3-j721s2-r5.dtsi > new file mode 100644 > index 000000000000..eb0df42583a3 > --- /dev/null > +++ b/arch/arm/dts/k3-j721s2-r5.dtsi > @@ -0,0 +1,81 @@ > +// SPDX-License-Identifier: GPL-2.0 > +/* > + * Copyright (C) 2021-2024 Texas Instruments Incorporated - https://www.ti.com/ > + */ > + > +/ { > + chosen { > + tick-timer = &mcu_timer0; > + }; > + > + aliases { > + remoteproc0 = &sysctrler; > + remoteproc1 = &a72_0; > + }; > + > + a72_0: a72@0 { > + compatible = "ti,am654-rproc"; > + reg = <0x0 0x00a90000 0x0 0x10>; > + power-domains = <&k3_pds 61 TI_SCI_PD_EXCLUSIVE>, > + <&k3_pds 202 TI_SCI_PD_EXCLUSIVE>, > + <&k3_pds 4 TI_SCI_PD_EXCLUSIVE>; > + resets = <&k3_reset 202 0>; > + clocks = <&k3_clks 61 1>; > + assigned-clocks = <&k3_clks 61 1>, <&k3_clks 202 0>; > + assigned-clock-parents = <&k3_clks 61 2>; > + assigned-clock-rates = <200000000>, <2000000000>; > + ti,sci = <&sms>; > + ti,sci-proc-id = <32>; > + ti,sci-host-id = <10>; > + bootph-pre-ram; > + }; > + > + dm_tifs: dm-tifs { > + compatible = "ti,j721e-dm-sci"; > + ti,host-id = <3>; > + ti,secure-host; > + mbox-names = "rx", "tx"; > + mboxes= <&secure_proxy_mcu 21>, > + <&secure_proxy_mcu 23>; > + bootph-pre-ram; > + }; > +}; > + > +&mcu_timer0 { > + clock-frequency = <250000000>; > + bootph-pre-ram; > +}; > + > +&secure_proxy_sa3 { > + bootph-pre-ram; > + status = "okay"; > +}; > + > +&secure_proxy_mcu { > + bootph-pre-ram; > + status = "okay"; > +}; > + > +&cbass_mcu_wakeup { > + sysctrler: sysctrler { > + compatible = "ti,am654-system-controller"; > + mboxes= <&secure_proxy_mcu 4>, <&secure_proxy_mcu 5>, <&secure_proxy_sa3 5>; > + mbox-names = "tx", "rx", "boot_notify"; > + bootph-pre-ram; > + }; > +}; > + > +&sms { > + mboxes= <&secure_proxy_mcu 8>, <&secure_proxy_mcu 6>, <&secure_proxy_mcu 5>; > + mbox-names = "tx", "rx", "notify"; > + ti,host-id = <4>; > + ti,secure-host; > +}; > + > +&mcu_ringacc { > + ti,sci = <&dm_tifs>; > +}; > + > +&mcu_udmap { > + ti,sci = <&dm_tifs>; > +}; > diff --git a/board/ti/j721s2/MAINTAINERS b/board/ti/j721s2/MAINTAINERS > index 08c8d110ac0a..561c3dfff9bd 100644 > --- a/board/ti/j721s2/MAINTAINERS > +++ b/board/ti/j721s2/MAINTAINERS > @@ -14,6 +14,7 @@ F: arch/arm/dts/k3-j721s2-thermal.dtsi > F: arch/arm/dts/k3-j721s2-som-p0.dtsi > F: arch/arm/dts/k3-j721s2-common-proc-board.dts > F: arch/arm/dts/k3-j721s2-common-proc-board-u-boot.dtsi > +F: arch/arm/dts/k3-j721s2-r5.dtsi > F: arch/arm/dts/k3-j721s2-r5-common-proc-board.dts > F: arch/arm/dts/k3-j721s2-ddr.dtsi > F: arch/arm/dts/k3-j721s2-ddr-evm-lp4-4266.dtsi > Reviewed-by: Neha Malcom Francis <n-francis@ti.com>
diff --git a/arch/arm/dts/k3-am68-sk-r5-base-board.dts b/arch/arm/dts/k3-am68-sk-r5-base-board.dts index 038b08dc3e01..3b2d7af2e528 100644 --- a/arch/arm/dts/k3-am68-sk-r5-base-board.dts +++ b/arch/arm/dts/k3-am68-sk-r5-base-board.dts @@ -9,80 +9,4 @@ #include "k3-j721s2-ddr-evm-lp4-4266.dtsi" #include "k3-j721s2-ddr.dtsi" #include "k3-am68-sk-base-board-u-boot.dtsi" - -/ { - chosen { - tick-timer = &mcu_timer0; - }; - - aliases { - remoteproc0 = &sysctrler; - remoteproc1 = &a72_0; - }; - - a72_0: a72@0 { - compatible = "ti,am654-rproc"; - reg = <0x0 0x00a90000 0x0 0x10>; - power-domains = <&k3_pds 61 TI_SCI_PD_EXCLUSIVE>, - <&k3_pds 202 TI_SCI_PD_EXCLUSIVE>, - <&k3_pds 4 TI_SCI_PD_EXCLUSIVE>; - resets = <&k3_reset 202 0>; - clocks = <&k3_clks 61 1>; - assigned-clocks = <&k3_clks 61 1>, <&k3_clks 202 0>; - assigned-clock-parents = <&k3_clks 61 2>; - assigned-clock-rates = <200000000>, <2000000000>; - ti,sci = <&sms>; - ti,sci-proc-id = <32>; - ti,sci-host-id = <10>; - bootph-pre-ram; - }; - - dm_tifs: dm-tifs { - compatible = "ti,j721e-dm-sci"; - ti,host-id = <3>; - ti,secure-host; - mbox-names = "rx", "tx"; - mboxes= <&secure_proxy_mcu 21>, - <&secure_proxy_mcu 23>; - bootph-pre-ram; - }; -}; - -&mcu_timer0 { - clock-frequency = <250000000>; - bootph-pre-ram; -}; - -&secure_proxy_mcu { - bootph-pre-ram; - status = "okay"; -}; - -&secure_proxy_sa3 { - bootph-pre-ram; - status = "okay"; -}; - -&cbass_mcu_wakeup { - sysctrler: sysctrler { - compatible = "ti,am654-system-controller"; - mboxes= <&secure_proxy_mcu 4>, <&secure_proxy_mcu 5>, <&secure_proxy_sa3 5>; - mbox-names = "tx", "rx", "boot_notify"; - bootph-pre-ram; - }; -}; - -&sms { - mboxes= <&secure_proxy_mcu 8>, <&secure_proxy_mcu 6>, <&secure_proxy_mcu 5>; - mbox-names = "tx", "rx", "notify"; - ti,host-id = <4>; - ti,secure-host; -}; - -&mcu_ringacc { - ti,sci = <&dm_tifs>; -}; - -&mcu_udmap { - ti,sci = <&dm_tifs>; -}; +#include "k3-j721s2-r5.dtsi" diff --git a/arch/arm/dts/k3-j721s2-r5-common-proc-board.dts b/arch/arm/dts/k3-j721s2-r5-common-proc-board.dts index 03bd680f4421..e92b1917df4e 100644 --- a/arch/arm/dts/k3-j721s2-r5-common-proc-board.dts +++ b/arch/arm/dts/k3-j721s2-r5-common-proc-board.dts @@ -9,80 +9,4 @@ #include "k3-j721s2-ddr-evm-lp4-4266.dtsi" #include "k3-j721s2-ddr.dtsi" #include "k3-j721s2-common-proc-board-u-boot.dtsi" - -/ { - chosen { - tick-timer = &mcu_timer0; - }; - - aliases { - remoteproc0 = &sysctrler; - remoteproc1 = &a72_0; - }; - - a72_0: a72@0 { - compatible = "ti,am654-rproc"; - reg = <0x0 0x00a90000 0x0 0x10>; - power-domains = <&k3_pds 61 TI_SCI_PD_EXCLUSIVE>, - <&k3_pds 202 TI_SCI_PD_EXCLUSIVE>, - <&k3_pds 4 TI_SCI_PD_EXCLUSIVE>; - resets = <&k3_reset 202 0>; - clocks = <&k3_clks 61 1>; - assigned-clocks = <&k3_clks 61 1>, <&k3_clks 202 0>; - assigned-clock-parents = <&k3_clks 61 2>; - assigned-clock-rates = <200000000>, <2000000000>; - ti,sci = <&sms>; - ti,sci-proc-id = <32>; - ti,sci-host-id = <10>; - bootph-pre-ram; - }; - - dm_tifs: dm-tifs { - compatible = "ti,j721e-dm-sci"; - ti,host-id = <3>; - ti,secure-host; - mbox-names = "rx", "tx"; - mboxes= <&secure_proxy_mcu 21>, - <&secure_proxy_mcu 23>; - bootph-pre-ram; - }; -}; - -&mcu_timer0 { - clock-frequency = <250000000>; - bootph-pre-ram; -}; - -&secure_proxy_sa3 { - bootph-pre-ram; - status = "okay"; -}; - -&secure_proxy_mcu { - bootph-pre-ram; - status = "okay"; -}; - -&cbass_mcu_wakeup { - sysctrler: sysctrler { - compatible = "ti,am654-system-controller"; - mboxes= <&secure_proxy_mcu 4>, <&secure_proxy_mcu 5>, <&secure_proxy_sa3 5>; - mbox-names = "tx", "rx", "boot_notify"; - bootph-pre-ram; - }; -}; - -&sms { - mboxes= <&secure_proxy_mcu 8>, <&secure_proxy_mcu 6>, <&secure_proxy_mcu 5>; - mbox-names = "tx", "rx", "notify"; - ti,host-id = <4>; - ti,secure-host; -}; - -&mcu_ringacc { - ti,sci = <&dm_tifs>; -}; - -&mcu_udmap { - ti,sci = <&dm_tifs>; -}; +#include "k3-j721s2-r5.dtsi" diff --git a/arch/arm/dts/k3-j721s2-r5.dtsi b/arch/arm/dts/k3-j721s2-r5.dtsi new file mode 100644 index 000000000000..eb0df42583a3 --- /dev/null +++ b/arch/arm/dts/k3-j721s2-r5.dtsi @@ -0,0 +1,81 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Copyright (C) 2021-2024 Texas Instruments Incorporated - https://www.ti.com/ + */ + +/ { + chosen { + tick-timer = &mcu_timer0; + }; + + aliases { + remoteproc0 = &sysctrler; + remoteproc1 = &a72_0; + }; + + a72_0: a72@0 { + compatible = "ti,am654-rproc"; + reg = <0x0 0x00a90000 0x0 0x10>; + power-domains = <&k3_pds 61 TI_SCI_PD_EXCLUSIVE>, + <&k3_pds 202 TI_SCI_PD_EXCLUSIVE>, + <&k3_pds 4 TI_SCI_PD_EXCLUSIVE>; + resets = <&k3_reset 202 0>; + clocks = <&k3_clks 61 1>; + assigned-clocks = <&k3_clks 61 1>, <&k3_clks 202 0>; + assigned-clock-parents = <&k3_clks 61 2>; + assigned-clock-rates = <200000000>, <2000000000>; + ti,sci = <&sms>; + ti,sci-proc-id = <32>; + ti,sci-host-id = <10>; + bootph-pre-ram; + }; + + dm_tifs: dm-tifs { + compatible = "ti,j721e-dm-sci"; + ti,host-id = <3>; + ti,secure-host; + mbox-names = "rx", "tx"; + mboxes= <&secure_proxy_mcu 21>, + <&secure_proxy_mcu 23>; + bootph-pre-ram; + }; +}; + +&mcu_timer0 { + clock-frequency = <250000000>; + bootph-pre-ram; +}; + +&secure_proxy_sa3 { + bootph-pre-ram; + status = "okay"; +}; + +&secure_proxy_mcu { + bootph-pre-ram; + status = "okay"; +}; + +&cbass_mcu_wakeup { + sysctrler: sysctrler { + compatible = "ti,am654-system-controller"; + mboxes= <&secure_proxy_mcu 4>, <&secure_proxy_mcu 5>, <&secure_proxy_sa3 5>; + mbox-names = "tx", "rx", "boot_notify"; + bootph-pre-ram; + }; +}; + +&sms { + mboxes= <&secure_proxy_mcu 8>, <&secure_proxy_mcu 6>, <&secure_proxy_mcu 5>; + mbox-names = "tx", "rx", "notify"; + ti,host-id = <4>; + ti,secure-host; +}; + +&mcu_ringacc { + ti,sci = <&dm_tifs>; +}; + +&mcu_udmap { + ti,sci = <&dm_tifs>; +}; diff --git a/board/ti/j721s2/MAINTAINERS b/board/ti/j721s2/MAINTAINERS index 08c8d110ac0a..561c3dfff9bd 100644 --- a/board/ti/j721s2/MAINTAINERS +++ b/board/ti/j721s2/MAINTAINERS @@ -14,6 +14,7 @@ F: arch/arm/dts/k3-j721s2-thermal.dtsi F: arch/arm/dts/k3-j721s2-som-p0.dtsi F: arch/arm/dts/k3-j721s2-common-proc-board.dts F: arch/arm/dts/k3-j721s2-common-proc-board-u-boot.dtsi +F: arch/arm/dts/k3-j721s2-r5.dtsi F: arch/arm/dts/k3-j721s2-r5-common-proc-board.dts F: arch/arm/dts/k3-j721s2-ddr.dtsi F: arch/arm/dts/k3-j721s2-ddr-evm-lp4-4266.dtsi
Create an SoC R5 dtsi file that could be used at board level R5 files. This would help in keeping the SoC level changes in sync across board files. Signed-off-by: Manorit Chawdhry <m-chawdhry@ti.com> --- arch/arm/dts/k3-am68-sk-r5-base-board.dts | 78 +----------------------- arch/arm/dts/k3-j721s2-r5-common-proc-board.dts | 78 +----------------------- arch/arm/dts/k3-j721s2-r5.dtsi | 81 +++++++++++++++++++++++++ board/ti/j721s2/MAINTAINERS | 1 + 4 files changed, 84 insertions(+), 154 deletions(-)