J722s: s2r: use ti,j7200-padconf
Subsystems (2)
v2 cover J722s: s2r: use ti,j7200-padconf
The pinctrl contexts for j722s should be saved and restored during suspend-to-ram, just like it is done for j7200 and j784s4 SoCs.
The first patch adds the ti,j7200-padconf compatible, and the next 2 patches introduce k3-j722s-mcu.dtsi and k3-j722s-wakeup.dtsi, preventing using k3-j722s-main.dtsi for something else than main domain peripherals.
Changes from v1:
- Add ti,j7200-padconf at SoC level instead of board level.
- create k3-j722s-mcu.dtsi and k3-j722s-wakeup.dtsi for mcu/wakeup domain peripherals.
- Link to v1: https://lore.kernel.org/lkml/[email protected]/
Abhash Kumar Jha (1):
arm64: dts: ti: k3-j722s: Use ti,j7200-padconf compatible
Richard Genoud (TI) (2):
arm64: dts: ti: k3-j722s: Add mcu domain peripherals specific to J722S
arm64: dts: ti: k3-j722s: Add wakeup domain peripherals specific to
J722S
arch/arm64/boot/dts/ti/k3-j722s-main.dtsi | 24 ++++----------------- arch/arm64/boot/dts/ti/k3-j722s-mcu.dtsi | 15 +++++++++++++ arch/arm64/boot/dts/ti/k3-j722s-wakeup.dtsi | 18 ++++++++++++++++ arch/arm64/boot/dts/ti/k3-j722s.dtsi | 2 ++ 4 files changed, 39 insertions(+), 20 deletions(-) create mode 100644 arch/arm64/boot/dts/ti/k3-j722s-mcu.dtsi create mode 100644 arch/arm64/boot/dts/ti/k3-j722s-wakeup.dtsi
base-commit: 254f49634ee16a731174d2ae34bc50bd5f45e731
PATCH v2 1/3 arm64: dts: ti: k3-j722s: Use ti,j7200-padconf compatible
From: Abhash Kumar Jha <[email protected]>
The pinctrl contexts for j722s should be saved and restored during suspend-to-ram, just like it is done for j7200 and j784s4 SoCs.
Use ti,j7200-padconf compatible to save and restore pinctrl contexts during suspend-to-ram.
--- arch/arm64/boot/dts/ti/k3-j722s-main.dtsi | 8 ++++++++ 1 file changed, 8 insertions(+)
arch/arm64/boot/dts/ti/k3-j722s-main.dtsi +8 -0
@@ -432,6 +432,10 @@ &main_bcdma_csi { /* MCU domain overrides */ +&mcu_pmx0 { + compatible = "ti,j7200-padconf", "pinctrl-single"; +}; + &mcu_r5fss0_core0 { firmware-name = "j722s-mcu-r5f0_0-fw"; };
@@ -473,6 +477,10 @@ &inta_main_dmss { ti,interrupt-ranges = <7 71 21>; }; +&main_pmx0 { + compatible = "ti,j7200-padconf", "pinctrl-single"; +}; + &main_gpio0 { gpio-ranges = <&main_pmx0 0 0 32>, <&main_pmx0 32 33 38>, <&main_pmx0 70 72 17>;
PATCH v2 2/3 arm64: dts: ti: k3-j722s: Add mcu domain peripherals specific to J722S
In reply to Richard Genoud (TI)Introduce the "k3-j722s-mcu.dtsi" file to contain mcu domain peripherals that are specific to J722S SoC and are not shared with AM62P. Previously, those nodes were squatting the k3-j722s-main.dtsi file which should contain only main domain peripherals.
--- arch/arm64/boot/dts/ti/k3-j722s-main.dtsi | 10 ---------- arch/arm64/boot/dts/ti/k3-j722s-mcu.dtsi | 15 +++++++++++++++ arch/arm64/boot/dts/ti/k3-j722s.dtsi | 1 + 3 files changed, 16 insertions(+), 10 deletions(-) create mode 100644 arch/arm64/boot/dts/ti/k3-j722s-mcu.dtsi
arch/arm64/boot/dts/ti/k3-j722s-main.dtsi +0 -10
@@ -430,16 +430,6 @@ &main_bcdma_csi { ti,sci-rm-range-tchan = <0x22>; }; -/* MCU domain overrides */ - -&mcu_pmx0 { - compatible = "ti,j7200-padconf", "pinctrl-single"; -}; - -&mcu_r5fss0_core0 { - firmware-name = "j722s-mcu-r5f0_0-fw"; -}; - /* Wakeup domain overrides */ &wkup_r5fss0_core0 {
arch/arm64/boot/dts/ti/k3-j722s-mcu.dtsi new file +15 -0
@@ -0,0 +1,15 @@ +// SPDX-License-Identifier: GPL-2.0-only OR MIT +/* + * Device Tree file for the J722S MCU domain peripherals + * + * Copyright (C) 2026 Texas Instruments Incorporated - https://www.ti.com/ + * Copyright (C) 2026 Bootlin + */ + +&mcu_pmx0 { + compatible = "ti,j7200-padconf", "pinctrl-single"; +}; + +&mcu_r5fss0_core0 { + firmware-name = "j722s-mcu-r5f0_0-fw"; +};
arch/arm64/boot/dts/ti/k3-j722s.dtsi +1 -0
@@ -238,3 +238,4 @@ cbass_wakeup: bus@b00000 { /* Include J722S specific peripherals */ #include "k3-j722s-main.dtsi" +#include "k3-j722s-mcu.dtsi"
PATCH v2 3/3 arm64: dts: ti: k3-j722s: Add wakeup domain peripherals specific to J722S
In reply to Richard Genoud (TI)Introduce the "k3-j722s-mcu.dtsi" file to contain wakeup domain peripherals that are specific to J722S SoC and are not shared with AM62P. Previously, those nodes were squatting the k3-j722s-main.dtsi file which should contain only main domain peripherals.
--- arch/arm64/boot/dts/ti/k3-j722s-main.dtsi | 14 -------------- arch/arm64/boot/dts/ti/k3-j722s-wakeup.dtsi | 18 ++++++++++++++++++ arch/arm64/boot/dts/ti/k3-j722s.dtsi | 1 + 3 files changed, 19 insertions(+), 14 deletions(-) create mode 100644 arch/arm64/boot/dts/ti/k3-j722s-wakeup.dtsi
arch/arm64/boot/dts/ti/k3-j722s-main.dtsi +0 -14
@@ -430,13 +430,6 @@ &main_bcdma_csi { ti,sci-rm-range-tchan = <0x22>; }; -/* Wakeup domain overrides */ - -&wkup_r5fss0_core0 { - firmware-name = "j722s-wkup-r5f0_0-fw"; -}; - -/* MAIN domain overrides */ &hsm { firmware-name = "j722s-hsm-m4f-fw"; };
@@ -451,13 +444,6 @@ serdes_ln_ctrl: mux-controller@4080 { }; }; -&wkup_conf { - pcie0_ctrl: pcie0-ctrl@4070 { - compatible = "ti,j784s4-pcie-ctrl", "syscon"; - reg = <0x4070 0x4>; - }; -}; - &oc_sram { reg = <0x00 0x70000000 0x00 0x40000>; ranges = <0x00 0x00 0x70000000 0x40000>;
arch/arm64/boot/dts/ti/k3-j722s-wakeup.dtsi new file +18 -0
@@ -0,0 +1,18 @@ +// SPDX-License-Identifier: GPL-2.0-only OR MIT +/* + * Device Tree file for the J722S WAKEUP domain peripherals + * + * Copyright (C) 2026 Texas Instruments Incorporated - https://www.ti.com/ + * Copyright (C) 2026 Bootlin + */ + +&wkup_conf { + pcie0_ctrl: pcie0-ctrl@4070 { + compatible = "ti,j784s4-pcie-ctrl", "syscon"; + reg = <0x4070 0x4>; + }; +}; + +&wkup_r5fss0_core0 { + firmware-name = "j722s-wkup-r5f0_0-fw"; +};
arch/arm64/boot/dts/ti/k3-j722s.dtsi +1 -0
@@ -239,3 +239,4 @@ cbass_wakeup: bus@b00000 { /* Include J722S specific peripherals */ #include "k3-j722s-main.dtsi" #include "k3-j722s-mcu.dtsi" +#include "k3-j722s-wakeup.dtsi"
Hi Richard Genoud (TI),
Quoted 9 lines · Richard Genoud (TI)
The pinctrl contexts for j722s should be saved and restored during suspend-to-ram, just like it is done for j7200 and j784s4 SoCs.
The first patch adds the ti,j7200-padconf compatible, and the next 2 patches introduce
k3-j722s-mcu.dtsiandk3-j722s-wakeup.dtsi, preventing usingk3-j722s-main.dtsifor something else than main domain peripherals.[...]
I have applied the following to branch ti-k3-dts-next on [1]. Thank you!
[1/3] arm64: dts: ti: k3-j722s: Use ti,j7200-padconf compatible
commit: 92468e053476537250e750ecc9bc648b0b1aef09
[2/3] arm64: dts: ti: k3-j722s: Add mcu domain peripherals specific to J722S
commit: e6856de612ca8941b7435c91a0f2e770d1a981e0
[3/3] arm64: dts: ti: k3-j722s: Add wakeup domain peripherals specific to J722S
commit: 6c21336acd5b2adf33ec73f43f31bd389381da5fAll being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent up the chain during the next merge window (or sooner if it is a relevant bug fix), however if problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying to this mail.
[1] https://git.kernel.org/pub/scm/linux/kernel/git/ti/linux.git
Signature · 4 lines
Regards, Nishanth Menon Key (0xDDB5849D1736249D) / Fingerprint: F8A2 8693 54EB 8232 17A3 1A34 DDB5 849D 1736 249D https://ti.com/opensource