* [PATCH 0/6] arm64: dts: ti: k3-j721s2: Mux fixups and eeprom misc
@ 2023-06-02 15:35 Nishanth Menon
2023-06-02 15:35 ` [PATCH 1/6] arm64: dts: ti: k3-j721s2: Fix wkup pinmux range Nishanth Menon
` (6 more replies)
0 siblings, 7 replies; 11+ messages in thread
From: Nishanth Menon @ 2023-06-02 15:35 UTC (permalink / raw)
To: Conor Dooley, Krzysztof Kozlowski, Rob Herring, Tero Kristo,
Vignesh Raghavendra
Cc: linux-kernel, devicetree, linux-arm-kernel, Nishanth Menon,
Udit Kumar, Nitin Yadav, Neha Malcom Francis, Sinthu Raja
Hi,
This is an expansion of Sinthu's series[1] for J721s2, fixing a few aspects
of his patches and adding uart, eeprom detection etc.
This set of changes picksup fixes seen in u-boot and else where an
consolidates into kernel as the definitive device tree description
Testing logs: https://gist.github.com/nmenon/2acfc566d0b215fe941c42317d9ac955
Changes:
* Fixups to the wkup_pmx0 patch to limit stable tree to 6.3
* Fixups to Rpi header patch for mcu_i2c0 pinmux
* Additional patches for eeprom and wkup/mcu uarts.
-- Sinthu's series history:
Changes in V5[1]:
-Remove main padconfig split patch which is not required.
Changes in V4:
- Address review comments
* Update main and wakeup domain IO padconfig
* Correct the pinctrl node offsets as per the newly split wkup_pmx*
and main_pmx* nodes.
Changes in V3:
- Add Fixes tag.
Changes in V2:
- Update commit description.
- Update the offset value to 0x194 as 0x190 is the last register of the
IO PADCONFIG register set.
V1: https://lore.kernel.org/all/20230123135831.4184-1-sinthu.raja@ti.com/
V2: https://lore.kernel.org/lkml/20230124120311.7323-1-sinthu.raja@ti.com/T/
V3: https://lore.kernel.org/linux-arm-kernel/20230316114102.3602-2-sinthu.raja@ti.com/T/
V4: https://lore.kernel.org/lkml/20230424081536.12123-1-sinthu.raja@ti.com/
V5[1]: https://lore.kernel.org/linux-arm-kernel/20230504073432.6438-1-sinthu.raja@ti.com/
Nishanth Menon (4):
arm64: dts: ti: k3-am68-sk-base-board: Add uart pinmux
arm64: dts: ti: k3-am68-sk-som: Enable wakeup_i2c0 and eeprom
arm64: dts: ti: k3-j721s2-common-proc-board: Add uart pinmux
arm64: dts: ti: k3-j721s2-som-p0: Enable wakeup_i2c0 and eeprom
Sinthu Raja (2):
arm64: dts: ti: k3-j721s2: Fix wkup pinmux range
arm64: dts: ti: k3-am68-sk-base-board: Add pinmux for RPi Header
.../boot/dts/ti/k3-am68-sk-base-board.dts | 145 +++++++++++++++---
arch/arm64/boot/dts/ti/k3-am68-sk-som.dtsi | 22 +++
.../dts/ti/k3-j721s2-common-proc-board.dts | 99 +++++++-----
.../boot/dts/ti/k3-j721s2-mcu-wakeup.dtsi | 29 +++-
arch/arm64/boot/dts/ti/k3-j721s2-som-p0.dtsi | 22 +++
5 files changed, 255 insertions(+), 62 deletions(-)
--
2.40.0
^ permalink raw reply [flat|nested] 11+ messages in thread* [PATCH 1/6] arm64: dts: ti: k3-j721s2: Fix wkup pinmux range 2023-06-02 15:35 [PATCH 0/6] arm64: dts: ti: k3-j721s2: Mux fixups and eeprom misc Nishanth Menon @ 2023-06-02 15:35 ` Nishanth Menon 2023-06-02 15:35 ` [PATCH 2/6] arm64: dts: ti: k3-am68-sk-base-board: Add pinmux for RPi Header Nishanth Menon ` (5 subsequent siblings) 6 siblings, 0 replies; 11+ messages in thread From: Nishanth Menon @ 2023-06-02 15:35 UTC (permalink / raw) To: Conor Dooley, Krzysztof Kozlowski, Rob Herring, Tero Kristo, Vignesh Raghavendra Cc: linux-kernel, devicetree, linux-arm-kernel, Nishanth Menon, Udit Kumar, Nitin Yadav, Neha Malcom Francis, Sinthu Raja, stable, Thejasvi Konduru From: Sinthu Raja <sinthu.raja@ti.com> The WKUP_PADCONFIG register region in J721S2 has multiple non-addressable regions, accordingly split the existing wkup_pmx region as follows to avoid the non-addressable regions and include the rest of valid WKUP_PADCONFIG registers. Also update references to old nodes with new ones. wkup_pmx0 -> 13 pins (WKUP_PADCONFIG 0 - 12) wkup_pmx1 -> 11 pins (WKUP_PADCONFIG 14 - 24) wkup_pmx2 -> 72 pins (WKUP_PADCONFIG 26 - 97) wkup_pmx3 -> 1 pin (WKUP_PADCONFIG 100) Fixes: b8545f9d3a54 ("arm64: dts: ti: Add initial support for J721S2 SoC") Cc: <stable@vger.kernel.org> # 6.3 Signed-off-by: Sinthu Raja <sinthu.raja@ti.com> Signed-off-by: Thejasvi Konduru <t-konduru@ti.com> Signed-off-by: Nishanth Menon <nm@ti.com> --- Changes since V5: (renumbered back to v1 for my series) * Stable tree constraint to 6.3 as the am68-sk-base-board which is also impacted by this change does'nt exist prior to that, older stable kernels since 5.17 will need handfixing. * Incorporated into my series doing other remaining fixups. V5: https://lore.kernel.org/linux-arm-kernel/20230504073432.6438-2-sinthu.raja@ti.com/ .../boot/dts/ti/k3-am68-sk-base-board.dts | 42 +++++----- .../dts/ti/k3-j721s2-common-proc-board.dts | 76 +++++++++---------- .../boot/dts/ti/k3-j721s2-mcu-wakeup.dtsi | 29 ++++++- 3 files changed, 87 insertions(+), 60 deletions(-) diff --git a/arch/arm64/boot/dts/ti/k3-am68-sk-base-board.dts b/arch/arm64/boot/dts/ti/k3-am68-sk-base-board.dts index ae9116655a83..37b598e98f8b 100644 --- a/arch/arm64/boot/dts/ti/k3-am68-sk-base-board.dts +++ b/arch/arm64/boot/dts/ti/k3-am68-sk-base-board.dts @@ -175,49 +175,49 @@ J721S2_IOPAD(0x09c, PIN_INPUT, 0) /* (T24) MCASP0_AXR11.MCAN7_TX */ }; }; -&wkup_pmx0 { +&wkup_pmx2 { mcu_cpsw_pins_default: mcu-cpsw-pins-default { pinctrl-single,pins = < - J721S2_WKUP_IOPAD(0x094, PIN_INPUT, 0) /* (B22) MCU_RGMII1_RD0 */ - J721S2_WKUP_IOPAD(0x090, PIN_INPUT, 0) /* (B21) MCU_RGMII1_RD1 */ - J721S2_WKUP_IOPAD(0x08c, PIN_INPUT, 0) /* (C22) MCU_RGMII1_RD2 */ - J721S2_WKUP_IOPAD(0x088, PIN_INPUT, 0) /* (D23) MCU_RGMII1_RD3 */ - J721S2_WKUP_IOPAD(0x084, PIN_INPUT, 0) /* (D22) MCU_RGMII1_RXC */ - J721S2_WKUP_IOPAD(0x06c, PIN_INPUT, 0) /* (E23) MCU_RGMII1_RX_CTL */ - J721S2_WKUP_IOPAD(0x07c, PIN_OUTPUT, 0) /* (F23) MCU_RGMII1_TD0 */ - J721S2_WKUP_IOPAD(0x078, PIN_OUTPUT, 0) /* (G22) MCU_RGMII1_TD1 */ - J721S2_WKUP_IOPAD(0x074, PIN_OUTPUT, 0) /* (E21) MCU_RGMII1_TD2 */ - J721S2_WKUP_IOPAD(0x070, PIN_OUTPUT, 0) /* (E22) MCU_RGMII1_TD3 */ - J721S2_WKUP_IOPAD(0x080, PIN_OUTPUT, 0) /* (F21) MCU_RGMII1_TXC */ - J721S2_WKUP_IOPAD(0x068, PIN_OUTPUT, 0) /* (F22) MCU_RGMII1_TX_CTL */ + J721S2_WKUP_IOPAD(0x02C, PIN_INPUT, 0) /* (B22) MCU_RGMII1_RD0 */ + J721S2_WKUP_IOPAD(0x028, PIN_INPUT, 0) /* (B21) MCU_RGMII1_RD1 */ + J721S2_WKUP_IOPAD(0x024, PIN_INPUT, 0) /* (C22) MCU_RGMII1_RD2 */ + J721S2_WKUP_IOPAD(0x020, PIN_INPUT, 0) /* (D23) MCU_RGMII1_RD3 */ + J721S2_WKUP_IOPAD(0x01C, PIN_INPUT, 0) /* (D22) MCU_RGMII1_RXC */ + J721S2_WKUP_IOPAD(0x004, PIN_INPUT, 0) /* (E23) MCU_RGMII1_RX_CTL */ + J721S2_WKUP_IOPAD(0x014, PIN_OUTPUT, 0) /* (F23) MCU_RGMII1_TD0 */ + J721S2_WKUP_IOPAD(0x010, PIN_OUTPUT, 0) /* (G22) MCU_RGMII1_TD1 */ + J721S2_WKUP_IOPAD(0x00C, PIN_OUTPUT, 0) /* (E21) MCU_RGMII1_TD2 */ + J721S2_WKUP_IOPAD(0x008, PIN_OUTPUT, 0) /* (E22) MCU_RGMII1_TD3 */ + J721S2_WKUP_IOPAD(0x018, PIN_OUTPUT, 0) /* (F21) MCU_RGMII1_TXC */ + J721S2_WKUP_IOPAD(0x000, PIN_OUTPUT, 0) /* (F22) MCU_RGMII1_TX_CTL */ >; }; mcu_mdio_pins_default: mcu-mdio-pins-default { pinctrl-single,pins = < - J721S2_WKUP_IOPAD(0x09c, PIN_OUTPUT, 0) /* (A21) MCU_MDIO0_MDC */ - J721S2_WKUP_IOPAD(0x098, PIN_INPUT, 0) /* (A22) MCU_MDIO0_MDIO */ + J721S2_WKUP_IOPAD(0x034, PIN_OUTPUT, 0) /* (A21) MCU_MDIO0_MDC */ + J721S2_WKUP_IOPAD(0x030, PIN_INPUT, 0) /* (A22) MCU_MDIO0_MDIO */ >; }; mcu_mcan0_pins_default: mcu-mcan0-pins-default { pinctrl-single,pins = < - J721S2_WKUP_IOPAD(0x0bc, PIN_INPUT, 0) /* (E28) MCU_MCAN0_RX */ - J721S2_WKUP_IOPAD(0x0b8, PIN_OUTPUT, 0) /* (E27) MCU_MCAN0_TX */ + J721S2_WKUP_IOPAD(0x054, PIN_INPUT, 0) /* (E28) MCU_MCAN0_RX */ + J721S2_WKUP_IOPAD(0x050, PIN_OUTPUT, 0) /* (E27) MCU_MCAN0_TX */ >; }; mcu_mcan1_pins_default: mcu-mcan1-pins-default { pinctrl-single,pins = < - J721S2_WKUP_IOPAD(0x0d4, PIN_INPUT, 0) /* (F26) WKUP_GPIO0_5.MCU_MCAN1_RX */ - J721S2_WKUP_IOPAD(0x0d0, PIN_OUTPUT, 0) /* (C23) WKUP_GPIO0_4.MCU_MCAN1_TX*/ + J721S2_WKUP_IOPAD(0x06C, PIN_INPUT, 0) /* (F26) WKUP_GPIO0_5.MCU_MCAN1_RX */ + J721S2_WKUP_IOPAD(0x068, PIN_OUTPUT, 0) /* (C23) WKUP_GPIO0_4.MCU_MCAN1_TX*/ >; }; mcu_i2c1_pins_default: mcu-i2c1-pins-default { pinctrl-single,pins = < - J721S2_WKUP_IOPAD(0x0e0, PIN_INPUT, 0) /* (F24) WKUP_GPIO0_8.MCU_I2C1_SCL */ - J721S2_WKUP_IOPAD(0x0e4, PIN_INPUT, 0) /* (H26) WKUP_GPIO0_9.MCU_I2C1_SDA */ + J721S2_WKUP_IOPAD(0x078, PIN_INPUT, 0) /* (F24) WKUP_GPIO0_8.MCU_I2C1_SCL */ + J721S2_WKUP_IOPAD(0x07c, PIN_INPUT, 0) /* (H26) WKUP_GPIO0_9.MCU_I2C1_SDA */ >; }; }; diff --git a/arch/arm64/boot/dts/ti/k3-j721s2-common-proc-board.dts b/arch/arm64/boot/dts/ti/k3-j721s2-common-proc-board.dts index 0bb40dd8e485..7283ce2aadb2 100644 --- a/arch/arm64/boot/dts/ti/k3-j721s2-common-proc-board.dts +++ b/arch/arm64/boot/dts/ti/k3-j721s2-common-proc-board.dts @@ -145,81 +145,81 @@ J721S2_IOPAD(0x020, PIN_INPUT, 7) /* (AA23) MCAN15_RX.GPIO0_8 */ }; }; -&wkup_pmx0 { +&wkup_pmx2 { mcu_cpsw_pins_default: mcu-cpsw-pins-default { pinctrl-single,pins = < - J721S2_WKUP_IOPAD(0x094, PIN_INPUT, 0) /* (B22) MCU_RGMII1_RD0 */ - J721S2_WKUP_IOPAD(0x090, PIN_INPUT, 0) /* (B21) MCU_RGMII1_RD1 */ - J721S2_WKUP_IOPAD(0x08c, PIN_INPUT, 0) /* (C22) MCU_RGMII1_RD2 */ - J721S2_WKUP_IOPAD(0x088, PIN_INPUT, 0) /* (D23) MCU_RGMII1_RD3 */ - J721S2_WKUP_IOPAD(0x084, PIN_INPUT, 0) /* (D22) MCU_RGMII1_RXC */ - J721S2_WKUP_IOPAD(0x06c, PIN_INPUT, 0) /* (E23) MCU_RGMII1_RX_CTL */ - J721S2_WKUP_IOPAD(0x07c, PIN_OUTPUT, 0) /* (F23) MCU_RGMII1_TD0 */ - J721S2_WKUP_IOPAD(0x078, PIN_OUTPUT, 0) /* (G22) MCU_RGMII1_TD1 */ - J721S2_WKUP_IOPAD(0x074, PIN_OUTPUT, 0) /* (E21) MCU_RGMII1_TD2 */ - J721S2_WKUP_IOPAD(0x070, PIN_OUTPUT, 0) /* (E22) MCU_RGMII1_TD3 */ - J721S2_WKUP_IOPAD(0x080, PIN_OUTPUT, 0) /* (F21) MCU_RGMII1_TXC */ - J721S2_WKUP_IOPAD(0x068, PIN_OUTPUT, 0) /* (F22) MCU_RGMII1_TX_CTL */ + J721S2_WKUP_IOPAD(0x02c, PIN_INPUT, 0) /* (B22) MCU_RGMII1_RD0 */ + J721S2_WKUP_IOPAD(0x028, PIN_INPUT, 0) /* (B21) MCU_RGMII1_RD1 */ + J721S2_WKUP_IOPAD(0x024, PIN_INPUT, 0) /* (C22) MCU_RGMII1_RD2 */ + J721S2_WKUP_IOPAD(0x020, PIN_INPUT, 0) /* (D23) MCU_RGMII1_RD3 */ + J721S2_WKUP_IOPAD(0x01c, PIN_INPUT, 0) /* (D22) MCU_RGMII1_RXC */ + J721S2_WKUP_IOPAD(0x004, PIN_INPUT, 0) /* (E23) MCU_RGMII1_RX_CTL */ + J721S2_WKUP_IOPAD(0x014, PIN_OUTPUT, 0) /* (F23) MCU_RGMII1_TD0 */ + J721S2_WKUP_IOPAD(0x010, PIN_OUTPUT, 0) /* (G22) MCU_RGMII1_TD1 */ + J721S2_WKUP_IOPAD(0x00c, PIN_OUTPUT, 0) /* (E21) MCU_RGMII1_TD2 */ + J721S2_WKUP_IOPAD(0x008, PIN_OUTPUT, 0) /* (E22) MCU_RGMII1_TD3 */ + J721S2_WKUP_IOPAD(0x018, PIN_OUTPUT, 0) /* (F21) MCU_RGMII1_TXC */ + J721S2_WKUP_IOPAD(0x000, PIN_OUTPUT, 0) /* (F22) MCU_RGMII1_TX_CTL */ >; }; mcu_mdio_pins_default: mcu-mdio-pins-default { pinctrl-single,pins = < - J721S2_WKUP_IOPAD(0x09c, PIN_OUTPUT, 0) /* (A21) MCU_MDIO0_MDC */ - J721S2_WKUP_IOPAD(0x098, PIN_INPUT, 0) /* (A22) MCU_MDIO0_MDIO */ + J721S2_WKUP_IOPAD(0x034, PIN_OUTPUT, 0) /* (A21) MCU_MDIO0_MDC */ + J721S2_WKUP_IOPAD(0x030, PIN_INPUT, 0) /* (A22) MCU_MDIO0_MDIO */ >; }; mcu_mcan0_pins_default: mcu-mcan0-pins-default { pinctrl-single,pins = < - J721S2_WKUP_IOPAD(0x0bc, PIN_INPUT, 0) /* (E28) MCU_MCAN0_RX */ - J721S2_WKUP_IOPAD(0x0b8, PIN_OUTPUT, 0) /* (E27) MCU_MCAN0_TX */ + J721S2_WKUP_IOPAD(0x054, PIN_INPUT, 0) /* (E28) MCU_MCAN0_RX */ + J721S2_WKUP_IOPAD(0x050, PIN_OUTPUT, 0) /* (E27) MCU_MCAN0_TX */ >; }; mcu_mcan1_pins_default: mcu-mcan1-pins-default { pinctrl-single,pins = < - J721S2_WKUP_IOPAD(0x0d4, PIN_INPUT, 0) /* (F26) WKUP_GPIO0_5.MCU_MCAN1_RX */ - J721S2_WKUP_IOPAD(0x0d0, PIN_OUTPUT, 0) /* (C23) WKUP_GPIO0_4.MCU_MCAN1_TX */ + J721S2_WKUP_IOPAD(0x06c, PIN_INPUT, 0) /* (F26) WKUP_GPIO0_5.MCU_MCAN1_RX */ + J721S2_WKUP_IOPAD(0x068, PIN_OUTPUT, 0) /*(C23) WKUP_GPIO0_4.MCU_MCAN1_TX */ >; }; mcu_mcan0_gpio_pins_default: mcu-mcan0-gpio-pins-default { pinctrl-single,pins = < - J721S2_WKUP_IOPAD(0x0c0, PIN_INPUT, 7) /* (D26) WKUP_GPIO0_0 */ - J721S2_WKUP_IOPAD(0x0a8, PIN_INPUT, 7) /* (B25) MCU_SPI0_D1.WKUP_GPIO0_69 */ + J721S2_WKUP_IOPAD(0x058, PIN_INPUT, 7) /* (D26) WKUP_GPIO0_0 */ + J721S2_WKUP_IOPAD(0x040, PIN_INPUT, 7) /* (B25) MCU_SPI0_D1.WKUP_GPIO0_69 */ >; }; mcu_mcan1_gpio_pins_default: mcu-mcan1-gpio-pins-default { pinctrl-single,pins = < - J721S2_WKUP_IOPAD(0x0c8, PIN_INPUT, 7) /* (C28) WKUP_GPIO0_2 */ + J721S2_WKUP_IOPAD(0x060, PIN_INPUT, 7) /* (C28) WKUP_GPIO0_2 */ >; }; mcu_adc0_pins_default: mcu-adc0-pins-default { pinctrl-single,pins = < - J721S2_WKUP_IOPAD(0x134, PIN_INPUT, 0) /* (L25) MCU_ADC0_AIN0 */ - J721S2_WKUP_IOPAD(0x138, PIN_INPUT, 0) /* (K25) MCU_ADC0_AIN1 */ - J721S2_WKUP_IOPAD(0x13c, PIN_INPUT, 0) /* (M24) MCU_ADC0_AIN2 */ - J721S2_WKUP_IOPAD(0x140, PIN_INPUT, 0) /* (L24) MCU_ADC0_AIN3 */ - J721S2_WKUP_IOPAD(0x144, PIN_INPUT, 0) /* (L27) MCU_ADC0_AIN4 */ - J721S2_WKUP_IOPAD(0x148, PIN_INPUT, 0) /* (K24) MCU_ADC0_AIN5 */ - J721S2_WKUP_IOPAD(0x14c, PIN_INPUT, 0) /* (M27) MCU_ADC0_AIN6 */ - J721S2_WKUP_IOPAD(0x150, PIN_INPUT, 0) /* (M26) MCU_ADC0_AIN7 */ + J721S2_WKUP_IOPAD(0x0cc, PIN_INPUT, 0) /* (L25) MCU_ADC0_AIN0 */ + J721S2_WKUP_IOPAD(0x0d0, PIN_INPUT, 0) /* (K25) MCU_ADC0_AIN1 */ + J721S2_WKUP_IOPAD(0x0d4, PIN_INPUT, 0) /* (M24) MCU_ADC0_AIN2 */ + J721S2_WKUP_IOPAD(0x0d8, PIN_INPUT, 0) /* (L24) MCU_ADC0_AIN3 */ + J721S2_WKUP_IOPAD(0x0dc, PIN_INPUT, 0) /* (L27) MCU_ADC0_AIN4 */ + J721S2_WKUP_IOPAD(0x0e0, PIN_INPUT, 0) /* (K24) MCU_ADC0_AIN5 */ + J721S2_WKUP_IOPAD(0x0e4, PIN_INPUT, 0) /* (M27) MCU_ADC0_AIN6 */ + J721S2_WKUP_IOPAD(0x0e8, PIN_INPUT, 0) /* (M26) MCU_ADC0_AIN7 */ >; }; mcu_adc1_pins_default: mcu-adc1-pins-default { pinctrl-single,pins = < - J721S2_WKUP_IOPAD(0x154, PIN_INPUT, 0) /* (P25) MCU_ADC1_AIN0 */ - J721S2_WKUP_IOPAD(0x158, PIN_INPUT, 0) /* (R25) MCU_ADC1_AIN1 */ - J721S2_WKUP_IOPAD(0x15c, PIN_INPUT, 0) /* (P28) MCU_ADC1_AIN2 */ - J721S2_WKUP_IOPAD(0x160, PIN_INPUT, 0) /* (P27) MCU_ADC1_AIN3 */ - J721S2_WKUP_IOPAD(0x164, PIN_INPUT, 0) /* (N25) MCU_ADC1_AIN4 */ - J721S2_WKUP_IOPAD(0x168, PIN_INPUT, 0) /* (P26) MCU_ADC1_AIN5 */ - J721S2_WKUP_IOPAD(0x16c, PIN_INPUT, 0) /* (N26) MCU_ADC1_AIN6 */ - J721S2_WKUP_IOPAD(0x170, PIN_INPUT, 0) /* (N27) MCU_ADC1_AIN7 */ + J721S2_WKUP_IOPAD(0x0ec, PIN_INPUT, 0) /* (P25) MCU_ADC1_AIN0 */ + J721S2_WKUP_IOPAD(0x0f0, PIN_INPUT, 0) /* (R25) MCU_ADC1_AIN1 */ + J721S2_WKUP_IOPAD(0x0f4, PIN_INPUT, 0) /* (P28) MCU_ADC1_AIN2 */ + J721S2_WKUP_IOPAD(0x0f8, PIN_INPUT, 0) /* (P27) MCU_ADC1_AIN3 */ + J721S2_WKUP_IOPAD(0x0fc, PIN_INPUT, 0) /* (N25) MCU_ADC1_AIN4 */ + J721S2_WKUP_IOPAD(0x100, PIN_INPUT, 0) /* (P26) MCU_ADC1_AIN5 */ + J721S2_WKUP_IOPAD(0x104, PIN_INPUT, 0) /* (N26) MCU_ADC1_AIN6 */ + J721S2_WKUP_IOPAD(0x108, PIN_INPUT, 0) /* (N27) MCU_ADC1_AIN7 */ >; }; }; diff --git a/arch/arm64/boot/dts/ti/k3-j721s2-mcu-wakeup.dtsi b/arch/arm64/boot/dts/ti/k3-j721s2-mcu-wakeup.dtsi index f563dcc7b3f8..ad57c69a2d5b 100644 --- a/arch/arm64/boot/dts/ti/k3-j721s2-mcu-wakeup.dtsi +++ b/arch/arm64/boot/dts/ti/k3-j721s2-mcu-wakeup.dtsi @@ -65,7 +65,34 @@ mcu_ram: sram@41c00000 { wkup_pmx0: pinctrl@4301c000 { compatible = "pinctrl-single"; /* Proxy 0 addressing */ - reg = <0x00 0x4301c000 0x00 0x178>; + reg = <0x00 0x4301c000 0x00 0x034>; + #pinctrl-cells = <1>; + pinctrl-single,register-width = <32>; + pinctrl-single,function-mask = <0xffffffff>; + }; + + wkup_pmx1: pinctrl@4301c038 { + compatible = "pinctrl-single"; + /* Proxy 0 addressing */ + reg = <0x00 0x4301c038 0x00 0x02C>; + #pinctrl-cells = <1>; + pinctrl-single,register-width = <32>; + pinctrl-single,function-mask = <0xffffffff>; + }; + + wkup_pmx2: pinctrl@4301c068 { + compatible = "pinctrl-single"; + /* Proxy 0 addressing */ + reg = <0x00 0x4301c068 0x00 0x120>; + #pinctrl-cells = <1>; + pinctrl-single,register-width = <32>; + pinctrl-single,function-mask = <0xffffffff>; + }; + + wkup_pmx3: pinctrl@4301c190 { + compatible = "pinctrl-single"; + /* Proxy 0 addressing */ + reg = <0x00 0x4301c190 0x00 0x004>; #pinctrl-cells = <1>; pinctrl-single,register-width = <32>; pinctrl-single,function-mask = <0xffffffff>; -- 2.40.0 ^ permalink raw reply [flat|nested] 11+ messages in thread
* [PATCH 2/6] arm64: dts: ti: k3-am68-sk-base-board: Add pinmux for RPi Header 2023-06-02 15:35 [PATCH 0/6] arm64: dts: ti: k3-j721s2: Mux fixups and eeprom misc Nishanth Menon 2023-06-02 15:35 ` [PATCH 1/6] arm64: dts: ti: k3-j721s2: Fix wkup pinmux range Nishanth Menon @ 2023-06-02 15:35 ` Nishanth Menon 2023-06-02 15:35 ` [PATCH 3/6] arm64: dts: ti: k3-am68-sk-base-board: Add uart pinmux Nishanth Menon ` (4 subsequent siblings) 6 siblings, 0 replies; 11+ messages in thread From: Nishanth Menon @ 2023-06-02 15:35 UTC (permalink / raw) To: Conor Dooley, Krzysztof Kozlowski, Rob Herring, Tero Kristo, Vignesh Raghavendra Cc: linux-kernel, devicetree, linux-arm-kernel, Nishanth Menon, Udit Kumar, Nitin Yadav, Neha Malcom Francis, Sinthu Raja From: Sinthu Raja <sinthu.raja@ti.com> Add pinmux required to bring out the i2c and gpios on 40-pin RPi expansion header on the AM68 SK board. Signed-off-by: Sinthu Raja <sinthu.raja@ti.com> Signed-off-by: Nishanth Menon <nm@ti.com> --- Changes since V5: (incorporated into my series as v1) * Fixed mcu_i2c0 pin_mux offsets (which were pointing to wakeup_i2c) * Minor style fixup for usage of pinctrl-0 phandle array V5: https://lore.kernel.org/linux-arm-kernel/20230504073432.6438-3-sinthu.raja@ti.com/ .../boot/dts/ti/k3-am68-sk-base-board.dts | 77 ++++++++++++++++++- 1 file changed, 76 insertions(+), 1 deletion(-) diff --git a/arch/arm64/boot/dts/ti/k3-am68-sk-base-board.dts b/arch/arm64/boot/dts/ti/k3-am68-sk-base-board.dts index 37b598e98f8b..014ff13d1032 100644 --- a/arch/arm64/boot/dts/ti/k3-am68-sk-base-board.dts +++ b/arch/arm64/boot/dts/ti/k3-am68-sk-base-board.dts @@ -173,6 +173,32 @@ J721S2_IOPAD(0x0a0, PIN_INPUT, 0) /* (AB25) MCASP0_AXR12.MCAN7_RX */ J721S2_IOPAD(0x09c, PIN_INPUT, 0) /* (T24) MCASP0_AXR11.MCAN7_TX */ >; }; + + main_i2c4_pins_default: main-i2c4-pins-default { + pinctrl-single,pins = < + J721S2_IOPAD(0x010, PIN_INPUT_PULLUP, 8) /* (AF28) MCAN13_RX.I2C4_SDA */ + J721S2_IOPAD(0x014, PIN_INPUT_PULLUP, 8) /* (AD25) MCAN14_TX.I2C4_SCL */ + >; + }; + + rpi_header_gpio0_pins_default: rpi-header-gpio0-pins-default { + pinctrl-single,pins = < + J721S2_IOPAD(0x0a8, PIN_INPUT, 7) /* (U24) MCASP0_AXR14.GPIO0_42 */ + J721S2_IOPAD(0x090, PIN_INPUT, 7) /* (W24) MCASP0_AXR8.GPIO0_36 */ + J721S2_IOPAD(0x0bc, PIN_INPUT, 7) /* (V28) MCASP1_AFSX.GPIO0_47 */ + J721S2_IOPAD(0x06c, PIN_INPUT, 7) /* (V26) MCAN1_TX.GPIO0_27 */ + J721S2_IOPAD(0x004, PIN_INPUT, 7) /* (W25) MCAN12_TX.GPIO0_1 */ + J721S2_IOPAD(0x008, PIN_INPUT, 7) /* (AC24) MCAN12_RX.GPIO0_2 */ + J721S2_IOPAD(0x0b8, PIN_INPUT, 7) /* (AA24) MCASP1_ACLKX.GPIO0_46 */ + J721S2_IOPAD(0x00c, PIN_INPUT, 7) /* (AE28) MCAN13_TX.GPIO0_3 */ + J721S2_IOPAD(0x034, PIN_INPUT, 7) /* (AD24) PMIC_WAKE0.GPIO0_13 */ + J721S2_IOPAD(0x0a4, PIN_INPUT, 7) /* (T23) MCASP0_AXR13.GPIO0_41 */ + J721S2_IOPAD(0x0c0, PIN_INPUT, 7) /* (T28) MCASP1_AXR0.GPIO0_48 */ + J721S2_IOPAD(0x0b4, PIN_INPUT, 7) /* (U25) MCASP1_AXR4.GPIO0_45 */ + J721S2_IOPAD(0x0cc, PIN_INPUT, 7) /* (AE27) SPI0_CS0.GPIO0_51 */ + J721S2_IOPAD(0x08c, PIN_INPUT, 7) /* (T25) MCASP0_AXR7.GPIO0_35 */ + >; + }; }; &wkup_pmx2 { @@ -214,12 +240,46 @@ J721S2_WKUP_IOPAD(0x068, PIN_OUTPUT, 0) /* (C23) WKUP_GPIO0_4.MCU_MCAN1_TX*/ >; }; + mcu_i2c0_pins_default: mcu-i2c0-pins-default { + pinctrl-single,pins = < + J721S2_WKUP_IOPAD(0x0a0, PIN_INPUT, 0) /* (G24) MCU_I2C0_SCL */ + J721S2_WKUP_IOPAD(0x0a4, PIN_INPUT, 0) /* (J25) MCU_I2C0_SDA */ + >; + }; + mcu_i2c1_pins_default: mcu-i2c1-pins-default { pinctrl-single,pins = < J721S2_WKUP_IOPAD(0x078, PIN_INPUT, 0) /* (F24) WKUP_GPIO0_8.MCU_I2C1_SCL */ J721S2_WKUP_IOPAD(0x07c, PIN_INPUT, 0) /* (H26) WKUP_GPIO0_9.MCU_I2C1_SDA */ >; }; + + mcu_rpi_header_gpio0_pins0_default: mcu-rpi-header-gpio0-pins0-default { + pinctrl-single,pins = < + J721S2_WKUP_IOPAD(0x118, PIN_INPUT, 7) /* (G25) WKUP_GPIO0_66 */ + J721S2_WKUP_IOPAD(0x05C, PIN_INPUT, 7) /* (E24) MCU_SPI1_D0.WKUP_GPIO0_1 */ + J721S2_WKUP_IOPAD(0x060, PIN_INPUT, 7) /* (C28) MCU_SPI1_D1.WKUP_GPIO0_2 */ + J721S2_WKUP_IOPAD(0x058, PIN_INPUT, 7) /* (D26) MCU_SPI1_CLK.WKUP_GPIO0_0 */ + J721S2_WKUP_IOPAD(0x094, PIN_INPUT, 7) /* (D25) MCU_SPI1_CS2.WKUP_GPIO0_15*/ + J721S2_WKUP_IOPAD(0x0B8, PIN_INPUT, 7) /* (G27) WKUP_GPIO0_56 */ + J721S2_WKUP_IOPAD(0x114, PIN_INPUT, 7) /* (J26) WKUP_GPIO0_57 */ + J721S2_WKUP_IOPAD(0x11C, PIN_INPUT, 7) /* (J27) WKUP_GPIO0_67 */ + J721S2_WKUP_IOPAD(0x064, PIN_INPUT, 7) /* (C27) MCU_SPI1_CS0.WKUP_GPIO0_3 */ + >; + }; +}; + +&wkup_pmx3 { + mcu_rpi_header_gpio0_pins1_default: mcu-rpi-header-gpio0-pins1-default { + pinctrl-single,pins = < + J721S2_WKUP_IOPAD(0x000, PIN_INPUT, 7) /* (K26) WKUP_GPIO0_49 */ + >; + }; +}; + +&main_gpio0 { + pinctrl-names = "default"; + pinctrl-0 = <&rpi_header_gpio0_pins_default>; }; &main_gpio2 { @@ -235,7 +295,8 @@ &main_gpio6 { }; &wkup_gpio0 { - status = "disabled"; + pinctrl-names = "default"; + pinctrl-0 = <&mcu_rpi_header_gpio0_pins0_default>, <&mcu_rpi_header_gpio0_pins1_default>; }; &wkup_gpio1 { @@ -271,6 +332,20 @@ exp1: gpio@21 { }; }; +&main_i2c4 { + status = "okay"; + pinctrl-names = "default"; + pinctrl-0 = <&main_i2c4_pins_default>; + clock-frequency = <400000>; +}; + +&mcu_i2c0 { + status = "okay"; + pinctrl-names = "default"; + pinctrl-0 = <&mcu_i2c0_pins_default>; + clock-frequency = <400000>; +}; + &main_sdhci0 { /* Unused */ status = "disabled"; -- 2.40.0 ^ permalink raw reply [flat|nested] 11+ messages in thread
* [PATCH 3/6] arm64: dts: ti: k3-am68-sk-base-board: Add uart pinmux 2023-06-02 15:35 [PATCH 0/6] arm64: dts: ti: k3-j721s2: Mux fixups and eeprom misc Nishanth Menon 2023-06-02 15:35 ` [PATCH 1/6] arm64: dts: ti: k3-j721s2: Fix wkup pinmux range Nishanth Menon 2023-06-02 15:35 ` [PATCH 2/6] arm64: dts: ti: k3-am68-sk-base-board: Add pinmux for RPi Header Nishanth Menon @ 2023-06-02 15:35 ` Nishanth Menon 2023-06-06 9:53 ` Kumar, Udit 2023-06-02 15:35 ` [PATCH 4/6] arm64: dts: ti: k3-am68-sk-som: Enable wakeup_i2c0 and eeprom Nishanth Menon ` (3 subsequent siblings) 6 siblings, 1 reply; 11+ messages in thread From: Nishanth Menon @ 2023-06-02 15:35 UTC (permalink / raw) To: Conor Dooley, Krzysztof Kozlowski, Rob Herring, Tero Kristo, Vignesh Raghavendra Cc: linux-kernel, devicetree, linux-arm-kernel, Nishanth Menon, Udit Kumar, Nitin Yadav, Neha Malcom Francis, Sinthu Raja Define the wakeup uart pin-mux for completeness and add explicit muxing for mcu_uart0. This allows the device tree usage in bootloader and firmwares that can configure the same appropriately. Signed-off-by: Nishanth Menon <nm@ti.com> --- New patch in the series .../boot/dts/ti/k3-am68-sk-base-board.dts | 26 +++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/arch/arm64/boot/dts/ti/k3-am68-sk-base-board.dts b/arch/arm64/boot/dts/ti/k3-am68-sk-base-board.dts index 014ff13d1032..979898bc5b02 100644 --- a/arch/arm64/boot/dts/ti/k3-am68-sk-base-board.dts +++ b/arch/arm64/boot/dts/ti/k3-am68-sk-base-board.dts @@ -22,6 +22,8 @@ chosen { }; aliases { + serial0 = &wkup_uart0; + serial1 = &mcu_uart0; serial2 = &main_uart8; mmc1 = &main_sdhci1; can0 = &mcu_mcan0; @@ -202,6 +204,15 @@ J721S2_IOPAD(0x08c, PIN_INPUT, 7) /* (T25) MCASP0_AXR7.GPIO0_35 */ }; &wkup_pmx2 { + wkup_uart0_pins_default: wkup-uart0-pins-default { + pinctrl-single,pins = < + J721S2_WKUP_IOPAD(0x070, PIN_INPUT, 0) /* (E25) WKUP_GPIO0_6.WKUP_UART0_CTSn */ + J721S2_WKUP_IOPAD(0x074, PIN_OUTPUT, 0) /* (F28) WKUP_GPIO0_7.WKUP_UART0_RTSn */ + J721S2_WKUP_IOPAD(0x048, PIN_INPUT, 0) /* (D28) WKUP_UART0_RXD */ + J721S2_WKUP_IOPAD(0x04c, PIN_OUTPUT, 0) /* (D27) WKUP_UART0_TXD */ + >; + }; + mcu_cpsw_pins_default: mcu-cpsw-pins-default { pinctrl-single,pins = < J721S2_WKUP_IOPAD(0x02C, PIN_INPUT, 0) /* (B22) MCU_RGMII1_RD0 */ @@ -254,6 +265,13 @@ J721S2_WKUP_IOPAD(0x07c, PIN_INPUT, 0) /* (H26) WKUP_GPIO0_9.MCU_I2C1_SDA */ >; }; + mcu_uart0_pins_default: mcu-uart0-pins-default { + pinctrl-single,pins = < + J721S2_WKUP_IOPAD(0x08c, PIN_INPUT, 0) /* (C24) WKUP_GPIO0_13.MCU_UART0_RXD */ + J721S2_WKUP_IOPAD(0x088, PIN_OUTPUT, 0) /* (C25) WKUP_GPIO0_12.MCU_UART0_TXD */ + >; + }; + mcu_rpi_header_gpio0_pins0_default: mcu-rpi-header-gpio0-pins0-default { pinctrl-single,pins = < J721S2_WKUP_IOPAD(0x118, PIN_INPUT, 7) /* (G25) WKUP_GPIO0_66 */ @@ -305,6 +323,14 @@ &wkup_gpio1 { &wkup_uart0 { status = "reserved"; + pinctrl-names = "default"; + pinctrl-0 = <&wkup_uart0_pins_default>; +}; + +&mcu_uart0 { + status = "okay"; + pinctrl-names = "default"; + pinctrl-0 = <&mcu_uart0_pins_default>; }; &main_uart8 { -- 2.40.0 ^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH 3/6] arm64: dts: ti: k3-am68-sk-base-board: Add uart pinmux 2023-06-02 15:35 ` [PATCH 3/6] arm64: dts: ti: k3-am68-sk-base-board: Add uart pinmux Nishanth Menon @ 2023-06-06 9:53 ` Kumar, Udit 2023-06-06 11:40 ` Nishanth Menon 0 siblings, 1 reply; 11+ messages in thread From: Kumar, Udit @ 2023-06-06 9:53 UTC (permalink / raw) To: Nishanth Menon, Conor Dooley, Krzysztof Kozlowski, Rob Herring, Tero Kristo, Vignesh Raghavendra Cc: linux-kernel, devicetree, linux-arm-kernel, Nitin Yadav, Neha Malcom Francis, Sinthu Raja Hi Nishanth, On 6/2/2023 9:05 PM, Nishanth Menon wrote: > Define the wakeup uart pin-mux for completeness and add explicit > muxing for mcu_uart0. This allows the device tree usage in bootloader > and firmwares that can configure the same appropriately. > > Signed-off-by: Nishanth Menon <nm@ti.com> > --- > New patch in the series > > .../boot/dts/ti/k3-am68-sk-base-board.dts | 26 +++++++++++++++++++ > 1 file changed, 26 insertions(+) > > diff --git a/arch/arm64/boot/dts/ti/k3-am68-sk-base-board.dts b/arch/arm64/boot/dts/ti/k3-am68-sk-base-board.dts > index 014ff13d1032..979898bc5b02 100644 > --- a/arch/arm64/boot/dts/ti/k3-am68-sk-base-board.dts > +++ b/arch/arm64/boot/dts/ti/k3-am68-sk-base-board.dts > @@ -22,6 +22,8 @@ chosen { > }; > > aliases { > + serial0 = &wkup_uart0; > + serial1 = &mcu_uart0; > serial2 = &main_uart8; > mmc1 = &main_sdhci1; > can0 = &mcu_mcan0; > @@ -202,6 +204,15 @@ J721S2_IOPAD(0x08c, PIN_INPUT, 7) /* (T25) MCASP0_AXR7.GPIO0_35 */ > }; > > &wkup_pmx2 { > + wkup_uart0_pins_default: wkup-uart0-pins-default { > + pinctrl-single,pins = < > + J721S2_WKUP_IOPAD(0x070, PIN_INPUT, 0) /* (E25) WKUP_GPIO0_6.WKUP_UART0_CTSn */ > + J721S2_WKUP_IOPAD(0x074, PIN_OUTPUT, 0) /* (F28) WKUP_GPIO0_7.WKUP_UART0_RTSn */ > + J721S2_WKUP_IOPAD(0x048, PIN_INPUT, 0) /* (D28) WKUP_UART0_RXD */ > + J721S2_WKUP_IOPAD(0x04c, PIN_OUTPUT, 0) /* (D27) WKUP_UART0_TXD */ > + >; > + }; > + > mcu_cpsw_pins_default: mcu-cpsw-pins-default { > pinctrl-single,pins = < > J721S2_WKUP_IOPAD(0x02C, PIN_INPUT, 0) /* (B22) MCU_RGMII1_RD0 */ > @@ -254,6 +265,13 @@ J721S2_WKUP_IOPAD(0x07c, PIN_INPUT, 0) /* (H26) WKUP_GPIO0_9.MCU_I2C1_SDA */ > >; > }; > > + mcu_uart0_pins_default: mcu-uart0-pins-default { > + pinctrl-single,pins = < > + J721S2_WKUP_IOPAD(0x08c, PIN_INPUT, 0) /* (C24) WKUP_GPIO0_13.MCU_UART0_RXD */ > + J721S2_WKUP_IOPAD(0x088, PIN_OUTPUT, 0) /* (C25) WKUP_GPIO0_12.MCU_UART0_TXD */ > + >; > + }; Series look good. One small question, We don't have CTS and RTS Pin for mcu uart , is this due to board connections ? > [..] ^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH 3/6] arm64: dts: ti: k3-am68-sk-base-board: Add uart pinmux 2023-06-06 9:53 ` Kumar, Udit @ 2023-06-06 11:40 ` Nishanth Menon 0 siblings, 0 replies; 11+ messages in thread From: Nishanth Menon @ 2023-06-06 11:40 UTC (permalink / raw) To: Kumar, Udit Cc: Conor Dooley, Krzysztof Kozlowski, Rob Herring, Tero Kristo, Vignesh Raghavendra, linux-kernel, devicetree, linux-arm-kernel, Nitin Yadav, Neha Malcom Francis, Sinthu Raja On 15:23-20230606, Kumar, Udit wrote: [...] > Series look good. Could you confirm by providing a Reviewed-by Tag to the cover-letter? > > One small question, We don't have CTS and RTS Pin for mcu uart , > > is this due to board connections ? yup. -- Regards, Nishanth Menon Key (0xDDB5849D1736249D) / Fingerprint: F8A2 8693 54EB 8232 17A3 1A34 DDB5 849D 1736 249D ^ permalink raw reply [flat|nested] 11+ messages in thread
* [PATCH 4/6] arm64: dts: ti: k3-am68-sk-som: Enable wakeup_i2c0 and eeprom 2023-06-02 15:35 [PATCH 0/6] arm64: dts: ti: k3-j721s2: Mux fixups and eeprom misc Nishanth Menon ` (2 preceding siblings ...) 2023-06-02 15:35 ` [PATCH 3/6] arm64: dts: ti: k3-am68-sk-base-board: Add uart pinmux Nishanth Menon @ 2023-06-02 15:35 ` Nishanth Menon 2023-06-06 6:24 ` Raja, M Sinthu 2023-06-02 15:35 ` [PATCH 5/6] arm64: dts: ti: k3-j721s2-common-proc-board: Add uart pinmux Nishanth Menon ` (2 subsequent siblings) 6 siblings, 1 reply; 11+ messages in thread From: Nishanth Menon @ 2023-06-02 15:35 UTC (permalink / raw) To: Conor Dooley, Krzysztof Kozlowski, Rob Herring, Tero Kristo, Vignesh Raghavendra Cc: linux-kernel, devicetree, linux-arm-kernel, Nishanth Menon, Udit Kumar, Nitin Yadav, Neha Malcom Francis, Sinthu Raja Enable wakeup_i2c. While at it, describe the board detection eeprom present on the board. Signed-off-by: Nishanth Menon <nm@ti.com> --- new patch arch/arm64/boot/dts/ti/k3-am68-sk-som.dtsi | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/arch/arm64/boot/dts/ti/k3-am68-sk-som.dtsi b/arch/arm64/boot/dts/ti/k3-am68-sk-som.dtsi index e92431250729..e2c80fff7478 100644 --- a/arch/arm64/boot/dts/ti/k3-am68-sk-som.dtsi +++ b/arch/arm64/boot/dts/ti/k3-am68-sk-som.dtsi @@ -27,3 +27,25 @@ secure_ddr: optee@9e800000 { }; }; }; + +&wkup_pmx2 { + wkup_i2c0_pins_default: wkup-i2c0-pins-default { + pinctrl-single,pins = < + J721S2_WKUP_IOPAD(0x098, PIN_INPUT, 0) /* (H24) WKUP_I2C0_SCL */ + J721S2_WKUP_IOPAD(0x09c, PIN_INPUT, 0) /* (H27) WKUP_I2C0_SDA */ + >; + }; +}; + +&wkup_i2c0 { + status = "okay"; + pinctrl-names = "default"; + pinctrl-0 = <&wkup_i2c0_pins_default>; + clock-frequency = <400000>; + + eeprom@51 { + /* AT24C512C-MAHM-T */ + compatible = "atmel,24c512"; + reg = <0x51>; + }; +}; -- 2.40.0 ^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH 4/6] arm64: dts: ti: k3-am68-sk-som: Enable wakeup_i2c0 and eeprom 2023-06-02 15:35 ` [PATCH 4/6] arm64: dts: ti: k3-am68-sk-som: Enable wakeup_i2c0 and eeprom Nishanth Menon @ 2023-06-06 6:24 ` Raja, M Sinthu 0 siblings, 0 replies; 11+ messages in thread From: Raja, M Sinthu @ 2023-06-06 6:24 UTC (permalink / raw) To: Menon, Nishanth, Conor Dooley, Krzysztof Kozlowski, Rob Herring, Tero Kristo, Raghavendra, Vignesh Cc: linux-kernel, devicetree, linux-arm-kernel, Kumar, Udit, Yadav, Nitin, Francis, Neha Nishanth, From: Menon, Nishanth Sent: Friday, June 2, 2023 9:05 PM To: Conor Dooley; Krzysztof Kozlowski; Rob Herring; Tero Kristo; Raghavendra, Vignesh Cc: linux-kernel@vger.kernel.org; devicetree@vger.kernel.org; linux-arm-kernel@lists.infradead.org; Menon, Nishanth; Kumar, Udit; Yadav, Nitin; Francis, Neha; Raja, M Sinthu Subject: [PATCH 4/6] arm64: dts: ti: k3-am68-sk-som: Enable wakeup_i2c0 and eeprom Enable wakeup_i2c. While at it, describe the board detection eeprom present on the board. Signed-off-by: Nishanth Menon <nm@ti.com> --- new patch arch/arm64/boot/dts/ti/k3-am68-sk-som.dtsi | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/arch/arm64/boot/dts/ti/k3-am68-sk-som.dtsi b/arch/arm64/boot/dts/ti/k3-am68-sk-som.dtsi index e92431250729..e2c80fff7478 100644 --- a/arch/arm64/boot/dts/ti/k3-am68-sk-som.dtsi +++ b/arch/arm64/boot/dts/ti/k3-am68-sk-som.dtsi @@ -27,3 +27,25 @@ secure_ddr: optee@9e800000 { }; }; }; + +&wkup_pmx2 { + wkup_i2c0_pins_default: wkup-i2c0-pins-default { + pinctrl-single,pins = < + J721S2_WKUP_IOPAD(0x098, PIN_INPUT, 0) /* (H24) WKUP_I2C0_SCL */ + J721S2_WKUP_IOPAD(0x09c, PIN_INPUT, 0) /* (H27) WKUP_I2C0_SDA */ + >; + }; +}; + +&wkup_i2c0 { + status = "okay"; + pinctrl-names = "default"; + pinctrl-0 = <&wkup_i2c0_pins_default>; + clock-frequency = <400000>; + + eeprom@51 { + /* AT24C512C-MAHM-T */ + compatible = "atmel,24c512"; + reg = <0x51>; + }; +}; LGTM Reviewed-by: Sinthu Raja <sinthu.raja@ti.com> -- 2.40.0 ^ permalink raw reply [flat|nested] 11+ messages in thread
* [PATCH 5/6] arm64: dts: ti: k3-j721s2-common-proc-board: Add uart pinmux 2023-06-02 15:35 [PATCH 0/6] arm64: dts: ti: k3-j721s2: Mux fixups and eeprom misc Nishanth Menon ` (3 preceding siblings ...) 2023-06-02 15:35 ` [PATCH 4/6] arm64: dts: ti: k3-am68-sk-som: Enable wakeup_i2c0 and eeprom Nishanth Menon @ 2023-06-02 15:35 ` Nishanth Menon 2023-06-02 15:35 ` [PATCH 6/6] arm64: dts: ti: k3-j721s2-som-p0: Enable wakeup_i2c0 and eeprom Nishanth Menon 2023-06-06 13:07 ` [PATCH 0/6] arm64: dts: ti: k3-j721s2: Mux fixups and eeprom misc Kumar, Udit 6 siblings, 0 replies; 11+ messages in thread From: Nishanth Menon @ 2023-06-02 15:35 UTC (permalink / raw) To: Conor Dooley, Krzysztof Kozlowski, Rob Herring, Tero Kristo, Vignesh Raghavendra Cc: linux-kernel, devicetree, linux-arm-kernel, Nishanth Menon, Udit Kumar, Nitin Yadav, Neha Malcom Francis, Sinthu Raja Define the wakeup uart pin-mux for completeness and add explicit muxing for mcu_uart0. This allows the device tree usage in bootloader and firmwares that can configure the same appropriately. Signed-off-by: Nishanth Menon <nm@ti.com> --- New patch .../dts/ti/k3-j721s2-common-proc-board.dts | 23 ++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/arch/arm64/boot/dts/ti/k3-j721s2-common-proc-board.dts b/arch/arm64/boot/dts/ti/k3-j721s2-common-proc-board.dts index 7283ce2aadb2..cc7aa2848a92 100644 --- a/arch/arm64/boot/dts/ti/k3-j721s2-common-proc-board.dts +++ b/arch/arm64/boot/dts/ti/k3-j721s2-common-proc-board.dts @@ -146,6 +146,24 @@ J721S2_IOPAD(0x020, PIN_INPUT, 7) /* (AA23) MCAN15_RX.GPIO0_8 */ }; &wkup_pmx2 { + wkup_uart0_pins_default: wkup-uart0-pins-default { + pinctrl-single,pins = < + J721S2_WKUP_IOPAD(0x070, PIN_INPUT, 0) /* (E25) WKUP_GPIO0_6.WKUP_UART0_CTSn */ + J721S2_WKUP_IOPAD(0x074, PIN_OUTPUT, 0) /* (F28) WKUP_GPIO0_7.WKUP_UART0_RTSn */ + J721S2_WKUP_IOPAD(0x048, PIN_INPUT, 0) /* (D28) WKUP_UART0_RXD */ + J721S2_WKUP_IOPAD(0x04c, PIN_OUTPUT, 0) /* (D27) WKUP_UART0_TXD */ + >; + }; + + mcu_uart0_pins_default: mcu-uart0-pins-default { + pinctrl-single,pins = < + J721S2_WKUP_IOPAD(0x090, PIN_INPUT, 0) /* (B24) WKUP_GPIO0_14.MCU_UART0_CTSn */ + J721S2_WKUP_IOPAD(0x094, PIN_OUTPUT, 0) /* (D25) WKUP_GPIO0_15.MCU_UART0_RTSn */ + J721S2_WKUP_IOPAD(0x08c, PIN_INPUT, 0) /* (C24) WKUP_GPIO0_13.MCU_UART0_RXD */ + J721S2_WKUP_IOPAD(0x088, PIN_OUTPUT, 0) /* (C25) WKUP_GPIO0_12.MCU_UART0_TXD */ + >; + }; + mcu_cpsw_pins_default: mcu-cpsw-pins-default { pinctrl-single,pins = < J721S2_WKUP_IOPAD(0x02c, PIN_INPUT, 0) /* (B22) MCU_RGMII1_RD0 */ @@ -242,11 +260,14 @@ &wkup_gpio1 { &wkup_uart0 { status = "reserved"; + pinctrl-names = "default"; + pinctrl-0 = <&wkup_uart0_pins_default>; }; &mcu_uart0 { status = "okay"; - /* Default pinmux */ + pinctrl-names = "default"; + pinctrl-0 = <&mcu_uart0_pins_default>; }; &main_uart8 { -- 2.40.0 ^ permalink raw reply [flat|nested] 11+ messages in thread
* [PATCH 6/6] arm64: dts: ti: k3-j721s2-som-p0: Enable wakeup_i2c0 and eeprom 2023-06-02 15:35 [PATCH 0/6] arm64: dts: ti: k3-j721s2: Mux fixups and eeprom misc Nishanth Menon ` (4 preceding siblings ...) 2023-06-02 15:35 ` [PATCH 5/6] arm64: dts: ti: k3-j721s2-common-proc-board: Add uart pinmux Nishanth Menon @ 2023-06-02 15:35 ` Nishanth Menon 2023-06-06 13:07 ` [PATCH 0/6] arm64: dts: ti: k3-j721s2: Mux fixups and eeprom misc Kumar, Udit 6 siblings, 0 replies; 11+ messages in thread From: Nishanth Menon @ 2023-06-02 15:35 UTC (permalink / raw) To: Conor Dooley, Krzysztof Kozlowski, Rob Herring, Tero Kristo, Vignesh Raghavendra Cc: linux-kernel, devicetree, linux-arm-kernel, Nishanth Menon, Udit Kumar, Nitin Yadav, Neha Malcom Francis, Sinthu Raja Enable wakeup_i2c and use un-used pinmux. While at it, describe the board detection eeprom present on the board. Signed-off-by: Nishanth Menon <nm@ti.com> --- New patch arch/arm64/boot/dts/ti/k3-j721s2-som-p0.dtsi | 22 ++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/arch/arm64/boot/dts/ti/k3-j721s2-som-p0.dtsi b/arch/arm64/boot/dts/ti/k3-j721s2-som-p0.dtsi index 6930efff8a5a..ccd69640a5c0 100644 --- a/arch/arm64/boot/dts/ti/k3-j721s2-som-p0.dtsi +++ b/arch/arm64/boot/dts/ti/k3-j721s2-som-p0.dtsi @@ -39,6 +39,15 @@ transceiver0: can-phy0 { }; }; +&wkup_pmx2 { + wkup_i2c0_pins_default: wkup-i2c0-pins-default { + pinctrl-single,pins = < + J721S2_WKUP_IOPAD(0x98, PIN_INPUT, 0) /* (H24) WKUP_I2C0_SCL */ + J721S2_WKUP_IOPAD(0x9c, PIN_INPUT, 0) /* (H27) WKUP_I2C0_SDA */ + >; + }; +}; + &main_pmx0 { main_i2c0_pins_default: main-i2c0-pins-default { pinctrl-single,pins = < @@ -55,6 +64,19 @@ J721S2_IOPAD(0x024, PIN_OUTPUT, 0) /* (Y28) MCAN16_TX */ }; }; +&wkup_i2c0 { + status = "okay"; + pinctrl-names = "default"; + pinctrl-0 = <&wkup_i2c0_pins_default>; + clock-frequency = <400000>; + + eeprom@50 { + /* CAV24C256WE-GT3 */ + compatible = "atmel,24c256"; + reg = <0x50>; + }; +}; + &main_i2c0 { status = "okay"; pinctrl-names = "default"; -- 2.40.0 ^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH 0/6] arm64: dts: ti: k3-j721s2: Mux fixups and eeprom misc 2023-06-02 15:35 [PATCH 0/6] arm64: dts: ti: k3-j721s2: Mux fixups and eeprom misc Nishanth Menon ` (5 preceding siblings ...) 2023-06-02 15:35 ` [PATCH 6/6] arm64: dts: ti: k3-j721s2-som-p0: Enable wakeup_i2c0 and eeprom Nishanth Menon @ 2023-06-06 13:07 ` Kumar, Udit 6 siblings, 0 replies; 11+ messages in thread From: Kumar, Udit @ 2023-06-06 13:07 UTC (permalink / raw) To: Nishanth Menon, Conor Dooley, Krzysztof Kozlowski, Rob Herring, Tero Kristo, Vignesh Raghavendra Cc: linux-kernel, devicetree, linux-arm-kernel, Nitin Yadav, Neha Malcom Francis, Sinthu Raja, u-kumar1 Thanks Nishanth On 6/2/2023 9:05 PM, Nishanth Menon wrote: > Hi, > > This is an expansion of Sinthu's series[1] for J721s2, fixing a few aspects > of his patches and adding uart, eeprom detection etc. > > This set of changes picksup fixes seen in u-boot and else where an > consolidates into kernel as the definitive device tree description > > Testing logs: https://gist.github.com/nmenon/2acfc566d0b215fe941c42317d9ac955 > > Changes: > * Fixups to the wkup_pmx0 patch to limit stable tree to 6.3 > * Fixups to Rpi header patch for mcu_i2c0 pinmux > * Additional patches for eeprom and wkup/mcu uarts. > > -- Sinthu's series history: > Changes in V5[1]: > -Remove main padconfig split patch which is not required. > > Changes in V4: > - Address review comments > * Update main and wakeup domain IO padconfig > * Correct the pinctrl node offsets as per the newly split wkup_pmx* > and main_pmx* nodes. > > Changes in V3: > - Add Fixes tag. > > Changes in V2: > - Update commit description. > - Update the offset value to 0x194 as 0x190 is the last register of the > IO PADCONFIG register set. > > V1: https://lore.kernel.org/all/20230123135831.4184-1-sinthu.raja@ti.com/ > V2: https://lore.kernel.org/lkml/20230124120311.7323-1-sinthu.raja@ti.com/T/ > V3: https://lore.kernel.org/linux-arm-kernel/20230316114102.3602-2-sinthu.raja@ti.com/T/ > V4: https://lore.kernel.org/lkml/20230424081536.12123-1-sinthu.raja@ti.com/ > V5[1]: https://lore.kernel.org/linux-arm-kernel/20230504073432.6438-1-sinthu.raja@ti.com/ > > Nishanth Menon (4): > arm64: dts: ti: k3-am68-sk-base-board: Add uart pinmux > arm64: dts: ti: k3-am68-sk-som: Enable wakeup_i2c0 and eeprom > arm64: dts: ti: k3-j721s2-common-proc-board: Add uart pinmux > arm64: dts: ti: k3-j721s2-som-p0: Enable wakeup_i2c0 and eeprom > > Sinthu Raja (2): > arm64: dts: ti: k3-j721s2: Fix wkup pinmux range > arm64: dts: ti: k3-am68-sk-base-board: Add pinmux for RPi Header Reviewed-by: Udit Kumar <u-kumar1@ti.com> > .../boot/dts/ti/k3-am68-sk-base-board.dts | 145 +++++++++++++++--- > arch/arm64/boot/dts/ti/k3-am68-sk-som.dtsi | 22 +++ > .../dts/ti/k3-j721s2-common-proc-board.dts | 99 +++++++----- > .../boot/dts/ti/k3-j721s2-mcu-wakeup.dtsi | 29 +++- > arch/arm64/boot/dts/ti/k3-j721s2-som-p0.dtsi | 22 +++ > 5 files changed, 255 insertions(+), 62 deletions(-) > ^ permalink raw reply [flat|nested] 11+ messages in thread
end of thread, other threads:[~2023-06-06 13:08 UTC | newest] Thread overview: 11+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2023-06-02 15:35 [PATCH 0/6] arm64: dts: ti: k3-j721s2: Mux fixups and eeprom misc Nishanth Menon 2023-06-02 15:35 ` [PATCH 1/6] arm64: dts: ti: k3-j721s2: Fix wkup pinmux range Nishanth Menon 2023-06-02 15:35 ` [PATCH 2/6] arm64: dts: ti: k3-am68-sk-base-board: Add pinmux for RPi Header Nishanth Menon 2023-06-02 15:35 ` [PATCH 3/6] arm64: dts: ti: k3-am68-sk-base-board: Add uart pinmux Nishanth Menon 2023-06-06 9:53 ` Kumar, Udit 2023-06-06 11:40 ` Nishanth Menon 2023-06-02 15:35 ` [PATCH 4/6] arm64: dts: ti: k3-am68-sk-som: Enable wakeup_i2c0 and eeprom Nishanth Menon 2023-06-06 6:24 ` Raja, M Sinthu 2023-06-02 15:35 ` [PATCH 5/6] arm64: dts: ti: k3-j721s2-common-proc-board: Add uart pinmux Nishanth Menon 2023-06-02 15:35 ` [PATCH 6/6] arm64: dts: ti: k3-j721s2-som-p0: Enable wakeup_i2c0 and eeprom Nishanth Menon 2023-06-06 13:07 ` [PATCH 0/6] arm64: dts: ti: k3-j721s2: Mux fixups and eeprom misc Kumar, Udit
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®