Skip to contentSkip to conversation

toradex: aquila-am69: fix SPL USB DFU, drop obsolete clock

PATCH In review Ernest Van Hoecke 3 participants 5 messages Jan 27 – Feb 4 Arm (32-bit)

lore
Share & tools
lore
#0 lore raw

cover toradex: aquila-am69: fix SPL USB DFU, drop obsolete clock

From: Ernest Van Hoecke <[email protected]>

This is a small, board-specific series for Aquila AM69.

Patch 1 fixes intermittent SPL USB DFU gadget enumeration. Patch 2 drops a stale MCU_CLKOUT0 enable for ETH_1. V1.1 hardware uses an external 25 MHz crystal, and support for earlier revisions was already removed from the DT before upstreaming.

Ernest Van Hoecke (2):
arm: dts: k3-am69-aquila: Fix SPL USB DFU gadget failures
board: toradex: aquila-am69: Remove ETH_1 MCU_CLKOUT0

 arch/arm/dts/k3-am69-aquila-dev-u-boot.dtsi | 1 +
 board/toradex/aquila-am69/aquila-am69.c     | 7 -------
 2 files changed, 1 insertion(+), 7 deletions(-)
Signature · 1 line
2.43.0
#1 lore raw

PATCH 1/2 arm: dts: k3-am69-aquila: Fix SPL USB DFU gadget failures

From: Ernest Van Hoecke <[email protected]>

Around 1 in 20 times, the current R5 SPL fails to pull up the D+ line to signal that a new USB device (the USB gadget used for downloading the next stage) joined the bus.

With these strapping options, this is greatly reduced to 1 in thousands.

---
 arch/arm/dts/k3-am69-aquila-dev-u-boot.dtsi | 1 +
 1 file changed, 1 insertion(+)
arch/arm/dts/k3-am69-aquila-dev-u-boot.dtsi +1 -0
index 59948b9d1f4b..5b8b8539da3f 100644
@@ -144,6 +144,7 @@
 };
 
 &usbss0 {
+	ti,modestrap-peripheral;
 	ti,usb2-only;
 	bootph-pre-ram;
 };
Signature · 1 line
2.43.0
#2 lore raw

PATCH 2/2 board: toradex: aquila-am69: Remove ETH_1 MCU_CLKOUT0

In reply to Ernest Van Hoecke

From: Ernest Van Hoecke <[email protected]>

On the Toradex Aquila AM69 V1.1, the on-module ETH_1 relies on an external 25 MHz crystal oscillator. On the V1.0, we needed to enable MCU_CLKOUT0, but support for this was already dropped from the device tree before being sent to U-Boot.

Remove this obsolete enabling of MCU_CLKOUT0.

Fixes 3f0528882c0d ("board: toradex: add aquila am69 support")
---
 board/toradex/aquila-am69/aquila-am69.c | 7 -------
 1 file changed, 7 deletions(-)
board/toradex/aquila-am69/aquila-am69.c +0 -7
index 98b9bfc5aa4b..e0975d5bc6fe 100644
@@ -22,8 +22,6 @@
 #include "ddrs_patch.h"
 
 #define CTRL_MMR_CFG0_MCU_ADC1_CTRL	0x40F040B4
-#define CTRL_MMR_CFG0_MCU_CLKOUT0_CTRL	0x40F08010
-#define MCU_CLKOUT0_CTRL_CLK_EN		BIT(4)
 
 #define HW_CFG_MEM_SZ_32GB		0x00
 #define HW_CFG_MEM_SZ_16GB		0x01
@@ -200,9 +198,4 @@ void spl_board_init(void)
 		if (ret)
 			printf("ESM PMIC init failed: %d\n", ret);
 	}
-
-	if (IS_ENABLED(CONFIG_TARGET_AQUILA_AM69_R5))
-		writel(readl(CTRL_MMR_CFG0_MCU_CLKOUT0_CTRL) |
-		       MCU_CLKOUT0_CTRL_CLK_EN,
-		       CTRL_MMR_CFG0_MCU_CLKOUT0_CTRL);
 }
Signature · 1 line
2.43.0
Reviewed-by on the v1 series
#3 lore raw
In reply to Ernest Van Hoecke
Quoted 8 lines · Ernest Van Hoecke

From: Ernest Van Hoecke <[email protected]>

This is a small, board-specific series for Aquila AM69.

Patch 1 fixes intermittent SPL USB DFU gadget enumeration. Patch 2 drops a stale MCU_CLKOUT0 enable for ETH_1. V1.1 hardware uses an external 25 MHz crystal, and support for earlier revisions was already removed from the DT before upstreaming.

#4 lore raw
In reply to Ernest Van Hoecke
Quoted 10 lines · Ernest Van Hoecke

From: Ernest Van Hoecke <[email protected]>

This is a small, board-specific series for Aquila AM69.

Patch 1 fixes intermittent SPL USB DFU gadget enumeration. Patch 2 drops a stale MCU_CLKOUT0 enable for ETH_1. V1.1 hardware uses an external 25 MHz crystal, and support for earlier revisions was already removed from the DT before upstreaming.

[...]

Applied to u-boot/master, thanks!

[1/2] arm: dts: k3-am69-aquila: Fix SPL USB DFU gadget failures

      commit: cdd51332cc87b1964f6b48d1c1d5ac142b0dc7a5
[2/2] board: toradex: aquila-am69: Remove ETH_1 MCU_CLKOUT0
      commit: 81cd740838b1fdc6c473580254f0f217df375bcc
Signature · 1 line
Tom