arm64: dts: ti: k3-j784s4-evm: Correct Pin mux offset for ospi
Subsystems (2)
PATCH v2 1/1 arm64: dts: ti: k3-j784s4-evm: Correct Pin mux offset for ospi
After splitting wkup_pmx pin mux for J784S4 into four regions. Pin mux offset for OSPI nodes were not updated to align with new regions, due to this while setting ospi pin muxes out of range error was seen.
Pin mux offsets for OSPI nodes are corrected in this patch.
---
Logs
https://gist.github.com/uditkumarti/f3b1a5402f7202931a4b905f7d331502
Please apply patch https://lore.kernel.org/all/[email protected]/
before this
Change log:
Change in v2
Changed name of pin mux to align with
https://lore.kernel.org/all/[email protected]/ patch
v1: https://lore.kernel.org/all/[email protected]/
arch/arm64/boot/dts/ti/k3-j784s4-evm.dts | 29 +++++++++++++++--------- 1 file changed, 18 insertions(+), 11 deletions(-)
arch/arm64/boot/dts/ti/k3-j784s4-evm.dts +18 -11
@@ -379,21 +379,28 @@ J784S4_WKUP_IOPAD(0x020, PIN_INPUT, 0) /* (D34) MCU_OSPI0_D5 */ J784S4_WKUP_IOPAD(0x024, PIN_INPUT, 0) /* (E34) MCU_OSPI0_D6 */ J784S4_WKUP_IOPAD(0x028, PIN_INPUT, 0) /* (E33) MCU_OSPI0_D7 */ J784S4_WKUP_IOPAD(0x008, PIN_INPUT, 0) /* (C34) MCU_OSPI0_DQS */ - J784S4_WKUP_IOPAD(0x03c, PIN_OUTPUT, 6) /* (C32) MCU_OSPI0_CSn3.MCU_OSPI0_ECC_FAIL */ - J784S4_WKUP_IOPAD(0x038, PIN_OUTPUT, 6) /* (B34) MCU_OSPI0_CSn2.MCU_OSPI0_RESET_OUT0 */ + >; + }; +}; + +&wkup_pmx1 { + mcu_fss0_ospi0_1_pins_default: mcu-fss0-ospi0-1-default-pins { + pinctrl-single,pins = < + J784S4_WKUP_IOPAD(0x004, PIN_OUTPUT, 6) /* (C32) MCU_OSPI0_ECC_FAIL */ + J784S4_WKUP_IOPAD(0x000, PIN_OUTPUT, 6) /* (B34) MCU_OSPI0_RESET_OUT0 */ >; }; mcu_fss0_ospi1_pins_default: mcu-fss0-ospi1-default-pins { pinctrl-single,pins = < - J784S4_WKUP_IOPAD(0x040, PIN_OUTPUT, 0) /* (F32) MCU_OSPI1_CLK */ - J784S4_WKUP_IOPAD(0x05c, PIN_OUTPUT, 0) /* (G32) MCU_OSPI1_CSn0 */ - J784S4_WKUP_IOPAD(0x04c, PIN_INPUT, 0) /* (E35) MCU_OSPI1_D0 */ - J784S4_WKUP_IOPAD(0x050, PIN_INPUT, 0) /* (D31) MCU_OSPI1_D1 */ - J784S4_WKUP_IOPAD(0x054, PIN_INPUT, 0) /* (G31) MCU_OSPI1_D2 */ - J784S4_WKUP_IOPAD(0x058, PIN_INPUT, 0) /* (F33) MCU_OSPI1_D3 */ - J784S4_WKUP_IOPAD(0x048, PIN_INPUT, 0) /* (F31) MCU_OSPI1_DQS */ - J784S4_WKUP_IOPAD(0x044, PIN_INPUT, 0) /* (C31) MCU_OSPI1_LBCLKO */ + J784S4_WKUP_IOPAD(0x008, PIN_OUTPUT, 0) /* (F32) MCU_OSPI1_CLK */ + J784S4_WKUP_IOPAD(0x024, PIN_OUTPUT, 0) /* (G32) MCU_OSPI1_CSn0 */ + J784S4_WKUP_IOPAD(0x014, PIN_INPUT, 0) /* (E35) MCU_OSPI1_D0 */ + J784S4_WKUP_IOPAD(0x018, PIN_INPUT, 0) /* (D31) MCU_OSPI1_D1 */ + J784S4_WKUP_IOPAD(0x01C, PIN_INPUT, 0) /* (G31) MCU_OSPI1_D2 */ + J784S4_WKUP_IOPAD(0x020, PIN_INPUT, 0) /* (F33) MCU_OSPI1_D3 */ + J784S4_WKUP_IOPAD(0x010, PIN_INPUT, 0) /* (F31) MCU_OSPI1_DQS */ + J784S4_WKUP_IOPAD(0x00C, PIN_INPUT, 0) /* (C31) MCU_OSPI1_LBCLKO */ >; }; };
@@ -437,7 +444,7 @@ &fss { &ospi0 { status = "okay"; pinctrl-names = "default"; - pinctrl-0 = <&mcu_fss0_ospi0_pins_default>; + pinctrl-0 = <&mcu_fss0_ospi0_pins_default>, <&mcu_fss0_ospi0_1_pins_default>; flash@0 { compatible = "jedec,spi-nor";
Signature · 1 line
2.34.1
Hi Udit,
Quoted 58 lines · Udit Kumar
After splitting
wkup_pmxpin mux for J784S4 into four regions. Pin mux offset for OSPI nodes were not updated to align with new regions, due to this while setting ospi pin muxes out of range error was seen.Pin mux offsets for OSPI nodes are corrected in this patch.
Fixes 14462bd0b247 ("arm64: dts: ti: k3-j784s4: Fix wakeup pinmux range and pinctrl node offsets")Signed-off-by Udit Kumar <[email protected]>---
Logs
https://gist.github.com/uditkumarti/f3b1a5402f7202931a4b905f7d331502Please apply patch https://lore.kernel.org/all/[email protected]/
before thisChange log:
Change in v2
Changed name of pin mux to align with
https://lore.kernel.org/all/[email protected]/ patchv1: https://lore.kernel.org/all/[email protected]/
arch/arm64/boot/dts/ti/k3-j784s4-evm.dts | 29 +++++++++++++++--------- 1 file changed, 18 insertions(+), 11 deletions(-)arch/arm64/boot/dts/ti/k3-j784s4-evm.dts +9
-8@@ -379,21 +379,28 @@ J784S4_WKUP_IOPAD(0x020, PIN_INPUT, 0) /* (D34) MCU_OSPI0_D5 */ J784S4_WKUP_IOPAD(0x024, PIN_INPUT, 0) /* (E34) MCU_OSPI0_D6 */ J784S4_WKUP_IOPAD(0x028, PIN_INPUT, 0) /* (E33) MCU_OSPI0_D7 */ J784S4_WKUP_IOPAD(0x008, PIN_INPUT, 0) /* (C34) MCU_OSPI0_DQS */ - J784S4_WKUP_IOPAD(0x03c, PIN_OUTPUT, 6) /* (C32) MCU_OSPI0_CSn3.MCU_OSPI0_ECC_FAIL */ - J784S4_WKUP_IOPAD(0x038, PIN_OUTPUT, 6) /* (B34) MCU_OSPI0_CSn2.MCU_OSPI0_RESET_OUT0 */ + >; + }; +}; + +&wkup_pmx1 { + mcu_fss0_ospi0_1_pins_default: mcu-fss0-ospi0-1-default-pins { + pinctrl-single,pins = < + J784S4_WKUP_IOPAD(0x004, PIN_OUTPUT, 6) /* (C32) MCU_OSPI0_ECC_FAIL */ + J784S4_WKUP_IOPAD(0x000, PIN_OUTPUT, 6) /* (B34) MCU_OSPI0_RESET_OUT0 */ >; }; mcu_fss0_ospi1_pins_default: mcu-fss0-ospi1-default-pins { pinctrl-single,pins = < - J784S4_WKUP_IOPAD(0x040, PIN_OUTPUT, 0) /* (F32) MCU_OSPI1_CLK */ - J784S4_WKUP_IOPAD(0x05c, PIN_OUTPUT, 0) /* (G32) MCU_OSPI1_CSn0 */ - J784S4_WKUP_IOPAD(0x04c, PIN_INPUT, 0) /* (E35) MCU_OSPI1_D0 */ - J784S4_WKUP_IOPAD(0x050, PIN_INPUT, 0) /* (D31) MCU_OSPI1_D1 */ - J784S4_WKUP_IOPAD(0x054, PIN_INPUT, 0) /* (G31) MCU_OSPI1_D2 */ - J784S4_WKUP_IOPAD(0x058, PIN_INPUT, 0) /* (F33) MCU_OSPI1_D3 */
arch/arm64/boot/dts/ti/k3-j784s4-evm.dts J784S4_WKUP_IOPAD(0x020, PIN_INPUT, 0) /* (D34) MCU_OSPI0_D5 */ · line 403
Quoted 10 lines
arch/arm64/boot/dts/ti/k3-j784s4-evm.dts +8
-2- J784S4_WKUP_IOPAD(0x048, PIN_INPUT, 0) /* (F31) MCU_OSPI1_DQS */ - J784S4_WKUP_IOPAD(0x044, PIN_INPUT, 0) /* (C31) MCU_OSPI1_LBCLKO */ + J784S4_WKUP_IOPAD(0x008, PIN_OUTPUT, 0) /* (F32) MCU_OSPI1_CLK */ + J784S4_WKUP_IOPAD(0x024, PIN_OUTPUT, 0) /* (G32) MCU_OSPI1_CSn0 */ + J784S4_WKUP_IOPAD(0x014, PIN_INPUT, 0) /* (E35) MCU_OSPI1_D0 */ + J784S4_WKUP_IOPAD(0x018, PIN_INPUT, 0) /* (D31) MCU_OSPI1_D1 */ + J784S4_WKUP_IOPAD(0x01C, PIN_INPUT, 0) /* (G31) MCU_OSPI1_D2 */ + J784S4_WKUP_IOPAD(0x020, PIN_INPUT, 0) /* (F33) MCU_OSPI1_D3 */ + J784S4_WKUP_IOPAD(0x010, PIN_INPUT, 0) /* (F31) MCU_OSPI1_DQS */ + J784S4_WKUP_IOPAD(0x00C, PIN_INPUT, 0) /* (C31) MCU_OSPI1_LBCLKO */
Thank you for the patch,
For OSPI functionality:
before: https://gist.github.com/vaishnavachath/c87275e53f6ae38bacc44c65ed09c733
(QSPI probe fails due to wrong pinmux)
after: https://gist.github.com/vaishnavachath/b5f6147cfae5218815aca94ec0dfd991
(both QSPI, OSPI is functional)
heads-up :
I see the following warnings for ADC:
``` pinctrl-single 4301c068.pinctrl: mux offset out of range: 0x134 (0x120) pinctrl-single 4301c068.pinctrl: could not add functions for mcu-adc0-default-pins 308x pinctrl-single 4301c068.pinctrl: mux offset out of range: 0x154 (0x120) pinctrl-single 4301c068.pinctrl: could not add functions for mcu-adc1-default-pins 340x ```
mcu_adc0_pins_default and mcu_adc1_pins_default entries needs to have the wkup_pmx2 base (0x68) subtracted to get the appropriate offsets, not sure if there is already a patch addressing the same or should be part of this patch.
Thanks and Regards,
Vaishnav
Quoted 12 lines
arch/arm64/boot/dts/ti/k3-j784s4-evm.dts +1
-1>; }; };@@ -437,7 +444,7 @@ &fss { &ospi0 { status = "okay"; pinctrl-names = "default"; - pinctrl-0 = <&mcu_fss0_ospi0_pins_default>; + pinctrl-0 = <&mcu_fss0_ospi0_pins_default>, <&mcu_fss0_ospi0_1_pins_default>; flash@0 { compatible = "jedec,spi-nor";
Thanks Vaishnav.
Hi Nishanth,
Quoted 30 lines · Vaishnav Achath
Hi Udit,
Quoted 27 lines · Udit Kumar
[...]
Thank you for the patch,For OSPI functionality:
Tested-by Vaishnav Achath <[email protected]>before: https://gist.github.com/vaishnavachath/c87275e53f6ae38bacc44c65ed09c733
(QSPI probe fails due to wrong pinmux)
after: https://gist.github.com/vaishnavachath/b5f6147cfae5218815aca94ec0dfd991
(both QSPI, OSPI is functional)heads-up :
I see the following warnings for ADC:``` pinctrl-single 4301c068.pinctrl: mux offset out of range: 0x134 (0x120) pinctrl-single 4301c068.pinctrl: could not add functions for mcu-adc0-default-pins 308x pinctrl-single 4301c068.pinctrl: mux offset out of range: 0x154 (0x120) pinctrl-single 4301c068.pinctrl: could not add functions for mcu-adc1-default-pins 340x ```
mcu_adc0_pins_defaultandmcu_adc1_pins_defaultentries needs to have thewkup_pmx2base (0x68) subtracted to get the appropriate offsets, not sure if there is already a patch addressing the same or should be part of this patch.
let me know, if you are ok with other patch to address adc pin mux or I should respin with adc changes
Quoted 15 lines
Quoted 15 lines
Thanks and Regards,
Vaishnav>; }; };arch/arm64/boot/dts/ti/k3-j784s4-evm.dts +1
-1@@ -437,7 +444,7 @@ &fss { &ospi0 { status = "okay"; pinctrl-names = "default"; - pinctrl-0 = <&mcu_fss0_ospi0_pins_default>; + pinctrl-0 = <&mcu_fss0_ospi0_pins_default>, <&mcu_fss0_ospi0_1_pins_default>; flash@0 { compatible = "jedec,spi-nor";
Nishanth Menon
maintainerQuoted 32 lines · Udit
Thanks Vaishnav.
Hi Nishanth,
Quoted 27 lines · Vaishnav Achath
Hi Udit,
Quoted 24 lines · Udit Kumar
[...]
Thank you for the patch,For OSPI functionality:
Tested-by Vaishnav Achath <[email protected]>before: https://gist.github.com/vaishnavachath/c87275e53f6ae38bacc44c65ed09c733
(QSPI probe fails due to wrong pinmux)
after: https://gist.github.com/vaishnavachath/b5f6147cfae5218815aca94ec0dfd991
(both QSPI, OSPI is functional)heads-up :
I see the following warnings for ADC:``` pinctrl-single 4301c068.pinctrl: mux offset out of range: 0x134 (0x120) pinctrl-single 4301c068.pinctrl: could not add functions for mcu-adc0-default-pins 308x pinctrl-single 4301c068.pinctrl: mux offset out of range: 0x154 (0x120) pinctrl-single 4301c068.pinctrl: could not add functions for mcu-adc1-default-pins 340x ```
Quoted 6 lines
Quoted 3 lines
Quoted 3 lines
mcu_adc0_pins_defaultandmcu_adc1_pins_defaultentries needs to have thewkup_pmx2base (0x68) subtracted to get the appropriate offsets, not sure if there is already a patch addressing the same or should be part of this patch.let me know, if you are ok with other patch to address adc pin mux or I should respin with adc changes
adc fixes come separate on top - for the next time please:
Roll these fixes out in a single series.
Signature · 3 lines
Regards, Nishanth Menon Key (0xDDB5849D1736249D) / Fingerprint: F8A2 8693 54EB 8232 17A3 1A34 DDB5 849D 1736 249D
Hi Udit Kumar,
Quoted 8 lines · Udit Kumar
After splitting
wkup_pmxpin mux for J784S4 into four regions. Pin mux offset for OSPI nodes were not updated to align with new regions, due to this while setting ospi pin muxes out of range error was seen.Pin mux offsets for OSPI nodes are corrected in this patch.
[...]
As discussed in the chain, please send adc and any other fixes (including those for sk-am69 as follow on patch series). In the future, I'd prefer all the fixes to be put in a single series to avoid this kind of cherry-pick fixing.
I have applied the following to branch ti-k3-dts-next on [1]. Thank you!
[1/1] arm64: dts: ti: k3-j784s4-evm: Correct Pin mux offset for ospi
commit: f10f836ccfea21ae3ad3066eb9576625f1acdea2
All 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 · 9 lines
Regards, Nishanth Menon Key (0xDDB5849D1736249D) / Fingerprint: F8A2 8693 54EB 8232 17A3 1A34 DDB5 849D 1736 249D _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel