On 06/06/24 13:04, Roger Quadros wrote: > > > On 06/06/2024 07:05, Vignesh Raghavendra wrote: >> >> >> On 04/06/24 14:22, Siddharth Vadapalli wrote: >>> Update "k3-j722s.dtsi" to use "k3-am62p-j722s-common.dtsi" which >>> contains the nodes shared with AM62P, followed by including the J722S >>> specific main domain peripherals contained in "k3-j722s-main.dtsi". >>> >>> Signed-off-by: Siddharth Vadapalli <s-vadapalli@xxxxxx> >>> --- >>> v4: >>> https://lore.kernel.org/r/20240601121554.2860403-5-s-vadapalli@xxxxxx/ >>> No changes since v4. >>> >>> arch/arm64/boot/dts/ti/k3-j722s.dtsi | 97 +++++++++++++++++++++++++++- >>> 1 file changed, 96 insertions(+), 1 deletion(-) >>> >>> diff --git a/arch/arm64/boot/dts/ti/k3-j722s.dtsi b/arch/arm64/boot/dts/ti/k3-j722s.dtsi >>> index c75744edb143..9e04e6a5c0fd 100644 >>> --- a/arch/arm64/boot/dts/ti/k3-j722s.dtsi >>> +++ b/arch/arm64/boot/dts/ti/k3-j722s.dtsi >>> @@ -10,12 +10,107 @@ >>> #include <dt-bindings/interrupt-controller/arm-gic.h> >>> #include <dt-bindings/soc/ti,sci_pm_domain.h> >>> >>> -#include "k3-am62p5.dtsi" >>> +#include "k3-am62p-j722s-common.dtsi" >>> +#include "k3-j722s-main.dtsi" >>> >>> / { >>> model = "Texas Instruments K3 J722S SoC"; >>> compatible = "ti,j722s"; >>> >>> + cpus { >>> + #address-cells = <1>; >>> + #size-cells = <0>; >>> + >>> + cpu-map { >>> + cluster0: cluster0 { >>> + core0 { >>> + cpu = <&cpu0>; >>> + }; >>> + >>> + core1 { >>> + cpu = <&cpu1>; >>> + }; >>> + >>> + core2 { >>> + cpu = <&cpu2>; >>> + }; >>> + >>> + core3 { >>> + cpu = <&cpu3>; >>> + }; >>> + }; >>> + }; >>> + >>> + cpu0: cpu@0 { >>> + compatible = "arm,cortex-a53"; >>> + reg = <0x000>; >>> + device_type = "cpu"; >>> + enable-method = "psci"; >>> + i-cache-size = <0x8000>; >>> + i-cache-line-size = <64>; >>> + i-cache-sets = <256>; >>> + d-cache-size = <0x8000>; >>> + d-cache-line-size = <64>; >>> + d-cache-sets = <128>; >>> + next-level-cache = <&l2_0>; >>> + clocks = <&k3_clks 135 0>; >>> + }; >>> + >>> + cpu1: cpu@1 { >>> + compatible = "arm,cortex-a53"; >>> + reg = <0x001>; >>> + device_type = "cpu"; >>> + enable-method = "psci"; >>> + i-cache-size = <0x8000>; >>> + i-cache-line-size = <64>; >>> + i-cache-sets = <256>; >>> + d-cache-size = <0x8000>; >>> + d-cache-line-size = <64>; >>> + d-cache-sets = <128>; >>> + next-level-cache = <&l2_0>; >>> + clocks = <&k3_clks 136 0>; >>> + }; >>> + >>> + cpu2: cpu@2 { >>> + compatible = "arm,cortex-a53"; >>> + reg = <0x002>; >>> + device_type = "cpu"; >>> + enable-method = "psci"; >>> + i-cache-size = <0x8000>; >>> + i-cache-line-size = <64>; >>> + i-cache-sets = <256>; >>> + d-cache-size = <0x8000>; >>> + d-cache-line-size = <64>; >>> + d-cache-sets = <128>; >>> + next-level-cache = <&l2_0>; >>> + clocks = <&k3_clks 137 0>; >>> + }; >>> + >>> + cpu3: cpu@3 { >>> + compatible = "arm,cortex-a53"; >>> + reg = <0x003>; >>> + device_type = "cpu"; >>> + enable-method = "psci"; >>> + i-cache-size = <0x8000>; >>> + i-cache-line-size = <64>; >>> + i-cache-sets = <256>; >>> + d-cache-size = <0x8000>; >>> + d-cache-line-size = <64>; >>> + d-cache-sets = <128>; >>> + next-level-cache = <&l2_0>; >>> + clocks = <&k3_clks 138 0>; >>> + }; >>> + }; >>> + >>> + l2_0: l2-cache0 { >>> + compatible = "cache"; >>> + cache-unified; >>> + cache-level = <2>; >>> + cache-size = <0x80000>; >>> + cache-line-size = <64>; >>> + cache-sets = <512>; >>> + }; >>> + >>> cbass_main: bus@f0000 { >>> compatible = "simple-bus"; >>> #address-cells = <2>; >> >> >> You would need to move the rest of main domain overrides and cbass_main >> definitions to k3-j722s-main.dtsi and limit this file to CPU definitions >> similar to k3-am62p5.dtsi > > Not exactly. > In existing cases there are 2 soc.dtsi files. e.g. k3-am62p.dtsi and k3-am62p5.dtsi. > or k3-am2.dtsi and k3-am625.dtsi. > > The former includes everything that is required for the SOC variant except the CPU, OPP and cache. > The later includes just the CPU, OPP and cache. > > I suppose this only makes sense if there are multiple variants of the SoC where only > the number of CPUs change. Would this be the case for J722S? Part numbers with different OPPs are expected besides difference in number of cores for J722s. > > If not then one soc.dtsi file should be sufficient. If yes then we need to have 2 soc.dtsi files > for J722S like the rest. > -- Regards Vignesh
