From: Udit Kumar <u-kum...@ti.com> commit 696d9e2d712fb42014a420942f9c787339f4a568 from git://git.ti.com/ti-linux-kernel/ti-linux-kernel.git
After splitting the wkup_pmx into four region. I2C and PMIC pin muxes was falling outside the assigned region. Also removed unused pin from OSPI pin mux. Fixes: c33b294d75dd ("arm64: dts: ti: k3-j721s2: Fix wkup pinmux range") Cc: Esteban Blanc <ebl...@baylibre.com> Cc: Vaishnav Achath <vaishna...@ti.com> Cc: Apurva Nandan <a-nan...@ti.com> Cc: Sinthu Raja <sinthu.r...@ti.com> Cc: Vignesh Raghavendra <vigne...@ti.com> Signed-off-by: Udit Kumar <u-kum...@ti.com> Signed-off-by: Vignesh Raghavendra <vigne...@ti.com> Signed-off-by: Xulin Sun <xulin....@windriver.com> --- .../dts/ti/k3-j721s2-common-proc-board.dts | 1 - arch/arm64/boot/dts/ti/k3-j721s2-som-p0.dtsi | 25 +++++++++---------- 2 files changed, 12 insertions(+), 14 deletions(-) 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 9027ddddbf34..74cae2ead63d 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 @@ -273,7 +273,6 @@ mcu_fss0_ospi1_pins_default: mcu-fss0-ospi1-pins-default { pinctrl-single,pins = < J721S2_WKUP_IOPAD(0x008, PIN_OUTPUT, 0) /* (A19) MCU_OSPI1_CLK */ J721S2_WKUP_IOPAD(0x024, PIN_OUTPUT, 0) /* (D20) MCU_OSPI1_CSn0 */ - J721S2_WKUP_IOPAD(0x028, PIN_OUTPUT, 0) /* (C21) MCU_OSPI1_CSn1 */ J721S2_WKUP_IOPAD(0x014, PIN_INPUT, 0) /* (D21) MCU_OSPI1_D0 */ J721S2_WKUP_IOPAD(0x018, PIN_INPUT, 0) /* (G20) MCU_OSPI1_D1 */ J721S2_WKUP_IOPAD(0x01c, PIN_INPUT, 0) /* (C20) MCU_OSPI1_D2 */ 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 d44605773dc0..0c7132206b3d 100644 --- a/arch/arm64/boot/dts/ti/k3-j721s2-som-p0.dtsi +++ b/arch/arm64/boot/dts/ti/k3-j721s2-som-p0.dtsi @@ -190,9 +190,6 @@ mcu_fss0_ospi0_pins_default: mcu-fss0-ospi0-pins-default { pinctrl-single,pins = < J721S2_WKUP_IOPAD(0x000, PIN_OUTPUT, 0) /* (D19) MCU_OSPI0_CLK */ J721S2_WKUP_IOPAD(0x02c, PIN_OUTPUT, 0) /* (F15) MCU_OSPI0_CSn0 */ - J721S2_WKUP_IOPAD(0x030, PIN_OUTPUT, 0) /* (G17) MCU_OSPI0_CSn1 */ - J721S2_WKUP_IOPAD(0x038, PIN_OUTPUT, 0) /* (F14) MCU_OSPI0_CSn2 */ - J721S2_WKUP_IOPAD(0x03c, PIN_OUTPUT, 0) /* (F17) MCU_OSPI0_CSn3 */ J721S2_WKUP_IOPAD(0x00c, PIN_INPUT, 0) /* (C19) MCU_OSPI0_D0 */ J721S2_WKUP_IOPAD(0x010, PIN_INPUT, 0) /* (F16) MCU_OSPI0_D1 */ J721S2_WKUP_IOPAD(0x014, PIN_INPUT, 0) /* (G15) MCU_OSPI0_D2 */ @@ -207,6 +204,15 @@ J721S2_WKUP_IOPAD(0x004, PIN_INPUT, 0) /* (E20) MCU_OSPI0_LBCLKO */ }; }; +&wkup_pmx1 { + pmic_irq_pins_default: pmic-irq-pins-default { + pinctrl-single,pins = < + /* (C21) MCU_OSPI1_CSn1.WKUP_GPIO0_39 */ + J721S2_WKUP_IOPAD(0x028, PIN_INPUT, 7) + >; + }; +}; + &main_pmx0 { main_i2c0_pins_default: main-i2c0-pins-default { pinctrl-single,pins = < @@ -248,18 +254,11 @@ &main_mcan16 { phys = <&transceiver0>; }; -&wkup_pmx0 { - pmic_irq_pins_default: pmic-irq-pins-default { - pinctrl-single,pins = < - /* (C21) MCU_OSPI1_CSn1.WKUP_GPIO0_39 */ - J721S2_WKUP_IOPAD(0x060, PIN_INPUT, 7) - >; - }; - +&wkup_pmx2 { wkup_i2c0_pins_default: wkup_i2c0_pins_default { pinctrl-single,pins = < - J721S2_WKUP_IOPAD(0x100, PIN_INPUT, 0) /* (H24) WKUP_I2C0_SCL */ - J721S2_WKUP_IOPAD(0x104, PIN_INPUT, 0) /* (H27) WKUP_I2C0_SDA */ + J721S2_WKUP_IOPAD(0x98, PIN_INPUT, 0) /* (H24) WKUP_I2C0_SCL */ + J721S2_WKUP_IOPAD(0x9c, PIN_INPUT, 0) /* (H27) WKUP_I2C0_SDA */ >; }; }; -- 2.35.5
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#13210): https://lists.yoctoproject.org/g/linux-yocto/message/13210 Mute This Topic: https://lists.yoctoproject.org/mt/102074934/21656 Group Owner: linux-yocto+ow...@lists.yoctoproject.org Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-