ARM: imx: Remove board files

This is a first pass converting i.MX to a devicetree-only platform.

i.MX board files have been primarily receiving only tree-wide API cleanups and does not appear to have real users.

i.MX27, i.MX31 and i.MX35 have basic devicetree support and users can improve devicetree support if needed.

i.MX21 has not been converted to device tree yet, so drop its support.

Of course if someone is interested in using i.MX21 with a mainline kernel, patches that add i.MX21 devicetree support will be welcome.

For maintainance perspective, it is easier to treat i.MX as a devicetree-only platform, so remove the board files to achieve this end goal.

Changes since v1:

Changes since v1:
- Rename imx27-dt.c => mach-imx27.c
imx31-dt.c => mach-imx31.c

	 imx35-dt.c => mach-imx35.c

for consistency among the other i.MX SoCs.

Fabio Estevam (5):
ARM: imx: Remove imx21 support
ARM: imx: Remove i.MX27 board files
ARM: imx: Remove i.MX31 board files
ARM: imx: Remove i.MX35 board files
ARM: imx: Remove ehci board files

 arch/arm/configs/imx_v4_v5_defconfig          |   2 +-
 arch/arm/configs/imx_v6_v7_defconfig          |  16 +-
 arch/arm/configs/multi_v5_defconfig           |   2 +-
 arch/arm/mach-imx/Kconfig                     | 362 +----------
 arch/arm/mach-imx/Makefile                    |  40 +-
 arch/arm/mach-imx/devices-imx21.h             |  56 --
 arch/arm/mach-imx/ehci-imx27.c                |  74 ---
 arch/arm/mach-imx/ehci-imx31.c                |  74 ---
 arch/arm/mach-imx/ehci-imx35.c                |  89 ---
 arch/arm/mach-imx/ehci.h                      |  44 --
 arch/arm/mach-imx/mach-armadillo5x0.c         | 562 ----------------
 arch/arm/mach-imx/mach-bug.c                  |  54 --
 .../arm/mach-imx/{imx27-dt.c => mach-imx27.c} |   0
 arch/arm/mach-imx/mach-imx27_visstrim_m10.c   | 562 ----------------
 .../arm/mach-imx/{imx31-dt.c => mach-imx31.c} |   0
 .../arm/mach-imx/{imx35-dt.c => mach-imx35.c} |   0
 arch/arm/mach-imx/mach-kzm_arm11_01.c         | 291 ---------
 arch/arm/mach-imx/mach-mx21ads.c              | 338 ----------
 arch/arm/mach-imx/mach-mx27_3ds.c             | 470 -------------
 arch/arm/mach-imx/mach-mx27ads.c              | 407 ------------
 arch/arm/mach-imx/mach-mx31_3ds.c             | 615 ------------------
 arch/arm/mach-imx/mach-mx31lilly.c            | 312 ---------
 arch/arm/mach-imx/mach-mx31lite.c             | 290 ---------
 arch/arm/mach-imx/mach-mx31moboard.c          | 581 -----------------
 arch/arm/mach-imx/mach-mx35_3ds.c             | 516 ---------------
 arch/arm/mach-imx/mach-pca100.c               | 426 ------------
 arch/arm/mach-imx/mach-pcm037.c               | 585 -----------------
 arch/arm/mach-imx/mach-pcm037_eet.c           | 166 -----
 arch/arm/mach-imx/mach-pcm043.c               | 412 ------------
 arch/arm/mach-imx/mach-qong.c                 | 262 --------
 arch/arm/mach-imx/mach-vpr200.c               | 306 ---------
 arch/arm/mach-imx/mm-imx21.c                  |  84 ---
 arch/arm/mach-imx/mx31lilly-db.c              | 182 ------
 arch/arm/mach-imx/mx31moboard-devboard.c      | 238 -------
 arch/arm/mach-imx/mx31moboard-marxbot.c       | 270 --------
 arch/arm/mach-imx/mx31moboard-smartbot.c      | 124 ----
 36 files changed, 24 insertions(+), 8788 deletions(-)
 delete mode 100644 arch/arm/mach-imx/devices-imx21.h
 delete mode 100644 arch/arm/mach-imx/ehci-imx27.c
 delete mode 100644 arch/arm/mach-imx/ehci-imx31.c
 delete mode 100644 arch/arm/mach-imx/ehci-imx35.c
 delete mode 100644 arch/arm/mach-imx/ehci.h
 delete mode 100644 arch/arm/mach-imx/mach-armadillo5x0.c
 delete mode 100644 arch/arm/mach-imx/mach-bug.c
 rename arch/arm/mach-imx/{imx27-dt.c => mach-imx27.c} (100%)
 delete mode 100644 arch/arm/mach-imx/mach-imx27_visstrim_m10.c
 rename arch/arm/mach-imx/{imx31-dt.c => mach-imx31.c} (100%)
 rename arch/arm/mach-imx/{imx35-dt.c => mach-imx35.c} (100%)
 delete mode 100644 arch/arm/mach-imx/mach-kzm_arm11_01.c
 delete mode 100644 arch/arm/mach-imx/mach-mx21ads.c
 delete mode 100644 arch/arm/mach-imx/mach-mx27_3ds.c
 delete mode 100644 arch/arm/mach-imx/mach-mx27ads.c
 delete mode 100644 arch/arm/mach-imx/mach-mx31_3ds.c
 delete mode 100644 arch/arm/mach-imx/mach-mx31lilly.c
 delete mode 100644 arch/arm/mach-imx/mach-mx31lite.c
 delete mode 100644 arch/arm/mach-imx/mach-mx31moboard.c
 delete mode 100644 arch/arm/mach-imx/mach-mx35_3ds.c
 delete mode 100644 arch/arm/mach-imx/mach-pca100.c
 delete mode 100644 arch/arm/mach-imx/mach-pcm037.c
 delete mode 100644 arch/arm/mach-imx/mach-pcm037_eet.c
 delete mode 100644 arch/arm/mach-imx/mach-pcm043.c
 delete mode 100644 arch/arm/mach-imx/mach-qong.c
 delete mode 100644 arch/arm/mach-imx/mach-vpr200.c
 delete mode 100644 arch/arm/mach-imx/mm-imx21.c
 delete mode 100644 arch/arm/mach-imx/mx31lilly-db.c
 delete mode 100644 arch/arm/mach-imx/mx31moboard-devboard.c
 delete mode 100644 arch/arm/mach-imx/mx31moboard-marxbot.c
 delete mode 100644 arch/arm/mach-imx/mx31moboard-smartbot.c

2.17.1


_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

mx21 has not been converted to device tree yet and there is only one single board that is supported (imx21ads).

To achieve the goal of converting all i.MX SoCs to devicetree-only platforms, remove imx21 support.

If someone is interested in supporting imx21, patches to add imx21 devicetree support will be welcome.

---
Changes since v1:
- None

 arch/arm/mach-imx/Kconfig         |  19 --
 arch/arm/mach-imx/Makefile        |   5 -
 arch/arm/mach-imx/devices-imx21.h |  56 -----
 arch/arm/mach-imx/mach-mx21ads.c  | 338 ------------------------------
 arch/arm/mach-imx/mm-imx21.c      |  84 --------
 5 files changed, 502 deletions(-)
 delete mode 100644 arch/arm/mach-imx/devices-imx21.h
 delete mode 100644 arch/arm/mach-imx/mach-mx21ads.c
 delete mode 100644 arch/arm/mach-imx/mm-imx21.c

index e7d7b90e2cf8..ae3b51b4a4fb 100644
@@ -53,12 +53,6 @@ config IMX_HAVE_IOMUX_V1
 config ARCH_MXC_IOMUX_V3
 	bool
 
-config SOC_IMX21
-	bool
-	select CPU_ARM926T
-	select IMX_HAVE_IOMUX_V1
-	select MXC_AVIC
-
 config SOC_IMX27
 	bool
 	select CPU_ARM926T

@@ -79,19 +73,6 @@ config SOC_IMX35
 
 if ARCH_MULTI_V5
 
-comment "MX21 platforms:"
-
-config MACH_MX21ADS
-	bool "MX21ADS platform"
-	select IMX_HAVE_PLATFORM_IMX_FB
-	select IMX_HAVE_PLATFORM_IMX_UART
-	select IMX_HAVE_PLATFORM_MXC_MMC
-	select IMX_HAVE_PLATFORM_MXC_NAND
-	select SOC_IMX21
-	help
-	  Include support for MX21ADS platform. This includes specific
-	  configurations for the board and its peripherals.
-
 comment "MX27 platforms:"
 
 config MACH_MX27ADS

index e7364e6c8c6b..d0370af0b1e3 100644
@@ -1,8 +1,6 @@
 # SPDX-License-Identifier: GPL-2.0
 obj-y := cpu.o system.o irq-common.o
 
-obj-$(CONFIG_SOC_IMX21) += mm-imx21.o
-
 obj-$(CONFIG_SOC_IMX25) += cpu-imx25.o mach-imx25.o pm-imx25.o
 
 obj-$(CONFIG_SOC_IMX27) += cpu-imx27.o pm-imx27.o

@@ -37,9 +35,6 @@ obj-y += ssi-fiq.o
 obj-y += ssi-fiq-ksym.o
 endif
 
-# i.MX21 based machines
-obj-$(CONFIG_MACH_MX21ADS) += mach-mx21ads.o
-
 # i.MX27 based machines
 obj-$(CONFIG_MACH_MX27ADS) += mach-mx27ads.o
 obj-$(CONFIG_MACH_MX27_3DS) += mach-mx27_3ds.o

2.17.1


_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

i.MX27 has basic device tree support.

To achieve the goal of converting all i.MX SoCs to a devicetree-only platform, remove imx27 board files.

---
Changes since v1:
- Rename imx27-dt.c => mach-imx27.c

 arch/arm/configs/imx_v4_v5_defconfig          |   2 +-
 arch/arm/configs/multi_v5_defconfig           |   2 +-
 arch/arm/mach-imx/Kconfig                     | 101 +---
 arch/arm/mach-imx/Makefile                    |   9 +-
 .../arm/mach-imx/{imx27-dt.c => mach-imx27.c} |   0
 arch/arm/mach-imx/mach-imx27_visstrim_m10.c   | 562 ------------------
 arch/arm/mach-imx/mach-mx27_3ds.c             | 470 ---------------
 arch/arm/mach-imx/mach-mx27ads.c              | 407 -------------
 arch/arm/mach-imx/mach-pca100.c               | 426 -------------
 9 files changed, 13 insertions(+), 1966 deletions(-)
 rename arch/arm/mach-imx/{imx27-dt.c => mach-imx27.c} (100%)
 delete mode 100644 arch/arm/mach-imx/mach-imx27_visstrim_m10.c
 delete mode 100644 arch/arm/mach-imx/mach-mx27_3ds.c
 delete mode 100644 arch/arm/mach-imx/mach-mx27ads.c
 delete mode 100644 arch/arm/mach-imx/mach-pca100.c

index f5f1111f2118..aeb1209e0804 100644
@@ -20,9 +20,9 @@ CONFIG_MACH_MX27ADS=y
 CONFIG_MACH_MX27_3DS=y
 CONFIG_MACH_IMX27_VISSTRIM_M10=y
 CONFIG_MACH_PCA100=y
-CONFIG_MACH_IMX27_DT=y
 CONFIG_SOC_IMX1=y
 CONFIG_SOC_IMX25=y
+CONFIG_SOC_IMX27=y
 CONFIG_AEABI=y
 CONFIG_ZBOOT_ROM_TEXT=0x0
 CONFIG_ZBOOT_ROM_BSS=0x0

index 2724fb3155cd..70b709a669d2 100644
@@ -29,8 +29,8 @@ CONFIG_MACH_MX27ADS=y
 CONFIG_MACH_MX27_3DS=y
 CONFIG_MACH_IMX27_VISSTRIM_M10=y
 CONFIG_MACH_PCA100=y
-CONFIG_MACH_IMX27_DT=y
 CONFIG_SOC_IMX25=y
+CONFIG_SOC_IMX27=y
 CONFIG_ARCH_MVEBU=y
 CONFIG_MACH_KIRKWOOD=y
 CONFIG_ARCH_ORION5X=y

index d0370af0b1e3..46a90d64c13b 100644
@@ -3,7 +3,7 @@ obj-y := cpu.o system.o irq-common.o
 
 obj-$(CONFIG_SOC_IMX25) += cpu-imx25.o mach-imx25.o pm-imx25.o
 
-obj-$(CONFIG_SOC_IMX27) += cpu-imx27.o pm-imx27.o
+obj-$(CONFIG_SOC_IMX27) += cpu-imx27.o pm-imx27.o mach-imx27.o
 obj-$(CONFIG_SOC_IMX27) += mm-imx27.o ehci-imx27.o
 
 obj-$(CONFIG_SOC_IMX31) += mm-imx3.o cpu-imx31.o iomux-imx31.o ehci-imx31.o

@@ -35,13 +35,6 @@ obj-y += ssi-fiq.o
 obj-y += ssi-fiq-ksym.o
 endif
 
-# i.MX27 based machines
-obj-$(CONFIG_MACH_MX27ADS) += mach-mx27ads.o
-obj-$(CONFIG_MACH_MX27_3DS) += mach-mx27_3ds.o
-obj-$(CONFIG_MACH_IMX27_VISSTRIM_M10) += mach-imx27_visstrim_m10.o
-obj-$(CONFIG_MACH_PCA100) += mach-pca100.o
-obj-$(CONFIG_MACH_IMX27_DT) += imx27-dt.o
-
 # i.MX31 based machines
 obj-$(CONFIG_MACH_MX31ADS) += mach-mx31ads.o
 obj-$(CONFIG_MACH_MX31LILLY) += mach-mx31lilly.o mx31lilly-db.o

similarity index 100%
rename from arch/arm/mach-imx/imx27-dt.c
rename to arch/arm/mach-imx/mach-imx27.c

2.17.1


_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

i.MX35 has basic device tree support.

To achieve the goal of converting all i.MX SoCs to a devicetree-only platform, remove imx35 board files.

---
Changes since v1:
- Rename imx35-dt.c => mach-imx35.c

 arch/arm/configs/imx_v6_v7_defconfig          |   5 +-
 arch/arm/mach-imx/Kconfig                     |  73 +--
 arch/arm/mach-imx/Makefile                    |   8 +-
 .../arm/mach-imx/{imx35-dt.c => mach-imx35.c} |   0
 arch/arm/mach-imx/mach-mx35_3ds.c             | 516 ------------------
 arch/arm/mach-imx/mach-pcm043.c               | 412 --------------
 arch/arm/mach-imx/mach-vpr200.c               | 306 -----------
 7 files changed, 10 insertions(+), 1310 deletions(-)
 rename arch/arm/mach-imx/{imx35-dt.c => mach-imx35.c} (100%)
 delete mode 100644 arch/arm/mach-imx/mach-mx35_3ds.c
 delete mode 100644 arch/arm/mach-imx/mach-pcm043.c
 delete mode 100644 arch/arm/mach-imx/mach-vpr200.c

index 337d3ede0f7f..0fa79bd00219 100644
@@ -15,11 +15,8 @@ CONFIG_PERF_EVENTS=y
 # CONFIG_COMPAT_BRK is not set
 CONFIG_ARCH_MULTI_V6=y
 CONFIG_ARCH_MXC=y
-CONFIG_MACH_IMX35_DT=y
-CONFIG_MACH_PCM043=y
-CONFIG_MACH_MX35_3DS=y
-CONFIG_MACH_VPR200=y
 CONFIG_SOC_IMX31=y
+CONFIG_SOC_IMX35=y
 CONFIG_SOC_IMX50=y
 CONFIG_SOC_IMX51=y
 CONFIG_SOC_IMX53=y

index 1b3c0cad148b..d6607f3000d9 100644
@@ -7,7 +7,7 @@ obj-$(CONFIG_SOC_IMX27) += cpu-imx27.o pm-imx27.o mach-imx27.o
 obj-$(CONFIG_SOC_IMX27) += mm-imx27.o ehci-imx27.o
 
 obj-$(CONFIG_SOC_IMX31) += mm-imx3.o cpu-imx31.o iomux-imx31.o ehci-imx31.o mach-imx31.o
-obj-$(CONFIG_SOC_IMX35) += mm-imx3.o cpu-imx35.o ehci-imx35.o
+obj-$(CONFIG_SOC_IMX35) += mm-imx3.o cpu-imx35.o ehci-imx35.o mach-imx35.o
 
 imx5-pm-$(CONFIG_PM) += pm-imx5.o
 obj-$(CONFIG_SOC_IMX5) += cpu-imx5.o $(imx5-pm-y)

@@ -35,12 +35,6 @@ obj-y += ssi-fiq.o
 obj-y += ssi-fiq-ksym.o
 endif
 
-# i.MX35 based machines
-obj-$(CONFIG_MACH_PCM043) += mach-pcm043.o
-obj-$(CONFIG_MACH_MX35_3DS) += mach-mx35_3ds.o
-obj-$(CONFIG_MACH_VPR200) += mach-vpr200.o
-obj-$(CONFIG_MACH_IMX35_DT) += imx35-dt.o
-
 obj-$(CONFIG_HAVE_IMX_ANATOP) += anatop.o
 obj-$(CONFIG_HAVE_IMX_GPC) += gpc.o
 obj-$(CONFIG_HAVE_IMX_MMDC) += mmdc.o

similarity index 100%
rename from arch/arm/mach-imx/imx35-dt.c
rename to arch/arm/mach-imx/mach-imx35.c

2.17.1


_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

Now that the i.MX board files have been removed, there is no need for keeping the ehci related files, so just remove them.

---
Changes since v2:
- None

 arch/arm/mach-imx/Makefile     |  7 ++-
 arch/arm/mach-imx/ehci-imx27.c | 74 ----------------------------
 arch/arm/mach-imx/ehci-imx31.c | 74 ----------------------------
 arch/arm/mach-imx/ehci-imx35.c | 89 ----------------------------------
 arch/arm/mach-imx/ehci.h       | 44 -----------------
 5 files changed, 3 insertions(+), 285 deletions(-)
 delete mode 100644 arch/arm/mach-imx/ehci-imx27.c
 delete mode 100644 arch/arm/mach-imx/ehci-imx31.c
 delete mode 100644 arch/arm/mach-imx/ehci-imx35.c
 delete mode 100644 arch/arm/mach-imx/ehci.h

index d6607f3000d9..ca35d3e4cab4 100644
@@ -3,11 +3,10 @@ obj-y := cpu.o system.o irq-common.o
 
 obj-$(CONFIG_SOC_IMX25) += cpu-imx25.o mach-imx25.o pm-imx25.o
 
-obj-$(CONFIG_SOC_IMX27) += cpu-imx27.o pm-imx27.o mach-imx27.o
-obj-$(CONFIG_SOC_IMX27) += mm-imx27.o ehci-imx27.o
+obj-$(CONFIG_SOC_IMX27) += cpu-imx27.o pm-imx27.o mach-imx27.o mm-imx27.o
 
-obj-$(CONFIG_SOC_IMX31) += mm-imx3.o cpu-imx31.o iomux-imx31.o ehci-imx31.o mach-imx31.o
-obj-$(CONFIG_SOC_IMX35) += mm-imx3.o cpu-imx35.o ehci-imx35.o mach-imx35.o
+obj-$(CONFIG_SOC_IMX31) += mm-imx3.o cpu-imx31.o iomux-imx31.o mach-imx31.o
+obj-$(CONFIG_SOC_IMX35) += mm-imx3.o cpu-imx35.o mach-imx35.o
 
 imx5-pm-$(CONFIG_PM) += pm-imx5.o
 obj-$(CONFIG_SOC_IMX5) += cpu-imx5.o $(imx5-pm-y)

2.17.1


_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

Applied all, thanks.

_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel