Skip to contentSkip to conversation

Cleanup i.MX95 based Toradex boards

PATCH In review Stefan Eichenberger 2 participants 4 messages Aug 19 Arm i.MX and Layerscape

lore
Share & tools
lore
#0 lore raw

cover Cleanup i.MX95 based Toradex boards

This series removes two leftovers from the Toradex i.MX95 board support.

The first patch drops CONFIG_SPI from the aquila-imx95, verdin-imx95 and toradex-smarc-imx95 defconfigs. It has been set since the initial board support, but none of the boards selects an SPI controller or slave driver, so SPI is not usable in U-Boot on them anyway.

The second patch removes the WDOG_BASE_ADDR definition from verdin-imx95.h. The ULP watchdog driver takes its base address from the devicetree now, and the macro it expanded to no longer exists, so the definition is dangling.

Neither patch changes behaviour, they only drop unused configuration. All three boards were build tested.

Stefan Eichenberger (2):
configs: {aquila, verdin, toradex-smarc}-imx95: remove CONFIG_SPI
imx: verdin-imx95: remove unused WDOG_BASE_ADDR

 configs/aquila-imx95_defconfig        | 1 -
 configs/toradex-smarc-imx95_defconfig | 1 -
 configs/verdin-imx95_defconfig        | 1 -
 include/configs/verdin-imx95.h        | 2 --
 4 files changed, 5 deletions(-)
Signature · 1 line
2.55.0
#1 lore raw

PATCH 1/2 configs: {aquila, verdin, toradex-smarc}-imx95: remove CONFIG_SPI

From: Stefan Eichenberger <[email protected]>

CONFIG_SPI=y has been set on the Toradex i.MX95 boards since their initial board support commits, but none of them selects an SPI controller or slave driver. The option therefore only builds the SPI uclass with no bus behind it, and SPI is not usable in U-Boot on these boards.

Remove CONFIG_SPI from the aquila-imx95, toradex-smarc-imx95 and verdin-imx95 defconfigs to reduce maintenance effort. No other symbol selects SPI, so the resulting configuration ends up with "# CONFIG_SPI is not set".

---
 configs/aquila-imx95_defconfig        | 1 -
 configs/toradex-smarc-imx95_defconfig | 1 -
 configs/verdin-imx95_defconfig        | 1 -
 3 files changed, 3 deletions(-)
configs/aquila-imx95_defconfig +0 -1
index bb3d475ef4d..dcac9fdc615 100644
@@ -160,7 +160,6 @@ CONFIG_REMOTEPROC_IMX=y
 CONFIG_DM_RNG=y
 CONFIG_DM_SERIAL=y
 CONFIG_FSL_LPUART=y
-CONFIG_SPI=y
 CONFIG_DM_THERMAL=y
 CONFIG_USB=y
 CONFIG_DM_USB_GADGET=y
configs/toradex-smarc-imx95_defconfig +0 -1
index 9abadb0ed1a..cd8344572ad 100644
@@ -162,7 +162,6 @@ CONFIG_REMOTEPROC_IMX=y
 CONFIG_DM_RNG=y
 CONFIG_DM_SERIAL=y
 CONFIG_FSL_LPUART=y
-CONFIG_SPI=y
 CONFIG_DM_THERMAL=y
 CONFIG_USB=y
 CONFIG_USB_XHCI_HCD=y
configs/verdin-imx95_defconfig +0 -1
index daf41a8b830..0d15a04635c 100644
@@ -164,7 +164,6 @@ CONFIG_REMOTEPROC_IMX=y
 CONFIG_DM_RNG=y
 CONFIG_DM_SERIAL=y
 CONFIG_FSL_LPUART=y
-CONFIG_SPI=y
 CONFIG_DM_THERMAL=y
 CONFIG_USB=y
 CONFIG_DM_USB_GADGET=y
Signature · 1 line
2.55.0
#2 lore raw

PATCH 2/2 imx: verdin-imx95: remove unused WDOG_BASE_ADDR

In reply to Stefan Eichenberger

From: Stefan Eichenberger <[email protected]>

The ULP watchdog driver obtains its base address from the devicetree since commit 3cacd1b1809d ("watchdog: ulp_wdog: Use driver model for reset_cpu()"), so WDOG_BASE_ADDR has no user left. Commit 4f8d6c8f417c ("imx: Remove hardcoded watchdog base address macros") dropped the macro from the other i.MX9 boards, including toradex-smarc-imx95, but missed verdin-imx95.

The definition is in fact dangling: WDG3_BASE_ADDR was removed from arch-imx9/imx-regs.h by that same commit, so anything expanding WDOG_BASE_ADDR would now fail to build.

Remove the leftover definition.

Fixes 4f8d6c8f417c ("imx: Remove hardcoded watchdog base address macros")
---
 include/configs/verdin-imx95.h | 2 --
 1 file changed, 2 deletions(-)
include/configs/verdin-imx95.h +0 -2
index 30eb2e01460..b6df4d48695 100644
@@ -22,6 +22,4 @@
 #define PHYS_SDRAM_SIZE		(SZ_2G - PHYS_SDRAM_FW_RSVD)
 #define PHYS_SDRAM_2_SIZE	SZ_30G
 
-#define WDOG_BASE_ADDR		WDG3_BASE_ADDR
-
 #endif
Signature · 1 line
2.55.0
Acked-by on the v1 series
#3 lore raw
In reply to Stefan Eichenberger
Quoted 11 lines · Stefan Eichenberger

This series removes two leftovers from the Toradex i.MX95 board support.

The first patch drops CONFIG_SPI from the aquila-imx95, verdin-imx95 and toradex-smarc-imx95 defconfigs. It has been set since the initial board support, but none of the boards selects an SPI controller or slave driver, so SPI is not usable in U-Boot on them anyway.

The second patch removes the WDOG_BASE_ADDR definition from verdin-imx95.h. The ULP watchdog driver takes its base address from the devicetree now, and the macro it expanded to no longer exists, so the definition is dangling.