Skip to contentSkip to conversation

ARM: imx: Remove more board related code

PATCH Applied Fabio Estevam 3 participants 13 messages Sep 11, 2020 – Sep 13, 2020

Subsystems (3)
lore
Share & tools
lore
author reviewer
#2 lore raw

PATCH 2/9 ARM: imx27: Remove iomux-v1 board code

In reply to Fabio Estevam

IMX_HAVE_IOMUX_V1 was only used by i.MX27 board files. Since the board files users are gone, it is safe to remove iomux-v1 related code.

---
 arch/arm/mach-imx/Kconfig    |   4 -
 arch/arm/mach-imx/Makefile   |   1 -
 arch/arm/mach-imx/iomux-v1.c | 174 -----------------------------------
 arch/arm/mach-imx/mm-imx27.c |   4 -
 4 files changed, 183 deletions(-)
 delete mode 100644 arch/arm/mach-imx/iomux-v1.c
arch/arm/mach-imx/Kconfig +0 -4
index c23e10fa8242..138c5344f2f2 100644
@@ -47,9 +47,6 @@ config HAVE_IMX_SRC
 	def_bool y if SMP
 	select ARCH_HAS_RESET_CONTROLLER
 
-config IMX_HAVE_IOMUX_V1
-	bool
-
 config ARCH_MXC_IOMUX_V3
 	bool
 
@@ -99,7 +96,6 @@ config SOC_IMX25
 
 config SOC_IMX27
 	bool "i.MX27 support"
-	select IMX_HAVE_IOMUX_V1
 	select CPU_ARM926T
 	select MXC_AVIC
 	select PINCTRL_IMX27
arch/arm/mach-imx/Makefile +0 -1
index ca35d3e4cab4..7fe3060c300e 100644
@@ -11,7 +11,6 @@ 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)
 
-obj-$(CONFIG_IMX_HAVE_IOMUX_V1) += iomux-v1.o
 obj-$(CONFIG_ARCH_MXC_IOMUX_V3) += iomux-v3.o
 
 obj-$(CONFIG_MXC_TZIC) += tzic.o
arch/arm/mach-imx/iomux-v1.c deleted +0 -174

174 lines not on this page · raw message

arch/arm/mach-imx/mm-imx27.c +0 -4
index caf1da1754f6..17345066b043 100644
@@ -7,13 +7,11 @@
 
 #include <linux/mm.h>
 #include <linux/init.h>
-#include <linux/pinctrl/machine.h>
 #include <asm/mach/map.h>
 
 #include "common.h"
 #include "devices/devices-common.h"
 #include "hardware.h"
-#include "iomux-v1.h"
 
 /* MX27 memory map definition */
 static struct map_desc imx27_io_desc[] __initdata = {
@@ -52,8 +50,6 @@ void __init mx27_map_io(void)
 void __init imx27_init_early(void)
 {
 	mxc_set_cpu_type(MXC_CPU_MX27);
-	imx_iomuxv1_init(MX27_IO_ADDRESS(MX27_GPIO_BASE_ADDR),
-			MX27_NUM_GPIO_PORT);
 }
 
 void __init mx27_init_irq(void)
Signature · 7 lines
2.17.1


_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
author reviewer
#1 lore raw

PATCH 1/9 ARM: imx27: Remove imx27_soc_init()

In reply to Fabio Estevam

imx27_soc_init() was only used by i.MX27 board files. Since the board files users are gone, it is safe to remove imx27_soc_init() too.

---
 arch/arm/mach-imx/common.h   |  1 -
 arch/arm/mach-imx/mm-imx27.c | 26 --------------------------
 2 files changed, 27 deletions(-)
arch/arm/mach-imx/common.h +0 -1
index 72c3fcc32910..9c1c51c5f46f 100644
@@ -31,7 +31,6 @@ void mx27_init_irq(void);
 void mx31_init_irq(void);
 void mx35_init_irq(void);
 void imx21_soc_init(void);
-void imx27_soc_init(void);
 void imx31_soc_init(void);
 void imx35_soc_init(void);
 int mx21_clocks_init(unsigned long lref, unsigned long fref);
arch/arm/mach-imx/mm-imx27.c +0 -26
index 2717614f101d..caf1da1754f6 100644
@@ -60,29 +60,3 @@ void __init mx27_init_irq(void)
 {
 	mxc_init_irq(MX27_IO_ADDRESS(MX27_AVIC_BASE_ADDR));
 }
-
-static const struct resource imx27_audmux_res[] __initconst = {
-	DEFINE_RES_MEM(MX27_AUDMUX_BASE_ADDR, SZ_4K),
-};
-
-void __init imx27_soc_init(void)
-{
-	mxc_arch_reset_init(MX27_IO_ADDRESS(MX27_WDOG_BASE_ADDR));
-	mxc_device_init();
-
-	/* i.mx27 has the i.mx21 type gpio */
-	mxc_register_gpio("imx21-gpio", 0, MX27_GPIO1_BASE_ADDR, SZ_256, MX27_INT_GPIO, 0);
-	mxc_register_gpio("imx21-gpio", 1, MX27_GPIO2_BASE_ADDR, SZ_256, MX27_INT_GPIO, 0);
-	mxc_register_gpio("imx21-gpio", 2, MX27_GPIO3_BASE_ADDR, SZ_256, MX27_INT_GPIO, 0);
-	mxc_register_gpio("imx21-gpio", 3, MX27_GPIO4_BASE_ADDR, SZ_256, MX27_INT_GPIO, 0);
-	mxc_register_gpio("imx21-gpio", 4, MX27_GPIO5_BASE_ADDR, SZ_256, MX27_INT_GPIO, 0);
-	mxc_register_gpio("imx21-gpio", 5, MX27_GPIO6_BASE_ADDR, SZ_256, MX27_INT_GPIO, 0);
-
-	pinctrl_provide_dummies();
-	imx_add_imx_dma("imx27-dma", MX27_DMA_BASE_ADDR, MX27_INT_DMACH0);
-	/* imx27 has the imx21 type audmux */
-	platform_device_register_simple("imx21-audmux", 0, imx27_audmux_res,
-					ARRAY_SIZE(imx27_audmux_res));
-
-	imx27_pm_init();
-}
Signature · 7 lines
2.17.1


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

Fabio Estevam

author reviewer
#0 lore raw

cover ARM: imx: Remove more board related code

Now that i.MX board files have been removed, here is another round of cleanup that removes unused code.

Fabio Estevam (9):
ARM: imx27: Remove imx27_soc_init()
ARM: imx27: Remove iomux-v1 board code
ARM: imx27: Get rid of mm-imx27.c
ARM: imx27: Retrieve AVIC base address from devicetree
ARM: imx31: Remove remaining i.MX31 board code
ARM: imx3: Remove imx3 soc_init()
ARM: imx: Remove iomux-v3 board code
ARM: imx: Remove imx device directory
ARM: imx: Remove remnant board file support pieces

 arch/arm/mach-imx/3ds_debugboard.c            |  207 ---
 arch/arm/mach-imx/3ds_debugboard.h            |   11 -
 arch/arm/mach-imx/Kconfig                     |   11 -
 arch/arm/mach-imx/Makefile                    |    9 +-
 arch/arm/mach-imx/board-mx31lilly.h           |   28 -
 arch/arm/mach-imx/board-mx31lite.h            |   29 -
 arch/arm/mach-imx/board-mx31moboard.h         |   30 -
 arch/arm/mach-imx/common.h                    |   15 -
 arch/arm/mach-imx/devices-imx27.h             |   86 --
 arch/arm/mach-imx/devices-imx31.h             |   80 --
 arch/arm/mach-imx/devices-imx35.h             |   87 --
 arch/arm/mach-imx/devices/Kconfig             |   71 -
 arch/arm/mach-imx/devices/Makefile            |   28 -
 arch/arm/mach-imx/devices/devices-common.h    |  293 ----
 arch/arm/mach-imx/devices/devices.c           |   35 -
 arch/arm/mach-imx/devices/platform-fec.c      |   49 -
 arch/arm/mach-imx/devices/platform-flexcan.c  |   45 -
 .../mach-imx/devices/platform-fsl-usb2-udc.c  |   51 -
 arch/arm/mach-imx/devices/platform-gpio-mxc.c |   31 -
 .../arm/mach-imx/devices/platform-gpio_keys.c |   15 -
 arch/arm/mach-imx/devices/platform-imx-dma.c  |   44 -
 arch/arm/mach-imx/devices/platform-imx-fb.c   |   47 -
 arch/arm/mach-imx/devices/platform-imx-i2c.c  |   74 -
 .../mach-imx/devices/platform-imx-keypad.c    |   54 -
 arch/arm/mach-imx/devices/platform-imx-ssi.c  |   86 --
 arch/arm/mach-imx/devices/platform-imx-uart.c |   92 --
 arch/arm/mach-imx/devices/platform-imx2-wdt.c |   52 -
 .../arm/mach-imx/devices/platform-imx21-hcd.c |   38 -
 .../mach-imx/devices/platform-imx27-coda.c    |   34 -
 arch/arm/mach-imx/devices/platform-ipu-core.c |  127 --
 .../mach-imx/devices/platform-mx2-camera.c    |   59 -
 arch/arm/mach-imx/devices/platform-mx2-emma.c |   37 -
 arch/arm/mach-imx/devices/platform-mxc-ehci.c |   61 -
 arch/arm/mach-imx/devices/platform-mxc-mmc.c  |   72 -
 arch/arm/mach-imx/devices/platform-mxc_nand.c |   72 -
 arch/arm/mach-imx/devices/platform-mxc_rtc.c  |   43 -
 arch/arm/mach-imx/devices/platform-mxc_w1.c   |   47 -
 arch/arm/mach-imx/devices/platform-pata_imx.c |   45 -
 .../devices/platform-sdhci-esdhc-imx.c        |   64 -
 arch/arm/mach-imx/devices/platform-spi_imx.c  |   78 -
 arch/arm/mach-imx/hardware.h                  |    1 -
 arch/arm/mach-imx/iomux-imx31.c               |  161 ---
 arch/arm/mach-imx/iomux-mx21.h                |  109 --
 arch/arm/mach-imx/iomux-mx27.h                |  192 ---
 arch/arm/mach-imx/iomux-mx2x.h                |  217 ---
 arch/arm/mach-imx/iomux-mx3.h                 |  706 ----------
 arch/arm/mach-imx/iomux-mx35.h                | 1254 -----------------
 arch/arm/mach-imx/iomux-v1.c                  |  174 ---
 arch/arm/mach-imx/iomux-v1.h                  |   81 --
 arch/arm/mach-imx/iomux-v3.c                  |   65 -
 arch/arm/mach-imx/iomux-v3.h                  |  130 --
 arch/arm/mach-imx/mach-imx27.c                |   55 +
 arch/arm/mach-imx/mach-mx31ads.c              |  579 --------
 arch/arm/mach-imx/mm-imx27.c                  |   88 --
 arch/arm/mach-imx/mm-imx3.c                   |  162 ---
 arch/arm/mach-imx/mx21.h                      |  176 ---
 arch/arm/mach-imx/mx31lite-db.c               |  154 --
 arch/arm/mach-imx/pcm037.h                    |   18 -
 arch/arm/mach-imx/ulpi.h                      |   20 -
 59 files changed, 57 insertions(+), 6722 deletions(-)
 delete mode 100644 arch/arm/mach-imx/3ds_debugboard.c
 delete mode 100644 arch/arm/mach-imx/3ds_debugboard.h
 delete mode 100644 arch/arm/mach-imx/board-mx31lilly.h
 delete mode 100644 arch/arm/mach-imx/board-mx31lite.h
 delete mode 100644 arch/arm/mach-imx/board-mx31moboard.h
 delete mode 100644 arch/arm/mach-imx/devices-imx27.h
 delete mode 100644 arch/arm/mach-imx/devices-imx31.h
 delete mode 100644 arch/arm/mach-imx/devices-imx35.h
 delete mode 100644 arch/arm/mach-imx/devices/Kconfig
 delete mode 100644 arch/arm/mach-imx/devices/Makefile
 delete mode 100644 arch/arm/mach-imx/devices/devices-common.h
 delete mode 100644 arch/arm/mach-imx/devices/devices.c
 delete mode 100644 arch/arm/mach-imx/devices/platform-fec.c
 delete mode 100644 arch/arm/mach-imx/devices/platform-flexcan.c
 delete mode 100644 arch/arm/mach-imx/devices/platform-fsl-usb2-udc.c
 delete mode 100644 arch/arm/mach-imx/devices/platform-gpio-mxc.c
 delete mode 100644 arch/arm/mach-imx/devices/platform-gpio_keys.c
 delete mode 100644 arch/arm/mach-imx/devices/platform-imx-dma.c
 delete mode 100644 arch/arm/mach-imx/devices/platform-imx-fb.c
 delete mode 100644 arch/arm/mach-imx/devices/platform-imx-i2c.c
 delete mode 100644 arch/arm/mach-imx/devices/platform-imx-keypad.c
 delete mode 100644 arch/arm/mach-imx/devices/platform-imx-ssi.c
 delete mode 100644 arch/arm/mach-imx/devices/platform-imx-uart.c
 delete mode 100644 arch/arm/mach-imx/devices/platform-imx2-wdt.c
 delete mode 100644 arch/arm/mach-imx/devices/platform-imx21-hcd.c
 delete mode 100644 arch/arm/mach-imx/devices/platform-imx27-coda.c
 delete mode 100644 arch/arm/mach-imx/devices/platform-ipu-core.c
 delete mode 100644 arch/arm/mach-imx/devices/platform-mx2-camera.c
 delete mode 100644 arch/arm/mach-imx/devices/platform-mx2-emma.c
 delete mode 100644 arch/arm/mach-imx/devices/platform-mxc-ehci.c
 delete mode 100644 arch/arm/mach-imx/devices/platform-mxc-mmc.c
 delete mode 100644 arch/arm/mach-imx/devices/platform-mxc_nand.c
 delete mode 100644 arch/arm/mach-imx/devices/platform-mxc_rtc.c
 delete mode 100644 arch/arm/mach-imx/devices/platform-mxc_w1.c
 delete mode 100644 arch/arm/mach-imx/devices/platform-pata_imx.c
 delete mode 100644 arch/arm/mach-imx/devices/platform-sdhci-esdhc-imx.c
 delete mode 100644 arch/arm/mach-imx/devices/platform-spi_imx.c
 delete mode 100644 arch/arm/mach-imx/iomux-imx31.c
 delete mode 100644 arch/arm/mach-imx/iomux-mx21.h
 delete mode 100644 arch/arm/mach-imx/iomux-mx27.h
 delete mode 100644 arch/arm/mach-imx/iomux-mx2x.h
 delete mode 100644 arch/arm/mach-imx/iomux-mx3.h
 delete mode 100644 arch/arm/mach-imx/iomux-mx35.h
 delete mode 100644 arch/arm/mach-imx/iomux-v1.c
 delete mode 100644 arch/arm/mach-imx/iomux-v1.h
 delete mode 100644 arch/arm/mach-imx/iomux-v3.c
 delete mode 100644 arch/arm/mach-imx/iomux-v3.h
 delete mode 100644 arch/arm/mach-imx/mach-mx31ads.c
 delete mode 100644 arch/arm/mach-imx/mm-imx27.c
 delete mode 100644 arch/arm/mach-imx/mx21.h
 delete mode 100644 arch/arm/mach-imx/mx31lite-db.c
 delete mode 100644 arch/arm/mach-imx/pcm037.h
 delete mode 100644 arch/arm/mach-imx/ulpi.h
Signature · 7 lines
2.17.1


_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
author reviewer
#4 lore raw

PATCH 4/9 ARM: imx27: Retrieve AVIC base address from devicetree

Now that imx27 has been converted to a devicetree-only platform, retrieve the AVIC base address from devicetree.

---
 arch/arm/mach-imx/mach-imx27.c | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)
arch/arm/mach-imx/mach-imx27.c +8 -1
index 2d981d1eafbf..84396ccf23f2 100644
@@ -5,6 +5,7 @@
 
 #include <linux/init.h>
 #include <linux/irq.h>
+#include <linux/of_address.h>
 #include <linux/of_irq.h>
 #include <linux/of_platform.h>
 #include <linux/mm.h>
@@ -58,7 +59,13 @@ static void __init imx27_init_early(void)
 
 static void __init mx27_init_irq(void)
 {
-	mxc_init_irq(MX27_IO_ADDRESS(MX27_AVIC_BASE_ADDR));
+	void __iomem *avic_base;
+	struct device_node *np;
+
+	np = of_find_compatible_node(NULL, NULL, "fsl,avic");
+	avic_base = of_iomap(np, 0);
+	BUG_ON(!avic_base);
+	mxc_init_irq(avic_base);
 }
 
 static const char * const imx27_dt_board_compat[] __initconst = {
Signature · 7 lines
2.17.1


_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
author reviewer
#8 lore raw

PATCH 6/9 ARM: imx3: Remove imx3 soc_init()

In reply to Fabio Estevam

imx31_soc_init() and imx35_soc_init() were only used by i.MX31/35 board files. Since the board files users are gone, it is safe to remove imx3 soc_init() functions.

---
 arch/arm/mach-imx/common.h  |   2 -
 arch/arm/mach-imx/mm-imx3.c | 159 ------------------------------------
 2 files changed, 161 deletions(-)
arch/arm/mach-imx/common.h +0 -2
index 6dd86b99cc68..dafc662959a6 100644
@@ -28,8 +28,6 @@ void mx21_init_irq(void);
 void mx31_init_irq(void);
 void mx35_init_irq(void);
 void imx21_soc_init(void);
-void imx31_soc_init(void);
-void imx35_soc_init(void);
 int mx21_clocks_init(unsigned long lref, unsigned long fref);
 int mx27_clocks_init(unsigned long fref);
 int mx31_clocks_init(unsigned long fref);
arch/arm/mach-imx/mm-imx3.c +0 -159

175 lines not on this page · raw message

Signature · 7 lines
2.17.1


_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
author reviewer
#9 lore raw

PATCH 7/9 ARM: imx: Remove iomux-v3 board code

In reply to Fabio Estevam

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.

---
 arch/arm/mach-imx/Kconfig    |   5 --
 arch/arm/mach-imx/Makefile   |   2 -
 arch/arm/mach-imx/iomux-v3.c |  65 ------------------
 arch/arm/mach-imx/iomux-v3.h | 130 -----------------------------------
 arch/arm/mach-imx/mm-imx3.c  |   2 -
 5 files changed, 204 deletions(-)
 delete mode 100644 arch/arm/mach-imx/iomux-v3.c
 delete mode 100644 arch/arm/mach-imx/iomux-v3.h
arch/arm/mach-imx/Kconfig +0 -5
index 138c5344f2f2..0ae09c9c22ae 100644
@@ -47,9 +47,6 @@ config HAVE_IMX_SRC
 	def_bool y if SMP
 	select ARCH_HAS_RESET_CONTROLLER
 
-config ARCH_MXC_IOMUX_V3
-	bool
-
 if ARCH_MULTI_V6
 
 comment "ARM1136 platforms"
@@ -63,7 +60,6 @@ config SOC_IMX31
 
 config SOC_IMX35
 	bool "i.MX35 support"
-	select ARCH_MXC_IOMUX_V3
 	select MXC_AVIC
 	select PINCTRL_IMX35
 	help
@@ -87,7 +83,6 @@ if ARCH_MULTI_V5
 
 config SOC_IMX25
 	bool "i.MX25 support"
-	select ARCH_MXC_IOMUX_V3
 	select CPU_ARM926T
 	select MXC_AVIC
 	select PINCTRL_IMX25
arch/arm/mach-imx/Makefile +0 -2
index a976b120ad45..b3ebfa03c27f 100644
@@ -11,8 +11,6 @@ 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)
 
-obj-$(CONFIG_ARCH_MXC_IOMUX_V3) += iomux-v3.o
-
 obj-$(CONFIG_MXC_TZIC) += tzic.o
 obj-$(CONFIG_MXC_AVIC) += avic.o
 
arch/arm/mach-imx/iomux-v3.c deleted +0 -65

65 lines not on this page · raw message

arch/arm/mach-imx/iomux-v3.h deleted +0 -130

130 lines not on this page · raw message

arch/arm/mach-imx/mm-imx3.c +0 -2
index 66b477586128..35883fa70479 100644
@@ -21,7 +21,6 @@
 #include "crmregs-imx3.h"
 #include "devices/devices-common.h"
 #include "hardware.h"
-#include "iomux-v3.h"
 
 void __iomem *mx3_ccm_base;
 
@@ -140,7 +139,6 @@ static void imx35_idle(void)
 void __init imx35_init_early(void)
 {
 	mxc_set_cpu_type(MXC_CPU_MX35);
-	mxc_iomux_v3_init(MX35_IO_ADDRESS(MX35_IOMUXC_BASE_ADDR));
 	arm_pm_idle = imx35_idle;
 	arch_ioremap_caller = imx3_ioremap_caller;
 	mx3_ccm_base = MX35_IO_ADDRESS(MX35_CCM_BASE_ADDR);
Signature · 7 lines
2.17.1


_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
author reviewer
#3 lore raw

PATCH 3/9 ARM: imx27: Get rid of mm-imx27.c

In reply to Fabio Estevam

Get rid of mm-imx27.c and move its code to the mach-imx27.c file.

This aligns with other i.MX SoC code.

---
 arch/arm/mach-imx/Makefile     |  2 +-
 arch/arm/mach-imx/common.h     |  3 --
 arch/arm/mach-imx/mach-imx27.c | 49 ++++++++++++++++++++++++++++
 arch/arm/mach-imx/mm-imx27.c   | 58 ----------------------------------
 4 files changed, 50 insertions(+), 62 deletions(-)
 delete mode 100644 arch/arm/mach-imx/mm-imx27.c
arch/arm/mach-imx/Makefile +1 -1
index 7fe3060c300e..a976b120ad45 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 mach-imx27.o mm-imx27.o
+obj-$(CONFIG_SOC_IMX27) += cpu-imx27.o pm-imx27.o mach-imx27.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
arch/arm/mach-imx/common.h +0 -3
index 9c1c51c5f46f..6dd86b99cc68 100644
@@ -18,16 +18,13 @@ enum mxc_cpu_pwr_mode;
 struct of_device_id;
 
 void mx21_map_io(void);
-void mx27_map_io(void);
 void mx31_map_io(void);
 void mx35_map_io(void);
 void imx21_init_early(void);
-void imx27_init_early(void);
 void imx31_init_early(void);
 void imx35_init_early(void);
 void mxc_init_irq(void __iomem *);
 void mx21_init_irq(void);
-void mx27_init_irq(void);
 void mx31_init_irq(void);
 void mx35_init_irq(void);
 void imx21_soc_init(void);
arch/arm/mach-imx/mach-imx27.c +49 -0

64 lines not on this page · raw message

arch/arm/mach-imx/mm-imx27.c deleted +0 -58

58 lines not on this page · raw message

Signature · 7 lines
2.17.1


_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
author reviewer
#10 lore raw

PATCH 8/9 ARM: imx: Remove imx device directory

In reply to Fabio Estevam

arch/arm/mach-imx/devices/ contains utilities for registering devices in board file. Now that board files are gone, get rid of the devices directory.

---
 arch/arm/mach-imx/Kconfig                     |   2 -
 arch/arm/mach-imx/Makefile                    |   2 -
 arch/arm/mach-imx/devices/Kconfig             |  71 -----
 arch/arm/mach-imx/devices/Makefile            |  28 --
 arch/arm/mach-imx/devices/devices-common.h    | 293 ------------------
 arch/arm/mach-imx/devices/devices.c           |  35 ---
 arch/arm/mach-imx/devices/platform-fec.c      |  49 ---
 arch/arm/mach-imx/devices/platform-flexcan.c  |  45 ---
 .../mach-imx/devices/platform-fsl-usb2-udc.c  |  51 ---
 arch/arm/mach-imx/devices/platform-gpio-mxc.c |  31 --
 .../arm/mach-imx/devices/platform-gpio_keys.c |  15 -
 arch/arm/mach-imx/devices/platform-imx-dma.c  |  44 ---
 arch/arm/mach-imx/devices/platform-imx-fb.c   |  47 ---
 arch/arm/mach-imx/devices/platform-imx-i2c.c  |  74 -----
 .../mach-imx/devices/platform-imx-keypad.c    |  54 ----
 arch/arm/mach-imx/devices/platform-imx-ssi.c  |  86 -----
 arch/arm/mach-imx/devices/platform-imx-uart.c |  92 ------
 arch/arm/mach-imx/devices/platform-imx2-wdt.c |  52 ----
 .../arm/mach-imx/devices/platform-imx21-hcd.c |  38 ---
 .../mach-imx/devices/platform-imx27-coda.c    |  34 --
 arch/arm/mach-imx/devices/platform-ipu-core.c | 127 --------
 .../mach-imx/devices/platform-mx2-camera.c    |  59 ----
 arch/arm/mach-imx/devices/platform-mx2-emma.c |  37 ---
 arch/arm/mach-imx/devices/platform-mxc-ehci.c |  61 ----
 arch/arm/mach-imx/devices/platform-mxc-mmc.c  |  72 -----
 arch/arm/mach-imx/devices/platform-mxc_nand.c |  72 -----
 arch/arm/mach-imx/devices/platform-mxc_rtc.c  |  43 ---
 arch/arm/mach-imx/devices/platform-mxc_w1.c   |  47 ---
 arch/arm/mach-imx/devices/platform-pata_imx.c |  45 ---
 .../devices/platform-sdhci-esdhc-imx.c        |  64 ----
 arch/arm/mach-imx/devices/platform-spi_imx.c  |  78 -----
 arch/arm/mach-imx/mach-imx27.c                |   1 -
 arch/arm/mach-imx/mm-imx3.c                   |   1 -
 33 files changed, 1850 deletions(-)
 delete mode 100644 arch/arm/mach-imx/devices/Kconfig
 delete mode 100644 arch/arm/mach-imx/devices/Makefile
 delete mode 100644 arch/arm/mach-imx/devices/devices-common.h
 delete mode 100644 arch/arm/mach-imx/devices/devices.c
 delete mode 100644 arch/arm/mach-imx/devices/platform-fec.c
 delete mode 100644 arch/arm/mach-imx/devices/platform-flexcan.c
 delete mode 100644 arch/arm/mach-imx/devices/platform-fsl-usb2-udc.c
 delete mode 100644 arch/arm/mach-imx/devices/platform-gpio-mxc.c
 delete mode 100644 arch/arm/mach-imx/devices/platform-gpio_keys.c
 delete mode 100644 arch/arm/mach-imx/devices/platform-imx-dma.c
 delete mode 100644 arch/arm/mach-imx/devices/platform-imx-fb.c
 delete mode 100644 arch/arm/mach-imx/devices/platform-imx-i2c.c
 delete mode 100644 arch/arm/mach-imx/devices/platform-imx-keypad.c
 delete mode 100644 arch/arm/mach-imx/devices/platform-imx-ssi.c
 delete mode 100644 arch/arm/mach-imx/devices/platform-imx-uart.c
 delete mode 100644 arch/arm/mach-imx/devices/platform-imx2-wdt.c
 delete mode 100644 arch/arm/mach-imx/devices/platform-imx21-hcd.c
 delete mode 100644 arch/arm/mach-imx/devices/platform-imx27-coda.c
 delete mode 100644 arch/arm/mach-imx/devices/platform-ipu-core.c
 delete mode 100644 arch/arm/mach-imx/devices/platform-mx2-camera.c
 delete mode 100644 arch/arm/mach-imx/devices/platform-mx2-emma.c
 delete mode 100644 arch/arm/mach-imx/devices/platform-mxc-ehci.c
 delete mode 100644 arch/arm/mach-imx/devices/platform-mxc-mmc.c
 delete mode 100644 arch/arm/mach-imx/devices/platform-mxc_nand.c
 delete mode 100644 arch/arm/mach-imx/devices/platform-mxc_rtc.c
 delete mode 100644 arch/arm/mach-imx/devices/platform-mxc_w1.c
 delete mode 100644 arch/arm/mach-imx/devices/platform-pata_imx.c
 delete mode 100644 arch/arm/mach-imx/devices/platform-sdhci-esdhc-imx.c
 delete mode 100644 arch/arm/mach-imx/devices/platform-spi_imx.c
arch/arm/mach-imx/Kconfig +0 -2
index 0ae09c9c22ae..52902782cc5f 100644
@@ -270,6 +270,4 @@ endchoice
 
 endif
 
-source "arch/arm/mach-imx/devices/Kconfig"
-
 endif
arch/arm/mach-imx/Makefile +0 -2
index b3ebfa03c27f..f3e7717cdbea 100644
@@ -68,5 +68,3 @@ obj-$(CONFIG_SOC_IMX53) += mach-imx53.o
 obj-$(CONFIG_SOC_VF610) += mach-vf610.o
 
 obj-$(CONFIG_SOC_LS1021A) += mach-ls1021a.o
-
-obj-y += devices/
arch/arm/mach-imx/devices/Kconfig deleted +0 -71

71 lines not on this page · raw message

arch/arm/mach-imx/devices/Makefile deleted +0 -28
deleted file mode 100644
index e44758aaa11c..000000000000
@@ -1,28 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0
-obj-y := devices.o
-
-obj-$(CONFIG_IMX_HAVE_PLATFORM_FEC) += platform-fec.o
-obj-$(CONFIG_IMX_HAVE_PLATFORM_FLEXCAN) += platform-flexcan.o
-obj-$(CONFIG_IMX_HAVE_PLATFORM_FSL_USB2_UDC) += platform-fsl-usb2-udc.o
-obj-$(CONFIG_IMX_HAVE_PLATFORM_GPIO_KEYS) += platform-gpio_keys.o
-obj-y += platform-gpio-mxc.o
-obj-$(CONFIG_IMX_HAVE_PLATFORM_IMX21_HCD) += platform-imx21-hcd.o
-obj-$(CONFIG_IMX_HAVE_PLATFORM_IMX27_CODA) += platform-imx27-coda.o
-obj-$(CONFIG_IMX_HAVE_PLATFORM_IMX2_WDT) += platform-imx2-wdt.o
-obj-y += platform-imx-dma.o
-obj-$(CONFIG_IMX_HAVE_PLATFORM_IMX_FB) += platform-imx-fb.o
-obj-$(CONFIG_IMX_HAVE_PLATFORM_IMX_I2C) += platform-imx-i2c.o
-obj-$(CONFIG_IMX_HAVE_PLATFORM_IMX_KEYPAD) += platform-imx-keypad.o
-obj-$(CONFIG_IMX_HAVE_PLATFORM_PATA_IMX) += platform-pata_imx.o
-obj-$(CONFIG_IMX_HAVE_PLATFORM_IMX_SSI) += platform-imx-ssi.o
-obj-$(CONFIG_IMX_HAVE_PLATFORM_IMX_UART) += platform-imx-uart.o
-obj-$(CONFIG_IMX_HAVE_PLATFORM_IPU_CORE) += platform-ipu-core.o
-obj-$(CONFIG_IMX_HAVE_PLATFORM_MX2_CAMERA) += platform-mx2-camera.o
-obj-$(CONFIG_IMX_HAVE_PLATFORM_MXC_EHCI) += platform-mxc-ehci.o
-obj-$(CONFIG_IMX_HAVE_PLATFORM_MXC_MMC) += platform-mxc-mmc.o
-obj-$(CONFIG_IMX_HAVE_PLATFORM_MXC_NAND) += platform-mxc_nand.o
-obj-$(CONFIG_IMX_HAVE_PLATFORM_MXC_RTC) += platform-mxc_rtc.o
-obj-$(CONFIG_IMX_HAVE_PLATFORM_MXC_W1) += platform-mxc_w1.o
-obj-$(CONFIG_IMX_HAVE_PLATFORM_SDHCI_ESDHC_IMX) += platform-sdhci-esdhc-imx.o
-obj-$(CONFIG_IMX_HAVE_PLATFORM_SPI_IMX) +=  platform-spi_imx.o
-obj-$(CONFIG_IMX_HAVE_PLATFORM_MX2_EMMA) += platform-mx2-emma.o
arch/arm/mach-imx/devices/devices-common.h deleted +0 -293

293 lines not on this page · raw message

arch/arm/mach-imx/devices/devices.c deleted +0 -35
deleted file mode 100644
index cd72f0894196..000000000000
@@ -1,35 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0-or-later
-/*
- * Copyright 2008 Sascha Hauer, [email protected]
- */
-
-#include <linux/kernel.h>
-#include <linux/slab.h>
-#include <linux/init.h>
-#include <linux/err.h>
-#include <linux/platform_device.h>
-
-#include "../common.h"
-#include "devices-common.h"
-
-struct device mxc_aips_bus = {
-	.init_name	= "mxc_aips",
-};
-
-struct device mxc_ahb_bus = {
-	.init_name	= "mxc_ahb",
-};
-
-int __init mxc_device_init(void)
-{
-	int ret;
-
-	ret = device_register(&mxc_aips_bus);
-	if (ret < 0)
-		goto done;
-
-	ret = device_register(&mxc_ahb_bus);
-
-done:
-	return ret;
-}
arch/arm/mach-imx/devices/platform-fec.c deleted +0 -49

49 lines not on this page · raw message

arch/arm/mach-imx/devices/platform-flexcan.c deleted +0 -45

45 lines not on this page · raw message

arch/arm/mach-imx/devices/platform-fsl-usb2-udc.c deleted +0 -51

51 lines not on this page · raw message

arch/arm/mach-imx/devices/platform-gpio-mxc.c deleted +0 -31
deleted file mode 100644
index 355de845224c..000000000000
@@ -1,31 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0-only
-/*
- * Copyright 2011 Freescale Semiconductor, Inc. All Rights Reserved.
- * Copyright 2011 Linaro Limited
- */
-#include "devices-common.h"
-#include "../common.h"
-
-struct platform_device *__init mxc_register_gpio(char *name, int id,
-	resource_size_t iobase, resource_size_t iosize, int irq, int irq_high)
-{
-	struct resource res[] = {
-		{
-			.start = iobase,
-			.end = iobase + iosize - 1,
-			.flags = IORESOURCE_MEM,
-		}, {
-			.start = irq,
-			.end = irq,
-			.flags = IORESOURCE_IRQ,
-		}, {
-			.start = irq_high,
-			.end = irq_high,
-			.flags = IORESOURCE_IRQ,
-		},
-	};
-	unsigned int nres;
-
-	nres = irq_high ? ARRAY_SIZE(res) : ARRAY_SIZE(res) - 1;
-	return platform_device_register_resndata(&mxc_aips_bus, name, id, res, nres, NULL, 0);
-}
arch/arm/mach-imx/devices/platform-gpio_keys.c deleted +0 -15
deleted file mode 100644
index 488678403ac8..000000000000
@@ -1,15 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0-or-later
-/*
- * Copyright (C) 2010 Freescale Semiconductor, Inc. All Rights Reserved.
- */
-#include <linux/sizes.h>
-
-#include "../hardware.h"
-#include "devices-common.h"
-
-struct platform_device *__init imx_add_gpio_keys(
-		const struct gpio_keys_platform_data *pdata)
-{
-	return imx_add_platform_device("gpio-keys", -1, NULL,
-		 0, pdata, sizeof(*pdata));
-}
arch/arm/mach-imx/devices/platform-imx-dma.c deleted +0 -44

44 lines not on this page · raw message

arch/arm/mach-imx/devices/platform-imx-fb.c deleted +0 -47

47 lines not on this page · raw message

arch/arm/mach-imx/devices/platform-imx-i2c.c deleted +0 -74

74 lines not on this page · raw message

arch/arm/mach-imx/devices/platform-imx-keypad.c deleted +0 -54

54 lines not on this page · raw message

arch/arm/mach-imx/devices/platform-imx-ssi.c deleted +0 -86

86 lines not on this page · raw message

arch/arm/mach-imx/devices/platform-imx-uart.c deleted +0 -92

92 lines not on this page · raw message

arch/arm/mach-imx/devices/platform-imx2-wdt.c deleted +0 -52

52 lines not on this page · raw message

arch/arm/mach-imx/devices/platform-imx21-hcd.c deleted +0 -38
deleted file mode 100644
index f55763c36d26..000000000000
@@ -1,38 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0-only
-/*
- * Copyright (C) 2010 Pengutronix
- * Uwe Kleine-Koenig <[email protected]>
- */
-#include "../hardware.h"
-#include "devices-common.h"
-
-#define imx_imx21_hcd_data_entry_single(soc)				\
-	{								\
-		.iobase = soc ## _USBOTG_BASE_ADDR,			\
-		.irq = soc ## _INT_USBHOST,				\
-	}
-
-#ifdef CONFIG_SOC_IMX21
-const struct imx_imx21_hcd_data imx21_imx21_hcd_data __initconst =
-	imx_imx21_hcd_data_entry_single(MX21);
-#endif /* ifdef CONFIG_SOC_IMX21 */
-
-struct platform_device *__init imx_add_imx21_hcd(
-		const struct imx_imx21_hcd_data *data,
-		const struct mx21_usbh_platform_data *pdata)
-{
-	struct resource res[] = {
-		{
-			.start = data->iobase,
-			.end = data->iobase + SZ_8K - 1,
-			.flags = IORESOURCE_MEM,
-		}, {
-			.start = data->irq,
-			.end = data->irq,
-			.flags = IORESOURCE_IRQ,
-		},
-	};
-	return imx_add_platform_device_dmamask("imx21-hcd", 0,
-			res, ARRAY_SIZE(res),
-			pdata, sizeof(*pdata), DMA_BIT_MASK(32));
-}
arch/arm/mach-imx/devices/platform-imx27-coda.c deleted +0 -34
deleted file mode 100644
index 66a116e6c6bc..000000000000
@@ -1,34 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0-only
-/*
- * Copyright (C) 2012 Vista Silicon
- * Javier Martin <[email protected]>
- */
-
-#include "../hardware.h"
-#include "devices-common.h"
-
-#ifdef CONFIG_SOC_IMX27
-const struct imx_imx27_coda_data imx27_coda_data __initconst = {
-	.iobase = MX27_VPU_BASE_ADDR,
-	.iosize = SZ_512,
-	.irq = MX27_INT_VPU,
-};
-#endif
-
-struct platform_device *__init imx_add_imx27_coda(
-		const struct imx_imx27_coda_data *data)
-{
-	struct resource res[] = {
-		{
-			.start = data->iobase,
-			.end = data->iobase + data->iosize - 1,
-			.flags = IORESOURCE_MEM,
-		}, {
-			.start = data->irq,
-			.end = data->irq,
-			.flags = IORESOURCE_IRQ,
-		},
-	};
-	return imx_add_platform_device_dmamask("coda-imx27", 0, res, 2, NULL,
-					0, DMA_BIT_MASK(32));
-}
arch/arm/mach-imx/devices/platform-ipu-core.c deleted +0 -127

127 lines not on this page · raw message

arch/arm/mach-imx/devices/platform-mx2-camera.c deleted +0 -59

59 lines not on this page · raw message

arch/arm/mach-imx/devices/platform-mx2-emma.c deleted +0 -37
deleted file mode 100644
index 20f28ba16f36..000000000000
@@ -1,37 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0-only
-/*
- * Copyright (C) 2010 Pengutronix
- * Uwe Kleine-Koenig <[email protected]>
- */
-#include "../hardware.h"
-#include "devices-common.h"
-
-#define imx_mx2_emmaprp_data_entry_single(soc)				\
-	{								\
-		.iobase = soc ## _EMMAPRP_BASE_ADDR,			\
-		.iosize = SZ_256,					\
-		.irq = soc ## _INT_EMMAPRP,				\
-	}
-
-#ifdef CONFIG_SOC_IMX27
-const struct imx_mx2_emma_data imx27_mx2_emmaprp_data __initconst =
-	imx_mx2_emmaprp_data_entry_single(MX27);
-#endif /* ifdef CONFIG_SOC_IMX27 */
-
-struct platform_device *__init imx_add_mx2_emmaprp(
-		const struct imx_mx2_emma_data *data)
-{
-	struct resource res[] = {
-		{
-			.start = data->iobase,
-			.end = data->iobase + data->iosize - 1,
-			.flags = IORESOURCE_MEM,
-		}, {
-			.start = data->irq,
-			.end = data->irq,
-			.flags = IORESOURCE_IRQ,
-		},
-	};
-	return imx_add_platform_device_dmamask("m2m-emmaprp", 0,
-			res, 2, NULL, 0, DMA_BIT_MASK(32));
-}
arch/arm/mach-imx/devices/platform-mxc-ehci.c deleted +0 -61

61 lines not on this page · raw message

arch/arm/mach-imx/devices/platform-mxc-mmc.c deleted +0 -72

72 lines not on this page · raw message

arch/arm/mach-imx/devices/platform-mxc_nand.c deleted +0 -72

72 lines not on this page · raw message

arch/arm/mach-imx/devices/platform-mxc_rtc.c deleted +0 -43

43 lines not on this page · raw message

arch/arm/mach-imx/devices/platform-mxc_w1.c deleted +0 -47

47 lines not on this page · raw message

arch/arm/mach-imx/devices/platform-pata_imx.c deleted +0 -45

45 lines not on this page · raw message

arch/arm/mach-imx/devices/platform-sdhci-esdhc-imx.c deleted +0 -64

64 lines not on this page · raw message

arch/arm/mach-imx/devices/platform-spi_imx.c deleted +0 -78

78 lines not on this page · raw message

arch/arm/mach-imx/mach-imx27.c +0 -1
index 84396ccf23f2..262422a9c196 100644
@@ -14,7 +14,6 @@
 #include <asm/mach/time.h>
 
 #include "common.h"
-#include "devices/devices-common.h"
 #include "hardware.h"
 #include "mx27.h"
 
arch/arm/mach-imx/mm-imx3.c +0 -1
index 35883fa70479..4df7edc7ae7c 100644
@@ -19,7 +19,6 @@
 
 #include "common.h"
 #include "crmregs-imx3.h"
-#include "devices/devices-common.h"
 #include "hardware.h"
 
 void __iomem *mx3_ccm_base;
Signature · 7 lines
2.17.1


_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
author reviewer
#7 lore raw

PATCH 5/9 ARM: imx31: Remove remaining i.MX31 board code

In reply to Fabio Estevam

i.MX31 is a devicetree only platform.

Remove remaining i.MX31 board code.

---
 arch/arm/mach-imx/3ds_debugboard.c    | 207 ---------
 arch/arm/mach-imx/3ds_debugboard.h    |  11 -
 arch/arm/mach-imx/board-mx31lilly.h   |  28 --
 arch/arm/mach-imx/board-mx31lite.h    |  29 --
 arch/arm/mach-imx/board-mx31moboard.h |  30 --
 arch/arm/mach-imx/mach-mx31ads.c      | 579 --------------------------
 arch/arm/mach-imx/mx31lite-db.c       | 154 -------
 arch/arm/mach-imx/pcm037.h            |  18 -
 8 files changed, 1056 deletions(-)
 delete mode 100644 arch/arm/mach-imx/3ds_debugboard.c
 delete mode 100644 arch/arm/mach-imx/3ds_debugboard.h
 delete mode 100644 arch/arm/mach-imx/board-mx31lilly.h
 delete mode 100644 arch/arm/mach-imx/board-mx31lite.h
 delete mode 100644 arch/arm/mach-imx/board-mx31moboard.h
 delete mode 100644 arch/arm/mach-imx/mach-mx31ads.c
 delete mode 100644 arch/arm/mach-imx/mx31lite-db.c
 delete mode 100644 arch/arm/mach-imx/pcm037.h
arch/arm/mach-imx/3ds_debugboard.c deleted +0 -207
deleted file mode 100644
index 0e018000715a..000000000000
@@ -1,207 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0-or-later
-/*
- * Copyright 2008-2009 Freescale Semiconductor, Inc. All Rights Reserved.
- * Copyright (C) 2010 Jason Wang <[email protected]>
- */
-
-#include <linux/interrupt.h>
-#include <linux/irq.h>
-#include <linux/irqdomain.h>
-#include <linux/io.h>
-#include <linux/platform_device.h>
-#include <linux/gpio.h>
-#include <linux/module.h>
-#include <linux/smsc911x.h>
-#include <linux/regulator/machine.h>
-#include <linux/regulator/fixed.h>
-#include "3ds_debugboard.h"
-#include "hardware.h"
-
-/* LAN9217 ethernet base address */
-#define LAN9217_BASE_ADDR(n)	(n + 0x0)
-/* External UART */
-#define UARTA_BASE_ADDR(n)	(n + 0x8000)
-#define UARTB_BASE_ADDR(n)	(n + 0x10000)
-
-#define BOARD_IO_ADDR(n)	(n + 0x20000)
-/* LED switchs */
-#define LED_SWITCH_REG		0x00
-/* buttons */
-#define SWITCH_BUTTONS_REG	0x08
-/* status, interrupt */
-#define INTR_STATUS_REG	0x10
-#define INTR_MASK_REG		0x38
-#define INTR_RESET_REG		0x20
-/* magic word for debug CPLD */
-#define MAGIC_NUMBER1_REG	0x40
-#define MAGIC_NUMBER2_REG	0x48
-/* CPLD code version */
-#define CPLD_CODE_VER_REG	0x50
-/* magic word for debug CPLD */
-#define MAGIC_NUMBER3_REG	0x58
-/* module reset register*/
-#define MODULE_RESET_REG	0x60
-/* CPU ID and Personality ID */
-#define MCU_BOARD_ID_REG	0x68
-
-#define MXC_MAX_EXP_IO_LINES	16
-
-/* interrupts like external uart , external ethernet etc*/
-#define EXPIO_INT_ENET		0
-#define EXPIO_INT_XUART_A	1
-#define EXPIO_INT_XUART_B	2
-#define EXPIO_INT_BUTTON_A	3
-#define EXPIO_INT_BUTTON_B	4
-
-static void __iomem *brd_io;
-static struct irq_domain *domain;
-
-static struct resource smsc911x_resources[] = {
-	{
-		.flags = IORESOURCE_MEM,
-	} , {
-		.flags = IORESOURCE_IRQ,
-	},
-};
-
-static struct smsc911x_platform_config smsc911x_config = {
-	.irq_polarity = SMSC911X_IRQ_POLARITY_ACTIVE_LOW,
-	.flags = SMSC911X_USE_32BIT | SMSC911X_FORCE_INTERNAL_PHY,
-};
-
-static struct platform_device smsc_lan9217_device = {
-	.name = "smsc911x",
-	.id = -1,
-	.dev = {
-		.platform_data = &smsc911x_config,
-	},
-	.num_resources = ARRAY_SIZE(smsc911x_resources),
-	.resource = smsc911x_resources,
-};
-
-static void mxc_expio_irq_handler(struct irq_desc *desc)
-{
-	u32 imr_val;
-	u32 int_valid;
-	u32 expio_irq;
-
-	/* irq = gpio irq number */
-	desc->irq_data.chip->irq_mask(&desc->irq_data);
-
-	imr_val = imx_readw(brd_io + INTR_MASK_REG);
-	int_valid = imx_readw(brd_io + INTR_STATUS_REG) & ~imr_val;
-
-	expio_irq = 0;
-	for (; int_valid != 0; int_valid >>= 1, expio_irq++) {
-		if ((int_valid & 1) == 0)
-			continue;
-		generic_handle_irq(irq_find_mapping(domain, expio_irq));
-	}
-
-	desc->irq_data.chip->irq_ack(&desc->irq_data);
-	desc->irq_data.chip->irq_unmask(&desc->irq_data);
-}
-
-/*
- * Disable an expio pin's interrupt by setting the bit in the imr.
- * Irq is an expio virtual irq number
- */
-static void expio_mask_irq(struct irq_data *d)
-{
-	u16 reg;
-	u32 expio = d->hwirq;
-
-	reg = imx_readw(brd_io + INTR_MASK_REG);
-	reg |= (1 << expio);
-	imx_writew(reg, brd_io + INTR_MASK_REG);
-}
-
-static void expio_ack_irq(struct irq_data *d)
-{
-	u32 expio = d->hwirq;
-
-	imx_writew(1 << expio, brd_io + INTR_RESET_REG);
-	imx_writew(0, brd_io + INTR_RESET_REG);
-	expio_mask_irq(d);
-}
-
-static void expio_unmask_irq(struct irq_data *d)
-{
-	u16 reg;
-	u32 expio = d->hwirq;
-
-	reg = imx_readw(brd_io + INTR_MASK_REG);
-	reg &= ~(1 << expio);
-	imx_writew(reg, brd_io + INTR_MASK_REG);
-}
-
-static struct irq_chip expio_irq_chip = {
-	.irq_ack = expio_ack_irq,
-	.irq_mask = expio_mask_irq,
-	.irq_unmask = expio_unmask_irq,
-};
-
-static struct regulator_consumer_supply dummy_supplies[] = {
-	REGULATOR_SUPPLY("vdd33a", "smsc911x"),
-	REGULATOR_SUPPLY("vddvario", "smsc911x"),
-};
-
-int __init mxc_expio_init(u32 base, u32 intr_gpio)
-{
-	u32 p_irq = gpio_to_irq(intr_gpio);
-	int irq_base;
-	int i;
-
-	brd_io = ioremap(BOARD_IO_ADDR(base), SZ_4K);
-	if (brd_io == NULL)
-		return -ENOMEM;
-
-	if ((imx_readw(brd_io + MAGIC_NUMBER1_REG) != 0xAAAA) ||
-	    (imx_readw(brd_io + MAGIC_NUMBER2_REG) != 0x5555) ||
-	    (imx_readw(brd_io + MAGIC_NUMBER3_REG) != 0xCAFE)) {
-		pr_info("3-Stack Debug board not detected\n");
-		iounmap(brd_io);
-		brd_io = NULL;
-		return -ENODEV;
-	}
-
-	pr_info("3-Stack Debug board detected, rev = 0x%04X\n",
-		readw(brd_io + CPLD_CODE_VER_REG));
-
-	/*
-	 * Configure INT line as GPIO input
-	 */
-	gpio_request(intr_gpio, "expio_pirq");
-	gpio_direction_input(intr_gpio);
-
-	/* disable the interrupt and clear the status */
-	imx_writew(0, brd_io + INTR_MASK_REG);
-	imx_writew(0xFFFF, brd_io + INTR_RESET_REG);
-	imx_writew(0, brd_io + INTR_RESET_REG);
-	imx_writew(0x1F, brd_io + INTR_MASK_REG);
-
-	irq_base = irq_alloc_descs(-1, 0, MXC_MAX_EXP_IO_LINES, numa_node_id());
-	WARN_ON(irq_base < 0);
-
-	domain = irq_domain_add_legacy(NULL, MXC_MAX_EXP_IO_LINES, irq_base, 0,
-				       &irq_domain_simple_ops, NULL);
-	WARN_ON(!domain);
-
-	for (i = irq_base; i < irq_base + MXC_MAX_EXP_IO_LINES; i++) {
-		irq_set_chip_and_handler(i, &expio_irq_chip, handle_level_irq);
-		irq_clear_status_flags(i, IRQ_NOREQUEST);
-	}
-	irq_set_irq_type(p_irq, IRQF_TRIGGER_LOW);
-	irq_set_chained_handler(p_irq, mxc_expio_irq_handler);
-
-	/* Register Lan device on the debugboard */
-	regulator_register_fixed(0, dummy_supplies, ARRAY_SIZE(dummy_supplies));
-
-	smsc911x_resources[0].start = LAN9217_BASE_ADDR(base);
-	smsc911x_resources[0].end = LAN9217_BASE_ADDR(base) + 0x100 - 1;
-	smsc911x_resources[1].start = irq_find_mapping(domain, EXPIO_INT_ENET);
-	smsc911x_resources[1].end = irq_find_mapping(domain, EXPIO_INT_ENET);
-	platform_device_register(&smsc_lan9217_device);
-
-	return 0;
-}
arch/arm/mach-imx/3ds_debugboard.h deleted +0 -11
deleted file mode 100644
index a4d04d099c61..000000000000
@@ -1,11 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-or-later */
-/*
- * Copyright 2008-2009 Freescale Semiconductor, Inc. All Rights Reserved.
- */
-
-#ifndef __ASM_ARCH_MXC_3DS_DB_H__
-#define __ASM_ARCH_MXC_3DS_DB_H__
-
-extern int __init mxc_expio_init(u32 base, u32 intr_gpio);
-
-#endif /* __ASM_ARCH_MXC_3DS_DB_H__ */
arch/arm/mach-imx/board-mx31lilly.h deleted +0 -28
deleted file mode 100644
index 3508c598c588..000000000000
@@ -1,28 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-or-later */
-/*
- * Copyright (C) 2009 Daniel Mack <[email protected]>
- *
- * Based on code for mobots boards,
- *   Copyright (C) 2009 Valentin Longchamp, EPFL Mobots group
- */
-
-#ifndef __ASM_ARCH_MXC_BOARD_MX31LILLY_H__
-#define __ASM_ARCH_MXC_BOARD_MX31LILLY_H__
-
-#ifndef __ASSEMBLY__
-
-enum mx31lilly_boards {
-	MX31LILLY_NOBOARD	= 0,
-	MX31LILLY_DB		= 1,
-};
-
-/*
- * This CPU module needs a baseboard to work. After basic initializing
- * its own devices, it calls the baseboard's init function.
- */
-
-extern void mx31lilly_db_init(void);
-
-#endif
-
-#endif /* __ASM_ARCH_MXC_BOARD_MX31LILLY_H__ */
arch/arm/mach-imx/board-mx31lite.h deleted +0 -29
deleted file mode 100644
index 7d7c6219b25f..000000000000
@@ -1,29 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-or-later */
-/*
- * Copyright 2007 Freescale Semiconductor, Inc. All Rights Reserved.
- * Copyright (C) 2009 Daniel Mack <[email protected]>
- *
- * Based on code for mobots boards,
- *   Copyright (C) 2009 Valentin Longchamp, EPFL Mobots group
- */
-
-#ifndef __ASM_ARCH_MXC_BOARD_MX31LITE_H__
-#define __ASM_ARCH_MXC_BOARD_MX31LITE_H__
-
-#ifndef __ASSEMBLY__
-
-enum mx31lite_boards {
-	MX31LITE_NOBOARD	= 0,
-	MX31LITE_DB		= 1,
-};
-
-/*
- * This CPU module needs a baseboard to work. After basic initializing
- * its own devices, it calls the baseboard's init function.
- */
-
-extern void mx31lite_db_init(void);
-
-#endif
-
-#endif /* __ASM_ARCH_MXC_BOARD_MX31LITE_H__ */
arch/arm/mach-imx/board-mx31moboard.h deleted +0 -30
deleted file mode 100644
index 6f3ff4d4ebc1..000000000000
@@ -1,30 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-or-later */
-/*
- * Copyright (C) 2009 Valentin Longchamp, EPFL Mobots group
- */
-
-#ifndef __ASM_ARCH_MXC_BOARD_MX31MOBOARD_H__
-#define __ASM_ARCH_MXC_BOARD_MX31MOBOARD_H__
-
-#ifndef __ASSEMBLY__
-
-enum mx31moboard_boards {
-	MX31NOBOARD	= 0,
-	MX31DEVBOARD	= 1,
-	MX31MARXBOT	= 2,
-	MX31SMARTBOT	= 3,
-	MX31EYEBOT	= 4,
-};
-
-/*
- * This CPU module needs a baseboard to work. After basic initializing
- * its own devices, it calls the baseboard's init function.
- */
-
-extern void mx31moboard_devboard_init(void);
-extern void mx31moboard_marxbot_init(void);
-extern void mx31moboard_smartbot_init(int board);
-
-#endif
-
-#endif /* __ASM_ARCH_MXC_BOARD_MX31MOBOARD_H__ */
arch/arm/mach-imx/mach-mx31ads.c deleted +0 -579

579 lines not on this page · raw message

arch/arm/mach-imx/mx31lite-db.c deleted +0 -154

154 lines not on this page · raw message

arch/arm/mach-imx/pcm037.h deleted +0 -18
deleted file mode 100644
index 470d3c887e14..000000000000
@@ -1,18 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0 */
-#ifndef __PCM037_H__
-#define __PCM037_H__
-
-enum pcm037_board_variant {
-	PCM037_PCM970,
-	PCM037_EET,
-};
-
-extern enum pcm037_board_variant pcm037_variant(void);
-
-#ifdef CONFIG_MACH_PCM037_EET
-int pcm037_eet_init_devices(void);
-#else
-static inline int pcm037_eet_init_devices(void) { return 0; }
-#endif
-
-#endif
Signature · 7 lines
2.17.1


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

Re: [PATCH 4/9] ARM: imx27: Retrieve AVIC base address from devicetree

In reply to Fabio Estevam
Quoted 9 lines · Fabio Estevam

Now that imx27 has been converted to a devicetree-only platform, retrieve the AVIC base address from devicetree.

static void __init mx27_init_irq(void)
{

arch/arm/mach-imx/mach-imx27.c static void __init imx27_init_early(void) · line 69

Quoted 9 lines
arch/arm/mach-imx/mach-imx27.c +7 -1
-       mxc_init_irq(MX27_IO_ADDRESS(MX27_AVIC_BASE_ADDR));
+       void __iomem *avic_base;
+       struct device_node *np;
+
+       np = of_find_compatible_node(NULL, NULL, "fsl,avic");
+       avic_base = of_iomap(np, 0);
+       BUG_ON(!avic_base);
+       mxc_init_irq(avic_base);
 }

I see this function is identical to mx25_init_irq(). Maybe just move the code into mxc_init_irq() directly and pass NULL from mx27_init_irq()?

Are you able to completely eliminate MX27_IO_ADDRESS()? If not, I probably wouldn't bother, but if you can, that sounds like a useful cleanup.

Arnd

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

Acked-by on the v1 series
#11 lore raw
In reply to Fabio Estevam
Quoted 4 lines · Fabio Estevam

Now that i.MX board files have been removed, here is another round of cleanup that removes unused code.

Quoted 10 lines

Fabio Estevam (9):
ARM: imx27: Remove imx27_soc_init()
ARM: imx27: Remove iomux-v1 board code
ARM: imx27: Get rid of mm-imx27.c
ARM: imx27: Retrieve AVIC base address from devicetree
ARM: imx31: Remove remaining i.MX31 board code
ARM: imx3: Remove imx3 soc_init()
ARM: imx: Remove iomux-v3 board code
ARM: imx: Remove imx device directory
ARM: imx: Remove remnant board file support pieces

Nice cleanup!

Whole series (regardless of the one comment I had):

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

author reviewer
#6 lore raw

Re: [PATCH 4/9] ARM: imx27: Retrieve AVIC base address from devicetree

In reply to Arnd Bergmann

Hi Arnd,

Quoted 2 lines · Arnd Bergmann

I see this function is identical to mx25_init_irq(). Maybe just move the code into mxc_init_irq() directly and pass NULL from mx27_init_irq()?

Yes, good idea. I will do as suggested on a follow-up series.

Quoted 3 lines

Are you able to completely eliminate MX27_IO_ADDRESS()? If not, I probably wouldn't bother, but if you can, that sounds like a useful cleanup.

Yes, I plan to eliminate MX27_IO_ADDRESS(), MX31_IO_ADDRESS() and MX35_IO_ADDRESS().

Will handle this in a follow-up series as well after this one lands in linux-next.

Thanks,

Fabio Estevam

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

Applied
#12 lore raw
In reply to Fabio Estevam
Quoted 13 lines · Fabio Estevam

Now that i.MX board files have been removed, here is another round of cleanup that removes unused code.

Fabio Estevam (9):
ARM: imx27: Remove imx27_soc_init()
ARM: imx27: Remove iomux-v1 board code
ARM: imx27: Get rid of mm-imx27.c
ARM: imx27: Retrieve AVIC base address from devicetree
ARM: imx31: Remove remaining i.MX31 board code
ARM: imx3: Remove imx3 soc_init()
ARM: imx: Remove iomux-v3 board code
ARM: imx: Remove imx device directory
ARM: imx: Remove remnant board file support pieces

Applied all, thanks.

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