TI J7x Disable Incomplete DT Nodes
Subsystems (2)
cover TI J7x Disable Incomplete DT Nodes
Hello all,
Same story as for AM64x[0] and AM62x[1], this time for J7x.
This one was a little more involved that the last 2 rounds as some IP (like UART) are pinned out using the default pinmux. Perhaps we should be explicit here and have pinmux nodes that simply restate the defaults. I can go solve that in a follow up series if we think that is what we want to do.
I have the last round for AM65x ready to post, but that involves a few boards that I do not have (Simatic IOT2050) but would like to do some additional re-work with, so holding off until after I get that sorted.
Thanks,
Andrew
[0] https://www.spinics.net/lists/arm-kernel/msg1018532.html
[1] https://www.spinics.net/lists/arm-kernel/msg1018864.html
Andrew Davis (12):
arm64: dts: ti: k3-j721e: Enable UART nodes at the board level
arm64: dts: ti: k3-j721e: Enable I2C nodes at the board level
arm64: dts: ti: k3-j721e: Enable MCASP nodes at the board level
arm64: dts: ti: k3-j721e: Enable MCAN nodes at the board level
arm64: dts: ti: k3-j7200: Enable UART nodes at the board level
arm64: dts: ti: k3-j7200: Enable I2C nodes at the board level
arm64: dts: ti: k3-j721s2: Enable UART nodes at the board level
arm64: dts: ti: k3-j721e: Enable Mailbox nodes at the board level
arm64: dts: ti: k3-j7200: Enable Mailbox nodes at the board level
arm64: dts: ti: k3-j721s2: Enable Mailbox nodes at the board level
arm64: dts: ti: k3-j721s2: Enable MCAN nodes at the board level
arm64: dts: ti: k3-j721s2: Enable I2C nodes at the board level
.../dts/ti/k3-j7200-common-proc-board.dts | 48 ++---- arch/arm64/boot/dts/ti/k3-j7200-main.dtsi | 29 ++++ .../boot/dts/ti/k3-j7200-mcu-wakeup.dtsi | 5 + arch/arm64/boot/dts/ti/k3-j7200-som-p0.dtsi | 42 +---- .../dts/ti/k3-j721e-common-proc-board.dts | 141 +++------------- arch/arm64/boot/dts/ti/k3-j721e-main.dtsi | 55 ++++++ .../boot/dts/ti/k3-j721e-mcu-wakeup.dtsi | 7 + arch/arm64/boot/dts/ti/k3-j721e-sk.dts | 158 ++---------------- arch/arm64/boot/dts/ti/k3-j721e-som-p0.dtsi | 33 +--- .../dts/ti/k3-j721s2-common-proc-board.dts | 132 +-------------- arch/arm64/boot/dts/ti/k3-j721s2-main.dtsi | 58 +++++++ .../boot/dts/ti/k3-j721s2-mcu-wakeup.dtsi | 7 + arch/arm64/boot/dts/ti/k3-j721s2-som-p0.dtsi | 98 +---------- 13 files changed, 231 insertions(+), 582 deletions(-)
Signature · 1 line
2.37.3
PATCH 1/12 arm64: dts: ti: k3-j721e: Enable UART nodes at the board level
UART nodes defined in the top-level J721e SoC dtsi files are incomplete and may not be functional unless they are extended with pinmux information.
As the pinmux is only known at the board integration level, these nodes should only be enabled when provided with this information.
Disable the UART nodes in the dtsi files and only enable the ones that are actually pinned out on a given board.
--- .../dts/ti/k3-j721e-common-proc-board.dts | 40 +++++++----------- arch/arm64/boot/dts/ti/k3-j721e-main.dtsi | 10 +++++ .../boot/dts/ti/k3-j721e-mcu-wakeup.dtsi | 2 + arch/arm64/boot/dts/ti/k3-j721e-sk.dts | 42 ++++--------------- 4 files changed, 37 insertions(+), 57 deletions(-)
arch/arm64/boot/dts/ti/k3-j721e-common-proc-board.dts +16 -24
@@ -370,38 +370,30 @@ &wkup_uart0 { status = "reserved"; }; -&main_uart0 { - power-domains = <&k3_pds 146 TI_SCI_PD_SHARED>; -}; - -&main_uart3 { - /* UART not brought out */ - status = "disabled"; -}; - -&main_uart5 { - /* UART not brought out */ - status = "disabled"; +&mcu_uart0 { + status = "okay"; + /* Default pinmux */ }; -&main_uart6 { - /* UART not brought out */ - status = "disabled"; +&main_uart0 { + status = "okay"; + /* Shared with ATF on this platform */ + power-domains = <&k3_pds 146 TI_SCI_PD_SHARED>; }; -&main_uart7 { - /* UART not brought out */ - status = "disabled"; +&main_uart1 { + status = "okay"; + /* Default pinmux */ }; -&main_uart8 { - /* UART not brought out */ - status = "disabled"; +&main_uart2 { + status = "okay"; + /* Default pinmux */ }; -&main_uart9 { - /* UART not brought out */ - status = "disabled"; +&main_uart4 { + status = "okay"; + /* Default pinmux */ }; &main_gpio2 {
arch/arm64/boot/dts/ti/k3-j721e-main.dtsi +10 -0
@@ -840,6 +840,7 @@ main_uart0: serial@2800000 { power-domains = <&k3_pds 146 TI_SCI_PD_EXCLUSIVE>; clocks = <&k3_clks 146 0>; clock-names = "fclk"; + status = "disabled"; }; main_uart1: serial@2810000 {
@@ -851,6 +852,7 @@ main_uart1: serial@2810000 { power-domains = <&k3_pds 278 TI_SCI_PD_EXCLUSIVE>; clocks = <&k3_clks 278 0>; clock-names = "fclk"; + status = "disabled"; }; main_uart2: serial@2820000 {
@@ -862,6 +864,7 @@ main_uart2: serial@2820000 { power-domains = <&k3_pds 279 TI_SCI_PD_EXCLUSIVE>; clocks = <&k3_clks 279 0>; clock-names = "fclk"; + status = "disabled"; }; main_uart3: serial@2830000 {
@@ -873,6 +876,7 @@ main_uart3: serial@2830000 { power-domains = <&k3_pds 280 TI_SCI_PD_EXCLUSIVE>; clocks = <&k3_clks 280 0>; clock-names = "fclk"; + status = "disabled"; }; main_uart4: serial@2840000 {
@@ -884,6 +888,7 @@ main_uart4: serial@2840000 { power-domains = <&k3_pds 281 TI_SCI_PD_EXCLUSIVE>; clocks = <&k3_clks 281 0>; clock-names = "fclk"; + status = "disabled"; }; main_uart5: serial@2850000 {
@@ -895,6 +900,7 @@ main_uart5: serial@2850000 { power-domains = <&k3_pds 282 TI_SCI_PD_EXCLUSIVE>; clocks = <&k3_clks 282 0>; clock-names = "fclk"; + status = "disabled"; }; main_uart6: serial@2860000 {
@@ -906,6 +912,7 @@ main_uart6: serial@2860000 { power-domains = <&k3_pds 283 TI_SCI_PD_EXCLUSIVE>; clocks = <&k3_clks 283 0>; clock-names = "fclk"; + status = "disabled"; }; main_uart7: serial@2870000 {
@@ -917,6 +924,7 @@ main_uart7: serial@2870000 { power-domains = <&k3_pds 284 TI_SCI_PD_EXCLUSIVE>; clocks = <&k3_clks 284 0>; clock-names = "fclk"; + status = "disabled"; }; main_uart8: serial@2880000 {
@@ -928,6 +936,7 @@ main_uart8: serial@2880000 { power-domains = <&k3_pds 285 TI_SCI_PD_EXCLUSIVE>; clocks = <&k3_clks 285 0>; clock-names = "fclk"; + status = "disabled"; }; main_uart9: serial@2890000 {
@@ -939,6 +948,7 @@ main_uart9: serial@2890000 { power-domains = <&k3_pds 286 TI_SCI_PD_EXCLUSIVE>; clocks = <&k3_clks 286 0>; clock-names = "fclk"; + status = "disabled"; }; main_gpio0: gpio@600000 {
arch/arm64/boot/dts/ti/k3-j721e-mcu-wakeup.dtsi +2 -0
@@ -79,6 +79,7 @@ wkup_uart0: serial@42300000 { power-domains = <&k3_pds 287 TI_SCI_PD_EXCLUSIVE>; clocks = <&k3_clks 287 0>; clock-names = "fclk"; + status = "disabled"; }; mcu_uart0: serial@40a00000 {
@@ -90,6 +91,7 @@ mcu_uart0: serial@40a00000 { power-domains = <&k3_pds 149 TI_SCI_PD_EXCLUSIVE>; clocks = <&k3_clks 149 0>; clock-names = "fclk"; + status = "disabled"; }; wkup_gpio_intr: interrupt-controller@42200000 {
arch/arm64/boot/dts/ti/k3-j721e-sk.dts +9 -33
55 lines not on this page · raw message
Signature · 1 line
2.37.3
PATCH 2/12 arm64: dts: ti: k3-j721e: Enable I2C nodes at the board level
In reply to Andrew DavisI2C nodes defined in the top-level J721e SoC dtsi files are incomplete and will not be functional unless they are extended with pinmux information.
As the pinmux is only known at the board integration level, these nodes should only be enabled when provided with this information.
Disable the I2C nodes in the dtsi files and only enable the ones that are actually pinned out on a given board.
--- .../dts/ti/k3-j721e-common-proc-board.dts | 4 ++++ arch/arm64/boot/dts/ti/k3-j721e-main.dtsi | 7 ++++++ .../boot/dts/ti/k3-j721e-mcu-wakeup.dtsi | 3 +++ arch/arm64/boot/dts/ti/k3-j721e-sk.dts | 23 +++---------------- 4 files changed, 17 insertions(+), 20 deletions(-)
arch/arm64/boot/dts/ti/k3-j721e-common-proc-board.dts +4 -0
@@ -529,6 +529,7 @@ adc { }; &main_i2c0 { + status = "okay"; pinctrl-names = "default"; pinctrl-0 = <&main_i2c0_pins_default>; clock-frequency = <400000>;
@@ -565,6 +566,7 @@ p10-hog { }; &main_i2c1 { + status = "okay"; pinctrl-names = "default"; pinctrl-0 = <&main_i2c1_pins_default>; clock-frequency = <400000>;
@@ -590,6 +592,7 @@ &k3_clks { }; &main_i2c3 { + status = "okay"; pinctrl-names = "default"; pinctrl-0 = <&main_i2c3_pins_default>; clock-frequency = <400000>;
@@ -628,6 +631,7 @@ pcm3168a_1: audio-codec@44 { }; &main_i2c6 { + status = "okay"; pinctrl-names = "default"; pinctrl-0 = <&main_i2c6_pins_default>; clock-frequency = <400000>;
arch/arm64/boot/dts/ti/k3-j721e-main.dtsi +7 -0
@@ -1229,6 +1229,7 @@ main_i2c0: i2c@2000000 { clock-names = "fck"; clocks = <&k3_clks 187 0>; power-domains = <&k3_pds 187 TI_SCI_PD_SHARED>; + status = "disabled"; }; main_i2c1: i2c@2010000 {
@@ -1240,6 +1241,7 @@ main_i2c1: i2c@2010000 { clock-names = "fck"; clocks = <&k3_clks 188 0>; power-domains = <&k3_pds 188 TI_SCI_PD_EXCLUSIVE>; + status = "disabled"; }; main_i2c2: i2c@2020000 {
@@ -1251,6 +1253,7 @@ main_i2c2: i2c@2020000 { clock-names = "fck"; clocks = <&k3_clks 189 0>; power-domains = <&k3_pds 189 TI_SCI_PD_EXCLUSIVE>; + status = "disabled"; }; main_i2c3: i2c@2030000 {
@@ -1262,6 +1265,7 @@ main_i2c3: i2c@2030000 { clock-names = "fck"; clocks = <&k3_clks 190 0>; power-domains = <&k3_pds 190 TI_SCI_PD_EXCLUSIVE>; + status = "disabled"; }; main_i2c4: i2c@2040000 {
@@ -1273,6 +1277,7 @@ main_i2c4: i2c@2040000 { clock-names = "fck"; clocks = <&k3_clks 191 0>; power-domains = <&k3_pds 191 TI_SCI_PD_EXCLUSIVE>; + status = "disabled"; }; main_i2c5: i2c@2050000 {
@@ -1284,6 +1289,7 @@ main_i2c5: i2c@2050000 { clock-names = "fck"; clocks = <&k3_clks 192 0>; power-domains = <&k3_pds 192 TI_SCI_PD_EXCLUSIVE>; + status = "disabled"; }; main_i2c6: i2c@2060000 {
@@ -1295,6 +1301,7 @@ main_i2c6: i2c@2060000 { clock-names = "fck"; clocks = <&k3_clks 193 0>; power-domains = <&k3_pds 193 TI_SCI_PD_EXCLUSIVE>; + status = "disabled"; }; ufs_wrapper: ufs-wrapper@4e80000 {
arch/arm64/boot/dts/ti/k3-j721e-mcu-wakeup.dtsi +3 -0
@@ -147,6 +147,7 @@ mcu_i2c0: i2c@40b00000 { clock-names = "fck"; clocks = <&k3_clks 194 0>; power-domains = <&k3_pds 194 TI_SCI_PD_EXCLUSIVE>; + status = "disabled"; }; mcu_i2c1: i2c@40b10000 {
@@ -158,6 +159,7 @@ mcu_i2c1: i2c@40b10000 { clock-names = "fck"; clocks = <&k3_clks 195 0>; power-domains = <&k3_pds 195 TI_SCI_PD_EXCLUSIVE>; + status = "disabled"; }; wkup_i2c0: i2c@42120000 {
@@ -169,6 +171,7 @@ wkup_i2c0: i2c@42120000 { clock-names = "fck"; clocks = <&k3_clks 197 0>; power-domains = <&k3_pds 197 TI_SCI_PD_SHARED>; + status = "disabled"; }; fss: fss@47000000 {
arch/arm64/boot/dts/ti/k3-j721e-sk.dts +3 -20
@@ -537,6 +537,7 @@ &ospi1 { }; &main_i2c0 { + status = "okay"; pinctrl-names = "default"; pinctrl-0 = <&main_i2c0_pins_default>; clock-frequency = <400000>;
@@ -564,18 +565,15 @@ i2c@1 { }; &main_i2c1 { + status = "okay"; pinctrl-names = "default"; pinctrl-0 = <&main_i2c1_pins_default>; /* i2c1 is used for DVI DDC, so we need to use 100kHz */ clock-frequency = <100000>; }; -&main_i2c2 { - /* Unused */ - status = "disabled"; -}; - &main_i2c3 { + status = "okay"; pinctrl-names = "default"; pinctrl-0 = <&main_i2c3_pins_default>; clock-frequency = <400000>;
@@ -602,21 +600,6 @@ i2c@1 { }; }; -&main_i2c4 { - /* Unused */ - status = "disabled"; -}; - -&main_i2c5 { - /* Brought out on RPi Header */ - status = "disabled"; -}; - -&main_i2c6 { - /* Unused */ - status = "disabled"; -}; - &main_gpio2 { status = "disabled"; };
Signature · 1 line
2.37.3
PATCH 3/12 arm64: dts: ti: k3-j721e: Enable MCASP nodes at the board level
In reply to Andrew DavisMCASP nodes defined in the top-level J721e SoC dtsi files are incomplete and may not be functional unless they are extended with pinmux information.
As the pinmux is only known at the board integration level, these nodes should only be enabled when provided with this information.
Disable the MCASP nodes in the dtsi files and only enable the ones that are actually pinned out on a given board.
--- .../dts/ti/k3-j721e-common-proc-board.dts | 45 +------------- arch/arm64/boot/dts/ti/k3-j721e-main.dtsi | 12 ++++ arch/arm64/boot/dts/ti/k3-j721e-sk.dts | 60 ------------------- 3 files changed, 13 insertions(+), 104 deletions(-)
arch/arm64/boot/dts/ti/k3-j721e-common-proc-board.dts +1 -44
@@ -709,47 +709,8 @@ dp0_out: endpoint { }; }; -&mcasp0 { - status = "disabled"; -}; - -&mcasp1 { - status = "disabled"; -}; - -&mcasp2 { - status = "disabled"; -}; - -&mcasp3 { - status = "disabled"; -}; - -&mcasp4 { - status = "disabled"; -}; - -&mcasp5 { - status = "disabled"; -}; - -&mcasp6 { - status = "disabled"; -}; - -&mcasp7 { - status = "disabled"; -}; - -&mcasp8 { - status = "disabled"; -}; - -&mcasp9 { - status = "disabled"; -}; - &mcasp10 { + status = "okay"; #sound-dai-cells = <0>; pinctrl-names = "default";
@@ -767,10 +728,6 @@ &mcasp10 { rx-num-evt = <0>; }; -&mcasp11 { - status = "disabled"; -}; - &cmn_refclk1 { clock-frequency = <100000000>; };
arch/arm64/boot/dts/ti/k3-j721e-main.dtsi +12 -0
@@ -1425,6 +1425,7 @@ mcasp0: mcasp@2b00000 { clocks = <&k3_clks 174 1>; clock-names = "fck"; power-domains = <&k3_pds 174 TI_SCI_PD_EXCLUSIVE>; + status = "disabled"; }; mcasp1: mcasp@2b10000 {
@@ -1442,6 +1443,7 @@ mcasp1: mcasp@2b10000 { clocks = <&k3_clks 175 1>; clock-names = "fck"; power-domains = <&k3_pds 175 TI_SCI_PD_EXCLUSIVE>; + status = "disabled"; }; mcasp2: mcasp@2b20000 {
@@ -1459,6 +1461,7 @@ mcasp2: mcasp@2b20000 { clocks = <&k3_clks 176 1>; clock-names = "fck"; power-domains = <&k3_pds 176 TI_SCI_PD_EXCLUSIVE>; + status = "disabled"; }; mcasp3: mcasp@2b30000 {
@@ -1476,6 +1479,7 @@ mcasp3: mcasp@2b30000 { clocks = <&k3_clks 177 1>; clock-names = "fck"; power-domains = <&k3_pds 177 TI_SCI_PD_EXCLUSIVE>; + status = "disabled"; }; mcasp4: mcasp@2b40000 {
@@ -1493,6 +1497,7 @@ mcasp4: mcasp@2b40000 { clocks = <&k3_clks 178 1>; clock-names = "fck"; power-domains = <&k3_pds 178 TI_SCI_PD_EXCLUSIVE>; + status = "disabled"; }; mcasp5: mcasp@2b50000 {
@@ -1510,6 +1515,7 @@ mcasp5: mcasp@2b50000 { clocks = <&k3_clks 179 1>; clock-names = "fck"; power-domains = <&k3_pds 179 TI_SCI_PD_EXCLUSIVE>; + status = "disabled"; }; mcasp6: mcasp@2b60000 {
@@ -1527,6 +1533,7 @@ mcasp6: mcasp@2b60000 { clocks = <&k3_clks 180 1>; clock-names = "fck"; power-domains = <&k3_pds 180 TI_SCI_PD_EXCLUSIVE>; + status = "disabled"; }; mcasp7: mcasp@2b70000 {
@@ -1544,6 +1551,7 @@ mcasp7: mcasp@2b70000 { clocks = <&k3_clks 181 1>; clock-names = "fck"; power-domains = <&k3_pds 181 TI_SCI_PD_EXCLUSIVE>; + status = "disabled"; }; mcasp8: mcasp@2b80000 {
@@ -1561,6 +1569,7 @@ mcasp8: mcasp@2b80000 { clocks = <&k3_clks 182 1>; clock-names = "fck"; power-domains = <&k3_pds 182 TI_SCI_PD_EXCLUSIVE>; + status = "disabled"; }; mcasp9: mcasp@2b90000 {
@@ -1578,6 +1587,7 @@ mcasp9: mcasp@2b90000 { clocks = <&k3_clks 183 1>; clock-names = "fck"; power-domains = <&k3_pds 183 TI_SCI_PD_EXCLUSIVE>; + status = "disabled"; }; mcasp10: mcasp@2ba0000 {
@@ -1595,6 +1605,7 @@ mcasp10: mcasp@2ba0000 { clocks = <&k3_clks 184 1>; clock-names = "fck"; power-domains = <&k3_pds 184 TI_SCI_PD_EXCLUSIVE>; + status = "disabled"; }; mcasp11: mcasp@2bb0000 {
@@ -1612,6 +1623,7 @@ mcasp11: mcasp@2bb0000 { clocks = <&k3_clks 185 1>; clock-names = "fck"; power-domains = <&k3_pds 185 TI_SCI_PD_EXCLUSIVE>; + status = "disabled"; }; watchdog0: watchdog@2200000 {
arch/arm64/boot/dts/ti/k3-j721e-sk.dts +0 -60
66 lines not on this page · raw message
Signature · 1 line
2.37.3
PATCH 4/12 arm64: dts: ti: k3-j721e: Enable MCAN nodes at the board level
In reply to Andrew DavisMCAN nodes defined in the top-level J721e SoC dtsi files are incomplete and may not be functional unless they are extended with pinmux information.
As the pinmux is only known at the board integration level, these nodes should only be enabled when provided with this information.
Disable the MCAN nodes in the dtsi files and only enable the ones that are actually pinned out on a given board.
--- .../dts/ti/k3-j721e-common-proc-board.dts | 52 ++----------------- arch/arm64/boot/dts/ti/k3-j721e-main.dtsi | 14 +++++ .../boot/dts/ti/k3-j721e-mcu-wakeup.dtsi | 2 + 3 files changed, 20 insertions(+), 48 deletions(-)
arch/arm64/boot/dts/ti/k3-j721e-common-proc-board.dts +4 -48
@@ -878,73 +878,29 @@ &icssg1_mdio { }; &mcu_mcan0 { + status = "okay"; pinctrl-names = "default"; pinctrl-0 = <&mcu_mcan0_pins_default>; phys = <&transceiver1>; }; &mcu_mcan1 { + status = "okay"; pinctrl-names = "default"; pinctrl-0 = <&mcu_mcan1_pins_default>; phys = <&transceiver2>; }; &main_mcan0 { + status = "okay"; pinctrl-names = "default"; pinctrl-0 = <&main_mcan0_pins_default>; phys = <&transceiver3>; }; -&main_mcan1 { - status = "disabled"; -}; - &main_mcan2 { + status = "okay"; pinctrl-names = "default"; pinctrl-0 = <&main_mcan2_pins_default>; phys = <&transceiver4>; }; - -&main_mcan3 { - status = "disabled"; -}; - -&main_mcan4 { - status = "disabled"; -}; - -&main_mcan5 { - status = "disabled"; -}; - -&main_mcan6 { - status = "disabled"; -}; - -&main_mcan7 { - status = "disabled"; -}; - -&main_mcan8 { - status = "disabled"; -}; - -&main_mcan9 { - status = "disabled"; -}; - -&main_mcan10 { - status = "disabled"; -}; - -&main_mcan11 { - status = "disabled"; -}; - -&main_mcan12 { - status = "disabled"; -}; - -&main_mcan13 { - status = "disabled"; -};
arch/arm64/boot/dts/ti/k3-j721e-main.dtsi +14 -0
@@ -2056,6 +2056,7 @@ main_mcan0: can@2701000 { <GIC_SPI 125 IRQ_TYPE_LEVEL_HIGH>; interrupt-names = "int0", "int1"; bosch,mram-cfg = <0x0 128 64 64 64 64 32 32>; + status = "disabled"; }; main_mcan1: can@2711000 {
@@ -2070,6 +2071,7 @@ main_mcan1: can@2711000 { <GIC_SPI 128 IRQ_TYPE_LEVEL_HIGH>; interrupt-names = "int0", "int1"; bosch,mram-cfg = <0x0 128 64 64 64 64 32 32>; + status = "disabled"; }; main_mcan2: can@2721000 {
@@ -2084,6 +2086,7 @@ main_mcan2: can@2721000 { <GIC_SPI 131 IRQ_TYPE_LEVEL_HIGH>; interrupt-names = "int0", "int1"; bosch,mram-cfg = <0x0 128 64 64 64 64 32 32>; + status = "disabled"; }; main_mcan3: can@2731000 {
@@ -2098,6 +2101,7 @@ main_mcan3: can@2731000 { <GIC_SPI 134 IRQ_TYPE_LEVEL_HIGH>; interrupt-names = "int0", "int1"; bosch,mram-cfg = <0x0 128 64 64 64 64 32 32>; + status = "disabled"; }; main_mcan4: can@2741000 {
@@ -2112,6 +2116,7 @@ main_mcan4: can@2741000 { <GIC_SPI 137 IRQ_TYPE_LEVEL_HIGH>; interrupt-names = "int0", "int1"; bosch,mram-cfg = <0x0 128 64 64 64 64 32 32>; + status = "disabled"; }; main_mcan5: can@2751000 {
@@ -2126,6 +2131,7 @@ main_mcan5: can@2751000 { <GIC_SPI 140 IRQ_TYPE_LEVEL_HIGH>; interrupt-names = "int0", "int1"; bosch,mram-cfg = <0x0 128 64 64 64 64 32 32>; + status = "disabled"; }; main_mcan6: can@2761000 {
@@ -2140,6 +2146,7 @@ main_mcan6: can@2761000 { <GIC_SPI 143 IRQ_TYPE_LEVEL_HIGH>; interrupt-names = "int0", "int1"; bosch,mram-cfg = <0x0 128 64 64 64 64 32 32>; + status = "disabled"; }; main_mcan7: can@2771000 {
@@ -2154,6 +2161,7 @@ main_mcan7: can@2771000 { <GIC_SPI 146 IRQ_TYPE_LEVEL_HIGH>; interrupt-names = "int0", "int1"; bosch,mram-cfg = <0x0 128 64 64 64 64 32 32>; + status = "disabled"; }; main_mcan8: can@2781000 {
@@ -2168,6 +2176,7 @@ main_mcan8: can@2781000 { <GIC_SPI 577 IRQ_TYPE_LEVEL_HIGH>; interrupt-names = "int0", "int1"; bosch,mram-cfg = <0x0 128 64 64 64 64 32 32>; + status = "disabled"; }; main_mcan9: can@2791000 {
@@ -2182,6 +2191,7 @@ main_mcan9: can@2791000 { <GIC_SPI 580 IRQ_TYPE_LEVEL_HIGH>; interrupt-names = "int0", "int1"; bosch,mram-cfg = <0x0 128 64 64 64 64 32 32>; + status = "disabled"; }; main_mcan10: can@27a1000 {
@@ -2196,6 +2206,7 @@ main_mcan10: can@27a1000 { <GIC_SPI 583 IRQ_TYPE_LEVEL_HIGH>; interrupt-names = "int0", "int1"; bosch,mram-cfg = <0x0 128 64 64 64 64 32 32>; + status = "disabled"; }; main_mcan11: can@27b1000 {
@@ -2210,6 +2221,7 @@ main_mcan11: can@27b1000 { <GIC_SPI 586 IRQ_TYPE_LEVEL_HIGH>; interrupt-names = "int0", "int1"; bosch,mram-cfg = <0x0 128 64 64 64 64 32 32>; + status = "disabled"; }; main_mcan12: can@27c1000 {
@@ -2224,6 +2236,7 @@ main_mcan12: can@27c1000 { <GIC_SPI 589 IRQ_TYPE_LEVEL_HIGH>; interrupt-names = "int0", "int1"; bosch,mram-cfg = <0x0 128 64 64 64 64 32 32>; + status = "disabled"; }; main_mcan13: can@27d1000 {
@@ -2238,5 +2251,6 @@ main_mcan13: can@27d1000 { <GIC_SPI 592 IRQ_TYPE_LEVEL_HIGH>; interrupt-names = "int0", "int1"; bosch,mram-cfg = <0x0 128 64 64 64 64 32 32>; + status = "disabled"; }; };
arch/arm64/boot/dts/ti/k3-j721e-mcu-wakeup.dtsi +2 -0
@@ -408,6 +408,7 @@ mcu_mcan0: can@40528000 { <GIC_SPI 833 IRQ_TYPE_LEVEL_HIGH>; interrupt-names = "int0", "int1"; bosch,mram-cfg = <0x0 128 64 64 64 64 32 32>; + status = "disabled"; }; mcu_mcan1: can@40568000 {
@@ -422,5 +423,6 @@ mcu_mcan1: can@40568000 { <GIC_SPI 836 IRQ_TYPE_LEVEL_HIGH>; interrupt-names = "int0", "int1"; bosch,mram-cfg = <0x0 128 64 64 64 64 32 32>; + status = "disabled"; }; };
Signature · 1 line
2.37.3
PATCH 5/12 arm64: dts: ti: k3-j7200: Enable UART nodes at the board level
In reply to Andrew DavisUART nodes defined in the top-level J7200 SoC dtsi files are incomplete and may not be functional unless they are extended with pinmux information.
As the pinmux is only known at the board integration level, these nodes should only be enabled when provided with this information.
Disable the UART nodes in the dtsi files and only enable the ones that are actually pinned out on a given board.
--- .../dts/ti/k3-j7200-common-proc-board.dts | 46 +++++-------------- arch/arm64/boot/dts/ti/k3-j7200-main.dtsi | 10 ++++ .../boot/dts/ti/k3-j7200-mcu-wakeup.dtsi | 2 + 3 files changed, 23 insertions(+), 35 deletions(-)
arch/arm64/boot/dts/ti/k3-j7200-common-proc-board.dts +11 -35
@@ -154,51 +154,27 @@ &wkup_uart0 { status = "reserved"; }; +&mcu_uart0 { + status = "okay"; + /* Default pinmux */ +}; + &main_uart0 { + status = "okay"; /* Shared with ATF on this platform */ power-domains = <&k3_pds 146 TI_SCI_PD_SHARED>; }; +&main_uart1 { + status = "okay"; + /* Default pinmux */ +}; + &main_uart2 { /* MAIN UART 2 is used by R5F firmware */ status = "reserved"; }; -&main_uart3 { - /* UART not brought out */ - status = "disabled"; -}; - -&main_uart4 { - /* UART not brought out */ - status = "disabled"; -}; - -&main_uart5 { - /* UART not brought out */ - status = "disabled"; -}; - -&main_uart6 { - /* UART not brought out */ - status = "disabled"; -}; - -&main_uart7 { - /* UART not brought out */ - status = "disabled"; -}; - -&main_uart8 { - /* UART not brought out */ - status = "disabled"; -}; - -&main_uart9 { - /* UART not brought out */ - status = "disabled"; -}; - &main_gpio2 { status = "disabled"; };
arch/arm64/boot/dts/ti/k3-j7200-main.dtsi +10 -0
@@ -319,6 +319,7 @@ main_uart0: serial@2800000 { power-domains = <&k3_pds 146 TI_SCI_PD_EXCLUSIVE>; clocks = <&k3_clks 146 2>; clock-names = "fclk"; + status = "disabled"; }; main_uart1: serial@2810000 {
@@ -330,6 +331,7 @@ main_uart1: serial@2810000 { power-domains = <&k3_pds 278 TI_SCI_PD_EXCLUSIVE>; clocks = <&k3_clks 278 2>; clock-names = "fclk"; + status = "disabled"; }; main_uart2: serial@2820000 {
@@ -341,6 +343,7 @@ main_uart2: serial@2820000 { power-domains = <&k3_pds 279 TI_SCI_PD_EXCLUSIVE>; clocks = <&k3_clks 279 2>; clock-names = "fclk"; + status = "disabled"; }; main_uart3: serial@2830000 {
@@ -352,6 +355,7 @@ main_uart3: serial@2830000 { power-domains = <&k3_pds 280 TI_SCI_PD_EXCLUSIVE>; clocks = <&k3_clks 280 2>; clock-names = "fclk"; + status = "disabled"; }; main_uart4: serial@2840000 {
@@ -363,6 +367,7 @@ main_uart4: serial@2840000 { power-domains = <&k3_pds 281 TI_SCI_PD_EXCLUSIVE>; clocks = <&k3_clks 281 2>; clock-names = "fclk"; + status = "disabled"; }; main_uart5: serial@2850000 {
@@ -374,6 +379,7 @@ main_uart5: serial@2850000 { power-domains = <&k3_pds 282 TI_SCI_PD_EXCLUSIVE>; clocks = <&k3_clks 282 2>; clock-names = "fclk"; + status = "disabled"; }; main_uart6: serial@2860000 {
@@ -385,6 +391,7 @@ main_uart6: serial@2860000 { power-domains = <&k3_pds 283 TI_SCI_PD_EXCLUSIVE>; clocks = <&k3_clks 283 2>; clock-names = "fclk"; + status = "disabled"; }; main_uart7: serial@2870000 {
@@ -396,6 +403,7 @@ main_uart7: serial@2870000 { power-domains = <&k3_pds 284 TI_SCI_PD_EXCLUSIVE>; clocks = <&k3_clks 284 2>; clock-names = "fclk"; + status = "disabled"; }; main_uart8: serial@2880000 {
@@ -407,6 +415,7 @@ main_uart8: serial@2880000 { power-domains = <&k3_pds 285 TI_SCI_PD_EXCLUSIVE>; clocks = <&k3_clks 285 2>; clock-names = "fclk"; + status = "disabled"; }; main_uart9: serial@2890000 {
@@ -418,6 +427,7 @@ main_uart9: serial@2890000 { power-domains = <&k3_pds 286 TI_SCI_PD_EXCLUSIVE>; clocks = <&k3_clks 286 2>; clock-names = "fclk"; + status = "disabled"; }; main_i2c0: i2c@2000000 {
arch/arm64/boot/dts/ti/k3-j7200-mcu-wakeup.dtsi +2 -0
@@ -79,6 +79,7 @@ wkup_uart0: serial@42300000 { power-domains = <&k3_pds 287 TI_SCI_PD_EXCLUSIVE>; clocks = <&k3_clks 287 2>; clock-names = "fclk"; + status = "disabled"; }; mcu_uart0: serial@40a00000 {
@@ -90,6 +91,7 @@ mcu_uart0: serial@40a00000 { power-domains = <&k3_pds 149 TI_SCI_PD_EXCLUSIVE>; clocks = <&k3_clks 149 2>; clock-names = "fclk"; + status = "disabled"; }; wkup_gpio_intr: interrupt-controller@42200000 {
Signature · 1 line
2.37.3
PATCH 6/12 arm64: dts: ti: k3-j7200: Enable I2C nodes at the board level
In reply to Andrew DavisI2C nodes defined in the top-level J7200 SoC dtsi files are incomplete and will not be functional unless they are extended with pinmux information.
As the pinmux is only known at the board integration level, these nodes should only be enabled when provided with this information.
Disable the I2C nodes in the dtsi files and only enable the ones that are actually pinned out on a given board.
--- arch/arm64/boot/dts/ti/k3-j7200-common-proc-board.dts | 2 ++ arch/arm64/boot/dts/ti/k3-j7200-main.dtsi | 7 +++++++ arch/arm64/boot/dts/ti/k3-j7200-mcu-wakeup.dtsi | 3 +++ 3 files changed, 12 insertions(+)
arch/arm64/boot/dts/ti/k3-j7200-common-proc-board.dts +2 -0
@@ -210,6 +210,7 @@ &cpsw_port1 { }; &main_i2c0 { + status = "okay"; pinctrl-names = "default"; pinctrl-0 = <&main_i2c0_pins_default>; clock-frequency = <400000>;
@@ -237,6 +238,7 @@ exp2: gpio@22 { * The i2c1 of the CPB (as it is labeled) is not connected to j7200. */ &main_i2c1 { + status = "okay"; pinctrl-names = "default"; pinctrl-0 = <&main_i2c1_pins_default>; clock-frequency = <400000>;
arch/arm64/boot/dts/ti/k3-j7200-main.dtsi +7 -0
@@ -439,6 +439,7 @@ main_i2c0: i2c@2000000 { clock-names = "fck"; clocks = <&k3_clks 187 1>; power-domains = <&k3_pds 187 TI_SCI_PD_SHARED>; + status = "disabled"; }; main_i2c1: i2c@2010000 {
@@ -450,6 +451,7 @@ main_i2c1: i2c@2010000 { clock-names = "fck"; clocks = <&k3_clks 188 1>; power-domains = <&k3_pds 188 TI_SCI_PD_EXCLUSIVE>; + status = "disabled"; }; main_i2c2: i2c@2020000 {
@@ -461,6 +463,7 @@ main_i2c2: i2c@2020000 { clock-names = "fck"; clocks = <&k3_clks 189 1>; power-domains = <&k3_pds 189 TI_SCI_PD_EXCLUSIVE>; + status = "disabled"; }; main_i2c3: i2c@2030000 {
@@ -472,6 +475,7 @@ main_i2c3: i2c@2030000 { clock-names = "fck"; clocks = <&k3_clks 190 1>; power-domains = <&k3_pds 190 TI_SCI_PD_EXCLUSIVE>; + status = "disabled"; }; main_i2c4: i2c@2040000 {
@@ -483,6 +487,7 @@ main_i2c4: i2c@2040000 { clock-names = "fck"; clocks = <&k3_clks 191 1>; power-domains = <&k3_pds 191 TI_SCI_PD_EXCLUSIVE>; + status = "disabled"; }; main_i2c5: i2c@2050000 {
@@ -494,6 +499,7 @@ main_i2c5: i2c@2050000 { clock-names = "fck"; clocks = <&k3_clks 192 1>; power-domains = <&k3_pds 192 TI_SCI_PD_EXCLUSIVE>; + status = "disabled"; }; main_i2c6: i2c@2060000 {
@@ -505,6 +511,7 @@ main_i2c6: i2c@2060000 { clock-names = "fck"; clocks = <&k3_clks 193 1>; power-domains = <&k3_pds 193 TI_SCI_PD_EXCLUSIVE>; + status = "disabled"; }; main_sdhci0: mmc@4f80000 {
arch/arm64/boot/dts/ti/k3-j7200-mcu-wakeup.dtsi +3 -0
@@ -251,6 +251,7 @@ mcu_i2c0: i2c@40b00000 { clock-names = "fck"; clocks = <&k3_clks 194 1>; power-domains = <&k3_pds 194 TI_SCI_PD_EXCLUSIVE>; + status = "disabled"; }; mcu_i2c1: i2c@40b10000 {
@@ -262,6 +263,7 @@ mcu_i2c1: i2c@40b10000 { clock-names = "fck"; clocks = <&k3_clks 195 1>; power-domains = <&k3_pds 195 TI_SCI_PD_EXCLUSIVE>; + status = "disabled"; }; wkup_i2c0: i2c@42120000 {
@@ -273,6 +275,7 @@ wkup_i2c0: i2c@42120000 { clock-names = "fck"; clocks = <&k3_clks 197 1>; power-domains = <&k3_pds 197 TI_SCI_PD_SHARED>; + status = "disabled"; }; fss: syscon@47000000 {
Signature · 1 line
2.37.3
PATCH 7/12 arm64: dts: ti: k3-j721s2: Enable UART nodes at the board level
In reply to Andrew DavisUART nodes defined in the top-level J721s2 SoC dtsi files are incomplete and may not be functional unless they are extended with pinmux information.
As the pinmux is only known at the board integration level, these nodes should only be enabled when provided with this information.
Disable the UART nodes in the dtsi files and only enable the ones that are actually pinned out on a given board.
--- .../dts/ti/k3-j721s2-common-proc-board.dts | 38 ++----------------- arch/arm64/boot/dts/ti/k3-j721s2-main.dtsi | 10 +++++ .../boot/dts/ti/k3-j721s2-mcu-wakeup.dtsi | 2 + 3 files changed, 16 insertions(+), 34 deletions(-)
arch/arm64/boot/dts/ti/k3-j721s2-common-proc-board.dts +4 -34
@@ -219,49 +219,19 @@ &wkup_uart0 { status = "reserved"; }; -&main_uart0 { - status = "disabled"; -}; - -&main_uart1 { - status = "disabled"; -}; - -&main_uart2 { - status = "disabled"; -}; - -&main_uart3 { - status = "disabled"; -}; - -&main_uart4 { - status = "disabled"; -}; - -&main_uart5 { - status = "disabled"; -}; - -&main_uart6 { - status = "disabled"; -}; - -&main_uart7 { - status = "disabled"; +&mcu_uart0 { + status = "okay"; + /* Default pinmux */ }; &main_uart8 { + status = "okay"; pinctrl-names = "default"; pinctrl-0 = <&main_uart8_pins_default>; /* Shared with TFA on this platform */ power-domains = <&k3_pds 357 TI_SCI_PD_SHARED>; }; -&main_uart9 { - status = "disabled"; -}; - &main_i2c0 { clock-frequency = <400000>;
arch/arm64/boot/dts/ti/k3-j721s2-main.dtsi +10 -0
@@ -80,6 +80,7 @@ main_uart0: serial@2800000 { clocks = <&k3_clks 146 3>; clock-names = "fclk"; power-domains = <&k3_pds 146 TI_SCI_PD_EXCLUSIVE>; + status = "disabled"; }; main_uart1: serial@2810000 {
@@ -90,6 +91,7 @@ main_uart1: serial@2810000 { clocks = <&k3_clks 350 3>; clock-names = "fclk"; power-domains = <&k3_pds 350 TI_SCI_PD_EXCLUSIVE>; + status = "disabled"; }; main_uart2: serial@2820000 {
@@ -100,6 +102,7 @@ main_uart2: serial@2820000 { clocks = <&k3_clks 351 3>; clock-names = "fclk"; power-domains = <&k3_pds 351 TI_SCI_PD_EXCLUSIVE>; + status = "disabled"; }; main_uart3: serial@2830000 {
@@ -110,6 +113,7 @@ main_uart3: serial@2830000 { clocks = <&k3_clks 352 3>; clock-names = "fclk"; power-domains = <&k3_pds 352 TI_SCI_PD_EXCLUSIVE>; + status = "disabled"; }; main_uart4: serial@2840000 {
@@ -120,6 +124,7 @@ main_uart4: serial@2840000 { clocks = <&k3_clks 353 3>; clock-names = "fclk"; power-domains = <&k3_pds 353 TI_SCI_PD_EXCLUSIVE>; + status = "disabled"; }; main_uart5: serial@2850000 {
@@ -130,6 +135,7 @@ main_uart5: serial@2850000 { clocks = <&k3_clks 354 3>; clock-names = "fclk"; power-domains = <&k3_pds 354 TI_SCI_PD_EXCLUSIVE>; + status = "disabled"; }; main_uart6: serial@2860000 {
@@ -140,6 +146,7 @@ main_uart6: serial@2860000 { clocks = <&k3_clks 355 3>; clock-names = "fclk"; power-domains = <&k3_pds 355 TI_SCI_PD_EXCLUSIVE>; + status = "disabled"; }; main_uart7: serial@2870000 {
@@ -150,6 +157,7 @@ main_uart7: serial@2870000 { clocks = <&k3_clks 356 3>; clock-names = "fclk"; power-domains = <&k3_pds 356 TI_SCI_PD_EXCLUSIVE>; + status = "disabled"; }; main_uart8: serial@2880000 {
@@ -160,6 +168,7 @@ main_uart8: serial@2880000 { clocks = <&k3_clks 357 3>; clock-names = "fclk"; power-domains = <&k3_pds 357 TI_SCI_PD_EXCLUSIVE>; + status = "disabled"; }; main_uart9: serial@2890000 {
@@ -170,6 +179,7 @@ main_uart9: serial@2890000 { clocks = <&k3_clks 358 3>; clock-names = "fclk"; power-domains = <&k3_pds 358 TI_SCI_PD_EXCLUSIVE>; + status = "disabled"; }; main_gpio0: gpio@600000 {
arch/arm64/boot/dts/ti/k3-j721s2-mcu-wakeup.dtsi +2 -0
@@ -91,6 +91,7 @@ wkup_uart0: serial@42300000 { clocks = <&k3_clks 359 3>; clock-names = "fclk"; power-domains = <&k3_pds 359 TI_SCI_PD_EXCLUSIVE>; + status = "disabled"; }; mcu_uart0: serial@40a00000 {
@@ -101,6 +102,7 @@ mcu_uart0: serial@40a00000 { clocks = <&k3_clks 149 3>; clock-names = "fclk"; power-domains = <&k3_pds 149 TI_SCI_PD_EXCLUSIVE>; + status = "disabled"; }; wkup_gpio0: gpio@42110000 {
Signature · 1 line
2.37.3
PATCH 8/12 arm64: dts: ti: k3-j721e: Enable Mailbox nodes at the board level
In reply to Andrew DavisMailbox nodes defined in the top-level J721e SoC dtsi files are incomplete and may not be functional unless they are extended with a chosen interrupt and connection to a remote processor.
As the remote processors depend on memory nodes which are only known at the board integration level, these nodes should only be enabled when provided with the above information.
Disable the Mailbox nodes in the dtsi files and only enable the ones that are actually used on a given board.
--- arch/arm64/boot/dts/ti/k3-j721e-main.dtsi | 12 ++++++++ arch/arm64/boot/dts/ti/k3-j721e-sk.dts | 33 ++++----------------- arch/arm64/boot/dts/ti/k3-j721e-som-p0.dtsi | 33 ++++----------------- 3 files changed, 22 insertions(+), 56 deletions(-)
arch/arm64/boot/dts/ti/k3-j721e-main.dtsi +12 -0
@@ -176,6 +176,7 @@ mailbox0_cluster0: mailbox@31f80000 { ti,mbox-num-users = <4>; ti,mbox-num-fifos = <16>; interrupt-parent = <&main_navss_intr>; + status = "disabled"; }; mailbox0_cluster1: mailbox@31f81000 {
@@ -185,6 +186,7 @@ mailbox0_cluster1: mailbox@31f81000 { ti,mbox-num-users = <4>; ti,mbox-num-fifos = <16>; interrupt-parent = <&main_navss_intr>; + status = "disabled"; }; mailbox0_cluster2: mailbox@31f82000 {
@@ -194,6 +196,7 @@ mailbox0_cluster2: mailbox@31f82000 { ti,mbox-num-users = <4>; ti,mbox-num-fifos = <16>; interrupt-parent = <&main_navss_intr>; + status = "disabled"; }; mailbox0_cluster3: mailbox@31f83000 {
@@ -203,6 +206,7 @@ mailbox0_cluster3: mailbox@31f83000 { ti,mbox-num-users = <4>; ti,mbox-num-fifos = <16>; interrupt-parent = <&main_navss_intr>; + status = "disabled"; }; mailbox0_cluster4: mailbox@31f84000 {
@@ -212,6 +216,7 @@ mailbox0_cluster4: mailbox@31f84000 { ti,mbox-num-users = <4>; ti,mbox-num-fifos = <16>; interrupt-parent = <&main_navss_intr>; + status = "disabled"; }; mailbox0_cluster5: mailbox@31f85000 {
@@ -221,6 +226,7 @@ mailbox0_cluster5: mailbox@31f85000 { ti,mbox-num-users = <4>; ti,mbox-num-fifos = <16>; interrupt-parent = <&main_navss_intr>; + status = "disabled"; }; mailbox0_cluster6: mailbox@31f86000 {
@@ -230,6 +236,7 @@ mailbox0_cluster6: mailbox@31f86000 { ti,mbox-num-users = <4>; ti,mbox-num-fifos = <16>; interrupt-parent = <&main_navss_intr>; + status = "disabled"; }; mailbox0_cluster7: mailbox@31f87000 {
@@ -239,6 +246,7 @@ mailbox0_cluster7: mailbox@31f87000 { ti,mbox-num-users = <4>; ti,mbox-num-fifos = <16>; interrupt-parent = <&main_navss_intr>; + status = "disabled"; }; mailbox0_cluster8: mailbox@31f88000 {
@@ -248,6 +256,7 @@ mailbox0_cluster8: mailbox@31f88000 { ti,mbox-num-users = <4>; ti,mbox-num-fifos = <16>; interrupt-parent = <&main_navss_intr>; + status = "disabled"; }; mailbox0_cluster9: mailbox@31f89000 {
@@ -257,6 +266,7 @@ mailbox0_cluster9: mailbox@31f89000 { ti,mbox-num-users = <4>; ti,mbox-num-fifos = <16>; interrupt-parent = <&main_navss_intr>; + status = "disabled"; }; mailbox0_cluster10: mailbox@31f8a000 {
@@ -266,6 +276,7 @@ mailbox0_cluster10: mailbox@31f8a000 { ti,mbox-num-users = <4>; ti,mbox-num-fifos = <16>; interrupt-parent = <&main_navss_intr>; + status = "disabled"; }; mailbox0_cluster11: mailbox@31f8b000 {
@@ -275,6 +286,7 @@ mailbox0_cluster11: mailbox@31f8b000 { ti,mbox-num-users = <4>; ti,mbox-num-fifos = <16>; interrupt-parent = <&main_navss_intr>; + status = "disabled"; }; main_ringacc: ringacc@3c000000 {
arch/arm64/boot/dts/ti/k3-j721e-sk.dts +5 -28
@@ -883,6 +883,7 @@ &ufs_wrapper { }; &mailbox0_cluster0 { + status = "okay"; interrupts = <436>; mbox_mcu_r5fss0_core0: mbox-mcu-r5fss0-core0 {
@@ -897,6 +898,7 @@ mbox_mcu_r5fss0_core1: mbox-mcu-r5fss0-core1 { }; &mailbox0_cluster1 { + status = "okay"; interrupts = <432>; mbox_main_r5fss0_core0: mbox-main-r5fss0-core0 {
@@ -911,6 +913,7 @@ mbox_main_r5fss0_core1: mbox-main-r5fss0-core1 { }; &mailbox0_cluster2 { + status = "okay"; interrupts = <428>; mbox_main_r5fss1_core0: mbox-main-r5fss1-core0 {
@@ -925,6 +928,7 @@ mbox_main_r5fss1_core1: mbox-main-r5fss1-core1 { }; &mailbox0_cluster3 { + status = "okay"; interrupts = <424>; mbox_c66_0: mbox-c66-0 {
@@ -939,6 +943,7 @@ mbox_c66_1: mbox-c66-1 { }; &mailbox0_cluster4 { + status = "okay"; interrupts = <420>; mbox_c71_0: mbox-c71-0 {
@@ -947,34 +952,6 @@ mbox_c71_0: mbox-c71-0 { }; }; -&mailbox0_cluster5 { - status = "disabled"; -}; - -&mailbox0_cluster6 { - status = "disabled"; -}; - -&mailbox0_cluster7 { - status = "disabled"; -}; - -&mailbox0_cluster8 { - status = "disabled"; -}; - -&mailbox0_cluster9 { - status = "disabled"; -}; - -&mailbox0_cluster10 { - status = "disabled"; -}; - -&mailbox0_cluster11 { - status = "disabled"; -}; - &mcu_r5fss0_core0 { mboxes = <&mailbox0_cluster0 &mbox_mcu_r5fss0_core0>; memory-region = <&mcu_r5fss0_core0_dma_memory_region>,
arch/arm64/boot/dts/ti/k3-j721e-som-p0.dtsi +5 -28
@@ -186,6 +186,7 @@ flash@0 { }; &mailbox0_cluster0 { + status = "okay"; interrupts = <436>; mbox_mcu_r5fss0_core0: mbox-mcu-r5fss0-core0 {
@@ -200,6 +201,7 @@ mbox_mcu_r5fss0_core1: mbox-mcu-r5fss0-core1 { }; &mailbox0_cluster1 { + status = "okay"; interrupts = <432>; mbox_main_r5fss0_core0: mbox-main-r5fss0-core0 {
@@ -214,6 +216,7 @@ mbox_main_r5fss0_core1: mbox-main-r5fss0-core1 { }; &mailbox0_cluster2 { + status = "okay"; interrupts = <428>; mbox_main_r5fss1_core0: mbox-main-r5fss1-core0 {
@@ -228,6 +231,7 @@ mbox_main_r5fss1_core1: mbox-main-r5fss1-core1 { }; &mailbox0_cluster3 { + status = "okay"; interrupts = <424>; mbox_c66_0: mbox-c66-0 {
@@ -242,6 +246,7 @@ mbox_c66_1: mbox-c66-1 { }; &mailbox0_cluster4 { + status = "okay"; interrupts = <420>; mbox_c71_0: mbox-c71-0 {
@@ -250,34 +255,6 @@ mbox_c71_0: mbox-c71-0 { }; }; -&mailbox0_cluster5 { - status = "disabled"; -}; - -&mailbox0_cluster6 { - status = "disabled"; -}; - -&mailbox0_cluster7 { - status = "disabled"; -}; - -&mailbox0_cluster8 { - status = "disabled"; -}; - -&mailbox0_cluster9 { - status = "disabled"; -}; - -&mailbox0_cluster10 { - status = "disabled"; -}; - -&mailbox0_cluster11 { - status = "disabled"; -}; - &mcu_r5fss0_core0 { mboxes = <&mailbox0_cluster0 &mbox_mcu_r5fss0_core0>; memory-region = <&mcu_r5fss0_core0_dma_memory_region>,
Signature · 1 line
2.37.3
PATCH 9/12 arm64: dts: ti: k3-j7200: Enable Mailbox nodes at the board level
In reply to Andrew DavisMailbox nodes defined in the top-level J7200 SoC dtsi files are incomplete and may not be functional unless they are extended with a chosen interrupt and connection to a remote processor.
As the remote processors depend on memory nodes which are only known at the board integration level, these nodes should only be enabled when provided with the above information.
Disable the Mailbox nodes in the dtsi files and only enable the ones that are actually used on a given board.
--- arch/arm64/boot/dts/ti/k3-j7200-main.dtsi | 12 ++++++ arch/arm64/boot/dts/ti/k3-j7200-som-p0.dtsi | 42 +-------------------- 2 files changed, 14 insertions(+), 40 deletions(-)
arch/arm64/boot/dts/ti/k3-j7200-main.dtsi +12 -0
@@ -142,6 +142,7 @@ mailbox0_cluster0: mailbox@31f80000 { ti,mbox-num-users = <4>; ti,mbox-num-fifos = <16>; interrupt-parent = <&main_navss_intr>; + status = "disabled"; }; mailbox0_cluster1: mailbox@31f81000 {
@@ -151,6 +152,7 @@ mailbox0_cluster1: mailbox@31f81000 { ti,mbox-num-users = <4>; ti,mbox-num-fifos = <16>; interrupt-parent = <&main_navss_intr>; + status = "disabled"; }; mailbox0_cluster2: mailbox@31f82000 {
@@ -160,6 +162,7 @@ mailbox0_cluster2: mailbox@31f82000 { ti,mbox-num-users = <4>; ti,mbox-num-fifos = <16>; interrupt-parent = <&main_navss_intr>; + status = "disabled"; }; mailbox0_cluster3: mailbox@31f83000 {
@@ -169,6 +172,7 @@ mailbox0_cluster3: mailbox@31f83000 { ti,mbox-num-users = <4>; ti,mbox-num-fifos = <16>; interrupt-parent = <&main_navss_intr>; + status = "disabled"; }; mailbox0_cluster4: mailbox@31f84000 {
@@ -178,6 +182,7 @@ mailbox0_cluster4: mailbox@31f84000 { ti,mbox-num-users = <4>; ti,mbox-num-fifos = <16>; interrupt-parent = <&main_navss_intr>; + status = "disabled"; }; mailbox0_cluster5: mailbox@31f85000 {
@@ -187,6 +192,7 @@ mailbox0_cluster5: mailbox@31f85000 { ti,mbox-num-users = <4>; ti,mbox-num-fifos = <16>; interrupt-parent = <&main_navss_intr>; + status = "disabled"; }; mailbox0_cluster6: mailbox@31f86000 {
@@ -196,6 +202,7 @@ mailbox0_cluster6: mailbox@31f86000 { ti,mbox-num-users = <4>; ti,mbox-num-fifos = <16>; interrupt-parent = <&main_navss_intr>; + status = "disabled"; }; mailbox0_cluster7: mailbox@31f87000 {
@@ -205,6 +212,7 @@ mailbox0_cluster7: mailbox@31f87000 { ti,mbox-num-users = <4>; ti,mbox-num-fifos = <16>; interrupt-parent = <&main_navss_intr>; + status = "disabled"; }; mailbox0_cluster8: mailbox@31f88000 {
@@ -214,6 +222,7 @@ mailbox0_cluster8: mailbox@31f88000 { ti,mbox-num-users = <4>; ti,mbox-num-fifos = <16>; interrupt-parent = <&main_navss_intr>; + status = "disabled"; }; mailbox0_cluster9: mailbox@31f89000 {
@@ -223,6 +232,7 @@ mailbox0_cluster9: mailbox@31f89000 { ti,mbox-num-users = <4>; ti,mbox-num-fifos = <16>; interrupt-parent = <&main_navss_intr>; + status = "disabled"; }; mailbox0_cluster10: mailbox@31f8a000 {
@@ -232,6 +242,7 @@ mailbox0_cluster10: mailbox@31f8a000 { ti,mbox-num-users = <4>; ti,mbox-num-fifos = <16>; interrupt-parent = <&main_navss_intr>; + status = "disabled"; }; mailbox0_cluster11: mailbox@31f8b000 {
@@ -241,6 +252,7 @@ mailbox0_cluster11: mailbox@31f8b000 { ti,mbox-num-users = <4>; ti,mbox-num-fifos = <16>; interrupt-parent = <&main_navss_intr>; + status = "disabled"; }; main_ringacc: ringacc@3c000000 {
arch/arm64/boot/dts/ti/k3-j7200-som-p0.dtsi +2 -40
60 lines not on this page · raw message
Signature · 1 line
2.37.3
PATCH 10/12 arm64: dts: ti: k3-j721s2: Enable Mailbox nodes at the board level
In reply to Andrew DavisMailbox nodes defined in the top-level J721s2 SoC dtsi files are incomplete and may not be functional unless they are extended with a chosen interrupt and connection to a remote processor.
As the remote processors depend on memory nodes which are only known at the board integration level, these nodes should only be enabled when provided with the above information.
Disable the Mailbox nodes in the dtsi files and only enable the ones that are actually used on a given board.
--- arch/arm64/boot/dts/ti/k3-j721s2-main.dtsi | 24 +++++ arch/arm64/boot/dts/ti/k3-j721s2-som-p0.dtsi | 96 -------------------- 2 files changed, 24 insertions(+), 96 deletions(-)
arch/arm64/boot/dts/ti/k3-j721s2-main.dtsi +24 -0
@@ -438,6 +438,7 @@ mailbox0_cluster0: mailbox@31f80000 { ti,mbox-num-users = <4>; ti,mbox-num-fifos = <16>; interrupt-parent = <&main_navss_intr>; + status = "disabled"; }; mailbox0_cluster1: mailbox@31f81000 {
@@ -447,6 +448,7 @@ mailbox0_cluster1: mailbox@31f81000 { ti,mbox-num-users = <4>; ti,mbox-num-fifos = <16>; interrupt-parent = <&main_navss_intr>; + status = "disabled"; }; mailbox0_cluster2: mailbox@31f82000 {
@@ -456,6 +458,7 @@ mailbox0_cluster2: mailbox@31f82000 { ti,mbox-num-users = <4>; ti,mbox-num-fifos = <16>; interrupt-parent = <&main_navss_intr>; + status = "disabled"; }; mailbox0_cluster3: mailbox@31f83000 {
@@ -465,6 +468,7 @@ mailbox0_cluster3: mailbox@31f83000 { ti,mbox-num-users = <4>; ti,mbox-num-fifos = <16>; interrupt-parent = <&main_navss_intr>; + status = "disabled"; }; mailbox0_cluster4: mailbox@31f84000 {
@@ -474,6 +478,7 @@ mailbox0_cluster4: mailbox@31f84000 { ti,mbox-num-users = <4>; ti,mbox-num-fifos = <16>; interrupt-parent = <&main_navss_intr>; + status = "disabled"; }; mailbox0_cluster5: mailbox@31f85000 {
@@ -483,6 +488,7 @@ mailbox0_cluster5: mailbox@31f85000 { ti,mbox-num-users = <4>; ti,mbox-num-fifos = <16>; interrupt-parent = <&main_navss_intr>; + status = "disabled"; }; mailbox0_cluster6: mailbox@31f86000 {
@@ -492,6 +498,7 @@ mailbox0_cluster6: mailbox@31f86000 { ti,mbox-num-users = <4>; ti,mbox-num-fifos = <16>; interrupt-parent = <&main_navss_intr>; + status = "disabled"; }; mailbox0_cluster7: mailbox@31f87000 {
@@ -501,6 +508,7 @@ mailbox0_cluster7: mailbox@31f87000 { ti,mbox-num-users = <4>; ti,mbox-num-fifos = <16>; interrupt-parent = <&main_navss_intr>; + status = "disabled"; }; mailbox0_cluster8: mailbox@31f88000 {
@@ -510,6 +518,7 @@ mailbox0_cluster8: mailbox@31f88000 { ti,mbox-num-users = <4>; ti,mbox-num-fifos = <16>; interrupt-parent = <&main_navss_intr>; + status = "disabled"; }; mailbox0_cluster9: mailbox@31f89000 {
@@ -519,6 +528,7 @@ mailbox0_cluster9: mailbox@31f89000 { ti,mbox-num-users = <4>; ti,mbox-num-fifos = <16>; interrupt-parent = <&main_navss_intr>; + status = "disabled"; }; mailbox0_cluster10: mailbox@31f8a000 {
@@ -528,6 +538,7 @@ mailbox0_cluster10: mailbox@31f8a000 { ti,mbox-num-users = <4>; ti,mbox-num-fifos = <16>; interrupt-parent = <&main_navss_intr>; + status = "disabled"; }; mailbox0_cluster11: mailbox@31f8b000 {
@@ -537,6 +548,7 @@ mailbox0_cluster11: mailbox@31f8b000 { ti,mbox-num-users = <4>; ti,mbox-num-fifos = <16>; interrupt-parent = <&main_navss_intr>; + status = "disabled"; }; mailbox1_cluster0: mailbox@31f90000 {
@@ -546,6 +558,7 @@ mailbox1_cluster0: mailbox@31f90000 { ti,mbox-num-users = <4>; ti,mbox-num-fifos = <16>; interrupt-parent = <&main_navss_intr>; + status = "disabled"; }; mailbox1_cluster1: mailbox@31f91000 {
@@ -555,6 +568,7 @@ mailbox1_cluster1: mailbox@31f91000 { ti,mbox-num-users = <4>; ti,mbox-num-fifos = <16>; interrupt-parent = <&main_navss_intr>; + status = "disabled"; }; mailbox1_cluster2: mailbox@31f92000 {
@@ -564,6 +578,7 @@ mailbox1_cluster2: mailbox@31f92000 { ti,mbox-num-users = <4>; ti,mbox-num-fifos = <16>; interrupt-parent = <&main_navss_intr>; + status = "disabled"; }; mailbox1_cluster3: mailbox@31f93000 {
@@ -573,6 +588,7 @@ mailbox1_cluster3: mailbox@31f93000 { ti,mbox-num-users = <4>; ti,mbox-num-fifos = <16>; interrupt-parent = <&main_navss_intr>; + status = "disabled"; }; mailbox1_cluster4: mailbox@31f94000 {
@@ -582,6 +598,7 @@ mailbox1_cluster4: mailbox@31f94000 { ti,mbox-num-users = <4>; ti,mbox-num-fifos = <16>; interrupt-parent = <&main_navss_intr>; + status = "disabled"; }; mailbox1_cluster5: mailbox@31f95000 {
@@ -591,6 +608,7 @@ mailbox1_cluster5: mailbox@31f95000 { ti,mbox-num-users = <4>; ti,mbox-num-fifos = <16>; interrupt-parent = <&main_navss_intr>; + status = "disabled"; }; mailbox1_cluster6: mailbox@31f96000 {
@@ -600,6 +618,7 @@ mailbox1_cluster6: mailbox@31f96000 { ti,mbox-num-users = <4>; ti,mbox-num-fifos = <16>; interrupt-parent = <&main_navss_intr>; + status = "disabled"; }; mailbox1_cluster7: mailbox@31f97000 {
@@ -609,6 +628,7 @@ mailbox1_cluster7: mailbox@31f97000 { ti,mbox-num-users = <4>; ti,mbox-num-fifos = <16>; interrupt-parent = <&main_navss_intr>; + status = "disabled"; }; mailbox1_cluster8: mailbox@31f98000 {
@@ -618,6 +638,7 @@ mailbox1_cluster8: mailbox@31f98000 { ti,mbox-num-users = <4>; ti,mbox-num-fifos = <16>; interrupt-parent = <&main_navss_intr>; + status = "disabled"; }; mailbox1_cluster9: mailbox@31f99000 {
@@ -627,6 +648,7 @@ mailbox1_cluster9: mailbox@31f99000 { ti,mbox-num-users = <4>; ti,mbox-num-fifos = <16>; interrupt-parent = <&main_navss_intr>; + status = "disabled"; }; mailbox1_cluster10: mailbox@31f9a000 {
@@ -636,6 +658,7 @@ mailbox1_cluster10: mailbox@31f9a000 { ti,mbox-num-users = <4>; ti,mbox-num-fifos = <16>; interrupt-parent = <&main_navss_intr>; + status = "disabled"; }; mailbox1_cluster11: mailbox@31f9b000 {
@@ -645,6 +668,7 @@ mailbox1_cluster11: mailbox@31f9b000 { ti,mbox-num-users = <4>; ti,mbox-num-fifos = <16>; interrupt-parent = <&main_navss_intr>; + status = "disabled"; }; main_ringacc: ringacc@3c000000 {
arch/arm64/boot/dts/ti/k3-j721s2-som-p0.dtsi +0 -96
99 lines not on this page · raw message
Signature · 1 line
2.37.3
PATCH 11/12 arm64: dts: ti: k3-j721s2: Enable MCAN nodes at the board level
In reply to Andrew DavisMCAN nodes defined in the top-level J721s2 SoC dtsi files are incomplete and may not be functional unless they are extended with pinmux information.
As the pinmux is only known at the board integration level, these nodes should only be enabled when provided with this information.
Disable the MCAN nodes in the dtsi files and only enable the ones that are actually pinned out on a given board.
--- .../dts/ti/k3-j721s2-common-proc-board.dts | 70 +------------------ arch/arm64/boot/dts/ti/k3-j721s2-main.dtsi | 18 +++++ .../boot/dts/ti/k3-j721s2-mcu-wakeup.dtsi | 2 + arch/arm64/boot/dts/ti/k3-j721s2-som-p0.dtsi | 1 + 4 files changed, 23 insertions(+), 68 deletions(-)
arch/arm64/boot/dts/ti/k3-j721s2-common-proc-board.dts +2 -68
@@ -321,81 +321,15 @@ &cpsw_port1 { }; &mcu_mcan0 { + status = "okay"; pinctrl-names = "default"; pinctrl-0 = <&mcu_mcan0_pins_default>; phys = <&transceiver1>; }; &mcu_mcan1 { + status = "okay"; pinctrl-names = "default"; pinctrl-0 = <&mcu_mcan1_pins_default>; phys = <&transceiver2>; }; - -&main_mcan0 { - status = "disabled"; -}; - -&main_mcan1 { - status = "disabled"; -}; - -&main_mcan2 { - status = "disabled"; -}; - -&main_mcan3 { - status = "disabled"; -}; - -&main_mcan4 { - status = "disabled"; -}; - -&main_mcan5 { - status = "disabled"; -}; - -&main_mcan6 { - status = "disabled"; -}; - -&main_mcan7 { - status = "disabled"; -}; - -&main_mcan8 { - status = "disabled"; -}; - -&main_mcan9 { - status = "disabled"; -}; - -&main_mcan10 { - status = "disabled"; -}; - -&main_mcan11 { - status = "disabled"; -}; - -&main_mcan12 { - status = "disabled"; -}; - -&main_mcan13 { - status = "disabled"; -}; - -&main_mcan14 { - status = "disabled"; -}; - -&main_mcan15 { - status = "disabled"; -}; - -&main_mcan17 { - status = "disabled"; -};
arch/arm64/boot/dts/ti/k3-j721s2-main.dtsi +18 -0
@@ -732,6 +732,7 @@ main_mcan0: can@2701000 { <GIC_SPI 125 IRQ_TYPE_LEVEL_HIGH>; interrupt-names = "int0", "int1"; bosch,mram-cfg = <0x0 128 64 64 64 64 32 32>; + status = "disabled"; }; main_mcan1: can@2711000 {
@@ -746,6 +747,7 @@ main_mcan1: can@2711000 { <GIC_SPI 128 IRQ_TYPE_LEVEL_HIGH>; interrupt-names = "int0", "int1"; bosch,mram-cfg = <0x0 128 64 64 64 64 32 32>; + status = "disabled"; }; main_mcan2: can@2721000 {
@@ -760,6 +762,7 @@ main_mcan2: can@2721000 { <GIC_SPI 131 IRQ_TYPE_LEVEL_HIGH>; interrupt-names = "int0", "int1"; bosch,mram-cfg = <0x0 128 64 64 64 64 32 32>; + status = "disabled"; }; main_mcan3: can@2731000 {
@@ -774,6 +777,7 @@ main_mcan3: can@2731000 { <GIC_SPI 134 IRQ_TYPE_LEVEL_HIGH>; interrupt-names = "int0", "int1"; bosch,mram-cfg = <0x0 128 64 64 64 64 32 32>; + status = "disabled"; }; main_mcan4: can@2741000 {
@@ -788,6 +792,7 @@ main_mcan4: can@2741000 { <GIC_SPI 137 IRQ_TYPE_LEVEL_HIGH>; interrupt-names = "int0", "int1"; bosch,mram-cfg = <0x0 128 64 64 64 64 32 32>; + status = "disabled"; }; main_mcan5: can@2751000 {
@@ -802,6 +807,7 @@ main_mcan5: can@2751000 { <GIC_SPI 140 IRQ_TYPE_LEVEL_HIGH>; interrupt-names = "int0", "int1"; bosch,mram-cfg = <0x0 128 64 64 64 64 32 32>; + status = "disabled"; }; main_mcan6: can@2761000 {
@@ -816,6 +822,7 @@ main_mcan6: can@2761000 { <GIC_SPI 143 IRQ_TYPE_LEVEL_HIGH>; interrupt-names = "int0", "int1"; bosch,mram-cfg = <0x0 128 64 64 64 64 32 32>; + status = "disabled"; }; main_mcan7: can@2771000 {
@@ -830,6 +837,7 @@ main_mcan7: can@2771000 { <GIC_SPI 146 IRQ_TYPE_LEVEL_HIGH>; interrupt-names = "int0", "int1"; bosch,mram-cfg = <0x0 128 64 64 64 64 32 32>; + status = "disabled"; }; main_mcan8: can@2781000 {
@@ -844,6 +852,7 @@ main_mcan8: can@2781000 { <GIC_SPI 577 IRQ_TYPE_LEVEL_HIGH>; interrupt-names = "int0", "int1"; bosch,mram-cfg = <0x0 128 64 64 64 64 32 32>; + status = "disabled"; }; main_mcan9: can@2791000 {
@@ -858,6 +867,7 @@ main_mcan9: can@2791000 { <GIC_SPI 580 IRQ_TYPE_LEVEL_HIGH>; interrupt-names = "int0", "int1"; bosch,mram-cfg = <0x0 128 64 64 64 64 32 32>; + status = "disabled"; }; main_mcan10: can@27a1000 {
@@ -872,6 +882,7 @@ main_mcan10: can@27a1000 { <GIC_SPI 583 IRQ_TYPE_LEVEL_HIGH>; interrupt-names = "int0", "int1"; bosch,mram-cfg = <0x0 128 64 64 64 64 32 32>; + status = "disabled"; }; main_mcan11: can@27b1000 {
@@ -886,6 +897,7 @@ main_mcan11: can@27b1000 { <GIC_SPI 586 IRQ_TYPE_LEVEL_HIGH>; interrupt-names = "int0", "int1"; bosch,mram-cfg = <0x0 128 64 64 64 64 32 32>; + status = "disabled"; }; main_mcan12: can@27c1000 {
@@ -900,6 +912,7 @@ main_mcan12: can@27c1000 { <GIC_SPI 589 IRQ_TYPE_LEVEL_HIGH>; interrupt-names = "int0", "int1"; bosch,mram-cfg = <0x0 128 64 64 64 64 32 32>; + status = "disabled"; }; main_mcan13: can@27d1000 {
@@ -914,6 +927,7 @@ main_mcan13: can@27d1000 { <GIC_SPI 592 IRQ_TYPE_LEVEL_HIGH>; interrupt-names = "int0", "int1"; bosch,mram-cfg = <0x0 128 64 64 64 64 32 32>; + status = "disabled"; }; main_mcan14: can@2681000 {
@@ -928,6 +942,7 @@ main_mcan14: can@2681000 { <GIC_SPI 595 IRQ_TYPE_LEVEL_HIGH>; interrupt-names = "int0", "int1"; bosch,mram-cfg = <0x0 128 64 64 64 64 32 32>; + status = "disabled"; }; main_mcan15: can@2691000 {
@@ -942,6 +957,7 @@ main_mcan15: can@2691000 { <GIC_SPI 598 IRQ_TYPE_LEVEL_HIGH>; interrupt-names = "int0", "int1"; bosch,mram-cfg = <0x0 128 64 64 64 64 32 32>; + status = "disabled"; }; main_mcan16: can@26a1000 {
@@ -956,6 +972,7 @@ main_mcan16: can@26a1000 { <GIC_SPI 785 IRQ_TYPE_LEVEL_HIGH>; interrupt-names = "int0", "int1"; bosch,mram-cfg = <0x0 128 64 64 64 64 32 32>; + status = "disabled"; }; main_mcan17: can@26b1000 {
@@ -970,5 +987,6 @@ main_mcan17: can@26b1000 { <GIC_SPI 788 IRQ_TYPE_LEVEL_HIGH>; interrupt-names = "int0", "int1"; bosch,mram-cfg = <0x0 128 64 64 64 64 32 32>; + status = "disabled"; }; };
arch/arm64/boot/dts/ti/k3-j721s2-mcu-wakeup.dtsi +2 -0
@@ -182,6 +182,7 @@ mcu_mcan0: can@40528000 { <GIC_SPI 833 IRQ_TYPE_LEVEL_HIGH>; interrupt-names = "int0", "int1"; bosch,mram-cfg = <0x0 128 64 64 64 64 32 32>; + status = "disabled"; }; mcu_mcan1: can@40568000 {
@@ -196,6 +197,7 @@ mcu_mcan1: can@40568000 { <GIC_SPI 836 IRQ_TYPE_LEVEL_HIGH>; interrupt-names = "int0", "int1"; bosch,mram-cfg = <0x0 128 64 64 64 64 32 32>; + status = "disabled"; }; mcu_navss: bus@28380000{
arch/arm64/boot/dts/ti/k3-j721s2-som-p0.dtsi +1 -0
@@ -73,6 +73,7 @@ exp_som: gpio@21 { }; &main_mcan16 { + status = "okay"; pinctrl-0 = <&main_mcan16_pins_default>; pinctrl-names = "default"; phys = <&transceiver0>;
Signature · 1 line
2.37.3
PATCH 12/12 arm64: dts: ti: k3-j721s2: Enable I2C nodes at the board level
In reply to Andrew DavisI2C nodes defined in the top-level J721s2 SoC dtsi files are incomplete and will not be functional unless they are extended with pinmux information.
As the pinmux is only known at the board integration level, these nodes should only be enabled when provided with this information.
Disable the I2C nodes in the dtsi files and only enable the ones that are actually pinned out on a given board.
--- .../dts/ti/k3-j721s2-common-proc-board.dts | 24 ------------------- arch/arm64/boot/dts/ti/k3-j721s2-main.dtsi | 6 +++++ .../boot/dts/ti/k3-j721s2-mcu-wakeup.dtsi | 3 +++ arch/arm64/boot/dts/ti/k3-j721s2-som-p0.dtsi | 1 + 4 files changed, 10 insertions(+), 24 deletions(-)
arch/arm64/boot/dts/ti/k3-j721s2-common-proc-board.dts +0 -24
@@ -261,30 +261,6 @@ exp2: gpio@22 { }; }; -&main_i2c1 { - status = "disabled"; -}; - -&main_i2c2 { - status = "disabled"; -}; - -&main_i2c3 { - status = "disabled"; -}; - -&main_i2c4 { - status = "disabled"; -}; - -&main_i2c5 { - status = "disabled"; -}; - -&main_i2c6 { - status = "disabled"; -}; - &main_sdhci0 { /* eMMC */ non-removable;
arch/arm64/boot/dts/ti/k3-j721s2-main.dtsi +6 -0
@@ -266,6 +266,7 @@ main_i2c1: i2c@2010000 { clocks = <&k3_clks 215 1>; clock-names = "fck"; power-domains = <&k3_pds 215 TI_SCI_PD_EXCLUSIVE>; + status = "disabled"; }; main_i2c2: i2c@2020000 {
@@ -277,6 +278,7 @@ main_i2c2: i2c@2020000 { clocks = <&k3_clks 216 1>; clock-names = "fck"; power-domains = <&k3_pds 216 TI_SCI_PD_EXCLUSIVE>; + status = "disabled"; }; main_i2c3: i2c@2030000 {
@@ -288,6 +290,7 @@ main_i2c3: i2c@2030000 { clocks = <&k3_clks 217 1>; clock-names = "fck"; power-domains = <&k3_pds 217 TI_SCI_PD_EXCLUSIVE>; + status = "disabled"; }; main_i2c4: i2c@2040000 {
@@ -299,6 +302,7 @@ main_i2c4: i2c@2040000 { clocks = <&k3_clks 218 1>; clock-names = "fck"; power-domains = <&k3_pds 218 TI_SCI_PD_EXCLUSIVE>; + status = "disabled"; }; main_i2c5: i2c@2050000 {
@@ -310,6 +314,7 @@ main_i2c5: i2c@2050000 { clocks = <&k3_clks 219 1>; clock-names = "fck"; power-domains = <&k3_pds 219 TI_SCI_PD_EXCLUSIVE>; + status = "disabled"; }; main_i2c6: i2c@2060000 {
@@ -321,6 +326,7 @@ main_i2c6: i2c@2060000 { clocks = <&k3_clks 220 1>; clock-names = "fck"; power-domains = <&k3_pds 220 TI_SCI_PD_EXCLUSIVE>; + status = "disabled"; }; main_sdhci0: mmc@4f80000 {
arch/arm64/boot/dts/ti/k3-j721s2-mcu-wakeup.dtsi +3 -0
@@ -146,6 +146,7 @@ wkup_i2c0: i2c@42120000 { clocks = <&k3_clks 223 1>; clock-names = "fck"; power-domains = <&k3_pds 223 TI_SCI_PD_EXCLUSIVE>; + status = "disabled"; }; mcu_i2c0: i2c@40b00000 {
@@ -157,6 +158,7 @@ mcu_i2c0: i2c@40b00000 { clocks = <&k3_clks 221 1>; clock-names = "fck"; power-domains = <&k3_pds 221 TI_SCI_PD_EXCLUSIVE>; + status = "disabled"; }; mcu_i2c1: i2c@40b10000 {
@@ -168,6 +170,7 @@ mcu_i2c1: i2c@40b10000 { clocks = <&k3_clks 222 1>; clock-names = "fck"; power-domains = <&k3_pds 222 TI_SCI_PD_EXCLUSIVE>; + status = "disabled"; }; mcu_mcan0: can@40528000 {
arch/arm64/boot/dts/ti/k3-j721s2-som-p0.dtsi +1 -0
@@ -56,6 +56,7 @@ J721S2_IOPAD(0x024, PIN_OUTPUT, 0) /* (Y28) MCAN16_TX */ }; &main_i2c0 { + status = "okay"; pinctrl-names = "default"; pinctrl-0 = <&main_i2c0_pins_default>; clock-frequency = <400000>;
Signature · 1 line
2.37.3
On October 20, 2022 thus sayeth Andrew Davis:
Quoted 34 lines
Hello all,
Same story as for AM64x[0] and AM62x[1], this time for J7x.
This one was a little more involved that the last 2 rounds as some IP (like UART) are pinned out using the default pinmux. Perhaps we should be explicit here and have pinmux nodes that simply restate the defaults. I can go solve that in a follow up series if we think that is what we want to do.
I have the last round for AM65x ready to post, but that involves a few boards that I do not have (Simatic IOT2050) but would like to do some additional re-work with, so holding off until after I get that sorted.
Thanks,
Andrew[0] https://www.spinics.net/lists/arm-kernel/msg1018532.html
[1] https://www.spinics.net/lists/arm-kernel/msg1018864.htmlAndrew Davis (12):
arm64: dts: ti: k3-j721e: Enable UART nodes at the board level
arm64: dts: ti: k3-j721e: Enable I2C nodes at the board level
arm64: dts: ti: k3-j721e: Enable MCASP nodes at the board level
arm64: dts: ti: k3-j721e: Enable MCAN nodes at the board level
arm64: dts: ti: k3-j7200: Enable UART nodes at the board level
arm64: dts: ti: k3-j7200: Enable I2C nodes at the board level
arm64: dts: ti: k3-j721s2: Enable UART nodes at the board level
arm64: dts: ti: k3-j721e: Enable Mailbox nodes at the board level
arm64: dts: ti: k3-j7200: Enable Mailbox nodes at the board level
arm64: dts: ti: k3-j721s2: Enable Mailbox nodes at the board level
arm64: dts: ti: k3-j721s2: Enable MCAN nodes at the board level
arm64: dts: ti: k3-j721s2: Enable I2C nodes at the board level
Quoted 15 lines
.../dts/ti/k3-j7200-common-proc-board.dts | 48 ++---- arch/arm64/boot/dts/ti/k3-j7200-main.dtsi | 29 ++++ .../boot/dts/ti/k3-j7200-mcu-wakeup.dtsi | 5 + arch/arm64/boot/dts/ti/k3-j7200-som-p0.dtsi | 42 +---- .../dts/ti/k3-j721e-common-proc-board.dts | 141 +++------------- arch/arm64/boot/dts/ti/k3-j721e-main.dtsi | 55 ++++++ .../boot/dts/ti/k3-j721e-mcu-wakeup.dtsi | 7 + arch/arm64/boot/dts/ti/k3-j721e-sk.dts | 158 ++---------------- arch/arm64/boot/dts/ti/k3-j721e-som-p0.dtsi | 33 +--- .../dts/ti/k3-j721s2-common-proc-board.dts | 132 +-------------- arch/arm64/boot/dts/ti/k3-j721s2-main.dtsi | 58 +++++++ .../boot/dts/ti/k3-j721s2-mcu-wakeup.dtsi | 7 + arch/arm64/boot/dts/ti/k3-j721s2-som-p0.dtsi | 98 +---------- 13 files changed, 231 insertions(+), 582 deletions(-)
*whew* these Jacinto boards have a lot of stuff on them :) but it LGTM
~Bryan
Quoted 14 lines · Andrew Davis
Andrew Davis (12):
arm64: dts: ti: k3-j721e: Enable UART nodes at the board level
arm64: dts: ti: k3-j721e: Enable I2C nodes at the board level
arm64: dts: ti: k3-j721e: Enable MCASP nodes at the board level
arm64: dts: ti: k3-j721e: Enable MCAN nodes at the board level
arm64: dts: ti: k3-j7200: Enable UART nodes at the board level
arm64: dts: ti: k3-j7200: Enable I2C nodes at the board level
arm64: dts: ti: k3-j721s2: Enable UART nodes at the board level
arm64: dts: ti: k3-j721e: Enable Mailbox nodes at the board level
arm64: dts: ti: k3-j7200: Enable Mailbox nodes at the board level
arm64: dts: ti: k3-j721s2: Enable Mailbox nodes at the board level
arm64: dts: ti: k3-j721s2: Enable MCAN nodes at the board level
arm64: dts: ti: k3-j721s2: Enable I2C nodes at the board level
Quoted 14 lines
.../dts/ti/k3-j7200-common-proc-board.dts | 48 ++---- arch/arm64/boot/dts/ti/k3-j7200-main.dtsi | 29 ++++ .../boot/dts/ti/k3-j7200-mcu-wakeup.dtsi | 5 + arch/arm64/boot/dts/ti/k3-j7200-som-p0.dtsi | 42 +---- .../dts/ti/k3-j721e-common-proc-board.dts | 141 +++------------- arch/arm64/boot/dts/ti/k3-j721e-main.dtsi | 55 ++++++ .../boot/dts/ti/k3-j721e-mcu-wakeup.dtsi | 7 + arch/arm64/boot/dts/ti/k3-j721e-sk.dts | 158 ++---------------- arch/arm64/boot/dts/ti/k3-j721e-som-p0.dtsi | 33 +--- .../dts/ti/k3-j721s2-common-proc-board.dts | 132 +-------------- arch/arm64/boot/dts/ti/k3-j721s2-main.dtsi | 58 +++++++ .../boot/dts/ti/k3-j721s2-mcu-wakeup.dtsi | 7 + arch/arm64/boot/dts/ti/k3-j721s2-som-p0.dtsi | 98 +---------- 13 files changed, 231 insertions(+), 582 deletions(-)
Hi Andrew Davis,
Quoted 9 lines · Andrew Davis
Same story as for AM64x[0] and AM62x[1], this time for J7x.
This one was a little more involved that the last 2 rounds as some IP (like UART) are pinned out using the default pinmux. Perhaps we should be explicit here and have pinmux nodes that simply restate the defaults. I can go solve that in a follow up series if we think that is what we want to do.
[...]
I have applied the following to branch ti-k3-dts-next on [1]. Thank you!
[01/12] arm64: dts: ti: k3-j721e: Enable UART nodes at the board level
commit: fe17e20fde14c6cbaf1cae97aef370b6f4c73518
[02/12] arm64: dts: ti: k3-j721e: Enable I2C nodes at the board level
commit: 282c4ad3b8c1da99095e0edbbe617cdf4dcb138b
[03/12] arm64: dts: ti: k3-j721e: Enable MCASP nodes at the board level
commit: 256596ad158c80c8e4104a6310a411ec8829f9eb
[04/12] arm64: dts: ti: k3-j721e: Enable MCAN nodes at the board level
commit: 39e7758b94e31071a87489364c723afe92849ae7
[05/12] arm64: dts: ti: k3-j7200: Enable UART nodes at the board level
commit: dae322f8a7ef11a06bfb61bada4ebbcac219783e
[06/12] arm64: dts: ti: k3-j7200: Enable I2C nodes at the board level
commit: a9ed915cd55c883fed72e50b45988fa4305496a7
[07/12] arm64: dts: ti: k3-j721s2: Enable UART nodes at the board level
commit: 0e63f35a9c6acf1d74bd693c492f8955bb16c89a
[08/12] arm64: dts: ti: k3-j721e: Enable Mailbox nodes at the board level
commit: 7e48b665100ee84bdaa163dece6d40351077f664
[09/12] arm64: dts: ti: k3-j7200: Enable Mailbox nodes at the board level
commit: 74f0f58d3122c3e2cc313dd6311b9742dbfd54e0
[10/12] arm64: dts: ti: k3-j721s2: Enable Mailbox nodes at the board level
commit: 3fb0402f65959edc9a14842dc36828d2c7109ae2
[11/12] arm64: dts: ti: k3-j721s2: Enable MCAN nodes at the board level
commit: 06639b8ae0e9be0cf0195209e6b69f4e254687b0
[12/12] arm64: dts: ti: k3-j721s2: Enable I2C nodes at the board level
commit: 0aef5131380628e2a9bfcbbcfed5d6477c8f9651All 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] git://git.kernel.org/pub/scm/linux/kernel/git/ti/linux.git
Signature · 3 lines
Regards, Nishanth Menon Key (0xDDB5849D1736249D) / Fingerprint: F8A2 8693 54EB 8232 17A3 1A34 DDB5 849D 1736 249D