arm: dts: Sync k3-am62 with upstream
Subsystems (2)
cover arm: dts: Sync k3-am62 with upstream
This series depends on Neha's binman series[1] and is intended for review and I will repost once binman series is merged in.
I have picked up part of Sjoerd's series[2] to keep it constrained just to dts sync at this point rather than adding newer functionality on top.
You can find the full series in [3].
Attempting am625 as a start of a series of clean ups for device tree for u-boot, but will love to get any review comments to improve this series up.
Nishanth Menon (2):
arm: dts: Fix build of am62a7 dtbs
arm: dts: k3-am62: Bump dtsi from linux v6.5-rc1
Sjoerd Simons (2):
omap: timer: add ti,am654-timer compatibility
arm: mach-k3: am62: Add timer0 id to the dev list
arch/arm/dts/Makefile | 2 +- arch/arm/dts/k3-am62-main.dtsi | 389 +++++++++++++++++++++++-- arch/arm/dts/k3-am62-mcu.dtsi | 66 +++++ arch/arm/dts/k3-am62-thermal.dtsi | 33 +++ arch/arm/dts/k3-am62-wakeup.dtsi | 33 ++- arch/arm/dts/k3-am62.dtsi | 11 +- arch/arm/dts/k3-am625-r5-sk.dts | 92 +----- arch/arm/dts/k3-am625-sk-u-boot.dtsi | 24 +- arch/arm/dts/k3-am625-sk.dts | 286 ++----------------- arch/arm/dts/k3-am625.dtsi | 54 +++- arch/arm/dts/k3-am62x-sk-common.dtsi | 412 +++++++++++++++++++++++++++ arch/arm/dts/k3-pinctrl.h | 53 ++++ arch/arm/mach-k3/am62x/dev-data.c | 3 +- drivers/timer/omap-timer.c | 1 + 14 files changed, 1069 insertions(+), 390 deletions(-) create mode 100644 arch/arm/dts/k3-am62-thermal.dtsi create mode 100644 arch/arm/dts/k3-am62x-sk-common.dtsi create mode 100644 arch/arm/dts/k3-pinctrl.h
[1] https://lore.kernel.org/all/[email protected]/
[2] https://lore.kernel.org/all/[email protected]/
[3] https://github.com/nmenon/fix-k3-dt-u-boot/commits/fdt-fixup-s1-am625-rev1
Signature · 1 line
2.40.0
RFC PATCH 1/4 omap: timer: add ti,am654-timer compatibility
From: Sjoerd Simons <[email protected]>
THe TI AM654 timer is compatible with the omap-timer implementation, so add it to the id list
---
No change from what Sjoerd has done.
V1: https://lore.kernel.org/r/[email protected]
drivers/timer/omap-timer.c | 1 + 1 file changed, 1 insertion(+)
drivers/timer/omap-timer.c +1 -0
@@ -114,6 +114,7 @@ static const struct udevice_id omap_timer_ids[] = { { .compatible = "ti,am335x-timer" }, { .compatible = "ti,am4372-timer" }, { .compatible = "ti,omap5430-timer" }, + { .compatible = "ti,am654-timer" }, {} };
Signature · 1 line
2.40.0
RFC PATCH 2/4 arm: mach-k3: am62: Add timer0 id to the dev list
In reply to Nishanth MenonFrom: Sjoerd Simons <[email protected]>
Timer0 is used by u-boot as the tick timer; Add it to the soc devices list so it can be enabled via the k3 power controller.
---
Changes since Sjoerd's revision:
I fixed up the num_devs to be 22.
V1: https://lore.kernel.org/r/[email protected]
arch/arm/mach-k3/am62x/dev-data.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
arch/arm/mach-k3/am62x/dev-data.c +2 -1
@@ -58,6 +58,7 @@ static struct ti_dev soc_dev_list[] = {PSC_DEV (161 , &soc_lpsc_list[8 ]),PSC_DEV (162 , &soc_lpsc_list[9 ]),PSC_DEV (75 , &soc_lpsc_list[10 ]), +PSC_DEV (36 , &soc_lpsc_list[11 ]),PSC_DEV (102 , &soc_lpsc_list[11 ]),PSC_DEV (146 , &soc_lpsc_list[11 ]), PSC_DEV(13, &soc_lpsc_list[12]),
@@ -74,5 +75,5 @@ const struct ti_k3_pd_platdata am62x_pd_platdata = { .num_psc = 2, .num_pd = 5, .num_lpsc = 16, - .num_devs = 21, + .num_devs = 22, };
Signature · 1 line
2.40.0
Re: [RFC PATCH 2/4] arm: mach-k3: am62: Add timer0 id to the dev list
Quoted 34 lines · Nishanth Menon
From: Sjoerd Simons <[email protected]>
Timer0 is used by u-boot as the tick timer; Add it to the soc devices list so it can be enabled via the k3 power controller.
Signed-off-by Sjoerd Simons <[email protected]>Reviewed-by Tom Rini <[email protected]>Tested-by Ravi Gunasekaran <[email protected]>Tested-by Mattijs Korpershoek <[email protected]>Cc Francesco Dolcini <[email protected]>Cc Wadim Egorov <[email protected]>[[email protected]: Fixup num_devices]Signed-off-by Nishanth Menon <[email protected]>---
Changes since Sjoerd's revision:
I fixed up thenum_devsto be 22.V1: https://lore.kernel.org/r/[email protected]
arch/arm/mach-k3/am62x/dev-data.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)arch/arm/mach-k3/am62x/dev-data.c +1
-0@@ -58,6 +58,7 @@ static struct ti_dev soc_dev_list[] = {PSC_DEV (161 , &soc_lpsc_list[8 ]),PSC_DEV (162 , &soc_lpsc_list[9 ]),PSC_DEV (75 , &soc_lpsc_list[10 ]), +PSC_DEV (36 , &soc_lpsc_list[11 ]),PSC_DEV (102 , &soc_lpsc_list[11 ]),PSC_DEV (146 , &soc_lpsc_list[11 ]), PSC_DEV(13, &soc_lpsc_list[12]),
arch/arm/mach-k3/am62x/dev-data.c const struct ti_k3_pd_platdata am62x_pd_platdata = { · line 78
Quoted 5 lines
arch/arm/mach-k3/am62x/dev-data.c +1
-1@@ -74,5 +75,5 @@ const struct ti_k3_pd_platdata am62x_pd_platdata = { .num_psc = 2, .num_pd = 5, .num_lpsc = 16, - .num_devs = 21, + .num_devs = 22,
How about using ARRAY_SIZE()?
Quoted 1 line
arch/arm/mach-k3/am62x/dev-data.c +0
-0};
Signature · 2 lines
Regards, Ravi
Re: [RFC PATCH 2/4] arm: mach-k3: am62: Add timer0 id to the dev list
Quoted 36 lines · Ravi Gunasekaran
Quoted 33 lines · Nishanth Menon
From: Sjoerd Simons <[email protected]>
Timer0 is used by u-boot as the tick timer; Add it to the soc devices list so it can be enabled via the k3 power controller.
Signed-off-by Sjoerd Simons <[email protected]>Reviewed-by Tom Rini <[email protected]>Tested-by Ravi Gunasekaran <[email protected]>Tested-by Mattijs Korpershoek <[email protected]>Cc Francesco Dolcini <[email protected]>Cc Wadim Egorov <[email protected]>[[email protected]: Fixup num_devices]Signed-off-by Nishanth Menon <[email protected]>---
Changes since Sjoerd's revision:
I fixed up thenum_devsto be 22.V1: https://lore.kernel.org/r/[email protected]
arch/arm/mach-k3/am62x/dev-data.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)arch/arm/mach-k3/am62x/dev-data.c +1
-0@@ -58,6 +58,7 @@ static struct ti_dev soc_dev_list[] = {PSC_DEV (161 , &soc_lpsc_list[8 ]),PSC_DEV (162 , &soc_lpsc_list[9 ]),PSC_DEV (75 , &soc_lpsc_list[10 ]), +PSC_DEV (36 , &soc_lpsc_list[11 ]),PSC_DEV (102 , &soc_lpsc_list[11 ]),PSC_DEV (146 , &soc_lpsc_list[11 ]), PSC_DEV(13, &soc_lpsc_list[12]),
Quoted 8 lines
arch/arm/mach-k3/am62x/dev-data.c const struct ti_k3_pd_platdata am62x_pd_platdata = { · line 78
Quoted 6 lines
arch/arm/mach-k3/am62x/dev-data.c +1
-1@@ -74,5 +75,5 @@ const struct ti_k3_pd_platdata am62x_pd_platdata = { .num_psc = 2, .num_pd = 5, .num_lpsc = 16, - .num_devs = 21, + .num_devs = 22,How about using
ARRAY_SIZE()?
That makes sense, I think.. Bryan: maybe the generator can be improved? .num_psc = ARRAY_SIZE(soc_psc_list),
.num_pds = ARRAY_SIZE(soc_pd_list),
.num_lpsc = ARRAY_SIZE(soc_lpsc_list),
.num_devs = ARRAY_SIZE(soc_dev_list),
Across the files?
Any reasons why we should'nt do that?
Signature · 3 lines
Regards, Nishanth Menon Key (0xDDB5849D1736249D) / Fingerprint: F8A2 8693 54EB 8232 17A3 1A34 DDB5 849D 1736 249D
Re: [RFC PATCH 2/4] arm: mach-k3: am62: Add timer0 id to the dev list
On July 13, 2023 thus sayeth Nishanth Menon:
Quoted 52 lines · Ravi Gunasekaran
Quoted 36 lines · Nishanth Menon
Quoted 33 lines
From: Sjoerd Simons <[email protected]>
Timer0 is used by u-boot as the tick timer; Add it to the soc devices list so it can be enabled via the k3 power controller.
Signed-off-by Sjoerd Simons <[email protected]>Reviewed-by Tom Rini <[email protected]>Tested-by Ravi Gunasekaran <[email protected]>Tested-by Mattijs Korpershoek <[email protected]>Cc Francesco Dolcini <[email protected]>Cc Wadim Egorov <[email protected]>[[email protected]: Fixup num_devices]Signed-off-by Nishanth Menon <[email protected]>---
Changes since Sjoerd's revision:
I fixed up thenum_devsto be 22.V1: https://lore.kernel.org/r/[email protected]
arch/arm/mach-k3/am62x/dev-data.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)arch/arm/mach-k3/am62x/dev-data.c +1
-0@@ -58,6 +58,7 @@ static struct ti_dev soc_dev_list[] = {PSC_DEV (161 , &soc_lpsc_list[8 ]),PSC_DEV (162 , &soc_lpsc_list[9 ]),PSC_DEV (75 , &soc_lpsc_list[10 ]), +PSC_DEV (36 , &soc_lpsc_list[11 ]),PSC_DEV (102 , &soc_lpsc_list[11 ]),PSC_DEV (146 , &soc_lpsc_list[11 ]), PSC_DEV(13, &soc_lpsc_list[12]),Quoted 8 lines
arch/arm/mach-k3/am62x/dev-data.c const struct ti_k3_pd_platdata am62x_pd_platdata = { · line 78
Quoted 6 lines
arch/arm/mach-k3/am62x/dev-data.c +1
-1@@ -74,5 +75,5 @@ const struct ti_k3_pd_platdata am62x_pd_platdata = { .num_psc = 2, .num_pd = 5, .num_lpsc = 16, - .num_devs = 21, + .num_devs = 22,How about using
ARRAY_SIZE()?That makes sense, I think.. Bryan: maybe the generator can be improved? .num_psc =
ARRAY_SIZE(soc_psc_list),
.num_pds =ARRAY_SIZE(soc_pd_list),
.num_lpsc =ARRAY_SIZE(soc_lpsc_list),
.num_devs =ARRAY_SIZE(soc_dev_list),
Quoted 3 lines
Across the files?
Any reasons why we should'nt do that?
Nope :) That's a good idea, I can make the changes to the scripts now
~Bryan
RFC PATCH 3/4 arm: dts: Fix build of am62a7 dtbs
In reply to Nishanth Menonam62a7 should be built with CONFIG_SOC_K3_AM62A7 not CONFIG_SOC_K3_AM625
---
Found this as i was building and wondering why 62a7 dtbs were building..
arch/arm/dts/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/dts/Makefile +1 -1
@@ -1301,7 +1301,7 @@ dtb-$(CONFIG_SOC_K3_AM642) += k3-am642-evm.dtb \ dtb-$(CONFIG_SOC_K3_AM625) += k3-am625-sk.dtb \ k3-am625-r5-sk.dtb -dtb-$(CONFIG_SOC_K3_AM625) += k3-am62a7-sk.dtb \ +dtb-$(CONFIG_SOC_K3_AM62A7) += k3-am62a7-sk.dtb \ k3-am62a7-r5-sk.dtb dtb-$(CONFIG_ARCH_MEDIATEK) += \
Signature · 1 line
2.40.0
Re: [RFC PATCH 3/4] arm: dts: Fix build of am62a7 dtbs
Quoted 10 lines · Nishanth Menon
am62a7 should be built with
CONFIG_SOC_K3_AM62A7notCONFIG_SOC_K3_AM625Fixes 6bdfa69155d8 ("arm: dts: introduce am62a7 u-boot dtbs")Cc Bryan Brattlof <[email protected]>Cc Vignesh Raghavendra <[email protected]>Cc Francesco Dolcini <[email protected]>Cc Sjoerd Simons <[email protected]>Cc Wadim Egorov <[email protected]>Signed-off-by Nishanth Menon <[email protected]>---
Quoted 21 lines
Found this as i was building and wondering why 62a7 dtbs were building..
arch/arm/dts/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)arch/arm/dts/Makefile +1
-1@@ -1301,7 +1301,7 @@ dtb-$(CONFIG_SOC_K3_AM642) += k3-am642-evm.dtb \ dtb-$(CONFIG_SOC_K3_AM625) += k3-am625-sk.dtb \ k3-am625-r5-sk.dtb -dtb-$(CONFIG_SOC_K3_AM625) += k3-am62a7-sk.dtb \ +dtb-$(CONFIG_SOC_K3_AM62A7) += k3-am62a7-sk.dtb \ k3-am62a7-r5-sk.dtb dtb-$(CONFIG_ARCH_MEDIATEK) += \Signature · 1 line
2.40.0
Re: [RFC PATCH 3/4] arm: dts: Fix build of am62a7 dtbs
In reply to Nishanth MenonOn July 13, 2023 thus sayeth Nishanth Menon:
Quoted 9 lines
am62a7 should be built with
CONFIG_SOC_K3_AM62A7notCONFIG_SOC_K3_AM625Fixes 6bdfa69155d8 ("arm: dts: introduce am62a7 u-boot dtbs")Cc Bryan Brattlof <[email protected]>Cc Vignesh Raghavendra <[email protected]>Cc Francesco Dolcini <[email protected]>Cc Sjoerd Simons <[email protected]>Cc Wadim Egorov <[email protected]>Signed-off-by Nishanth Menon <[email protected]>
Quoted 4 lines
---
Found this as i was building and wondering why 62a7 dtbs were building..
Oops :)
Re: [RFC PATCH 3/4] arm: dts: Fix build of am62a7 dtbs
Quoted 12 lines · Bryan Brattlof
On July 13, 2023 thus sayeth Nishanth Menon:
Quoted 11 lines
am62a7 should be built with
CONFIG_SOC_K3_AM62A7notCONFIG_SOC_K3_AM625Fixes 6bdfa69155d8 ("arm: dts: introduce am62a7 u-boot dtbs")Cc Bryan Brattlof <[email protected]>Cc Vignesh Raghavendra <[email protected]>Cc Francesco Dolcini <[email protected]>Cc Sjoerd Simons <[email protected]>Cc Wadim Egorov <[email protected]>Signed-off-by Nishanth Menon <[email protected]>---
Quoted 7 lines
Quoted 2 lines
Found this as i was building and wondering why 62a7 dtbs were building..
Oops :)
Reviewed-by Bryan Brattlof <[email protected]>
Let me take this patch off the RFC as it has no specific dependency.. and would be good to have it merged earlier in the cycle.
Signature · 3 lines
Regards, Nishanth Menon Key (0xDDB5849D1736249D) / Fingerprint: F8A2 8693 54EB 8232 17A3 1A34 DDB5 849D 1736 249D
RFC PATCH 4/4 arm: dts: k3-am62: Bump dtsi from linux v6.5-rc1
In reply to Nishanth MenonUpdate the am62 and am625 device-trees from linux v6.3-rc5 This needed the followin tweaks to the u-boot specific dtsi as well:
- Switch tick-timer to the main_timer as it's now defined in the main dtsi
- Secure proxies are defined in Soc dtsis
- Drop duplicate nodes - u-boot.dtsi is includes in r5-sk, no need for either the definitions from main.dtsi OR duplication from u-boot.dtsi
- Add mdio pins to the cpsw3g pinctrl in u-boot dtsi. It moved to a subnode in the linux dtsi that u-boot doesn't use/support
---
This is a respin of Sjoerd's series.. quiet a bit of sync there. but should make it easier to add on newer boards by backporting from upstream kernel.
arch/arm/dts/k3-am62-main.dtsi | 389 +++++++++++++++++++++++-- arch/arm/dts/k3-am62-mcu.dtsi | 66 +++++ arch/arm/dts/k3-am62-thermal.dtsi | 33 +++ arch/arm/dts/k3-am62-wakeup.dtsi | 33 ++- arch/arm/dts/k3-am62.dtsi | 11 +- arch/arm/dts/k3-am625-r5-sk.dts | 92 +----- arch/arm/dts/k3-am625-sk-u-boot.dtsi | 24 +- arch/arm/dts/k3-am625-sk.dts | 286 ++----------------- arch/arm/dts/k3-am625.dtsi | 54 +++- arch/arm/dts/k3-am62x-sk-common.dtsi | 412 +++++++++++++++++++++++++++ arch/arm/dts/k3-pinctrl.h | 53 ++++ 11 files changed, 1065 insertions(+), 388 deletions(-) create mode 100644 arch/arm/dts/k3-am62-thermal.dtsi create mode 100644 arch/arm/dts/k3-am62x-sk-common.dtsi create mode 100644 arch/arm/dts/k3-pinctrl.h
arch/arm/dts/k3-am62-main.dtsi +359 -30
@@ -54,6 +54,12 @@ reg = <0x4044 0x8>; #phy-cells = <1>; }; + + epwm_tbclk: clock@4130 { + compatible = "ti,am62-epwm-tbclk", "syscon"; + reg = <0x4130 0x4>; + #clock-cells = <1>; + }; }; dmss: bus@48000000 {
@@ -144,8 +150,8 @@ compatible = "ti,k2g-sci"; ti,host-id = <12>; mbox-names = "rx", "tx"; - mboxes= <&secure_proxy_main 12>, - <&secure_proxy_main 13>; + mboxes = <&secure_proxy_main 12>, + <&secure_proxy_main 13>; reg-names = "debug_messages"; reg = <0x00 0x44043000 0x00 0xfe0>;
@@ -178,6 +184,21 @@ dma-names = "tx", "rx1", "rx2"; }; + secure_proxy_sa3: mailbox@43600000 { + compatible = "ti,am654-secure-proxy"; + #mbox-cells = <1>; + reg-names = "target_data", "rt", "scfg"; + reg = <0x00 0x43600000 0x00 0x10000>, + <0x00 0x44880000 0x00 0x20000>, + <0x00 0x44860000 0x00 0x20000>; + /* + * Marked Disabled: + * Node is incomplete as it is meant for bootloaders and + * firmware on non-MPU processors + */ + status = "disabled"; + }; + main_pmx0: pinctrl@f4000 { compatible = "pinctrl-single"; reg = <0x00 0xf4000 0x00 0x2ac>;
@@ -186,6 +207,108 @@ pinctrl-single,function-mask = <0xffffffff>; }; + main_esm: esm@420000 { + compatible = "ti,j721e-esm"; + reg = <0x00 0x420000 0x00 0x1000>; + ti,esm-pins = <160>, <161>, <162>, <163>, <177>, <178>; + }; + + main_timer0: timer@2400000 { + compatible = "ti,am654-timer"; + reg = <0x00 0x2400000 0x00 0x400>; + interrupts = <GIC_SPI 120 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&k3_clks 36 2>; + clock-names = "fck"; + assigned-clocks = <&k3_clks 36 2>; + assigned-clock-parents = <&k3_clks 36 3>; + power-domains = <&k3_pds 36 TI_SCI_PD_EXCLUSIVE>; + ti,timer-pwm; + }; + + main_timer1: timer@2410000 { + compatible = "ti,am654-timer"; + reg = <0x00 0x2410000 0x00 0x400>; + interrupts = <GIC_SPI 121 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&k3_clks 37 2>; + clock-names = "fck"; + assigned-clocks = <&k3_clks 37 2>; + assigned-clock-parents = <&k3_clks 37 3>; + power-domains = <&k3_pds 37 TI_SCI_PD_EXCLUSIVE>; + ti,timer-pwm; + }; + + main_timer2: timer@2420000 { + compatible = "ti,am654-timer"; + reg = <0x00 0x2420000 0x00 0x400>; + interrupts = <GIC_SPI 122 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&k3_clks 38 2>; + clock-names = "fck"; + assigned-clocks = <&k3_clks 38 2>; + assigned-clock-parents = <&k3_clks 38 3>; + power-domains = <&k3_pds 38 TI_SCI_PD_EXCLUSIVE>; + ti,timer-pwm; + }; + + main_timer3: timer@2430000 { + compatible = "ti,am654-timer"; + reg = <0x00 0x2430000 0x00 0x400>; + interrupts = <GIC_SPI 123 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&k3_clks 39 2>; + clock-names = "fck"; + assigned-clocks = <&k3_clks 39 2>; + assigned-clock-parents = <&k3_clks 39 3>; + power-domains = <&k3_pds 39 TI_SCI_PD_EXCLUSIVE>; + ti,timer-pwm; + }; + + main_timer4: timer@2440000 { + compatible = "ti,am654-timer"; + reg = <0x00 0x2440000 0x00 0x400>; + interrupts = <GIC_SPI 124 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&k3_clks 40 2>; + clock-names = "fck"; + assigned-clocks = <&k3_clks 40 2>; + assigned-clock-parents = <&k3_clks 40 3>; + power-domains = <&k3_pds 40 TI_SCI_PD_EXCLUSIVE>; + ti,timer-pwm; + }; + + main_timer5: timer@2450000 { + compatible = "ti,am654-timer"; + reg = <0x00 0x2450000 0x00 0x400>; + interrupts = <GIC_SPI 125 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&k3_clks 41 2>; + clock-names = "fck"; + assigned-clocks = <&k3_clks 41 2>; + assigned-clock-parents = <&k3_clks 41 3>; + power-domains = <&k3_pds 41 TI_SCI_PD_EXCLUSIVE>; + ti,timer-pwm; + }; + + main_timer6: timer@2460000 { + compatible = "ti,am654-timer"; + reg = <0x00 0x2460000 0x00 0x400>; + interrupts = <GIC_SPI 126 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&k3_clks 42 2>; + clock-names = "fck"; + assigned-clocks = <&k3_clks 42 2>; + assigned-clock-parents = <&k3_clks 42 3>; + power-domains = <&k3_pds 42 TI_SCI_PD_EXCLUSIVE>; + ti,timer-pwm; + }; + + main_timer7: timer@2470000 { + compatible = "ti,am654-timer"; + reg = <0x00 0x2470000 0x00 0x400>; + interrupts = <GIC_SPI 127 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&k3_clks 43 2>; + clock-names = "fck"; + assigned-clocks = <&k3_clks 43 2>; + assigned-clock-parents = <&k3_clks 43 3>; + power-domains = <&k3_pds 43 TI_SCI_PD_EXCLUSIVE>; + ti,timer-pwm; + }; + main_uart0: serial@2800000 { compatible = "ti,am64-uart", "ti,am654-uart"; reg = <0x00 0x02800000 0x00 0x100>;
@@ -193,6 +316,7 @@ power-domains = <&k3_pds 146 TI_SCI_PD_EXCLUSIVE>; clocks = <&k3_clks 146 0>; clock-names = "fclk"; + status = "disabled"; }; main_uart1: serial@2810000 {
@@ -202,6 +326,7 @@ power-domains = <&k3_pds 152 TI_SCI_PD_EXCLUSIVE>; clocks = <&k3_clks 152 0>; clock-names = "fclk"; + status = "disabled"; }; main_uart2: serial@2820000 {
@@ -211,6 +336,7 @@ power-domains = <&k3_pds 153 TI_SCI_PD_EXCLUSIVE>; clocks = <&k3_clks 153 0>; clock-names = "fclk"; + status = "disabled"; }; main_uart3: serial@2830000 {
@@ -220,6 +346,7 @@ power-domains = <&k3_pds 154 TI_SCI_PD_EXCLUSIVE>; clocks = <&k3_clks 154 0>; clock-names = "fclk"; + status = "disabled"; }; main_uart4: serial@2840000 {
@@ -229,6 +356,7 @@ power-domains = <&k3_pds 155 TI_SCI_PD_EXCLUSIVE>; clocks = <&k3_clks 155 0>; clock-names = "fclk"; + status = "disabled"; }; main_uart5: serial@2850000 {
@@ -238,6 +366,7 @@ power-domains = <&k3_pds 156 TI_SCI_PD_EXCLUSIVE>; clocks = <&k3_clks 156 0>; clock-names = "fclk"; + status = "disabled"; }; main_uart6: serial@2860000 {
@@ -247,6 +376,7 @@ power-domains = <&k3_pds 158 TI_SCI_PD_EXCLUSIVE>; clocks = <&k3_clks 158 0>; clock-names = "fclk"; + status = "disabled"; }; main_i2c0: i2c@20000000 {
@@ -258,6 +388,7 @@ power-domains = <&k3_pds 102 TI_SCI_PD_EXCLUSIVE>; clocks = <&k3_clks 102 2>; clock-names = "fck"; + status = "disabled"; }; main_i2c1: i2c@20010000 {
@@ -269,6 +400,7 @@ power-domains = <&k3_pds 103 TI_SCI_PD_EXCLUSIVE>; clocks = <&k3_clks 103 2>; clock-names = "fck"; + status = "disabled"; }; main_i2c2: i2c@20020000 {
@@ -280,6 +412,7 @@ power-domains = <&k3_pds 104 TI_SCI_PD_EXCLUSIVE>; clocks = <&k3_clks 104 2>; clock-names = "fck"; + status = "disabled"; }; main_i2c3: i2c@20030000 {
@@ -291,6 +424,7 @@ power-domains = <&k3_pds 105 TI_SCI_PD_EXCLUSIVE>; clocks = <&k3_clks 105 2>; clock-names = "fck"; + status = "disabled"; }; main_spi0: spi@20100000 {
@@ -300,7 +434,8 @@ #address-cells = <1>; #size-cells = <0>; power-domains = <&k3_pds 141 TI_SCI_PD_EXCLUSIVE>; - clocks = <&k3_clks 172 0>; + clocks = <&k3_clks 141 0>; + status = "disabled"; }; main_spi1: spi@20110000 {
@@ -310,7 +445,8 @@ #address-cells = <1>; #size-cells = <0>; power-domains = <&k3_pds 142 TI_SCI_PD_EXCLUSIVE>; - clocks = <&k3_clks 173 0>; + clocks = <&k3_clks 142 0>; + status = "disabled"; }; main_spi2: spi@20120000 {
@@ -320,7 +456,8 @@ #address-cells = <1>; #size-cells = <0>; power-domains = <&k3_pds 143 TI_SCI_PD_EXCLUSIVE>; - clocks = <&k3_clks 174 0>; + clocks = <&k3_clks 143 0>; + status = "disabled"; }; main_gpio_intr: interrupt-controller@a00000 {
@@ -345,7 +482,7 @@ <193>, <194>, <195>; interrupt-controller; #interrupt-cells = <2>; - ti,ngpio = <87>; + ti,ngpio = <92>; ti,davinci-gpio-unbanked = <0>; power-domains = <&k3_pds 77 TI_SCI_PD_EXCLUSIVE>; clocks = <&k3_clks 77 0>;
@@ -362,7 +499,7 @@ <183>, <184>, <185>; interrupt-controller; #interrupt-cells = <2>; - ti,ngpio = <88>; + ti,ngpio = <52>; ti,davinci-gpio-unbanked = <0>; power-domains = <&k3_pds 78 TI_SCI_PD_EXCLUSIVE>; clocks = <&k3_clks 78 0>;
@@ -385,8 +522,11 @@ ti,clkbuf-sel = <0x7>; ti,otap-del-sel-legacy = <0x0>; ti,otap-del-sel-mmc-hs = <0x0>; - ti,otap-del-sel-ddr52 = <0x9>; - ti,otap-del-sel-hs200 = <0x6>; + ti,otap-del-sel-ddr52 = <0x5>; + ti,otap-del-sel-hs200 = <0x5>; + ti,itap-del-sel-legacy = <0xa>; + ti,itap-del-sel-mmc-hs = <0x1>; + status = "disabled"; }; sdhci1: mmc@fa00000 {
@@ -397,19 +537,20 @@ clocks = <&k3_clks 58 5>, <&k3_clks 58 6>; clock-names = "clk_ahb", "clk_xin"; ti,trm-icp = <0x2>; - ti,otap-del-sel-legacy = <0x0>; + ti,otap-del-sel-legacy = <0x8>; ti,otap-del-sel-sd-hs = <0x0>; - ti,otap-del-sel-sdr12 = <0xf>; - ti,otap-del-sel-sdr25 = <0xf>; - ti,otap-del-sel-sdr50 = <0xc>; - ti,otap-del-sel-sdr104 = <0x6>; - ti,otap-del-sel-ddr50 = <0x9>; - ti,itap-del-sel-legacy = <0x0>; - ti,itap-del-sel-sd-hs = <0x0>; - ti,itap-del-sel-sdr12 = <0x0>; - ti,itap-del-sel-sdr25 = <0x0>; + ti,otap-del-sel-sdr12 = <0x0>; + ti,otap-del-sel-sdr25 = <0x0>; + ti,otap-del-sel-sdr50 = <0x8>; + ti,otap-del-sel-sdr104 = <0x7>; + ti,otap-del-sel-ddr50 = <0x4>; + ti,itap-del-sel-legacy = <0xa>; + ti,itap-del-sel-sd-hs = <0x1>; + ti,itap-del-sel-sdr12 = <0xa>; + ti,itap-del-sel-sdr25 = <0x1>; ti,clkbuf-sel = <0x7>; bus-width = <4>; + status = "disabled"; }; sdhci2: mmc@fa20000 {
@@ -420,18 +561,65 @@ clocks = <&k3_clks 184 5>, <&k3_clks 184 6>; clock-names = "clk_ahb", "clk_xin"; ti,trm-icp = <0x2>; - ti,otap-del-sel-legacy = <0x0>; + ti,otap-del-sel-legacy = <0x8>; ti,otap-del-sel-sd-hs = <0x0>; - ti,otap-del-sel-sdr12 = <0xf>; - ti,otap-del-sel-sdr25 = <0xf>; - ti,otap-del-sel-sdr50 = <0xc>; - ti,otap-del-sel-sdr104 = <0x6>; - ti,otap-del-sel-ddr50 = <0x9>; - ti,itap-del-sel-legacy = <0x0>; - ti,itap-del-sel-sd-hs = <0x0>; - ti,itap-del-sel-sdr12 = <0x0>; - ti,itap-del-sel-sdr25 = <0x0>; + ti,otap-del-sel-sdr12 = <0x0>; + ti,otap-del-sel-sdr25 = <0x0>; + ti,otap-del-sel-sdr50 = <0x8>; + ti,otap-del-sel-sdr104 = <0x7>; + ti,otap-del-sel-ddr50 = <0x8>; + ti,itap-del-sel-legacy = <0xa>; + ti,itap-del-sel-sd-hs = <0xa>; + ti,itap-del-sel-sdr12 = <0xa>; + ti,itap-del-sel-sdr25 = <0x1>; ti,clkbuf-sel = <0x7>; + status = "disabled"; + }; + + usbss0: dwc3-usb@f900000 { + compatible = "ti,am62-usb"; + reg = <0x00 0x0f900000 0x00 0x800>; + clocks = <&k3_clks 161 3>; + clock-names = "ref"; + ti,syscon-phy-pll-refclk = <&wkup_conf 0x4008>; + #address-cells = <2>; + #size-cells = <2>; + power-domains = <&k3_pds 178 TI_SCI_PD_EXCLUSIVE>; + ranges; + status = "disabled"; + + usb0: usb@31000000 { + compatible = "snps,dwc3"; + reg =<0x00 0x31000000 0x00 0x50000>; + interrupts = <GIC_SPI 188 IRQ_TYPE_LEVEL_HIGH>, /* irq.0 */ + <GIC_SPI 188 IRQ_TYPE_LEVEL_HIGH>; /* irq.0 */ + interrupt-names = "host", "peripheral"; + maximum-speed = "high-speed"; + dr_mode = "otg"; + }; + }; + + usbss1: dwc3-usb@f910000 { + compatible = "ti,am62-usb"; + reg = <0x00 0x0f910000 0x00 0x800>; + clocks = <&k3_clks 162 3>; + clock-names = "ref"; + ti,syscon-phy-pll-refclk = <&wkup_conf 0x4018>; + #address-cells = <2>; + #size-cells = <2>; + power-domains = <&k3_pds 179 TI_SCI_PD_EXCLUSIVE>; + ranges; + status = "disabled"; + + usb1: usb@31100000 { + compatible = "snps,dwc3"; + reg =<0x00 0x31100000 0x00 0x50000>; + interrupts = <GIC_SPI 226 IRQ_TYPE_LEVEL_HIGH>, /* irq.0 */ + <GIC_SPI 226 IRQ_TYPE_LEVEL_HIGH>; /* irq.0 */ + interrupt-names = "host", "peripheral"; + maximum-speed = "high-speed"; + dr_mode = "otg"; + }; }; fss: bus@fc00000 {
@@ -456,6 +644,7 @@ power-domains = <&k3_pds 75 TI_SCI_PD_EXCLUSIVE>; #address-cells = <1>; #size-cells = <0>; + status = "disabled"; }; };
@@ -514,12 +703,13 @@ clocks = <&k3_clks 13 0>; clock-names = "fck"; bus_freq = <1000000>; + status = "disabled"; }; cpts@3d000 { compatible = "ti,j721e-cpts"; reg = <0x00 0x3d000 0x00 0x400>; - clocks = <&k3_clks 13 1>; + clocks = <&k3_clks 13 3>; clock-names = "cpts"; interrupts-extended = <&gic500 GIC_SPI 102 IRQ_TYPE_LEVEL_HIGH>; interrupt-names = "cpts";
@@ -551,6 +741,7 @@ power-domains = <&k3_pds 51 TI_SCI_PD_EXCLUSIVE>; clocks = <&k3_clks 51 0>; clock-names = "fck"; + status = "disabled"; }; ecap1: pwm@23110000 {
@@ -560,6 +751,7 @@ power-domains = <&k3_pds 52 TI_SCI_PD_EXCLUSIVE>; clocks = <&k3_clks 52 0>; clock-names = "fck"; + status = "disabled"; }; ecap2: pwm@23120000 {
@@ -569,6 +761,7 @@ power-domains = <&k3_pds 53 TI_SCI_PD_EXCLUSIVE>; clocks = <&k3_clks 53 0>; clock-names = "fck"; + status = "disabled"; }; main_mcan0: can@20701000 {
@@ -583,5 +776,141 @@ <GIC_SPI 156 IRQ_TYPE_LEVEL_HIGH>; interrupt-names = "int0", "int1"; bosch,mram-cfg = <0x0 128 64 64 64 64 32 32>; + status = "disabled"; + }; + + main_rti0: watchdog@e000000 { + compatible = "ti,j7-rti-wdt"; + reg = <0x00 0x0e000000 0x00 0x100>; + clocks = <&k3_clks 125 0>; + power-domains = <&k3_pds 125 TI_SCI_PD_EXCLUSIVE>; + assigned-clocks = <&k3_clks 125 0>; + assigned-clock-parents = <&k3_clks 125 2>; + }; + + main_rti1: watchdog@e010000 { + compatible = "ti,j7-rti-wdt"; + reg = <0x00 0x0e010000 0x00 0x100>; + clocks = <&k3_clks 126 0>; + power-domains = <&k3_pds 126 TI_SCI_PD_EXCLUSIVE>; + assigned-clocks = <&k3_clks 126 0>; + assigned-clock-parents = <&k3_clks 126 2>; + }; + + main_rti2: watchdog@e020000 { + compatible = "ti,j7-rti-wdt"; + reg = <0x00 0x0e020000 0x00 0x100>; + clocks = <&k3_clks 127 0>; + power-domains = <&k3_pds 127 TI_SCI_PD_EXCLUSIVE>; + assigned-clocks = <&k3_clks 127 0>; + assigned-clock-parents = <&k3_clks 127 2>; + }; + + main_rti3: watchdog@e030000 { + compatible = "ti,j7-rti-wdt"; + reg = <0x00 0x0e030000 0x00 0x100>; + clocks = <&k3_clks 128 0>; + power-domains = <&k3_pds 128 TI_SCI_PD_EXCLUSIVE>; + assigned-clocks = <&k3_clks 128 0>; + assigned-clock-parents = <&k3_clks 128 2>; + }; + + main_rti15: watchdog@e0f0000 { + compatible = "ti,j7-rti-wdt"; + reg = <0x00 0x0e0f0000 0x00 0x100>; + clocks = <&k3_clks 130 0>; + power-domains = <&k3_pds 130 TI_SCI_PD_EXCLUSIVE>; + assigned-clocks = <&k3_clks 130 0>; + assigned-clock-parents = <&k3_clks 130 2>; + }; + + epwm0: pwm@23000000 { + compatible = "ti,am64-epwm", "ti,am3352-ehrpwm"; + #pwm-cells = <3>; + reg = <0x00 0x23000000 0x00 0x100>; + power-domains = <&k3_pds 86 TI_SCI_PD_EXCLUSIVE>; + clocks = <&epwm_tbclk 0>, <&k3_clks 86 0>; + clock-names = "tbclk", "fck"; + status = "disabled"; + }; + + epwm1: pwm@23010000 { + compatible = "ti,am64-epwm", "ti,am3352-ehrpwm"; + #pwm-cells = <3>; + reg = <0x00 0x23010000 0x00 0x100>; + power-domains = <&k3_pds 87 TI_SCI_PD_EXCLUSIVE>; + clocks = <&epwm_tbclk 1>, <&k3_clks 87 0>; + clock-names = "tbclk", "fck"; + status = "disabled"; + }; + + epwm2: pwm@23020000 { + compatible = "ti,am64-epwm", "ti,am3352-ehrpwm"; + #pwm-cells = <3>; + reg = <0x00 0x23020000 0x00 0x100>; + power-domains = <&k3_pds 88 TI_SCI_PD_EXCLUSIVE>; + clocks = <&epwm_tbclk 2>, <&k3_clks 88 0>; + clock-names = "tbclk", "fck"; + status = "disabled"; + }; + + mcasp0: audio-controller@2b00000 { + compatible = "ti,am33xx-mcasp-audio"; + reg = <0x00 0x02b00000 0x00 0x2000>, + <0x00 0x02b08000 0x00 0x400>; + reg-names = "mpu", "dat"; + interrupts = <GIC_SPI 236 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 235 IRQ_TYPE_LEVEL_HIGH>; + interrupt-names = "tx", "rx"; + + dmas = <&main_bcdma 0 0xc500 0>, <&main_bcdma 0 0x4500 0>; + dma-names = "tx", "rx"; + + clocks = <&k3_clks 190 0>; + clock-names = "fck"; + assigned-clocks = <&k3_clks 190 0>; + assigned-clock-parents = <&k3_clks 190 2>; + power-domains = <&k3_pds 190 TI_SCI_PD_EXCLUSIVE>; + status = "disabled"; + }; + + mcasp1: audio-controller@2b10000 { + compatible = "ti,am33xx-mcasp-audio"; + reg = <0x00 0x02b10000 0x00 0x2000>, + <0x00 0x02b18000 0x00 0x400>; + reg-names = "mpu", "dat"; + interrupts = <GIC_SPI 238 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 237 IRQ_TYPE_LEVEL_HIGH>; + interrupt-names = "tx", "rx"; + + dmas = <&main_bcdma 0 0xc501 0>, <&main_bcdma 0 0x4501 0>; + dma-names = "tx", "rx"; + + clocks = <&k3_clks 191 0>; + clock-names = "fck"; + assigned-clocks = <&k3_clks 191 0>; + assigned-clock-parents = <&k3_clks 191 2>; + power-domains = <&k3_pds 191 TI_SCI_PD_EXCLUSIVE>; + status = "disabled"; + }; + + mcasp2: audio-controller@2b20000 { + compatible = "ti,am33xx-mcasp-audio"; + reg = <0x00 0x02b20000 0x00 0x2000>, + <0x00 0x02b28000 0x00 0x400>; + reg-names = "mpu", "dat"; + interrupts = <GIC_SPI 240 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 239 IRQ_TYPE_LEVEL_HIGH>; + interrupt-names = "tx", "rx"; + + dmas = <&main_bcdma 0 0xc502 0>, <&main_bcdma 0 0x4502 0>; + dma-names = "tx", "rx"; + + clocks = <&k3_clks 192 0>; + clock-names = "fck"; + assigned-clocks = <&k3_clks 192 0>; + assigned-clock-parents = <&k3_clks 192 2>; + power-domains = <&k3_pds 192 TI_SCI_PD_EXCLUSIVE>; + status = "disabled"; }; };
arch/arm/dts/k3-am62-mcu.dtsi +66 -0
100 lines not on this page · raw message
arch/arm/dts/k3-am62-thermal.dtsi new file +33 -0
@@ -0,0 +1,33 @@ +// SPDX-License-Identifier: GPL-2.0 + +#include <dt-bindings/thermal/thermal.h> + +thermal_zones: thermal-zones { + main0_thermal: main0-thermal { + polling-delay-passive = <250>; /* milliSeconds */ + polling-delay = <500>; /* milliSeconds */ + thermal-sensors = <&wkup_vtm0 0>; + + trips { + main0_crit: main0-crit { + temperature = <105000>; /* milliCelsius */ + hysteresis = <2000>; /* milliCelsius */ + type = "critical"; + }; + }; + }; + + main1_thermal: main1-thermal { + polling-delay-passive = <250>; /* milliSeconds */ + polling-delay = <500>; /* milliSeconds */ + thermal-sensors = <&wkup_vtm0 1>; + + trips { + main1_crit: main1-crit { + temperature = <105000>; /* milliCelsius */ + hysteresis = <2000>; /* milliCelsius */ + type = "critical"; + }; + }; + }; +};
arch/arm/dts/k3-am62-wakeup.dtsi +32 -1
@@ -26,16 +26,47 @@ power-domains = <&k3_pds 114 TI_SCI_PD_EXCLUSIVE>; clocks = <&k3_clks 114 0>; clock-names = "fclk"; + status = "disabled"; }; wkup_i2c0: i2c@2b200000 { compatible = "ti,am64-i2c", "ti,omap4-i2c"; - reg = <0x00 0x02b200000 0x00 0x100>; + reg = <0x00 0x2b200000 0x00 0x100>; interrupts = <GIC_SPI 165 IRQ_TYPE_LEVEL_HIGH>; #address-cells = <1>; #size-cells = <0>; power-domains = <&k3_pds 107 TI_SCI_PD_EXCLUSIVE>; clocks = <&k3_clks 107 4>; clock-names = "fck"; + status = "disabled"; + }; + + wkup_rtc0: rtc@2b1f0000 { + compatible = "ti,am62-rtc"; + reg = <0x00 0x2b1f0000 0x00 0x100>; + interrupts = <GIC_SPI 100 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&k3_clks 117 6> , <&k3_clks 117 0>; + clock-names = "vbus", "osc32k"; + power-domains = <&k3_pds 117 TI_SCI_PD_EXCLUSIVE>; + wakeup-source; + }; + + wkup_rti0: watchdog@2b000000 { + compatible = "ti,j7-rti-wdt"; + reg = <0x00 0x2b000000 0x00 0x100>; + clocks = <&k3_clks 132 0>; + power-domains = <&k3_pds 132 TI_SCI_PD_EXCLUSIVE>; + assigned-clocks = <&k3_clks 132 0>; + assigned-clock-parents = <&k3_clks 132 2>; + /* Used by DM firmware */ + status = "reserved"; + }; + + wkup_vtm0: temperature-sensor@b00000 { + compatible = "ti,j7200-vtm"; + reg = <0x00 0xb00000 0x00 0x400>, + <0x00 0xb01000 0x00 0x400>; + power-domains = <&k3_pds 95 TI_SCI_PD_EXCLUSIVE>; + #thermal-sensor-cells = <1>; }; };
arch/arm/dts/k3-am62.dtsi +8 -3
@@ -8,9 +8,10 @@ #include <dt-bindings/gpio/gpio.h> #include <dt-bindings/interrupt-controller/irq.h> #include <dt-bindings/interrupt-controller/arm-gic.h> -#include <dt-bindings/pinctrl/k3.h> #include <dt-bindings/soc/ti,sci_pm_domain.h> +#include "k3-pinctrl.h" + / { model = "Texas Instruments K3 AM625 SoC"; compatible = "ti,am625";
@@ -80,6 +81,7 @@ <0x00 0x04000000 0x00 0x04000000 0x00 0x01ff1400>, /* Wakeup Domain Range */ + <0x00 0x00b00000 0x00 0x00b00000 0x00 0x00002400>, /* VTM */ <0x00 0x2b000000 0x00 0x2b000000 0x00 0x00300400>, <0x00 0x43000000 0x00 0x43000000 0x00 0x00020000>;
@@ -90,14 +92,17 @@ ranges = <0x00 0x04000000 0x00 0x04000000 0x00 0x01ff1400>; /* Peripheral window */ }; - cbass_wakeup: bus@2b000000 { + cbass_wakeup: bus@b00000 { compatible = "simple-bus"; #address-cells = <2>; #size-cells = <2>; - ranges = <0x00 0x2b000000 0x00 0x2b000000 0x00 0x00300400>, /* Peripheral Window */ + ranges = <0x00 0x00b00000 0x00 0x00b00000 0x00 0x00002400>, /* VTM */ + <0x00 0x2b000000 0x00 0x2b000000 0x00 0x00300400>, /* Peripheral Window */ <0x00 0x43000000 0x00 0x43000000 0x00 0x00020000>; }; }; + + #include "k3-am62-thermal.dtsi" }; /* Now include the peripherals for each bus segments */
arch/arm/dts/k3-am625-r5-sk.dts +15 -77
133 lines not on this page · raw message
arch/arm/dts/k3-am625-sk-u-boot.dtsi +7 -17
@@ -9,7 +9,7 @@ / { chosen { stdout-path = "serial2:115200n8"; - tick-timer = &timer1; + tick-timer = &main_timer0; }; aliases {
@@ -21,16 +21,13 @@ }; }; -&cbass_main{ +&cbass_main { bootph-pre-ram; +}; - timer1: timer@2400000 { - compatible = "ti,omap5430-timer"; - reg = <0x00 0x2400000 0x00 0x80>; - ti,timer-alwon; - clock-frequency = <25000000>; - bootph-pre-ram; - }; +&main_timer0 { + clock-frequency = <25000000>; + bootph-pre-ram; }; &dmss {
@@ -77,10 +74,6 @@ bootph-pre-ram; }; -&main_uart1 { - bootph-pre-ram; -}; - &cbass_mcu { bootph-pre-ram; };
@@ -93,10 +86,6 @@ bootph-pre-ram; }; -&wkup_uart0 { - bootph-pre-ram; -}; - &sdhci1 { bootph-pre-ram; };
@@ -135,6 +124,7 @@ reg-names = "cpsw_nuss", "mac_efuse"; /delete-property/ ranges; bootph-pre-ram; + pinctrl-0 = <&main_mdio1_pins_default &main_rgmii1_pins_default>; cpsw-phy-sel@04044 { compatible = "ti,am64-phy-gmii-sel";
arch/arm/dts/k3-am625-sk.dts +27 -259
371 lines not on this page · raw message
arch/arm/dts/k3-am625.dtsi +53 -1
84 lines not on this page · raw message
arch/arm/dts/k3-am62x-sk-common.dtsi new file +412 -0
412 lines not on this page · raw message
arch/arm/dts/k3-pinctrl.h new file +53 -0
53 lines not on this page · raw message
Signature · 1 line
2.40.0
Re: [RFC PATCH 4/4] arm: dts: k3-am62: Bump dtsi from linux v6.5-rc1
Hi Nishanth,
Quoted 8 lines · Nishanth Menon
Update the am62 and am625 device-trees from linux v6.3-rc5 This needed the followin tweaks to the u-boot specific dtsi as well:
- Switch tick-timer to themain_timeras it's now defined in the main dtsi
- Secure proxies are defined in Soc dtsis
- Drop duplicate nodes -u-boot.dtsiis includes in r5-sk, no need for either the definitions frommain.dtsiOR duplication fromu-boot.dtsi
- Add mdio pins to the cpsw3g pinctrl in u-boot dtsi. It moved to a subnode in the linux dtsi that u-boot doesn't use/support
Unfortunately, this introduces a regression in Linux where the pinctrl node is now affected to both the MAC and PHY, and we end up not being able to probe both.
Maxime
Re: [RFC PATCH 4/4] arm: dts: k3-am62: Bump dtsi from linux v6.5-rc1
Quoted 3 lines · Maxime Ripard
Hi Nishanth,
On Thu, Jul 13, 2023 at 02:20:19AM -0500, Nishanth Menon wrote:
[...]
Quoted 6 lines
Quoted 2 lines
- Add mdio pins to the cpsw3g pinctrl in u-boot dtsi. It moved to a subnode in the linux dtsi that u-boot doesn't use/support
Unfortunately, this introduces a regression in Linux where the pinctrl node is now affected to both the MAC and PHY, and we end up not being able to probe both.
Uggh!!!! this is the case where u-boot hands over it's device tree to linux kernel to boot, I presume?
Signature · 3 lines
Regards, Nishanth Menon Key (0xDDB5849D1736249D) / Fingerprint: F8A2 8693 54EB 8232 17A3 1A34 DDB5 849D 1736 249D
Re: [RFC PATCH 4/4] arm: dts: k3-am62: Bump dtsi from linux v6.5-rc1
Quoted 9 lines · Nishanth Menon
Quoted 3 lines · Maxime Ripard
Hi Nishanth,
On Thu, Jul 13, 2023 at 02:20:19AM -0500, Nishanth Menon wrote:
[...]
Quoted 3 lines
Quoted 2 lines
- Add mdio pins to the cpsw3g pinctrl in u-boot dtsi. It moved to a subnode in the linux dtsi that u-boot doesn't use/support
Quoted 7 lines
Quoted 3 lines
Unfortunately, this introduces a regression in Linux where the pinctrl node is now affected to both the MAC and PHY, and we end up not being able to probe both.
Uggh!!!! this is the case where u-boot hands over it's device tree to linux kernel to boot, I presume?
Yes, it is :)
I've started to look into making the MAC driver grab the MDIO pinctrl state, but it doesn't look trivial to do since the pinctrl API doesn't support taking an ofnode pointer instead of a device. Shouldn't be too hard either though.
Do you know if there's any other way to fix this?
Maxime
Re: [RFC PATCH 4/4] arm: dts: k3-am62: Bump dtsi from linux v6.5-rc1
Quoted 18 lines · Maxime Ripard
Quoted 9 lines · Nishanth Menon
Quoted 3 lines · Maxime Ripard
Hi Nishanth,
On Thu, Jul 13, 2023 at 02:20:19AM -0500, Nishanth Menon wrote:
[...]
Quoted 3 lines
Quoted 2 lines
- Add mdio pins to the cpsw3g pinctrl in u-boot dtsi. It moved to a subnode in the linux dtsi that u-boot doesn't use/support
Quoted 7 lines
Quoted 3 lines
Unfortunately, this introduces a regression in Linux where the pinctrl node is now affected to both the MAC and PHY, and we end up not being able to probe both.
Uggh!!!! this is the case where u-boot hands over it's device tree to linux kernel to boot, I presume?
Quoted 8 lines
Yes, it is :)
I've started to look into making the MAC driver grab the MDIO pinctrl state, but it doesn't look trivial to do since the pinctrl API doesn't support taking an ofnode pointer instead of a device. Shouldn't be too hard either though.
Do you know if there's any other way to fix this?
I dont think there is any other way - I am looping in Ravi who is our networking lead on the topic for ideas.
Signature · 3 lines
Regards, Nishanth Menon Key (0xDDB5849D1736249D) / Fingerprint: F8A2 8693 54EB 8232 17A3 1A34 DDB5 849D 1736 249D
Re: [RFC PATCH 4/4] arm: dts: k3-am62: Bump dtsi from linux v6.5-rc1
In reply to Nishanth MenonQuoted 35 lines · Nishanth Menon
Update the am62 and am625 device-trees from linux v6.3-rc5 This needed the followin tweaks to the u-boot specific dtsi as well:
- Switch tick-timer to themain_timeras it's now defined in the main dtsi
- Secure proxies are defined in Soc dtsis
- Drop duplicate nodes -u-boot.dtsiis includes in r5-sk, no need for either the definitions frommain.dtsiOR duplication fromu-boot.dtsi
- Add mdio pins to the cpsw3g pinctrl in u-boot dtsi. It moved to a subnode in the linux dtsi that u-boot doesn't use/supportCc Francesco Dolcini <[email protected]>Cc Sjoerd Simons <[email protected]>Cc Wadim Egorov <[email protected]>Signed-off-by Nishanth Menon <[email protected]>---
This is a respin of Sjoerd's series.. quiet a bit of sync there. but should make it easier to add on newer boards by backporting from upstream kernel.
arch/arm/dts/k3-am62-main.dtsi | 389 +++++++++++++++++++++++-- arch/arm/dts/k3-am62-mcu.dtsi | 66 +++++ arch/arm/dts/k3-am62-thermal.dtsi | 33 +++ arch/arm/dts/k3-am62-wakeup.dtsi | 33 ++- arch/arm/dts/k3-am62.dtsi | 11 +- arch/arm/dts/k3-am625-r5-sk.dts | 92 +----- arch/arm/dts/k3-am625-sk-u-boot.dtsi | 24 +- arch/arm/dts/k3-am625-sk.dts | 286 ++----------------- arch/arm/dts/k3-am625.dtsi | 54 +++- arch/arm/dts/k3-am62x-sk-common.dtsi | 412 +++++++++++++++++++++++++++ arch/arm/dts/k3-pinctrl.h | 53 ++++ 11 files changed, 1065 insertions(+), 388 deletions(-) create mode 100644 arch/arm/dts/k3-am62-thermal.dtsi create mode 100644 arch/arm/dts/k3-am62x-sk-common.dtsi create mode 100644 arch/arm/dts/k3-pinctrl.h
<snip>
Quoted 59 lines
arch/arm/dts/k3-am625-sk-u-boot.dtsi +6
-17@@ -9,7 +9,7 @@ / { chosen { stdout-path = "serial2:115200n8"; - tick-timer = &timer1; + tick-timer = &main_timer0; }; aliases {@@ -21,16 +21,13 @@ }; }; -&cbass_main{ +&cbass_main { bootph-pre-ram; +}; - timer1: timer@2400000 { - compatible = "ti,omap5430-timer"; - reg = <0x00 0x2400000 0x00 0x80>; - ti,timer-alwon; - clock-frequency = <25000000>; - bootph-pre-ram; - }; +&main_timer0 { + clock-frequency = <25000000>; + bootph-pre-ram; }; &dmss {@@ -77,10 +74,6 @@ bootph-pre-ram; }; -&main_uart1 { - bootph-pre-ram; -}; - &cbass_mcu { bootph-pre-ram; };@@ -93,10 +86,6 @@ bootph-pre-ram; }; -&wkup_uart0 { - bootph-pre-ram; -}; - &sdhci1 { bootph-pre-ram; };
arch/arm/dts/k3-am625-sk-u-boot.dtsi line 124
Quoted 1 line
arch/arm/dts/k3-am625-sk-u-boot.dtsi +0
-0@@ -135,6 +124,7 @@ reg-names = "cpsw_nuss", "mac_efuse";
mac_efuse is another odd duck.
The efuse offset needs to be obtained from
"ti,syscon-efuse = <&wkup_conf 0x200>;"
which is already present in am62-main.dtsi
arch/arm/dts/k3-am625-sk-u-boot.dtsi line 125
Quoted 1 line
arch/arm/dts/k3-am625-sk-u-boot.dtsi +0
-0/delete-property/ ranges;
Any idea why we delete ranges?
arch/arm/dts/k3-am625-sk-u-boot.dtsi line 130
Quoted 5 lines
arch/arm/dts/k3-am625-sk-u-boot.dtsi +1
-0bootph-pre-ram; + pinctrl-0 = <&main_mdio1_pins_default &main_rgmii1_pins_default>; cpsw-phy-sel@04044 { compatible = "ti,am64-phy-gmii-sel";
This can also go away.
Only bootph-pre-ram required.
Signature · 2 lines
cheers, -roger
Hi,
Quoted 11 lines · Nishanth Menon
This series depends on Neha's binman series[1] and is intended for review and I will repost once binman series is merged in.
I have picked up part of Sjoerd's series[2] to keep it constrained just to dts sync at this point rather than adding newer functionality on top.
You can find the full series in [3].
Attempting am625 as a start of a series of clean ups for device tree for u-boot, but will love to get any review comments to improve this series up.
This also fixes an MMC issue when booting Linux with the U-Boot device tree.
Maxime