Skip to content

Commit e8d992f

Browse files
fabioestevamShawn Guo
authored andcommitted
ARM: imx: Remove iomux-v3 board code
IMX_HAVE_IOMUX_V3 was only used by i.MX25/35 board files. Since the board files users are gone, it is safe to remove iomux-v3 related code. Signed-off-by: Fabio Estevam <festevam@gmail.com> Acked-by: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Shawn Guo <shawnguo@kernel.org>
1 parent 6c5f05a commit e8d992f

5 files changed

Lines changed: 0 additions & 204 deletions

File tree

arch/arm/mach-imx/Kconfig

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,6 @@ config HAVE_IMX_SRC
4747
def_bool y if SMP
4848
select ARCH_HAS_RESET_CONTROLLER
4949

50-
config ARCH_MXC_IOMUX_V3
51-
bool
52-
5350
if ARCH_MULTI_V6
5451

5552
comment "ARM1136 platforms"
@@ -63,7 +60,6 @@ config SOC_IMX31
6360

6461
config SOC_IMX35
6562
bool "i.MX35 support"
66-
select ARCH_MXC_IOMUX_V3
6763
select MXC_AVIC
6864
select PINCTRL_IMX35
6965
help
@@ -87,7 +83,6 @@ if ARCH_MULTI_V5
8783

8884
config SOC_IMX25
8985
bool "i.MX25 support"
90-
select ARCH_MXC_IOMUX_V3
9186
select CPU_ARM926T
9287
select MXC_AVIC
9388
select PINCTRL_IMX25

arch/arm/mach-imx/Makefile

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,6 @@ obj-$(CONFIG_SOC_IMX35) += mm-imx3.o cpu-imx35.o mach-imx35.o
1111
imx5-pm-$(CONFIG_PM) += pm-imx5.o
1212
obj-$(CONFIG_SOC_IMX5) += cpu-imx5.o $(imx5-pm-y)
1313

14-
obj-$(CONFIG_ARCH_MXC_IOMUX_V3) += iomux-v3.o
15-
1614
obj-$(CONFIG_MXC_TZIC) += tzic.o
1715
obj-$(CONFIG_MXC_AVIC) += avic.o
1816

arch/arm/mach-imx/iomux-v3.c

Lines changed: 0 additions & 65 deletions
This file was deleted.

arch/arm/mach-imx/iomux-v3.h

Lines changed: 0 additions & 130 deletions
This file was deleted.

arch/arm/mach-imx/mm-imx3.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
#include "crmregs-imx3.h"
2222
#include "devices/devices-common.h"
2323
#include "hardware.h"
24-
#include "iomux-v3.h"
2524

2625
void __iomem *mx3_ccm_base;
2726

@@ -140,7 +139,6 @@ static void imx35_idle(void)
140139
void __init imx35_init_early(void)
141140
{
142141
mxc_set_cpu_type(MXC_CPU_MX35);
143-
mxc_iomux_v3_init(MX35_IO_ADDRESS(MX35_IOMUXC_BASE_ADDR));
144142
arm_pm_idle = imx35_idle;
145143
arch_ioremap_caller = imx3_ioremap_caller;
146144
mx3_ccm_base = MX35_IO_ADDRESS(MX35_CCM_BASE_ADDR);

0 commit comments

Comments
 (0)