ARM: imx25: Remove eukrea mx25 board files

PATCH Superseded Fabio Estevam 3 participants 8 messages Mar 6, 2015 – Mar 11, 2015

Subsystems (3)

Arm (32-bit) Arm sub-architectures Arm i.MX and Layerscape

lore

Share & tools

lore

Fabio Estevam

author reviewer

2015-03-06 17:25 UTC #0 lore raw

PATCH v2 1/3 ARM: imx25: Remove eukrea mx25 board files

From: Fabio Estevam <[email protected]>

eukrea mx25 is well supported in device tree, so let's get rid of its board files.

Cc Eric B?nard <[email protected]>

Signed-off-by Fabio Estevam <[email protected]>

---
Changes since v1:
- None

 arch/arm/mach-imx/Kconfig                      |  32 ---
 arch/arm/mach-imx/Makefile                     |   2 -
 arch/arm/mach-imx/eukrea_mbimxsd25-baseboard.c | 310 -------------------------
 arch/arm/mach-imx/mach-eukrea_cpuimx25.c       | 172 --------------
 4 files changed, 516 deletions(-)
 delete mode 100644 arch/arm/mach-imx/eukrea_mbimxsd25-baseboard.c
 delete mode 100644 arch/arm/mach-imx/mach-eukrea_cpuimx25.c

arch/arm/mach-imx/Kconfig +0 ~~-32~~

index 247a465..4861ad5 100644
@@ -151,38 +151,6 @@ config MACH_MX21ADS
 
 comment "MX25 platforms:"
 
-config MACH_EUKREA_CPUIMX25SD
-	bool "Support Eukrea CPUIMX25 Platform"
-	select IMX_HAVE_PLATFORM_FLEXCAN
-	select IMX_HAVE_PLATFORM_FSL_USB2_UDC
-	select IMX_HAVE_PLATFORM_IMX2_WDT
-	select IMX_HAVE_PLATFORM_IMXDI_RTC
-	select IMX_HAVE_PLATFORM_IMX_FB
-	select IMX_HAVE_PLATFORM_IMX_I2C
-	select IMX_HAVE_PLATFORM_IMX_UART
-	select IMX_HAVE_PLATFORM_MXC_EHCI
-	select IMX_HAVE_PLATFORM_MXC_NAND
-	select IMX_HAVE_PLATFORM_SDHCI_ESDHC_IMX
-	select USB_ULPI_VIEWPORT if USB_ULPI
-	select SOC_IMX25
-
-choice
-	prompt "Baseboard"
-	depends on MACH_EUKREA_CPUIMX25SD
-	default MACH_EUKREA_MBIMXSD25_BASEBOARD
-
-config MACH_EUKREA_MBIMXSD25_BASEBOARD
-	bool "Eukrea MBIMXSD development board"
-	select IMX_HAVE_PLATFORM_GPIO_KEYS
-	select IMX_HAVE_PLATFORM_IMX_SSI
-	select IMX_HAVE_PLATFORM_SPI_IMX
-	select LEDS_GPIO_REGISTER
-	help
-	  This adds board specific devices that can be found on Eukrea's
-	  MBIMXSD evaluation board.
-
-endchoice
-
 config MACH_IMX25_DT
 	bool "Support i.MX25 platforms from device tree"
 	select SOC_IMX25

arch/arm/mach-imx/Makefile +0 -2

index e92ede9..724b7fb 100644
@@ -49,8 +49,6 @@ obj-$(CONFIG_MACH_IMX1_DT) += imx1-dt.o
 obj-$(CONFIG_MACH_MX21ADS) += mach-mx21ads.o
 
 # i.MX25 based machines
-obj-$(CONFIG_MACH_EUKREA_CPUIMX25SD) += mach-eukrea_cpuimx25.o
-obj-$(CONFIG_MACH_EUKREA_MBIMXSD25_BASEBOARD) += eukrea_mbimxsd25-baseboard.o
 obj-$(CONFIG_MACH_IMX25_DT) += imx25-dt.o
 
 # i.MX27 based machines

arch/arm/mach-imx/eukrea_mbimxsd25-baseboard.c deleted +0 -0

deleted file mode 100644
index e77cc3af..0000000

arch/arm/mach-imx/mach-eukrea_cpuimx25.c deleted +0 -0

deleted file mode 100644
index b2ee6e0..0000000

Signature · 1 line

1.9.1

Fabio Estevam

author reviewer

2015-03-06 17:25 UTC #1 lore raw

PATCH v2 2/3 ARM: mx25: Convert to a dt-only platform

From: Fabio Estevam <[email protected]>

As there is no more mx25 board files, we can turn mx25 into a dt-only platform.

Rename imx25-dt.c to mach-imx25.c to be consistent with the other i.MX SoCs.

Signed-off-by Fabio Estevam <[email protected]>

---
Changes since v1:
- Let config files select CONFIG_SOC_IMX25

 arch/arm/configs/imx_v4_v5_defconfig           |  2 +-
 arch/arm/configs/multi_v5_defconfig            |  2 +-
 arch/arm/mach-imx/Kconfig                      | 28 +++++++++++++-------------
 arch/arm/mach-imx/Makefile                     |  5 +----
 arch/arm/mach-imx/{imx25-dt.c => mach-imx25.c} |  0
 5 files changed, 17 insertions(+), 20 deletions(-)
 rename arch/arm/mach-imx/{imx25-dt.c => mach-imx25.c} (100%)

arch/arm/configs/imx_v4_v5_defconfig +1 -1

index e6b0007..b959617 100644
@@ -26,7 +26,7 @@ CONFIG_MACH_APF9328=y
 CONFIG_MACH_MX21ADS=y
 CONFIG_MACH_MX25_3DS=y
 CONFIG_MACH_EUKREA_CPUIMX25SD=y
-CONFIG_MACH_IMX25_DT=y
+CONFIG_SOC_IMX25=y
 CONFIG_MACH_MX27ADS=y
 CONFIG_MACH_MX27_3DS=y
 CONFIG_MACH_IMX27_VISSTRIM_M10=y

arch/arm/configs/multi_v5_defconfig +1 -1

index 9d56781..f69a459 100644
@@ -13,7 +13,7 @@ CONFIG_ARCH_MVEBU=y
 CONFIG_MACH_KIRKWOOD=y
 CONFIG_MACH_NETXBIG=y
 CONFIG_ARCH_MXC=y
-CONFIG_MACH_IMX25_DT=y
+CONFIG_SOC_IMX25=y
 CONFIG_MACH_IMX27_DT=y
 CONFIG_ARCH_U300=y
 CONFIG_PCI_MVEBU=y

arch/arm/mach-imx/Kconfig +14 ~~-14~~

index 6eec625..ddbb4b8 100644
@@ -77,13 +77,6 @@ config SOC_IMX21
 	select IMX_HAVE_IOMUX_V1
 	select MXC_AVIC
 
-config SOC_IMX25
-	bool
-	select ARCH_MXC_IOMUX_V3
-	select CPU_ARM926T
-	select MXC_AVIC
-	select PINCTRL_IMX25
-
 config SOC_IMX27
 	bool
 	select CPU_ARM926T

@@ -149,13 +142,6 @@ config MACH_MX21ADS
 	  Include support for MX21ADS platform. This includes specific
 	  configurations for the board and its peripherals.
 
-config MACH_IMX25_DT
-	bool "Support i.MX25 platforms from device tree"
-	select SOC_IMX25
-	help
-	  Include support for Freescale i.MX25 based platforms
-	  using the device tree for discovery
-
 comment "MX27 platforms:"
 
 config MACH_MX27ADS

@@ -508,6 +494,20 @@ config MACH_VPR200
 
 endif
 
+if ARCH_MULTI_V5
+
+comment "Device tree only"
+
+config SOC_IMX25
+	bool "i.MX25 support"
+	select ARCH_MXC_IOMUX_V3
+	select CPU_ARM926T
+	select MXC_AVIC
+	select PINCTRL_IMX25
+	help
+	  This enables support for Freescale i.MX25 processor
+endif
+
 if ARCH_MULTI_V7
 
 comment "Device tree only"

arch/arm/mach-imx/Makefile +1 -4

index 724b7fb..45f183a 100644
@@ -3,7 +3,7 @@ obj-y := time.o cpu.o system.o irq-common.o
 obj-$(CONFIG_SOC_IMX1) += clk-imx1.o mm-imx1.o
 obj-$(CONFIG_SOC_IMX21) += clk-imx21.o mm-imx21.o
 
-obj-$(CONFIG_SOC_IMX25) += clk-imx25.o mm-imx25.o ehci-imx25.o cpu-imx25.o
+obj-$(CONFIG_SOC_IMX25) += clk-imx25.o mm-imx25.o ehci-imx25.o cpu-imx25.o mach-imx25.o
 
 obj-$(CONFIG_SOC_IMX27) += cpu-imx27.o pm-imx27.o
 obj-$(CONFIG_SOC_IMX27) += clk-imx27.o mm-imx27.o ehci-imx27.o

@@ -48,9 +48,6 @@ obj-$(CONFIG_MACH_IMX1_DT) += imx1-dt.o
 # i.MX21 based machines
 obj-$(CONFIG_MACH_MX21ADS) += mach-mx21ads.o
 
-# i.MX25 based machines
-obj-$(CONFIG_MACH_IMX25_DT) += imx25-dt.o
-
 # i.MX27 based machines
 obj-$(CONFIG_MACH_MX27ADS) += mach-mx27ads.o
 obj-$(CONFIG_MACH_MX27_3DS) += mach-mx27_3ds.o

arch/arm/mach-imx/mach-imx25.c renamed from arch/arm/mach-imx/imx25-dt.c +0 -0

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

Signature · 1 line

1.9.1

Fabio Estevam

author reviewer

2015-03-06 17:25 UTC #2 lore raw

PATCH v2 3/3 ARM: mx25: Remove platform code support files

In reply to Fabio Estevam

From: Fabio Estevam <[email protected]>

As mx25 is a dt-only platform, we can get rid of platform code support files, which are unused now.

Signed-off-by Fabio Estevam <[email protected]>

---
Changes since v1:
- None

 arch/arm/mach-imx/Makefile        |   2 +-
 arch/arm/mach-imx/devices-imx25.h |  85 -------
 arch/arm/mach-imx/ehci-imx25.c    |  99 -------
 arch/arm/mach-imx/iomux-mx25.h    | 524 --------------------------------------
 4 files changed, 1 insertion(+), 709 deletions(-)
 delete mode 100644 arch/arm/mach-imx/devices-imx25.h
 delete mode 100644 arch/arm/mach-imx/ehci-imx25.c
 delete mode 100644 arch/arm/mach-imx/iomux-mx25.h

arch/arm/mach-imx/Makefile +1 -1

index 45f183a..86c6470 100644
@@ -3,7 +3,7 @@ obj-y := time.o cpu.o system.o irq-common.o
 obj-$(CONFIG_SOC_IMX1) += clk-imx1.o mm-imx1.o
 obj-$(CONFIG_SOC_IMX21) += clk-imx21.o mm-imx21.o
 
-obj-$(CONFIG_SOC_IMX25) += clk-imx25.o mm-imx25.o ehci-imx25.o cpu-imx25.o mach-imx25.o
+obj-$(CONFIG_SOC_IMX25) += clk-imx25.o mm-imx25.o cpu-imx25.o mach-imx25.o
 
 obj-$(CONFIG_SOC_IMX27) += cpu-imx27.o pm-imx27.o
 obj-$(CONFIG_SOC_IMX27) += clk-imx27.o mm-imx27.o ehci-imx27.o

arch/arm/mach-imx/devices-imx25.h deleted +0 ~~-85~~

85 lines not on this page · raw message

arch/arm/mach-imx/ehci-imx25.c deleted +0 ~~-99~~

99 lines not on this page · raw message

arch/arm/mach-imx/iomux-mx25.h deleted +0 ~~-524~~

524 lines not on this page · raw message

Signature · 1 line

1.9.1

Arnd Bergmann

2015-03-09 21:21 UTC #3 lore raw

PATCH v2 3/3 ARM: mx25: Remove platform code support files

Quoted 6 lines · On Friday 06 March 2015 14:25:58 Fabio Estevam wrote:

From: Fabio Estevam <[email protected]>
As mx25 is a dt-only platform, we can get rid of platform code support files, which are unused now.
Signed-off-by Fabio Estevam <[email protected]>

Quoted 9 lines

---
Changes since v1:
- None

 arch/arm/mach-imx/Makefile        |   2 +-
 arch/arm/mach-imx/devices-imx25.h |  85 -------
 arch/arm/mach-imx/ehci-imx25.c    |  99 -------
 arch/arm/mach-imx/iomux-mx25.h    | 524 --------------------------------------

Very nice, good to see some progress on the old machines!

If you find the time, could you summarize your plans for the remaining i.MX SoCs that have board files (imx21, imx27, imx31, imx35)? Do you plan to continue with those, one by one?

Arnd

Fabio Estevam

author reviewer

2015-03-10 01:51 UTC #4 lore raw

PATCH v2 3/3 ARM: mx25: Remove platform code support files

Hi Arnd,

Quoted 5 lines · Arnd Bergmann

Very nice, good to see some progress on the old machines!
If you find the time, could you summarize your plans for the remaining i.MX SoCs that have board files (imx21, imx27, imx31, imx35)? Do you plan to continue with those, one by one?

After this series gets applied I will submit another one removing the remaining mx25 leftovers pieces.

mx27 can be the next one to be converted to dt-only (still need to get ov2640 camera, mc13783 audio and LCD to work in imx27-pdk.dts though).

mx35 should also be simple to convert to dt-only.

mx31 still lacks pinctrl.

I don't have access to imx1/imx21 hardware.

Hopefully someday we can get imx to be dt-only.

Regards,

Fabio Estevam

Arnd Bergmann

2015-03-10 14:52 UTC #5 lore raw

PATCH v2 3/3 ARM: mx25: Remove platform code support files

Quoted 16 lines · On Monday 09 March 2015 22:51:53 Fabio Estevam wrote:

Hi Arnd,
Quoted 5 lines · Arnd Bergmann
Very nice, good to see some progress on the old machines!
If you find the time, could you summarize your plans for the remaining i.MX SoCs that have board files (imx21, imx27, imx31, imx35)? Do you plan to continue with those, one by one?
After this series gets applied I will submit another one removing the remaining mx25 leftovers pieces.
mx27 can be the next one to be converted to dt-only (still need to get ov2640 camera, mc13783 audio and LCD to work in imx27-pdk.dts though).

Quoted 8 lines

mx35 should also be simple to convert to dt-only.
mx31 still lacks pinctrl.
I don't have access to imx1/imx21 hardware.
Hopefully someday we can get imx to be dt-only.

Ok, thanks a lot for the update.

For imx21, we only support the original development board and no real products, which means the platform code is not very valuable and we could drop that if everything else is done.

For imx1, Alexander Shiyan has already submitted a series to remove the board files. I don't know remember if there were remaining objections to that, but it does seem reasonable.

Arnd

Shawn Guo

2015-03-11 01:27 UTC #6 lore raw

PATCH v2 1/3 ARM: imx25: Remove eukrea mx25 board files

In reply to Fabio Estevam

Quoted 7 lines · Fabio Estevam

From: Fabio Estevam <[email protected]>
eukrea mx25 is well supported in device tree, so let's get rid of its board files.
Cc Eric B?nard <[email protected]>
Signed-off-by Fabio Estevam <[email protected]>

The series doesn't apply to imx/cleanup branch. You have '-D' in your git format-patch command again?

Shawn

Fabio Estevam

author reviewer

2015-03-11 01:41 UTC #7 lore raw

PATCH v2 1/3 ARM: imx25: Remove eukrea mx25 board files

Quoted 2 lines · Shawn Guo

The series doesn't apply to imx/cleanup branch. You have '-D' in your git format-patch command again?

Maybe it was another issue. I have generated v3 and confirmed it applies cleanly with git am.

Sorry about that.