Skip to contentSkip to conversation

arm: imx: Remove the rest of i.MX31 support

PATCH Applied Tom Rini 3 participants 3 messages Jul 4, 2025 – Jul 11, 2025

Subsystems (6)
lore
Share & tools
lore

Tom Rini

author
#0 lore raw

PATCH 1/1 arm: imx: Remove the rest of i.MX31 support

With the removal of the last i.MX31 platform we can remove the rest of the underlying architecture code as well.

Fixes f247354708ec ("arm: Remove mx31pdk board")

---
Cc: Stefano Babic <[email protected]>
Cc: Fabio Estevam <[email protected]>
Cc: "NXP i.MX U-Boot Team" <[email protected]>

---
 arch/arm/Kconfig                           |   8 -
 arch/arm/include/asm/arch-mx31/clock.h     |  35 -
 arch/arm/include/asm/arch-mx31/gpio.h      |  12 -
 arch/arm/include/asm/arch-mx31/imx-regs.h  | 905 ---------------------
 arch/arm/include/asm/arch-mx31/sys_proto.h |  20 -
 arch/arm/mach-imx/mx3/Kconfig              |  33 -
 drivers/misc/Kconfig                       |   2 +-
 drivers/serial/Kconfig                     |   2 +-
 drivers/w1/Kconfig                         |   2 +-
 drivers/watchdog/Kconfig                   |   2 +-
 10 files changed, 4 insertions(+), 1017 deletions(-)
 delete mode 100644 arch/arm/include/asm/arch-mx31/clock.h
 delete mode 100644 arch/arm/include/asm/arch-mx31/gpio.h
 delete mode 100644 arch/arm/include/asm/arch-mx31/imx-regs.h
 delete mode 100644 arch/arm/include/asm/arch-mx31/sys_proto.h
 delete mode 100644 arch/arm/mach-imx/mx3/Kconfig
arch/arm/Kconfig +0 -8
index 1d096ad6554f..be0819a9c9d6 100644
@@ -966,12 +966,6 @@ config ARCH_MX28
 	select MACH_IMX
 	select SUPPORT_SPL
 
-config ARCH_MX31
-	bool "NXP i.MX31 family"
-	select CPU_ARM1136
-	select GPIO_EXTRA_HEADER
-	select MACH_IMX
-
 config ARCH_MX7ULP
 	bool "NXP MX7ULP"
 	select BOARD_POSTCLK_INIT
@@ -2317,8 +2311,6 @@ source "arch/arm/mach-octeontx2/Kconfig"
 
 source "arch/arm/cpu/armv7/ls102xa/Kconfig"
 
-source "arch/arm/mach-imx/mx3/Kconfig"
-
 source "arch/arm/mach-imx/mx5/Kconfig"
 
 source "arch/arm/mach-imx/mx6/Kconfig"
arch/arm/include/asm/arch-mx31/clock.h deleted +0 -35
deleted file mode 100644
index e99e115f79e7..000000000000
@@ -1,35 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0+ */
-/*
- *
- * (c) 2007 Pengutronix, Sascha Hauer <[email protected]>
- */
-
-#ifndef __ASM_ARCH_CLOCK_H
-#define __ASM_ARCH_CLOCK_H
-
-#define MXC_HCLK	CONFIG_MX31_HCLK_FREQ
-
-#define MXC_CLK32	CONFIG_MX31_CLK32
-
-enum mxc_clock {
-	MXC_ARM_CLK,
-	MXC_IPG_CLK,
-	MXC_IPG_PERCLK,
-	MXC_CSPI_CLK,
-	MXC_UART_CLK,
-	MXC_IPU_CLK,
-	MXC_ESDHC_CLK,
-	MXC_I2C_CLK,
-};
-
-unsigned int mxc_get_clock(enum mxc_clock clk);
-extern u32 imx_get_uartclk(void);
-extern void mx31_gpio_mux(unsigned long mode);
-extern void mx31_set_pad(enum iomux_pins pin, u32 config);
-extern void mx31_set_gpr(enum iomux_gp_func gp, char en);
-
-void mx31_uart1_hw_init(void);
-void mx31_uart2_hw_init(void);
-void mx31_spi2_hw_init(void);
-
-#endif /* __ASM_ARCH_CLOCK_H */
arch/arm/include/asm/arch-mx31/gpio.h deleted +0 -12
deleted file mode 100644
index 1bfe28f95c96..000000000000
@@ -1,12 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0+ */
-/*
- * Copyright (C) 2011
- * Stefano Babic, DENX Software Engineering, <[email protected]>
- */
-
-#ifndef __ASM_ARCH_MX31_GPIO_H
-#define __ASM_ARCH_MX31_GPIO_H
-
-#include <asm/mach-imx/gpio.h>
-
-#endif
arch/arm/include/asm/arch-mx31/imx-regs.h deleted +0 -905

905 lines not on this page · raw message

arch/arm/include/asm/arch-mx31/sys_proto.h deleted +0 -20
deleted file mode 100644
index 29fc0fda0e66..000000000000
@@ -1,20 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0+ */
-/*
- * (C) Copyright 2011
- * Helmut Raiger, HALE electronic GmbH, [email protected]
- */
-
-#ifndef _MX31_SYS_PROTO_H_
-#define _MX31_SYS_PROTO_H_
-
-#include <asm/mach-imx/sys_proto.h>
-
-struct mxc_weimcs {
-	u32 upper;
-	u32 lower;
-	u32 additional;
-};
-
-void mxc_setup_weimcs(int cs, const struct mxc_weimcs *weimcs);
-int mxc_mmc_init(struct bd_info *bis);
-#endif
arch/arm/mach-imx/mx3/Kconfig deleted +0 -33
deleted file mode 100644
index 42bba4822e61..000000000000
@@ -1,33 +0,0 @@
-if ARCH_MX31
-
-config MX31
-       bool
-       default y
-choice
-	prompt "MX31 board select"
-	optional
-
-config TARGET_MX31PDK
-	bool "Support the i.MX31 PDK board from Freescale/NXP"
-	select BOARD_EARLY_INIT_F
-	select BOARD_LATE_INIT
-	select SUPPORT_SPL
-
-endchoice
-
-config MX31_HCLK_FREQ
-       int "i.MX31 HCLK frequency"
-       default 26000000
-       help
-         Frequency in Hz of the high frequency input clock. Typically
-	 26000000 Hz.
-
-config MX31_CLK32
-       int "i.MX31 CLK32 Frequency"
-       default 32768
-       help
-         Frequency in Hz of the low frequency input clock. Typically
-	 32768 or 32000 Hz.
-
-
-endif
drivers/misc/Kconfig +1 -1
index 8b8f6309adaa..515d3668395d 100644
@@ -300,7 +300,7 @@ config DS4510
 
 config FSL_IIM
 	bool "Enable FSL IC Identification Module (IIM) driver"
-	depends on ARCH_MX31 || ARCH_MX5
+	depends on ARCH_MX5
 
 config FSL_SEC_MON
 	bool "Enable FSL SEC_MON Driver"
drivers/serial/Kconfig +1 -1
index 589b526381ff..1f2f2468eb0b 100644
@@ -762,7 +762,7 @@ config MCFUART
 
 config MXC_UART
 	bool "IMX serial port support"
-	depends on ARCH_MX31 || MX5 || MX6 || MX7 || IMX8M
+	depends on MX5 || MX6 || MX7 || IMX8M
 	help
 	  If you have a machine based on a Motorola IMX CPU you
 	  can enable its onboard serial port by enabling this option.
drivers/w1/Kconfig +1 -1
index 0ffc1b6444b6..9e52ba8905c6 100644
@@ -20,7 +20,7 @@ config W1_GPIO
 
 config W1_MXC
 	bool "Enable 1-wire controller on i.MX processors"
-	depends on ARCH_MX31 || ARCH_MX5
+	depends on ARCH_MX5
 	help
 	  Support the one wire controller found in some members of the NXP
 	  i.MX SoC family.
drivers/watchdog/Kconfig +1 -1
index 45eb9b4d3f99..e9ea874d0e3d 100644
@@ -27,7 +27,7 @@ config WATCHDOG_AUTOSTART
 
 config WATCHDOG_TIMEOUT_MSECS
 	int "Watchdog timeout in msec"
-	default 128000 if ARCH_MX31 || ARCH_MX5 || ARCH_MX6
+	default 128000 if ARCH_MX5 || ARCH_MX6
 	default 128000 if ARCH_MX7 || ARCH_VF610
 	default 30000 if ARCH_SNAPDRAGON
 	default 30000 if ARCH_SOCFPGA
Signature · 1 line
2.43.0
Acked-by on v1 1/1
#1 lore raw
Quoted 7 lines

Subject: [PATCH] arm: imx: Remove the rest of i.MX31 support

With the removal of the last i.MX31 platform we can remove the rest of the underlying architecture code as well.

Fixes f247354708ec ("arm: Remove mx31pdk board")