Skip to contentSkip to conversation

enable DMA and CPSW nodes for am62ax SoC family

PATCH NAK Bryan Brattlof 2 participants 8 messages Apr 14, 2023

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

v3 cover enable DMA and CPSW nodes for am62ax SoC family

Hello again everyone!

This patch series syncs TI's am62ax device tree files with what has been merged in the v6.3-rc6 of the Linux Kernel. This series will also enable YMODEM support to make automated testing (which uses the UART boot method to load the bootloaders into the SoC)

Thanks for reviewing
~Bryan

Changes from v2: [1]
- pulled linux dtbs from v6.3-rc6 instead of -rc4

Changed from v1: [0]
- Rebased on top of -next branch
- dropped 'u-boot,dm-spl' for the new 'bootph-pre-ram' properties

[0] https://lore.kernel.org/u-boot/[email protected]/
[1] https://lore.kernel.org/u-boot/[email protected]/

Bryan Brattlof (4):
arm: dts: sync am62ax dtbs with linux v6.3-rc6
arm: dts: add DMA and CPSW nodes for uboot
configs: enable net features for am62ax
configs: am62ax: enable ymodem support for a53 spl

Vignesh Raghavendra (1):
dma: ti: k3-udma: Introduce DMA support for the am62ax

 arch/arm/dts/k3-am62a-main.dtsi       | 365 ++++++++++++++++++++++++++
 arch/arm/dts/k3-am62a-mcu.dtsi        |  51 ++++
 arch/arm/dts/k3-am62a-wakeup.dtsi     |   2 +-
 arch/arm/dts/k3-am62a7-r5-sk.dts      |   8 +
 arch/arm/dts/k3-am62a7-sk-u-boot.dtsi |  26 +-
 arch/arm/dts/k3-am62a7-sk.dts         |  75 +++++-
 arch/arm/dts/k3-am62a7.dtsi           |   1 +
 configs/am62ax_evm_a53_defconfig      |   7 +-
 drivers/dma/ti/Makefile               |   1 +
 drivers/dma/ti/k3-psil-am62a.c        | 196 ++++++++++++++
 drivers/dma/ti/k3-psil-priv.h         |   1 +
 drivers/dma/ti/k3-psil.c              |   2 +
 12 files changed, 729 insertions(+), 6 deletions(-)
 create mode 100644 drivers/dma/ti/k3-psil-am62a.c

base-commit: a25dcda452bf6a6de72764a8d990d72e5def643d

Signature · 1 line
2.40.0
#1 lore raw

PATCH v3 1/5 dma: ti: k3-udma: Introduce DMA support for the am62ax

From: Vignesh Raghavendra <[email protected]>

In preparation for enabling ethernet for the am62ax family of SoCs, introduce the initial DMA channel settings for the am62ax

---
 drivers/dma/ti/Makefile        |   1 +
 drivers/dma/ti/k3-psil-am62a.c | 196 +++++++++++++++++++++++++++++++++
 drivers/dma/ti/k3-psil-priv.h  |   1 +
 drivers/dma/ti/k3-psil.c       |   2 +
 4 files changed, 200 insertions(+)
 create mode 100644 drivers/dma/ti/k3-psil-am62a.c
drivers/dma/ti/Makefile +1 -0
index 6807eb8e8b2d3..f4e0271efbf32 100644
@@ -8,3 +8,4 @@ k3-psil-data-$(CONFIG_SOC_K3_J721E) += k3-psil-j721e.o
 k3-psil-data-$(CONFIG_SOC_K3_J721S2) += k3-psil-j721s2.o
 k3-psil-data-$(CONFIG_SOC_K3_AM642) += k3-psil-am64.o
 k3-psil-data-$(CONFIG_SOC_K3_AM625) += k3-psil-am62.o
+k3-psil-data-$(CONFIG_SOC_K3_AM62A7) += k3-psil-am62a.o
drivers/dma/ti/k3-psil-am62a.c new file +196 -0

196 lines not on this page · raw message

drivers/dma/ti/k3-psil-priv.h +1 -0
index 28078c6bd8d7d..02d479d5c9dba 100644
@@ -42,5 +42,6 @@ extern struct psil_ep_map j721e_ep_map;
 extern struct psil_ep_map j721s2_ep_map;
 extern struct psil_ep_map am64_ep_map;
 extern struct psil_ep_map am62_ep_map;
+extern struct psil_ep_map am62a_ep_map;
 
 #endif /* K3_PSIL_PRIV_H_ */
drivers/dma/ti/k3-psil.c +2 -0
index f23c8ca2b74c8..13d429b0991f3 100644
@@ -26,6 +26,8 @@ struct psil_endpoint_config *psil_get_ep_config(u32 thread_id)
 			soc_ep_map = &am64_ep_map;
 		else if (IS_ENABLED(CONFIG_SOC_K3_AM625))
 			soc_ep_map = &am62_ep_map;
+		else if (IS_ENABLED(CONFIG_SOC_K3_AM62A7))
+			soc_ep_map = &am62a_ep_map;
 	}
 
 	if (thread_id & K3_PSIL_DST_THREAD_ID_OFFSET && soc_ep_map->dst) {
Signature · 1 line
2.40.0
#5 lore raw

PATCH v3 4/5 configs: enable net features for am62ax

In reply to Bryan Brattlof

Enable DMA and CPSW options we now support for the am62ax SoC family

---
 configs/am62ax_evm_a53_defconfig | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)
configs/am62ax_evm_a53_defconfig +5 -1
index 46a95a692e9ac..e17bfd4dd2936 100644
@@ -40,7 +40,6 @@ CONFIG_SPL_OF_CONTROL=y
 CONFIG_MULTI_DTB_FIT=y
 CONFIG_SPL_MULTI_DTB_FIT=y
 CONFIG_SPL_MULTI_DTB_FIT_NO_COMPRESSION=y
-# CONFIG_NET is not set
 CONFIG_SPL_DM=y
 CONFIG_SPL_DM_SEQ_ALIAS=y
 CONFIG_REGMAP=y
@@ -49,15 +48,20 @@ CONFIG_SPL_OF_TRANSLATE=y
 CONFIG_CLK=y
 CONFIG_SPL_CLK=y
 CONFIG_CLK_TI_SCI=y
+CONFIG_DMA_CHANNELS=y
+CONFIG_TI_K3_NAVSS_UDMA=y
 CONFIG_TI_SCI_PROTOCOL=y
 # CONFIG_GPIO is not set
 # CONFIG_I2C is not set
 CONFIG_DM_MAILBOX=y
 CONFIG_K3_SEC_PROXY=y
+# CONFIG_SPL_MISC is not set
 CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI_ADMA=y
 CONFIG_SPL_MMC_SDHCI_ADMA=y
 CONFIG_MMC_SDHCI_AM654=y
+CONFIG_PHY_TI_DP83867=y
+CONFIG_TI_AM65_CPSW_NUSS=y
 CONFIG_PINCTRL=y
 CONFIG_SPL_PINCTRL=y
 CONFIG_PINCTRL_SINGLE=y
Signature · 1 line
2.40.0
#6 lore raw

PATCH v3 5/5 configs: am62ax: enable ymodem support for a53 spl

In reply to Bryan Brattlof

Automated testing inside TI currently relies on loading the boot-loaders into the SoC via UART. Enable SPL_YMODEM_SUPPORT so our testing infrastructure can boot (and test) our boards.

Fixes 719bd650c30e8 ("configs: introduce configs for the am62a")
---
 configs/am62ax_evm_a53_defconfig | 1 +
 1 file changed, 1 insertion(+)
configs/am62ax_evm_a53_defconfig +1 -0
index e17bfd4dd2936..10c9d5268c846 100644
@@ -34,6 +34,7 @@ CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR=0x1400
 CONFIG_SPL_FS_LOAD_PAYLOAD_NAME="u-boot.img"
 CONFIG_SPL_DM_MAILBOX=y
 CONFIG_SPL_POWER_DOMAIN=y
+CONFIG_SPL_YMODEM_SUPPORT=y
 CONFIG_CMD_MMC=y
 CONFIG_OF_CONTROL=y
 CONFIG_SPL_OF_CONTROL=y
Signature · 1 line
2.40.0
#3 lore raw

PATCH v3 3/5 arm: dts: add DMA and CPSW nodes for uboot

In reply to Bryan Brattlof

Update the uboot dtsi to enable DMA and CPSW at the uboot level

---
 arch/arm/dts/k3-am62a7-r5-sk.dts      |  8 ++++++++
 arch/arm/dts/k3-am62a7-sk-u-boot.dtsi | 26 +++++++++++++++++++++++++-
 2 files changed, 33 insertions(+), 1 deletion(-)
arch/arm/dts/k3-am62a7-r5-sk.dts +8 -0
index c953a82c7a5e9..b4c2fd7f50038 100644
@@ -143,3 +143,11 @@
 	status = "okay";
 	bootph-pre-ram;
 };
+
+&main_pktdma {
+	ti,sci = <&dm_tifs>;
+};
+
+&main_bcdma {
+	ti,sci = <&dm_tifs>;
+};
arch/arm/dts/k3-am62a7-sk-u-boot.dtsi +25 -1
index cf938c43b832e..fd3f7e63d5da6 100644
@@ -15,7 +15,7 @@
 	};
 };
 
-&cbass_main{
+&cbass_main {
 	bootph-pre-ram;
 
 	timer1: timer@2400000 {
@@ -138,3 +138,27 @@
 &vdd_mmc1 {
 	bootph-pre-ram;
 };
+
+&main_bcdma {
+	bootph-pre-ram;
+};
+
+&main_pktdma {
+	bootph-pre-ram;
+};
+
+&cpsw3g {
+	reg = <0x00 0x08000000 0x00 0x200000>,
+	      <0x00 0x43000200 0x00 0x8>;
+	reg-names = "cpsw_nuss", "mac_efuse";
+	/delete-property/ ranges;
+	pinctrl-0 = <&main_mdio1_pins_default
+		     &main_rgmii1_pins_default>;
+	bootph-pre-ram;
+
+	cpsw-phy-sel@04044 {
+		compatible = "ti,am64-phy-gmii-sel";
+		reg = <0x00 0x00104044 0x00 0x8>;
+		bootph-pre-ram;
+	};
+};
Signature · 1 line
2.40.0
#2 lore raw

PATCH v3 2/5 arm: dts: sync am62ax dtbs with linux v6.3-rc6

In reply to Bryan Brattlof

To enable Ethernet support at the uboot level, pull the device tree files from the v6.3-rc6 version of the Linux kernel.

---
 arch/arm/dts/k3-am62a-main.dtsi   | 365 ++++++++++++++++++++++++++++++
 arch/arm/dts/k3-am62a-mcu.dtsi    |  51 +++++
 arch/arm/dts/k3-am62a-wakeup.dtsi |   2 +-
 arch/arm/dts/k3-am62a7-sk.dts     |  75 +++++-
 arch/arm/dts/k3-am62a7.dtsi       |   1 +
 5 files changed, 490 insertions(+), 4 deletions(-)
arch/arm/dts/k3-am62a-main.dtsi +365 -0
index bc4b50bcd1773..393a1a40b68b8 100644
@@ -48,6 +48,18 @@
 		#address-cells = <1>;
 		#size-cells = <1>;
 		ranges = <0x00 0x00 0x00100000 0x20000>;
+
+		phy_gmii_sel: phy@4044 {
+			compatible = "ti,am654-phy-gmii-sel";
+			reg = <0x4044 0x8>;
+			#phy-cells = <1>;
+		};
+
+		epwm_tbclk: clock-controller@4130 {
+			compatible = "ti,am62-epwm-tbclk", "syscon";
+			reg = <0x4130 0x4>;
+			#clock-cells = <1>;
+		};
 	};
 
 	dmss: bus@48000000 {
@@ -69,6 +81,67 @@
 			interrupt-names = "rx_012";
 			interrupts = <GIC_SPI 34 IRQ_TYPE_LEVEL_HIGH>;
 		};
+
+		inta_main_dmss: interrupt-controller@48000000 {
+			compatible = "ti,sci-inta";
+			reg = <0x00 0x48000000 0x00 0x100000>;
+			#interrupt-cells = <0>;
+			interrupt-controller;
+			interrupt-parent = <&gic500>;
+			msi-controller;
+			ti,sci = <&dmsc>;
+			ti,sci-dev-id = <28>;
+			ti,interrupt-ranges = <6 70 34>;
+			ti,unmapped-event-sources = <&main_bcdma>, <&main_pktdma>;
+		};
+
+		main_bcdma: dma-controller@485c0100 {
+			compatible = "ti,am64-dmss-bcdma";
+			reg = <0x00 0x485c0100 0x00 0x100>,
+			      <0x00 0x4c000000 0x00 0x20000>,
+			      <0x00 0x4a820000 0x00 0x20000>,
+			      <0x00 0x4aa40000 0x00 0x20000>,
+			      <0x00 0x4bc00000 0x00 0x100000>;
+			reg-names = "gcfg", "bchanrt", "rchanrt", "tchanrt", "ringrt";
+			msi-parent = <&inta_main_dmss>;
+			#dma-cells = <3>;
+			ti,sci = <&dmsc>;
+			ti,sci-dev-id = <26>;
+			ti,sci-rm-range-bchan = <0x20>; /* BLOCK_COPY_CHAN */
+			ti,sci-rm-range-rchan = <0x21>; /* SPLIT_TR_RX_CHAN */
+			ti,sci-rm-range-tchan = <0x22>; /* SPLIT_TR_TX_CHAN */
+		};
+
+		main_pktdma: dma-controller@485c0000 {
+			compatible = "ti,am64-dmss-pktdma";
+			reg = <0x00 0x485c0000 0x00 0x100>,
+			      <0x00 0x4a800000 0x00 0x20000>,
+			      <0x00 0x4aa00000 0x00 0x40000>,
+			      <0x00 0x4b800000 0x00 0x400000>;
+			reg-names = "gcfg", "rchanrt", "tchanrt", "ringrt";
+			msi-parent = <&inta_main_dmss>;
+			#dma-cells = <2>;
+			ti,sci = <&dmsc>;
+			ti,sci-dev-id = <30>;
+			ti,sci-rm-range-tchan = <0x23>, /* UNMAPPED_TX_CHAN */
+						<0x24>, /* CPSW_TX_CHAN */
+						<0x25>, /* SAUL_TX_0_CHAN */
+						<0x26>; /* SAUL_TX_1_CHAN */
+			ti,sci-rm-range-tflow = <0x10>, /* RING_UNMAPPED_TX_CHAN */
+						<0x11>, /* RING_CPSW_TX_CHAN */
+						<0x12>, /* RING_SAUL_TX_0_CHAN */
+						<0x13>; /* RING_SAUL_TX_1_CHAN */
+			ti,sci-rm-range-rchan = <0x29>, /* UNMAPPED_RX_CHAN */
+						<0x2b>, /* CPSW_RX_CHAN */
+						<0x2d>, /* SAUL_RX_0_CHAN */
+						<0x2f>, /* SAUL_RX_1_CHAN */
+						<0x31>, /* SAUL_RX_2_CHAN */
+						<0x33>; /* SAUL_RX_3_CHAN */
+			ti,sci-rm-range-rflow = <0x2a>, /* FLOW_UNMAPPED_RX_CHAN */
+						<0x2c>, /* FLOW_CPSW_RX_CHAN */
+						<0x2e>, /* FLOW_SAUL_RX_0/1_CHAN */
+						<0x32>; /* FLOW_SAUL_RX_2/3_CHAN */
+		};
 	};
 
 	dmsc: system-controller@44043000 {
@@ -222,6 +295,39 @@
 		status = "disabled";
 	};
 
+	main_spi0: spi@20100000 {
+		compatible = "ti,am654-mcspi", "ti,omap4-mcspi";
+		reg = <0x00 0x20100000 0x00 0x400>;
+		interrupts = <GIC_SPI 172 IRQ_TYPE_LEVEL_HIGH>;
+		#address-cells = <1>;
+		#size-cells = <0>;
+		power-domains = <&k3_pds 141 TI_SCI_PD_EXCLUSIVE>;
+		clocks = <&k3_clks 141 0>;
+		status = "disabled";
+	};
+
+	main_spi1: spi@20110000 {
+		compatible = "ti,am654-mcspi","ti,omap4-mcspi";
+		reg = <0x00 0x20110000 0x00 0x400>;
+		interrupts = <GIC_SPI 173 IRQ_TYPE_LEVEL_HIGH>;
+		#address-cells = <1>;
+		#size-cells = <0>;
+		power-domains = <&k3_pds 142 TI_SCI_PD_EXCLUSIVE>;
+		clocks = <&k3_clks 142 0>;
+		status = "disabled";
+	};
+
+	main_spi2: spi@20120000 {
+		compatible = "ti,am654-mcspi","ti,omap4-mcspi";
+		reg = <0x00 0x20120000 0x00 0x400>;
+		interrupts = <GIC_SPI 174 IRQ_TYPE_LEVEL_HIGH>;
+		#address-cells = <1>;
+		#size-cells = <0>;
+		power-domains = <&k3_pds 143 TI_SCI_PD_EXCLUSIVE>;
+		clocks = <&k3_clks 143 0>;
+		status = "disabled";
+	};
+
 	main_gpio_intr: interrupt-controller@a00000 {
 		compatible = "ti,sci-intr";
 		reg = <0x00 0x00a00000 0x00 0x800>;
@@ -295,4 +401,263 @@
 		no-1-8-v;
 		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 {
+		compatible = "simple-bus";
+		reg = <0x00 0x0fc00000 0x00 0x70000>;
+		#address-cells = <2>;
+		#size-cells = <2>;
+		ranges;
+		status = "disabled";
+
+		ospi0: spi@fc40000 {
+			compatible = "ti,am654-ospi", "cdns,qspi-nor";
+			reg = <0x00 0x0fc40000 0x00 0x100>,
+			      <0x05 0x00000000 0x01 0x00000000>;
+			interrupts = <GIC_SPI 139 IRQ_TYPE_LEVEL_HIGH>;
+			cdns,fifo-depth = <256>;
+			cdns,fifo-width = <4>;
+			cdns,trigger-address = <0x0>;
+			clocks = <&k3_clks 75 7>;
+			assigned-clocks = <&k3_clks 75 7>;
+			assigned-clock-parents = <&k3_clks 75 8>;
+			assigned-clock-rates = <166666666>;
+			power-domains = <&k3_pds 75 TI_SCI_PD_EXCLUSIVE>;
+			#address-cells = <1>;
+			#size-cells = <0>;
+		};
+	};
+
+	cpsw3g: ethernet@8000000 {
+		compatible = "ti,am642-cpsw-nuss";
+		#address-cells = <2>;
+		#size-cells = <2>;
+		reg = <0x0 0x8000000 0x0 0x200000>;
+		reg-names = "cpsw_nuss";
+		ranges = <0x0 0x0 0x0 0x8000000 0x0 0x200000>;
+		clocks = <&k3_clks 13 0>;
+		assigned-clocks = <&k3_clks 13 3>;
+		assigned-clock-parents = <&k3_clks 13 11>;
+		clock-names = "fck";
+		power-domains = <&k3_pds 13 TI_SCI_PD_EXCLUSIVE>;
+		status = "disabled";
+
+		dmas = <&main_pktdma 0xc600 15>,
+		       <&main_pktdma 0xc601 15>,
+		       <&main_pktdma 0xc602 15>,
+		       <&main_pktdma 0xc603 15>,
+		       <&main_pktdma 0xc604 15>,
+		       <&main_pktdma 0xc605 15>,
+		       <&main_pktdma 0xc606 15>,
+		       <&main_pktdma 0xc607 15>,
+		       <&main_pktdma 0x4600 15>;
+		dma-names = "tx0", "tx1", "tx2", "tx3", "tx4", "tx5", "tx6",
+			    "tx7", "rx";
+
+		ethernet-ports {
+			#address-cells = <1>;
+			#size-cells = <0>;
+
+			cpsw_port1: port@1 {
+				reg = <1>;
+				ti,mac-only;
+				label = "port1";
+				phys = <&phy_gmii_sel 1>;
+				mac-address = [00 00 00 00 00 00];
+				ti,syscon-efuse = <&wkup_conf 0x200>;
+			};
+
+			cpsw_port2: port@2 {
+				reg = <2>;
+				ti,mac-only;
+				label = "port2";
+				phys = <&phy_gmii_sel 2>;
+				mac-address = [00 00 00 00 00 00];
+			};
+		};
+
+		cpsw3g_mdio: mdio@f00 {
+			compatible = "ti,cpsw-mdio","ti,davinci_mdio";
+			reg = <0x0 0xf00 0x0 0x100>;
+			#address-cells = <1>;
+			#size-cells = <0>;
+			clocks = <&k3_clks 13 0>;
+			clock-names = "fck";
+			bus_freq = <1000000>;
+		};
+
+		cpts@3d000 {
+			compatible = "ti,j721e-cpts";
+			reg = <0x0 0x3d000 0x0 0x400>;
+			clocks = <&k3_clks 13 3>;
+			clock-names = "cpts";
+			interrupts-extended = <&gic500 GIC_SPI 102 IRQ_TYPE_LEVEL_HIGH>;
+			interrupt-names = "cpts";
+			ti,cpts-ext-ts-inputs = <4>;
+			ti,cpts-periodic-outputs = <2>;
+		};
+	};
+
+	hwspinlock: spinlock@2a000000 {
+		compatible = "ti,am64-hwspinlock";
+		reg = <0x00 0x2a000000 0x00 0x1000>;
+		#hwlock-cells = <1>;
+	};
+
+	mailbox0_cluster0: mailbox@29000000 {
+		compatible = "ti,am64-mailbox";
+		reg = <0x00 0x29000000 0x00 0x200>;
+		interrupts = <GIC_SPI 76 IRQ_TYPE_LEVEL_HIGH>;
+		#mbox-cells = <1>;
+		ti,mbox-num-users = <4>;
+		ti,mbox-num-fifos = <16>;
+	};
+
+	mailbox0_cluster1: mailbox@29010000 {
+		compatible = "ti,am64-mailbox";
+		reg = <0x00 0x29010000 0x00 0x200>;
+		interrupts = <GIC_SPI 77 IRQ_TYPE_LEVEL_HIGH>;
+		#mbox-cells = <1>;
+		ti,mbox-num-users = <4>;
+		ti,mbox-num-fifos = <16>;
+	};
+
+	mailbox0_cluster2: mailbox@29020000 {
+		compatible = "ti,am64-mailbox";
+		reg = <0x00 0x29020000 0x00 0x200>;
+		interrupts = <GIC_SPI 108 IRQ_TYPE_LEVEL_HIGH>;
+		#mbox-cells = <1>;
+		ti,mbox-num-users = <4>;
+		ti,mbox-num-fifos = <16>;
+	};
+
+	mailbox0_cluster3: mailbox@29030000 {
+		compatible = "ti,am64-mailbox";
+		reg = <0x00 0x29030000 0x00 0x200>;
+		interrupts = <GIC_SPI 109 IRQ_TYPE_LEVEL_HIGH>;
+		#mbox-cells = <1>;
+		ti,mbox-num-users = <4>;
+		ti,mbox-num-fifos = <16>;
+	};
+
+	main_mcan0: can@20701000 {
+		compatible = "bosch,m_can";
+		reg = <0x00 0x20701000 0x00 0x200>,
+		      <0x00 0x20708000 0x00 0x8000>;
+		reg-names = "m_can", "message_ram";
+		power-domains = <&k3_pds 98 TI_SCI_PD_EXCLUSIVE>;
+		clocks = <&k3_clks 98 6>, <&k3_clks 98 1>;
+		clock-names = "hclk", "cclk";
+		interrupts = <GIC_SPI 155 IRQ_TYPE_LEVEL_HIGH>,
+			     <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 {
+		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";
+	};
+
+	ecap0: pwm@23100000 {
+		compatible = "ti,am3352-ecap";
+		#pwm-cells = <3>;
+		reg = <0x00 0x23100000 0x00 0x100>;
+		power-domains = <&k3_pds 51 TI_SCI_PD_EXCLUSIVE>;
+		clocks = <&k3_clks 51 0>;
+		clock-names = "fck";
+		status = "disabled";
+	};
+
+	ecap1: pwm@23110000 {
+		compatible = "ti,am3352-ecap";
+		#pwm-cells = <3>;
+		reg = <0x00 0x23110000 0x00 0x100>;
+		power-domains = <&k3_pds 52 TI_SCI_PD_EXCLUSIVE>;
+		clocks = <&k3_clks 52 0>;
+		clock-names = "fck";
+		status = "disabled";
+	};
+
+	ecap2: pwm@23120000 {
+		compatible = "ti,am3352-ecap";
+		#pwm-cells = <3>;
+		reg = <0x00 0x23120000 0x00 0x100>;
+		power-domains = <&k3_pds 53 TI_SCI_PD_EXCLUSIVE>;
+		clocks = <&k3_clks 53 0>;
+		clock-names = "fck";
+		status = "disabled";
+	};
 };
arch/arm/dts/k3-am62a-mcu.dtsi +51 -0

55 lines not on this page · raw message

arch/arm/dts/k3-am62a-wakeup.dtsi +1 -1
index 99afac40e8d4b..81d984414fd4a 100644
@@ -31,7 +31,7 @@
 
 	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>;
arch/arm/dts/k3-am62a7-sk.dts +72 -3

96 lines not on this page · raw message

arch/arm/dts/k3-am62a7.dtsi +1 -0
index 331d89fda29d0..9734549851c06 100644
@@ -95,6 +95,7 @@
 
 	L2_0: l2-cache0 {
 		compatible = "cache";
+		cache-unified;
 		cache-level = <2>;
 		cache-size = <0x40000>;
 		cache-line-size = <64>;
Signature · 1 line
2.40.0
#4 lore raw

Re: [PATCH v3 3/5] arm: dts: add DMA and CPSW nodes for uboot

In reply to Bryan Brattlof
Quoted 44 lines · Bryan Brattlof

Update the uboot dtsi to enable DMA and CPSW at the uboot level

---
 arch/arm/dts/k3-am62a7-r5-sk.dts      |  8 ++++++++
 arch/arm/dts/k3-am62a7-sk-u-boot.dtsi | 26 +++++++++++++++++++++++++-
 2 files changed, 33 insertions(+), 1 deletion(-)
arch/arm/dts/k3-am62a7-r5-sk.dts +8 -0
index c953a82c7a5e9..b4c2fd7f50038 100644
@@ -143,3 +143,11 @@
 	status = "okay";
 	bootph-pre-ram;
 };
+
+&main_pktdma {
+	ti,sci = <&dm_tifs>;
+};
+
+&main_bcdma {
+	ti,sci = <&dm_tifs>;
+};
arch/arm/dts/k3-am62a7-sk-u-boot.dtsi +4 -1
index cf938c43b832e..fd3f7e63d5da6 100644
@@ -15,7 +15,7 @@
 	};
 };
 
-&cbass_main{
+&cbass_main {
 	bootph-pre-ram;
 
 	timer1: timer@2400000 {
@@ -138,3 +138,27 @@
 &vdd_mmc1 {
 	bootph-pre-ram;
 };
+
+&main_bcdma {
+	bootph-pre-ram;

arch/arm/dts/k3-am62a7-sk-u-boot.dtsi line 153

Quoted 10 lines
arch/arm/dts/k3-am62a7-sk-u-boot.dtsi +10 -0
+};
+
+&main_pktdma {
+	bootph-pre-ram;
+};
+
+&cpsw3g {
+	reg = <0x00 0x08000000 0x00 0x200000>,
+	      <0x00 0x43000200 0x00 0x8>;
+	reg-names = "cpsw_nuss", "mac_efuse";

mac_efuse needs to go to upstream kernel.

arch/arm/dts/k3-am62a7-sk-u-boot.dtsi line 156

Quoted 3 lines
arch/arm/dts/k3-am62a7-sk-u-boot.dtsi +3 -0
+	/delete-property/ ranges;
+	pinctrl-0 = <&main_mdio1_pins_default
+		     &main_rgmii1_pins_default>;

Why not do this hack in board.dts and mark it due to MDIO limitation?

Quoted 11 lines
arch/arm/dts/k3-am62a7-sk-u-boot.dtsi +8 -0
+	bootph-pre-ram;
+
+	cpsw-phy-sel@04044 {
+		compatible = "ti,am64-phy-gmii-sel";
+		reg = <0x00 0x00104044 0x00 0x8>;
+		bootph-pre-ram;
+	};
+};
Signature · 1 line
2.40.0
Signature · 3 lines
Regards,
Nishanth Menon
Key (0xDDB5849D1736249D) / Fingerprint: F8A2 8693 54EB 8232 17A3  1A34 DDB5 849D 1736 249D
#7 lore raw
In reply to Bryan Brattlof
Quoted 26 lines · Bryan Brattlof

Hello again everyone!

This patch series syncs TI's am62ax device tree files with what has been merged in the v6.3-rc6 of the Linux Kernel. This series will also enable YMODEM support to make automated testing (which uses the UART boot method to load the bootloaders into the SoC)

Thanks for reviewing
~Bryan

Changes from v2: [1]
- pulled linux dtbs from v6.3-rc6 instead of -rc4

Changed from v1: [0]
- Rebased on top of -next branch
- dropped 'u-boot,dm-spl' for the new 'bootph-pre-ram' properties

[0] https://lore.kernel.org/u-boot/[email protected]/
[1] https://lore.kernel.org/u-boot/[email protected]/

Bryan Brattlof (4):
arm: dts: sync am62ax dtbs with linux v6.3-rc6
arm: dts: add DMA and CPSW nodes for uboot
configs: enable net features for am62ax
configs: am62ax: enable ymodem support for a53 spl

Quoted 7 lines

Vignesh Raghavendra (1):
dma: ti: k3-udma: Introduce DMA support for the am62ax

 arch/arm/dts/k3-am62a-main.dtsi       | 365 ++++++++++++++++++++++++++
 arch/arm/dts/k3-am62a-mcu.dtsi        |  51 ++++
 arch/arm/dts/k3-am62a-wakeup.dtsi     |   2 +-
 arch/arm/dts/k3-am62a7-r5-sk.dts      |   8 +

NAK - not complete.

This needs to drop everything duplicate => why is memory reserved-memory duplicate? chosen....

Please send the uart pinmux patches upstream.

Remember:
board.dts - included by u-boot.dtsi -> included by r5.dtsi

there is 0 need to duplicate stuff.

Quoted 16 lines
 arch/arm/dts/k3-am62a7-sk-u-boot.dtsi |  26 +-
 arch/arm/dts/k3-am62a7-sk.dts         |  75 +++++-
 arch/arm/dts/k3-am62a7.dtsi           |   1 +
 configs/am62ax_evm_a53_defconfig      |   7 +-
 drivers/dma/ti/Makefile               |   1 +
 drivers/dma/ti/k3-psil-am62a.c        | 196 ++++++++++++++
 drivers/dma/ti/k3-psil-priv.h         |   1 +
 drivers/dma/ti/k3-psil.c              |   2 +
 12 files changed, 729 insertions(+), 6 deletions(-)
 create mode 100644 drivers/dma/ti/k3-psil-am62a.c

base-commit: a25dcda452bf6a6de72764a8d990d72e5def643d

Signature · 1 line
2.40.0
Signature · 3 lines
Regards,
Nishanth Menon
Key (0xDDB5849D1736249D) / Fingerprint: F8A2 8693 54EB 8232 17A3  1A34 DDB5 849D 1736 249D