arm64: dts: ti: Fix the number of common watchdog instances between J784S4 and J742S2
Subsystems (2)
PATCH v3 1/1 arm64: dts: ti: Fix the number of common watchdog instances between J784S4 and J742S2
Each A72 core has one watchdog instance associated with it. Since J742S2 has 4 A72 cores, it is incorrect to have 8 watchdog instances in the j742s2-j784s4 common file.
Remove the last 4 extra watchdogs from the common file and add them only for J784S4 which has 8 A72 cores and thus 8 watchdog instances associated with them.
---
Changes in v3:
- Improve the commit description and subject.
- Link to v2: https://lore.kernel.org/all/[email protected]/
Changes in v2:
- Added fixes tag in the commit message.
- Link to v1: https://lore.kernel.org/all/[email protected]/T/#u
.../dts/ti/k3-j784s4-j742s2-main-common.dtsi | 36 ------------------- arch/arm64/boot/dts/ti/k3-j784s4-main.dtsi | 36 +++++++++++++++++++ 2 files changed, 36 insertions(+), 36 deletions(-)
arch/arm64/boot/dts/ti/k3-j784s4-j742s2-main-common.dtsi +0 -36
@@ -2378,42 +2378,6 @@ watchdog3: watchdog@2230000 { assigned-clock-parents = <&k3_clks 351 4>; }; - watchdog4: watchdog@2240000 { - compatible = "ti,j7-rti-wdt"; - reg = <0x00 0x2240000 0x00 0x100>; - clocks = <&k3_clks 352 0>; - power-domains = <&k3_pds 352 TI_SCI_PD_EXCLUSIVE>; - assigned-clocks = <&k3_clks 352 0>; - assigned-clock-parents = <&k3_clks 352 4>; - }; - - watchdog5: watchdog@2250000 { - compatible = "ti,j7-rti-wdt"; - reg = <0x00 0x2250000 0x00 0x100>; - clocks = <&k3_clks 353 0>; - power-domains = <&k3_pds 353 TI_SCI_PD_EXCLUSIVE>; - assigned-clocks = <&k3_clks 353 0>; - assigned-clock-parents = <&k3_clks 353 4>; - }; - - watchdog6: watchdog@2260000 { - compatible = "ti,j7-rti-wdt"; - reg = <0x00 0x2260000 0x00 0x100>; - clocks = <&k3_clks 354 0>; - power-domains = <&k3_pds 354 TI_SCI_PD_EXCLUSIVE>; - assigned-clocks = <&k3_clks 354 0>; - assigned-clock-parents = <&k3_clks 354 4>; - }; - - watchdog7: watchdog@2270000 { - compatible = "ti,j7-rti-wdt"; - reg = <0x00 0x2270000 0x00 0x100>; - clocks = <&k3_clks 355 0>; - power-domains = <&k3_pds 355 TI_SCI_PD_EXCLUSIVE>; - assigned-clocks = <&k3_clks 355 0>; - assigned-clock-parents = <&k3_clks 355 4>; - }; - /* * The following RTI instances are coupled with MCU R5Fs, c7x and * GPU so keeping them reserved as these will be used by their
arch/arm64/boot/dts/ti/k3-j784s4-main.dtsi +36 -0
@@ -113,6 +113,42 @@ serdes2: serdes@5020000 { status = "disabled"; }; }; + + watchdog4: watchdog@2240000 { + compatible = "ti,j7-rti-wdt"; + reg = <0x00 0x2240000 0x00 0x100>; + clocks = <&k3_clks 352 0>; + power-domains = <&k3_pds 352 TI_SCI_PD_EXCLUSIVE>; + assigned-clocks = <&k3_clks 352 0>; + assigned-clock-parents = <&k3_clks 352 4>; + }; + + watchdog5: watchdog@2250000 { + compatible = "ti,j7-rti-wdt"; + reg = <0x00 0x2250000 0x00 0x100>; + clocks = <&k3_clks 353 0>; + power-domains = <&k3_pds 353 TI_SCI_PD_EXCLUSIVE>; + assigned-clocks = <&k3_clks 353 0>; + assigned-clock-parents = <&k3_clks 353 4>; + }; + + watchdog6: watchdog@2260000 { + compatible = "ti,j7-rti-wdt"; + reg = <0x00 0x2260000 0x00 0x100>; + clocks = <&k3_clks 354 0>; + power-domains = <&k3_pds 354 TI_SCI_PD_EXCLUSIVE>; + assigned-clocks = <&k3_clks 354 0>; + assigned-clock-parents = <&k3_clks 354 4>; + }; + + watchdog7: watchdog@2270000 { + compatible = "ti,j7-rti-wdt"; + reg = <0x00 0x2270000 0x00 0x100>; + clocks = <&k3_clks 355 0>; + power-domains = <&k3_pds 355 TI_SCI_PD_EXCLUSIVE>; + assigned-clocks = <&k3_clks 355 0>; + assigned-clock-parents = <&k3_clks 355 4>; + }; }; &scm_conf {
Signature · 1 line
2.34.1
Nishanth Menon
maintainerFew suggestions:
$subject
arm64: dts: ti: k3-j784s4-j742s2-main-common.dtsi: Refactor watchdog instances for j784s4
Quoted 3 lines · Abhash Kumar Jha
Each A72 core has one watchdog instance associated with it. Since J742S2 has 4 A72 cores, it is incorrect to have 8 watchdog instances in the j742s2-j784s4 common file.
Each A72 core has one watchdog instance associated with it. Since J742S2 has 4 A72 cores, the common file should not define 8 watchdog instances.
Quoted 4 lines
Remove the last 4 extra watchdogs from the common file and add them only for J784S4 which has 8 A72 cores and thus 8 watchdog instances associated with them.
Refactor the last 4 watchdogs from the common file to J784S4-specific file, as J784S4 has 8 A72 cores and thus hardware definition requires 8 watchdog instances.
Additionally, if there is user-visible breakage seen on j742s2, will be good to mention that as well.
Quoted 4 lines
Fixes 9cc161a4509c ("arm64: dts: ti: Refactor J784s4 SoC files to a common file")Signed-off-by Abhash Kumar Jha <[email protected]>---
[...]
Signature · 4 lines
Regards, Nishanth Menon Key (0xDDB5849D1736249D) / Fingerprint: F8A2 8693 54EB 8232 17A3 1A34 DDB5 849D 1736 249D https://ti.com/opensource