Hello all,
Same story as for AM64x[0], this time for AM62x. If there
are no objections here then the J7x platforms are next.
Thanks,
Andrew
[0] https://www.spinics.net/lists/arm-kernel/msg1018532.html
Andrew Davis (10):
arm64: dts: ti: k3-am62: Enable UART nodes at the board level
arm64: dts: ti: k3-am62: Enable I2C nodes at the board level
arm64: dts: ti: k3-am62: Enable SPI nodes at the board level
arm64: dts: ti: k3-am62: Enable EPWM nodes at the board level
arm64: dts: ti: k3-am62: Enable ECAP nodes at the board level
arm64: dts: ti: k3-am62: MDIO pinmux should belong to the MDIO node
arm64: dts: ti: k3-am62: Enable MDIO nodes at the board level
arm64: dts: ti: k3-am62: Enable MCAN nodes at the board level
arm64: dts: ti: k3-am62: Enable SDHCI nodes at the board level
arm64: dts: ti: k3-am62: Enable OSPI nodes at the board level
arch/arm64/boot/dts/ti/k3-am62-main.dtsi | 26 +++++++
arch/arm64/boot/dts/ti/k3-am62-mcu.dtsi | 4 ++
arch/arm64/boot/dts/ti/k3-am62-wakeup.dtsi | 2 +
arch/arm64/boot/dts/ti/k3-am625-sk.dts | 81 +++-------------------
4 files changed, 43 insertions(+), 70 deletions(-)
--
2.37.3
OSPI nodes defined in the top-level AM62x 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 OSPI nodes in the dtsi files and only enable the ones that
are actually pinned out on a given board.
Signed-off-by: Andrew Davis <[email protected]>
---
arch/arm64/boot/dts/ti/k3-am62-main.dtsi | 1 +
arch/arm64/boot/dts/ti/k3-am625-sk.dts | 1 +
2 files changed, 2 insertions(+)
diff --git a/arch/arm64/boot/dts/ti/k3-am62-main.dtsi b/arch/arm64/boot/dts/ti/k3-am62-main.dtsi
index 5a2cd474a761..0d04176498fa 100644
--- a/arch/arm64/boot/dts/ti/k3-am62-main.dtsi
+++ b/arch/arm64/boot/dts/ti/k3-am62-main.dtsi
@@ -479,6 +479,7 @@ ospi0: spi@fc40000 {
power-domains = <&k3_pds 75 TI_SCI_PD_EXCLUSIVE>;
#address-cells = <1>;
#size-cells = <0>;
+ status = "disabled";
};
};
diff --git a/arch/arm64/boot/dts/ti/k3-am625-sk.dts b/arch/arm64/boot/dts/ti/k3-am625-sk.dts
index 3c98b639b0b2..18ca56cedc63 100644
--- a/arch/arm64/boot/dts/ti/k3-am625-sk.dts
+++ b/arch/arm64/boot/dts/ti/k3-am625-sk.dts
@@ -397,6 +397,7 @@ mbox_m4_0: mbox-m4-0 {
};
&ospi0 {
+ status = "okay";
pinctrl-names = "default";
pinctrl-0 = <&ospi0_pins_default>;
--
2.37.3
ECAP nodes defined in the top-level AM62x SoC dtsi files are incomplete
and will not be functional unless they are extended with pinmux
information. (These and the EPWM nodes could be used to trigger internal
actions but they are not used like that currently)
As the pinmux is only known at the board integration level, these
nodes should only be enabled when provided with this information.
Disable the ECAP nodes in the dtsi files and only enable the ones that
are actually pinned out on a given board.
Signed-off-by: Andrew Davis <[email protected]>
---
arch/arm64/boot/dts/ti/k3-am62-main.dtsi | 3 +++
arch/arm64/boot/dts/ti/k3-am625-sk.dts | 12 ------------
2 files changed, 3 insertions(+), 12 deletions(-)
diff --git a/arch/arm64/boot/dts/ti/k3-am62-main.dtsi b/arch/arm64/boot/dts/ti/k3-am62-main.dtsi
index a0d24faa6833..a580867e68b2 100644
--- a/arch/arm64/boot/dts/ti/k3-am62-main.dtsi
+++ b/arch/arm64/boot/dts/ti/k3-am62-main.dtsi
@@ -571,6 +571,7 @@ ecap0: pwm@23100000 {
power-domains = <&k3_pds 51 TI_SCI_PD_EXCLUSIVE>;
clocks = <&k3_clks 51 0>;
clock-names = "fck";
+ status = "disabled";
};
ecap1: pwm@23110000 {
@@ -580,6 +581,7 @@ ecap1: pwm@23110000 {
power-domains = <&k3_pds 52 TI_SCI_PD_EXCLUSIVE>;
clocks = <&k3_clks 52 0>;
clock-names = "fck";
+ status = "disabled";
};
ecap2: pwm@23120000 {
@@ -589,6 +591,7 @@ ecap2: pwm@23120000 {
power-domains = <&k3_pds 53 TI_SCI_PD_EXCLUSIVE>;
clocks = <&k3_clks 53 0>;
clock-names = "fck";
+ status = "disabled";
};
main_mcan0: can@20701000 {
diff --git a/arch/arm64/boot/dts/ti/k3-am625-sk.dts b/arch/arm64/boot/dts/ti/k3-am625-sk.dts
index 4086d61807ab..197d329a6082 100644
--- a/arch/arm64/boot/dts/ti/k3-am625-sk.dts
+++ b/arch/arm64/boot/dts/ti/k3-am625-sk.dts
@@ -450,18 +450,6 @@ partition@3fc0000 {
};
};
-&ecap0 {
- status = "disabled";
-};
-
-&ecap1 {
- status = "disabled";
-};
-
-&ecap2 {
- status = "disabled";
-};
-
&main_mcan0 {
status = "disabled";
};
--
2.37.3
SDHCI nodes defined in the top-level AM62x 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 SDHCI nodes in the dtsi files and only enable the ones that
are actually pinned out on a given board.
Signed-off-by: Andrew Davis <[email protected]>
---
arch/arm64/boot/dts/ti/k3-am62-main.dtsi | 3 +++
arch/arm64/boot/dts/ti/k3-am625-sk.dts | 2 ++
2 files changed, 5 insertions(+)
diff --git a/arch/arm64/boot/dts/ti/k3-am62-main.dtsi b/arch/arm64/boot/dts/ti/k3-am62-main.dtsi
index 43eebff429ab..5a2cd474a761 100644
--- a/arch/arm64/boot/dts/ti/k3-am62-main.dtsi
+++ b/arch/arm64/boot/dts/ti/k3-am62-main.dtsi
@@ -407,6 +407,7 @@ sdhci0: mmc@fa10000 {
ti,otap-del-sel-mmc-hs = <0x0>;
ti,otap-del-sel-ddr52 = <0x9>;
ti,otap-del-sel-hs200 = <0x6>;
+ status = "disabled";
};
sdhci1: mmc@fa00000 {
@@ -430,6 +431,7 @@ sdhci1: mmc@fa00000 {
ti,itap-del-sel-sdr25 = <0x0>;
ti,clkbuf-sel = <0x7>;
bus-width = <4>;
+ status = "disabled";
};
sdhci2: mmc@fa20000 {
@@ -452,6 +454,7 @@ sdhci2: mmc@fa20000 {
ti,itap-del-sel-sdr12 = <0x0>;
ti,itap-del-sel-sdr25 = <0x0>;
ti,clkbuf-sel = <0x7>;
+ status = "disabled";
};
fss: bus@fc00000 {
diff --git a/arch/arm64/boot/dts/ti/k3-am625-sk.dts b/arch/arm64/boot/dts/ti/k3-am625-sk.dts
index b6d53366ec50..3c98b639b0b2 100644
--- a/arch/arm64/boot/dts/ti/k3-am625-sk.dts
+++ b/arch/arm64/boot/dts/ti/k3-am625-sk.dts
@@ -335,6 +335,7 @@ exp1: gpio@22 {
};
&sdhci0 {
+ status = "okay";
pinctrl-names = "default";
pinctrl-0 = <&main_mmc0_pins_default>;
ti,driver-strength-ohm = <50>;
@@ -343,6 +344,7 @@ &sdhci0 {
&sdhci1 {
/* SD/MMC */
+ status = "okay";
vmmc-supply = <&vdd_mmc1>;
vqmmc-supply = <&vdd_sd_dv>;
pinctrl-names = "default";
--
2.37.3
MCAN nodes defined in the top-level AM62x 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 MCAN nodes in the dtsi files and only enable the ones that
are actually pinned out on a given board.
Signed-off-by: Andrew Davis <[email protected]>
---
arch/arm64/boot/dts/ti/k3-am62-main.dtsi | 1 +
arch/arm64/boot/dts/ti/k3-am625-sk.dts | 4 ----
2 files changed, 1 insertion(+), 4 deletions(-)
diff --git a/arch/arm64/boot/dts/ti/k3-am62-main.dtsi b/arch/arm64/boot/dts/ti/k3-am62-main.dtsi
index 5169f77cd37a..43eebff429ab 100644
--- a/arch/arm64/boot/dts/ti/k3-am62-main.dtsi
+++ b/arch/arm64/boot/dts/ti/k3-am62-main.dtsi
@@ -607,6 +607,7 @@ main_mcan0: can@20701000 {
<GIC_SPI 156 IRQ_TYPE_LEVEL_HIGH>;
interrupt-names = "int0", "int1";
bosch,mram-cfg = <0x0 128 64 64 64 64 32 32>;
+ status = "disabled";
};
epwm0: pwm@23000000 {
diff --git a/arch/arm64/boot/dts/ti/k3-am625-sk.dts b/arch/arm64/boot/dts/ti/k3-am625-sk.dts
index b8938eb9c55a..b6d53366ec50 100644
--- a/arch/arm64/boot/dts/ti/k3-am625-sk.dts
+++ b/arch/arm64/boot/dts/ti/k3-am625-sk.dts
@@ -452,7 +452,3 @@ partition@3fc0000 {
};
};
};
-
-&main_mcan0 {
- status = "disabled";
-};
--
2.37.3
I2C nodes defined in the top-level AM62x 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.
Signed-off-by: Andrew Davis <[email protected]>
---
arch/arm64/boot/dts/ti/k3-am62-main.dtsi | 4 ++++
arch/arm64/boot/dts/ti/k3-am62-mcu.dtsi | 1 +
arch/arm64/boot/dts/ti/k3-am62-wakeup.dtsi | 1 +
arch/arm64/boot/dts/ti/k3-am625-sk.dts | 18 ++----------------
4 files changed, 8 insertions(+), 16 deletions(-)
diff --git a/arch/arm64/boot/dts/ti/k3-am62-main.dtsi b/arch/arm64/boot/dts/ti/k3-am62-main.dtsi
index f6f8ccdb5f55..295c9bb22e7d 100644
--- a/arch/arm64/boot/dts/ti/k3-am62-main.dtsi
+++ b/arch/arm64/boot/dts/ti/k3-am62-main.dtsi
@@ -271,6 +271,7 @@ main_i2c0: i2c@20000000 {
power-domains = <&k3_pds 102 TI_SCI_PD_EXCLUSIVE>;
clocks = <&k3_clks 102 2>;
clock-names = "fck";
+ status = "disabled";
};
main_i2c1: i2c@20010000 {
@@ -282,6 +283,7 @@ main_i2c1: i2c@20010000 {
power-domains = <&k3_pds 103 TI_SCI_PD_EXCLUSIVE>;
clocks = <&k3_clks 103 2>;
clock-names = "fck";
+ status = "disabled";
};
main_i2c2: i2c@20020000 {
@@ -293,6 +295,7 @@ main_i2c2: i2c@20020000 {
power-domains = <&k3_pds 104 TI_SCI_PD_EXCLUSIVE>;
clocks = <&k3_clks 104 2>;
clock-names = "fck";
+ status = "disabled";
};
main_i2c3: i2c@20030000 {
@@ -304,6 +307,7 @@ main_i2c3: i2c@20030000 {
power-domains = <&k3_pds 105 TI_SCI_PD_EXCLUSIVE>;
clocks = <&k3_clks 105 2>;
clock-names = "fck";
+ status = "disabled";
};
main_spi0: spi@20100000 {
diff --git a/arch/arm64/boot/dts/ti/k3-am62-mcu.dtsi b/arch/arm64/boot/dts/ti/k3-am62-mcu.dtsi
index 8dff39723628..7f715ebe8e24 100644
--- a/arch/arm64/boot/dts/ti/k3-am62-mcu.dtsi
+++ b/arch/arm64/boot/dts/ti/k3-am62-mcu.dtsi
@@ -33,6 +33,7 @@ mcu_i2c0: i2c@4900000 {
power-domains = <&k3_pds 106 TI_SCI_PD_EXCLUSIVE>;
clocks = <&k3_clks 106 2>;
clock-names = "fck";
+ status = "disabled";
};
mcu_spi0: spi@4b00000 {
diff --git a/arch/arm64/boot/dts/ti/k3-am62-wakeup.dtsi b/arch/arm64/boot/dts/ti/k3-am62-wakeup.dtsi
index 94cfc549f644..ff936d547c99 100644
--- a/arch/arm64/boot/dts/ti/k3-am62-wakeup.dtsi
+++ b/arch/arm64/boot/dts/ti/k3-am62-wakeup.dtsi
@@ -38,5 +38,6 @@ wkup_i2c0: i2c@2b200000 {
power-domains = <&k3_pds 107 TI_SCI_PD_EXCLUSIVE>;
clocks = <&k3_clks 107 4>;
clock-names = "fck";
+ status = "disabled";
};
};
diff --git a/arch/arm64/boot/dts/ti/k3-am625-sk.dts b/arch/arm64/boot/dts/ti/k3-am625-sk.dts
index 0c7b25213e97..c280d6c00412 100644
--- a/arch/arm64/boot/dts/ti/k3-am625-sk.dts
+++ b/arch/arm64/boot/dts/ti/k3-am625-sk.dts
@@ -293,21 +293,15 @@ &main_uart1 {
status = "reserved";
};
-&mcu_i2c0 {
- status = "disabled";
-};
-
-&wkup_i2c0 {
- status = "disabled";
-};
-
&main_i2c0 {
+ status = "okay";
pinctrl-names = "default";
pinctrl-0 = <&main_i2c0_pins_default>;
clock-frequency = <400000>;
};
&main_i2c1 {
+ status = "okay";
pinctrl-names = "default";
pinctrl-0 = <&main_i2c1_pins_default>;
clock-frequency = <400000>;
@@ -340,14 +334,6 @@ exp1: gpio@22 {
};
};
-&main_i2c2 {
- status = "disabled";
-};
-
-&main_i2c3 {
- status = "disabled";
-};
-
&sdhci0 {
pinctrl-names = "default";
pinctrl-0 = <&main_mmc0_pins_default>;
--
2.37.3
SPI nodes defined in the top-level AM62x 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 SPI nodes in the dtsi files and only enable the ones that
are actually pinned out on a given board.
Signed-off-by: Andrew Davis <[email protected]>
---
arch/arm64/boot/dts/ti/k3-am62-main.dtsi | 3 +++
arch/arm64/boot/dts/ti/k3-am62-mcu.dtsi | 2 ++
2 files changed, 5 insertions(+)
diff --git a/arch/arm64/boot/dts/ti/k3-am62-main.dtsi b/arch/arm64/boot/dts/ti/k3-am62-main.dtsi
index 295c9bb22e7d..83ac2e45998d 100644
--- a/arch/arm64/boot/dts/ti/k3-am62-main.dtsi
+++ b/arch/arm64/boot/dts/ti/k3-am62-main.dtsi
@@ -318,6 +318,7 @@ main_spi0: spi@20100000 {
#size-cells = <0>;
power-domains = <&k3_pds 141 TI_SCI_PD_EXCLUSIVE>;
clocks = <&k3_clks 172 0>;
+ status = "disabled";
};
main_spi1: spi@20110000 {
@@ -328,6 +329,7 @@ main_spi1: spi@20110000 {
#size-cells = <0>;
power-domains = <&k3_pds 142 TI_SCI_PD_EXCLUSIVE>;
clocks = <&k3_clks 173 0>;
+ status = "disabled";
};
main_spi2: spi@20120000 {
@@ -338,6 +340,7 @@ main_spi2: spi@20120000 {
#size-cells = <0>;
power-domains = <&k3_pds 143 TI_SCI_PD_EXCLUSIVE>;
clocks = <&k3_clks 174 0>;
+ status = "disabled";
};
main_gpio_intr: interrupt-controller@a00000 {
diff --git a/arch/arm64/boot/dts/ti/k3-am62-mcu.dtsi b/arch/arm64/boot/dts/ti/k3-am62-mcu.dtsi
index 7f715ebe8e24..28daf476e6a9 100644
--- a/arch/arm64/boot/dts/ti/k3-am62-mcu.dtsi
+++ b/arch/arm64/boot/dts/ti/k3-am62-mcu.dtsi
@@ -44,6 +44,7 @@ mcu_spi0: spi@4b00000 {
#size-cells = <0>;
power-domains = <&k3_pds 147 TI_SCI_PD_EXCLUSIVE>;
clocks = <&k3_clks 147 0>;
+ status = "disabled";
};
mcu_spi1: spi@4b10000 {
@@ -54,6 +55,7 @@ mcu_spi1: spi@4b10000 {
#size-cells = <0>;
power-domains = <&k3_pds 148 TI_SCI_PD_EXCLUSIVE>;
clocks = <&k3_clks 148 0>;
+ status = "disabled";
};
mcu_gpio_intr: interrupt-controller@4210000 {
--
2.37.3
On October 18, 2022 thus sayeth Andrew Davis:
> Hello all,
>
> Same story as for AM64x[0], this time for AM62x. If there
> are no objections here then the J7x platforms are next.
>
> Thanks,
> Andrew
>
> [0] https://www.spinics.net/lists/arm-kernel/msg1018532.html
Not a lore fan is see ;)
>
> Andrew Davis (10):
> arm64: dts: ti: k3-am62: Enable UART nodes at the board level
> arm64: dts: ti: k3-am62: Enable I2C nodes at the board level
> arm64: dts: ti: k3-am62: Enable SPI nodes at the board level
> arm64: dts: ti: k3-am62: Enable EPWM nodes at the board level
> arm64: dts: ti: k3-am62: Enable ECAP nodes at the board level
> arm64: dts: ti: k3-am62: MDIO pinmux should belong to the MDIO node
> arm64: dts: ti: k3-am62: Enable MDIO nodes at the board level
> arm64: dts: ti: k3-am62: Enable MCAN nodes at the board level
> arm64: dts: ti: k3-am62: Enable SDHCI nodes at the board level
> arm64: dts: ti: k3-am62: Enable OSPI nodes at the board level
>
> arch/arm64/boot/dts/ti/k3-am62-main.dtsi | 26 +++++++
> arch/arm64/boot/dts/ti/k3-am62-mcu.dtsi | 4 ++
> arch/arm64/boot/dts/ti/k3-am62-wakeup.dtsi | 2 +
> arch/arm64/boot/dts/ti/k3-am625-sk.dts | 81 +++-------------------
> 4 files changed, 43 insertions(+), 70 deletions(-)
>
LGTM!
Reviewed-by: Bryan Brattlof <[email protected]>
~Bryan
On 19/10/22 2:45 am, Andrew Davis wrote:
>
> Andrew Davis (10):
> arm64: dts: ti: k3-am62: Enable UART nodes at the board level
> arm64: dts: ti: k3-am62: Enable I2C nodes at the board level
> arm64: dts: ti: k3-am62: Enable SPI nodes at the board level
> arm64: dts: ti: k3-am62: Enable EPWM nodes at the board level
> arm64: dts: ti: k3-am62: Enable ECAP nodes at the board level
> arm64: dts: ti: k3-am62: MDIO pinmux should belong to the MDIO node
> arm64: dts: ti: k3-am62: Enable MDIO nodes at the board level
> arm64: dts: ti: k3-am62: Enable MCAN nodes at the board level
> arm64: dts: ti: k3-am62: Enable SDHCI nodes at the board level
> arm64: dts: ti: k3-am62: Enable OSPI nodes at the board level
>
> arch/arm64/boot/dts/ti/k3-am62-main.dtsi | 26 +++++++
> arch/arm64/boot/dts/ti/k3-am62-mcu.dtsi | 4 ++
> arch/arm64/boot/dts/ti/k3-am62-wakeup.dtsi | 2 +
> arch/arm64/boot/dts/ti/k3-am625-sk.dts | 81 +++-------------------
> 4 files changed, 43 insertions(+), 70 deletions(-)
>
Acked-by: Vignesh Raghavendra <[email protected]>
Hi Andrew Davis,
On Tue, 18 Oct 2022 16:15:23 -0500, Andrew Davis wrote:
> Same story as for AM64x[0], this time for AM62x. If there
> are no objections here then the J7x platforms are next.
>
> Thanks,
> Andrew
>
> [0] https://www.spinics.net/lists/arm-kernel/msg1018532.html
>
> [...]
I have applied the following to branch ti-k3-dts-next on [1].
Thank you!
[01/10] arm64: dts: ti: k3-am62: Enable UART nodes at the board level
commit: b5877d9b409cfd5667813e667cbc27192a0fb9ea
[02/10] arm64: dts: ti: k3-am62: Enable I2C nodes at the board level
commit: a1541a08bbf9d02f842801261d0dd4505bcd29e0
[03/10] arm64: dts: ti: k3-am62: Enable SPI nodes at the board level
commit: 361e8b7144405b78bd37cc3e9b2d23fc2e2ed6d5
[04/10] arm64: dts: ti: k3-am62: Enable EPWM nodes at the board level
commit: 6e5474826606a783dd969467f93b0c6a56c39780
[05/10] arm64: dts: ti: k3-am62: Enable ECAP nodes at the board level
commit: ffd61c16fe8facf56b6fb06e29ba5bd150f01bd9
[06/10] arm64: dts: ti: k3-am62: MDIO pinmux should belong to the MDIO node
commit: 8709e0442c79c03f7067d6e7464d669504f76527
[07/10] arm64: dts: ti: k3-am62: Enable MDIO nodes at the board level
commit: 1f737012ce7bd92aecf7d6b1e17742dc7cae7bee
[08/10] arm64: dts: ti: k3-am62: Enable MCAN nodes at the board level
commit: 2f6d7e18e73d3bd3752ca16d0b3c6b2926809452
[09/10] arm64: dts: ti: k3-am62: Enable SDHCI nodes at the board level
commit: b2b10301ca685ac23f09d2e663eb4b990b871935
[10/10] arm64: dts: ti: k3-am62: Enable OSPI nodes at the board level
commit: b0ca32e895680ba94c0ef24a5faa738e536e31cc
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] git://git.kernel.org/pub/scm/linux/kernel/git/ti/linux.git
--
Regards,
Nishanth Menon
Key (0xDDB5849D1736249D) / Fingerprint: F8A2 8693 54EB 8232 17A3 1A34 DDB5 849D 1736 249D