| Message ID | 20240612132409.2477888-6-s-vadapalli@ti.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Add PCIe, SERDES and USB DT support for J722S | expand |
Hi Siddharth, On 12/06/2024 16:24, Siddharth Vadapalli wrote: > Since the MAIN domain peripherals specific to J722S SoC are present in the > "k3-j722s-main.dtsi" file, move the overrides for the MAIN domain from the > "k3-j722s.dtsi" file to the "k3-j722s-main.dtsi" file. Overrides is kind of a misnomer here. It looks like these are J722S specific changes. > > Signed-off-by: Siddharth Vadapalli <s-vadapalli@ti.com> > --- > This patch has been newly introduced in this series and doesn't have a > Changelog. > > arch/arm64/boot/dts/ti/k3-j722s-main.dtsi | 11 +++++++++++ > arch/arm64/boot/dts/ti/k3-j722s.dtsi | 11 ----------- > 2 files changed, 11 insertions(+), 11 deletions(-) > > diff --git a/arch/arm64/boot/dts/ti/k3-j722s-main.dtsi b/arch/arm64/boot/dts/ti/k3-j722s-main.dtsi > index 84378fc839d6..b75dab8230c2 100644 > --- a/arch/arm64/boot/dts/ti/k3-j722s-main.dtsi > +++ b/arch/arm64/boot/dts/ti/k3-j722s-main.dtsi > @@ -38,3 +38,14 @@ usb1: usb@31200000{ > }; > }; > }; > + > +/* MAIN domain overrides */ > + > +&inta_main_dmss { > + ti,interrupt-ranges = <7 71 21>; > +}; > + > +&oc_sram { > + reg = <0x00 0x70000000 0x00 0x40000>; > + ranges = <0x00 0x00 0x70000000 0x40000>; > +}; > diff --git a/arch/arm64/boot/dts/ti/k3-j722s.dtsi b/arch/arm64/boot/dts/ti/k3-j722s.dtsi > index 1bcbc9152ff0..14c6c6a332ef 100644 > --- a/arch/arm64/boot/dts/ti/k3-j722s.dtsi > +++ b/arch/arm64/boot/dts/ti/k3-j722s.dtsi > @@ -232,14 +232,3 @@ cbass_wakeup: bus@b00000 { > > /* Include J722S specific peripherals */ > #include "k3-j722s-main.dtsi" > - > -/* Main domain overrides */ > - > -&inta_main_dmss { > - ti,interrupt-ranges = <7 71 21>; > -}; > - > -&oc_sram { > - reg = <0x00 0x70000000 0x00 0x40000>; > - ranges = <0x00 0x00 0x70000000 0x40000>; > -}; These are originally set in k3-am62p-j722s-common-main.dtsi which cannot be as they are not common to both SoCs. Should we be moving the AM62 specific portion into k3-am62p-main.dtsi. So they are no longer overrides but SoC specific changes?
On Fri, Jun 14, 2024 at 12:53:37PM +0300, Roger Quadros wrote: > Hi Siddharth, [...] > > --- a/arch/arm64/boot/dts/ti/k3-j722s.dtsi > > +++ b/arch/arm64/boot/dts/ti/k3-j722s.dtsi > > @@ -232,14 +232,3 @@ cbass_wakeup: bus@b00000 { > > > > /* Include J722S specific peripherals */ > > #include "k3-j722s-main.dtsi" > > - > > -/* Main domain overrides */ > > - > > -&inta_main_dmss { > > - ti,interrupt-ranges = <7 71 21>; > > -}; > > - > > -&oc_sram { > > - reg = <0x00 0x70000000 0x00 0x40000>; > > - ranges = <0x00 0x00 0x70000000 0x40000>; > > -}; > These are originally set in k3-am62p-j722s-common-main.dtsi > which cannot be as they are not common to both SoCs. > > Should we be moving the AM62 specific portion into k3-am62p-main.dtsi. > > So they are no longer overrides but SoC specific changes? Roger, Thank you for reviewing the patch. I will remove the above properties within the respective nodes of k3-am62p-j722s-common-main.dtsi and add them to match the respective SoC in k3-{soc}-main.dtsi. Regards, Siddharth.
diff --git a/arch/arm64/boot/dts/ti/k3-j722s-main.dtsi b/arch/arm64/boot/dts/ti/k3-j722s-main.dtsi index 84378fc839d6..b75dab8230c2 100644 --- a/arch/arm64/boot/dts/ti/k3-j722s-main.dtsi +++ b/arch/arm64/boot/dts/ti/k3-j722s-main.dtsi @@ -38,3 +38,14 @@ usb1: usb@31200000{ }; }; }; + +/* MAIN domain overrides */ + +&inta_main_dmss { + ti,interrupt-ranges = <7 71 21>; +}; + +&oc_sram { + reg = <0x00 0x70000000 0x00 0x40000>; + ranges = <0x00 0x00 0x70000000 0x40000>; +}; diff --git a/arch/arm64/boot/dts/ti/k3-j722s.dtsi b/arch/arm64/boot/dts/ti/k3-j722s.dtsi index 1bcbc9152ff0..14c6c6a332ef 100644 --- a/arch/arm64/boot/dts/ti/k3-j722s.dtsi +++ b/arch/arm64/boot/dts/ti/k3-j722s.dtsi @@ -232,14 +232,3 @@ cbass_wakeup: bus@b00000 { /* Include J722S specific peripherals */ #include "k3-j722s-main.dtsi" - -/* Main domain overrides */ - -&inta_main_dmss { - ti,interrupt-ranges = <7 71 21>; -}; - -&oc_sram { - reg = <0x00 0x70000000 0x00 0x40000>; - ranges = <0x00 0x00 0x70000000 0x40000>; -};
Since the MAIN domain peripherals specific to J722S SoC are present in the "k3-j722s-main.dtsi" file, move the overrides for the MAIN domain from the "k3-j722s.dtsi" file to the "k3-j722s-main.dtsi" file. Signed-off-by: Siddharth Vadapalli <s-vadapalli@ti.com> --- This patch has been newly introduced in this series and doesn't have a Changelog. arch/arm64/boot/dts/ti/k3-j722s-main.dtsi | 11 +++++++++++ arch/arm64/boot/dts/ti/k3-j722s.dtsi | 11 ----------- 2 files changed, 11 insertions(+), 11 deletions(-)