ARM: mx25: Remove mx25_clocks_init()

PATCH Superseded Fabio Estevam 2 participants 10 messages 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-11 12:43 UTC #0 lore raw

PATCH 1/7 ARM: mx25: Remove mx25_clocks_init()

From: Fabio Estevam <[email protected]>

mx25_clocks_init() is only used to register the clocks for non-dt platforms.

As mx25 has been converted to a dt-only platform, we can safely remove it.

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

---
 arch/arm/mach-imx/clk-imx25.c | 75 -------------------------------------------
 arch/arm/mach-imx/common.h    |  1 -
 2 files changed, 76 deletions(-)

arch/arm/mach-imx/clk-imx25.c +0 ~~-75~~

index 59c0c85..9c2633a 100644
@@ -30,7 +30,6 @@
 #include "clk.h"
 #include "common.h"
 #include "hardware.h"
-#include "mx25.h"
 
 #define CCM_MPCTL	0x00
 #define CCM_UPCTL	0x04

@@ -239,80 +238,6 @@ static int __init __mx25_clocks_init(unsigned long osc_rate,
 	return 0;
 }
 
-int __init mx25_clocks_init(void)
-{
-	void __iomem *ccm;
-
-	ccm = ioremap(MX25_CRM_BASE_ADDR, SZ_16K);
-
-	__mx25_clocks_init(24000000, ccm);
-
-	clk_register_clkdev(clk[gpt1_ipg], "ipg", "imx-gpt.0");
-	clk_register_clkdev(clk[gpt_ipg_per], "per", "imx-gpt.0");
-	/* i.mx25 has the i.mx21 type uart */
-	clk_register_clkdev(clk[uart1_ipg], "ipg", "imx21-uart.0");
-	clk_register_clkdev(clk[uart_ipg_per], "per", "imx21-uart.0");
-	clk_register_clkdev(clk[uart2_ipg], "ipg", "imx21-uart.1");
-	clk_register_clkdev(clk[uart_ipg_per], "per", "imx21-uart.1");
-	clk_register_clkdev(clk[uart3_ipg], "ipg", "imx21-uart.2");
-	clk_register_clkdev(clk[uart_ipg_per], "per", "imx21-uart.2");
-	clk_register_clkdev(clk[uart4_ipg], "ipg", "imx21-uart.3");
-	clk_register_clkdev(clk[uart_ipg_per], "per", "imx21-uart.3");
-	clk_register_clkdev(clk[uart5_ipg], "ipg", "imx21-uart.4");
-	clk_register_clkdev(clk[uart_ipg_per], "per", "imx21-uart.4");
-	clk_register_clkdev(clk[ipg], "ipg", "mxc-ehci.0");
-	clk_register_clkdev(clk[usbotg_ahb], "ahb", "mxc-ehci.0");
-	clk_register_clkdev(clk[usb_div], "per", "mxc-ehci.0");
-	clk_register_clkdev(clk[ipg], "ipg", "mxc-ehci.1");
-	clk_register_clkdev(clk[usbotg_ahb], "ahb", "mxc-ehci.1");
-	clk_register_clkdev(clk[usb_div], "per", "mxc-ehci.1");
-	clk_register_clkdev(clk[ipg], "ipg", "mxc-ehci.2");
-	clk_register_clkdev(clk[usbotg_ahb], "ahb", "mxc-ehci.2");
-	clk_register_clkdev(clk[usb_div], "per", "mxc-ehci.2");
-	clk_register_clkdev(clk[ipg], "ipg", "imx-udc-mx27");
-	clk_register_clkdev(clk[usbotg_ahb], "ahb", "imx-udc-mx27");
-	clk_register_clkdev(clk[usb_div], "per", "imx-udc-mx27");
-	clk_register_clkdev(clk[nfc_ipg_per], NULL, "imx25-nand.0");
-	/* i.mx25 has the i.mx35 type cspi */
-	clk_register_clkdev(clk[cspi1_ipg], NULL, "imx35-cspi.0");
-	clk_register_clkdev(clk[cspi2_ipg], NULL, "imx35-cspi.1");
-	clk_register_clkdev(clk[cspi3_ipg], NULL, "imx35-cspi.2");
-	clk_register_clkdev(clk[kpp_ipg], NULL, "imx-keypad");
-	clk_register_clkdev(clk[tsc_ipg], NULL, "mx25-adc");
-	clk_register_clkdev(clk[i2c_ipg_per], NULL, "imx21-i2c.0");
-	clk_register_clkdev(clk[i2c_ipg_per], NULL, "imx21-i2c.1");
-	clk_register_clkdev(clk[i2c_ipg_per], NULL, "imx21-i2c.2");
-	clk_register_clkdev(clk[fec_ipg], "ipg", "imx25-fec.0");
-	clk_register_clkdev(clk[fec_ahb], "ahb", "imx25-fec.0");
-	clk_register_clkdev(clk[dryice_ipg], NULL, "imxdi_rtc.0");
-	clk_register_clkdev(clk[lcdc_ipg_per], "per", "imx21-fb.0");
-	clk_register_clkdev(clk[lcdc_ipg], "ipg", "imx21-fb.0");
-	clk_register_clkdev(clk[lcdc_ahb], "ahb", "imx21-fb.0");
-	clk_register_clkdev(clk[wdt_ipg], NULL, "imx2-wdt.0");
-	clk_register_clkdev(clk[ssi1_ipg], NULL, "imx-ssi.0");
-	clk_register_clkdev(clk[ssi2_ipg], NULL, "imx-ssi.1");
-	clk_register_clkdev(clk[esdhc1_ipg_per], "per", "sdhci-esdhc-imx25.0");
-	clk_register_clkdev(clk[esdhc1_ipg], "ipg", "sdhci-esdhc-imx25.0");
-	clk_register_clkdev(clk[esdhc1_ahb], "ahb", "sdhci-esdhc-imx25.0");
-	clk_register_clkdev(clk[esdhc2_ipg_per], "per", "sdhci-esdhc-imx25.1");
-	clk_register_clkdev(clk[esdhc2_ipg], "ipg", "sdhci-esdhc-imx25.1");
-	clk_register_clkdev(clk[esdhc2_ahb], "ahb", "sdhci-esdhc-imx25.1");
-	clk_register_clkdev(clk[csi_ipg_per], "per", "imx25-camera.0");
-	clk_register_clkdev(clk[csi_ipg], "ipg", "imx25-camera.0");
-	clk_register_clkdev(clk[csi_ahb], "ahb", "imx25-camera.0");
-	clk_register_clkdev(clk[dummy], "audmux", NULL);
-	clk_register_clkdev(clk[can1_ipg], NULL, "flexcan.0");
-	clk_register_clkdev(clk[can2_ipg], NULL, "flexcan.1");
-	/* i.mx25 has the i.mx35 type sdma */
-	clk_register_clkdev(clk[sdma_ipg], "ipg", "imx35-sdma");
-	clk_register_clkdev(clk[sdma_ahb], "ahb", "imx35-sdma");
-	clk_register_clkdev(clk[iim_ipg], "iim", NULL);
-
-	mxc_timer_init(MX25_IO_ADDRESS(MX25_GPT1_BASE_ADDR), MX25_INT_GPT1);
-
-	return 0;
-}
-
 static void __init mx25_clocks_init_dt(struct device_node *np)
 {
 	struct device_node *refnp;

arch/arm/mach-imx/common.h +0 -1

index 1028b6c..a12b52d 100644
@@ -51,7 +51,6 @@ void epit_timer_init(void __iomem *base, int irq);
 void mxc_timer_init(void __iomem *, int);
 int mx1_clocks_init(unsigned long fref);
 int mx21_clocks_init(unsigned long lref, unsigned long fref);
-int mx25_clocks_init(void);
 int mx27_clocks_init(unsigned long fref);
 int mx31_clocks_init(unsigned long fref);
 int mx35_clocks_init(void);

Signature · 1 line

1.9.1

Fabio Estevam

author reviewer

2015-03-11 12:43 UTC #1 lore raw

PATCH 2/7 ARM: mx25: Remove mm-imx25.c

From: Fabio Estevam <[email protected]>

Move the functionality from mm-imx25.c into arch/arm/mach-imx/mach-imx25.c as done by other i.MX SoCs.

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

---
 arch/arm/mach-imx/Makefile     |  2 +-
 arch/arm/mach-imx/common.h     |  4 --
 arch/arm/mach-imx/mach-imx25.c | 41 ++++++++++++++++++-
 arch/arm/mach-imx/mm-imx25.c   | 89 ------------------------------------------
 4 files changed, 41 insertions(+), 95 deletions(-)
 delete mode 100644 arch/arm/mach-imx/mm-imx25.c

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

index 86c6470..3244cf1 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 cpu-imx25.o mach-imx25.o
+obj-$(CONFIG_SOC_IMX25) += clk-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/common.h +0 -4

index a12b52d..771ecfe 100644
@@ -23,13 +23,11 @@ struct of_device_id;
 
 void mx1_map_io(void);
 void mx21_map_io(void);
-void mx25_map_io(void);
 void mx27_map_io(void);
 void mx31_map_io(void);
 void mx35_map_io(void);
 void imx1_init_early(void);
 void imx21_init_early(void);
-void imx25_init_early(void);
 void imx27_init_early(void);
 void imx31_init_early(void);
 void imx35_init_early(void);

@@ -37,13 +35,11 @@ void mxc_init_irq(void __iomem *);
 void tzic_init_irq(void);
 void mx1_init_irq(void);
 void mx21_init_irq(void);
-void mx25_init_irq(void);
 void mx27_init_irq(void);
 void mx31_init_irq(void);
 void mx35_init_irq(void);
 void imx1_soc_init(void);
 void imx21_soc_init(void);
-void imx25_soc_init(void);
 void imx27_soc_init(void);
 void imx31_soc_init(void);
 void imx35_soc_init(void);

arch/arm/mach-imx/mach-imx25.c +40 -1

52 lines not on this page · raw message

arch/arm/mach-imx/mm-imx25.c deleted +0 ~~-89~~

89 lines not on this page · raw message

Signature · 1 line

1.9.1

Fabio Estevam

author reviewer

2015-03-11 12:43 UTC #2 lore raw

PATCH 3/7 ARM: mx25: Remove static memory mapping

In reply to Fabio Estevam

From: Fabio Estevam <[email protected]>

We use dynamic memory mapping when using dt, so remove all the static mappings.

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

---
 arch/arm/mach-imx/mach-imx25.c | 21 ---------------------
 1 file changed, 21 deletions(-)

arch/arm/mach-imx/mach-imx25.c +0 ~~-21~~

index 7cad96d..1a2c5de 100644
@@ -20,26 +20,6 @@
 #include "common.h"
 #include "hardware.h"
 
-/*
- * This table defines static virtual address mappings for I/O regions.
- * These are the mappings common across all MX25 boards.
- */
-static struct map_desc mx25_io_desc[] __initdata = {
-	imx_map_entry(MX25, AVIC, MT_DEVICE_NONSHARED),
-	imx_map_entry(MX25, AIPS1, MT_DEVICE_NONSHARED),
-	imx_map_entry(MX25, AIPS2, MT_DEVICE_NONSHARED),
-};
-
-/*
- * This function initializes the memory map. It is called during the
- * system startup to create static physical to virtual memory mappings
- * for the IO modules.
- */
-void static __init mx25_map_io(void)
-{
-	iotable_init(mx25_io_desc, ARRAY_SIZE(mx25_io_desc));
-}
-
 void static __init imx25_init_early(void)
 {
 	mxc_set_cpu_type(MXC_CPU_MX25);

@@ -62,7 +42,6 @@ static const char * const imx25_dt_board_compat[] __initconst = {
 };
 
 DT_MACHINE_START(IMX25_DT, "Freescale i.MX25 (Device Tree Support)")
-	.map_io		= mx25_map_io,
 	.init_early	= imx25_init_early,
 	.init_irq	= mx25_init_irq,
 	.dt_compat	= imx25_dt_board_compat,

Signature · 1 line

1.9.1

Fabio Estevam

author reviewer

2015-03-11 12:43 UTC #3 lore raw

PATCH 4/7 ARM: mx25: Retrieve IIM base from dt

In reply to Fabio Estevam

From: Fabio Estevam <[email protected]>

We should use dt to retrieve the IIM base address.

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

---
 arch/arm/mach-imx/cpu-imx25.c | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

arch/arm/mach-imx/cpu-imx25.c +10 -1

index 96ec64b..0d2d860 100644
@@ -11,6 +11,8 @@
  */
 #include <linux/module.h>
 #include <linux/io.h>
+#include <linux/of.h>
+#include <linux/of_address.h>
 
 #include "iim.h"
 #include "hardware.h"

@@ -20,8 +22,15 @@ static int mx25_cpu_rev = -1;
 static int mx25_read_cpu_rev(void)
 {
 	u32 rev;
+	void __iomem *iim_base;
+	struct device_node *np;
+
+	np = of_find_compatible_node(NULL, NULL, "fsl,imx25-iim");
+	iim_base = of_iomap(np, 0);
+	WARN_ON(!iim_base);
+	rev = readl(iim_base + MXC_IIMSREV);
+	iounmap(iim_base);
 
-	rev = __raw_readl(MX25_IO_ADDRESS(MX25_IIM_BASE_ADDR + MXC_IIMSREV));
 	switch (rev) {
 	case 0x00:
 		return IMX_CHIP_REVISION_1_0;

Signature · 1 line

1.9.1

Russell King - ARM Linux

2015-03-11 13:24 UTC #4 lore raw

PATCH 4/7 ARM: mx25: Retrieve IIM base from dt

arch/arm/mach-imx/cpu-imx25.c static int mx25_cpu_rev = -1; · line 32

Quoted 8 lines · Fabio Estevam

arch/arm/mach-imx/cpu-imx25.c +8 -0

+	void __iomem *iim_base;
+	struct device_node *np;
+
+	np = of_find_compatible_node(NULL, NULL, "fsl,imx25-iim");
+	iim_base = of_iomap(np, 0);
+	WARN_ON(!iim_base);
+	rev = readl(iim_base + MXC_IIMSREV);
+	iounmap(iim_base);

Is there much point to that WARN_ON()? Are you avoiding the political BUG_ON(!iim_base) ? :)

Since a NULL pointer there will lead to a NULL pointer dereference, it's silly to use WARN_ON() there - we'll get a backtrace etc from the WARN_ON followed immediately by an oops dump due to the readl(), crashing the kernel.

Better to just use BUG_ON() and only get one set of diagnostics.

Signature · 2 lines

FTTC broadband for 0.8mile line: currently at 10.5Mbps down 400kbps up
according to speedtest.net.

Fabio Estevam

author reviewer

2015-03-11 14:20 UTC #5 lore raw

PATCH 4/7 ARM: mx25: Retrieve IIM base from dt

Quoted 13 lines · Russell King - ARM Linux

arch/arm/mach-imx/cpu-imx25.c static int mx25_cpu_rev = -1; · line 32
Quoted 8 lines · Fabio Estevam
arch/arm/mach-imx/cpu-imx25.c +8 -0
+     void __iomem *iim_base;
+     struct device_node *np;
+
+     np = of_find_compatible_node(NULL, NULL, "fsl,imx25-iim");
+     iim_base = of_iomap(np, 0);
+     WARN_ON(!iim_base);
+     rev = readl(iim_base + MXC_IIMSREV);
+     iounmap(iim_base);
Is there much point to that WARN_ON()? Are you avoiding the political BUG_ON(!iim_base) ? :)

Quoted 6 lines

Since a NULL pointer there will lead to a NULL pointer dereference, it's silly to use WARN_ON() there - we'll get a backtrace etc from the WARN_ON followed immediately by an oops dump due to the readl(), crashing the kernel.
Better to just use BUG_ON() and only get one set of diagnostics.

Thanks, will do it in v2.

Fabio Estevam

author reviewer

2015-03-11 12:43 UTC #6 lore raw

PATCH 5/7 ARM: mx25: Remove "mx25.h" header file

In reply to Fabio Estevam

From: Fabio Estevam <[email protected]>

As mx27 has been converted to a dt-only platform, we do not need the "mx25.h" header file anymore.

Remove it and also clean up all the mx25 occurences from the platform helper code.

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

---
 arch/arm/mach-imx/devices/platform-fec.c          |   5 -
 arch/arm/mach-imx/devices/platform-fsl-usb2-udc.c |   5 -
 arch/arm/mach-imx/devices/platform-imx-fb.c       |   5 -
 arch/arm/mach-imx/devices/platform-imx-i2c.c      |  10 --
 arch/arm/mach-imx/devices/platform-imx-keypad.c   |   5 -
 arch/arm/mach-imx/devices/platform-imx-ssi.c      |   9 --
 arch/arm/mach-imx/devices/platform-imx-uart.c     |  12 ---
 arch/arm/mach-imx/devices/platform-imx2-wdt.c     |   5 -
 arch/arm/mach-imx/devices/platform-mx2-camera.c   |   5 -
 arch/arm/mach-imx/devices/platform-mxc-ehci.c     |   7 --
 arch/arm/mach-imx/devices/platform-mxc_nand.c     |   5 -
 arch/arm/mach-imx/devices/platform-spi_imx.c      |  11 --
 arch/arm/mach-imx/hardware.h                      |   1 -
 arch/arm/mach-imx/mx25.h                          | 117 ----------------------
 14 files changed, 202 deletions(-)
 delete mode 100644 arch/arm/mach-imx/mx25.h

arch/arm/mach-imx/devices/platform-fec.c +0 -5

index d86f925..b403a4f 100644
@@ -19,11 +19,6 @@
 		.irq = soc ## _INT_FEC,					\
 	}
 
-#ifdef CONFIG_SOC_IMX25
-const struct imx_fec_data imx25_fec_data __initconst =
-	imx_fec_data_entry_single(MX25, "imx25-fec");
-#endif /* ifdef CONFIG_SOC_IMX25 */
-
 #ifdef CONFIG_SOC_IMX27
 const struct imx_fec_data imx27_fec_data __initconst =
 	imx_fec_data_entry_single(MX27, "imx27-fec");

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

index 23b0061..25e1de6 100644
@@ -18,11 +18,6 @@
 		.irq = soc ## _INT_USB_OTG,				\
 	}
 
-#ifdef CONFIG_SOC_IMX25
-const struct imx_fsl_usb2_udc_data imx25_fsl_usb2_udc_data __initconst =
-	imx_fsl_usb2_udc_data_entry_single(MX25, "imx-udc-mx27");
-#endif /* ifdef CONFIG_SOC_IMX25 */
-
 #ifdef CONFIG_SOC_IMX27
 const struct imx_fsl_usb2_udc_data imx27_fsl_usb2_udc_data __initconst =
 	imx_fsl_usb2_udc_data_entry_single(MX27, "imx-udc-mx27");

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

index 25a47c6..7df6328 100644
@@ -29,11 +29,6 @@ const struct imx_imx_fb_data imx21_imx_fb_data __initconst =
 	imx_imx_fb_data_entry_single(MX21, "imx21-fb", SZ_4K);
 #endif /* ifdef CONFIG_SOC_IMX21 */
 
-#ifdef CONFIG_SOC_IMX25
-const struct imx_imx_fb_data imx25_imx_fb_data __initconst =
-	imx_imx_fb_data_entry_single(MX25, "imx21-fb", SZ_16K);
-#endif /* ifdef CONFIG_SOC_IMX25 */
-
 #ifdef CONFIG_SOC_IMX27
 const struct imx_imx_fb_data imx27_imx_fb_data __initconst =
 	imx_imx_fb_data_entry_single(MX27, "imx21-fb", SZ_4K);

arch/arm/mach-imx/devices/platform-imx-i2c.c +0 ~~-10~~

index 644ac26..ae97915 100644
@@ -31,16 +31,6 @@ const struct imx_imx_i2c_data imx21_imx_i2c_data __initconst =
 	imx_imx_i2c_data_entry_single(MX21, "imx21-i2c", 0, , SZ_4K);
 #endif /* ifdef CONFIG_SOC_IMX21 */
 
-#ifdef CONFIG_SOC_IMX25
-const struct imx_imx_i2c_data imx25_imx_i2c_data[] __initconst = {
-#define imx25_imx_i2c_data_entry(_id, _hwid)				\
-	imx_imx_i2c_data_entry(MX25, "imx21-i2c", _id, _hwid, SZ_16K)
-	imx25_imx_i2c_data_entry(0, 1),
-	imx25_imx_i2c_data_entry(1, 2),
-	imx25_imx_i2c_data_entry(2, 3),
-};
-#endif /* ifdef CONFIG_SOC_IMX25 */
-
 #ifdef CONFIG_SOC_IMX27
 const struct imx_imx_i2c_data imx27_imx_i2c_data[] __initconst = {
 #define imx27_imx_i2c_data_entry(_id, _hwid)				\

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

index f42200b..479e4d7 100644
@@ -21,11 +21,6 @@ const struct imx_imx_keypad_data imx21_imx_keypad_data __initconst =
 	imx_imx_keypad_data_entry_single(MX21, SZ_16);
 #endif /* ifdef CONFIG_SOC_IMX21 */
 
-#ifdef CONFIG_SOC_IMX25
-const struct imx_imx_keypad_data imx25_imx_keypad_data __initconst =
-	imx_imx_keypad_data_entry_single(MX25, SZ_16K);
-#endif /* ifdef CONFIG_SOC_IMX25 */
-
 #ifdef CONFIG_SOC_IMX27
 const struct imx_imx_keypad_data imx27_imx_keypad_data __initconst =
 	imx_imx_keypad_data_entry_single(MX27, SZ_16);

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

index 1c7c721..6f0e94e 100644
@@ -30,15 +30,6 @@ const struct imx_imx_ssi_data imx21_imx_ssi_data[] __initconst = {
 };
 #endif /* ifdef CONFIG_SOC_IMX21 */
 
-#ifdef CONFIG_SOC_IMX25
-const struct imx_imx_ssi_data imx25_imx_ssi_data[] __initconst = {
-#define imx25_imx_ssi_data_entry(_id, _hwid)				\
-	imx_imx_ssi_data_entry(MX25, _id, _hwid, SZ_4K)
-	imx25_imx_ssi_data_entry(0, 1),
-	imx25_imx_ssi_data_entry(1, 2),
-};
-#endif /* ifdef CONFIG_SOC_IMX25 */
-
 #ifdef CONFIG_SOC_IMX27
 const struct imx_imx_ssi_data imx27_imx_ssi_data[] __initconst = {
 #define imx27_imx_ssi_data_entry(_id, _hwid)				\

arch/arm/mach-imx/devices/platform-imx-uart.c +0 ~~-12~~

index 8c01836..6962cff 100644
@@ -47,18 +47,6 @@ const struct imx_imx_uart_1irq_data imx21_imx_uart_data[] __initconst = {
 };
 #endif
 
-#ifdef CONFIG_SOC_IMX25
-const struct imx_imx_uart_1irq_data imx25_imx_uart_data[] __initconst = {
-#define imx25_imx_uart_data_entry(_id, _hwid)				\
-	imx_imx_uart_1irq_data_entry(MX25, _id, _hwid, SZ_16K)
-	imx25_imx_uart_data_entry(0, 1),
-	imx25_imx_uart_data_entry(1, 2),
-	imx25_imx_uart_data_entry(2, 3),
-	imx25_imx_uart_data_entry(3, 4),
-	imx25_imx_uart_data_entry(4, 5),
-};
-#endif /* ifdef CONFIG_SOC_IMX25 */
-
 #ifdef CONFIG_SOC_IMX27
 const struct imx_imx_uart_1irq_data imx27_imx_uart_data[] __initconst = {
 #define imx27_imx_uart_data_entry(_id, _hwid)				\

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

index 54f63bc..8c134c8 100644
@@ -25,11 +25,6 @@ const struct imx_imx2_wdt_data imx21_imx2_wdt_data __initconst =
 	imx_imx2_wdt_data_entry_single(MX21, 0, , SZ_4K);
 #endif /* ifdef CONFIG_SOC_IMX21 */
 
-#ifdef CONFIG_SOC_IMX25
-const struct imx_imx2_wdt_data imx25_imx2_wdt_data __initconst =
-	imx_imx2_wdt_data_entry_single(MX25, 0, , SZ_16K);
-#endif /* ifdef CONFIG_SOC_IMX25 */
-
 #ifdef CONFIG_SOC_IMX27
 const struct imx_imx2_wdt_data imx27_imx2_wdt_data __initconst =
 	imx_imx2_wdt_data_entry_single(MX27, 0, , SZ_4K);

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

index b53e1f3..4c377c3 100644
@@ -27,11 +27,6 @@
 		.irqemmaprp = soc ## _INT_EMMAPRP,			\
 	}
 
-#ifdef CONFIG_SOC_IMX25
-const struct imx_mx2_camera_data imx25_mx2_camera_data __initconst =
-	imx_mx2_camera_data_entry_single(MX25, "imx25-camera");
-#endif /* ifdef CONFIG_SOC_IMX25 */
-
 #ifdef CONFIG_SOC_IMX27
 const struct imx_mx2_camera_data imx27_mx2_camera_data __initconst =
 	imx_mx2_camera_data_entry_single_emma(MX27, "imx27-camera");

arch/arm/mach-imx/devices/platform-mxc-ehci.c +0 -7

index 2963536..4537abd 100644
@@ -18,13 +18,6 @@
 		.irq = soc ## _INT_USB_ ## hs,				\
 	}
 
-#ifdef CONFIG_SOC_IMX25
-const struct imx_mxc_ehci_data imx25_mxc_ehci_otg_data __initconst =
-	imx_mxc_ehci_data_entry_single(MX25, 0, OTG);
-const struct imx_mxc_ehci_data imx25_mxc_ehci_hs_data __initconst =
-	imx_mxc_ehci_data_entry_single(MX25, 1, HS);
-#endif /* ifdef CONFIG_SOC_IMX25 */
-
 #ifdef CONFIG_SOC_IMX27
 const struct imx_mxc_ehci_data imx27_mxc_ehci_otg_data __initconst =
 	imx_mxc_ehci_data_entry_single(MX27, 0, OTG);

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

index fa618a3..676df49 100644
@@ -34,11 +34,6 @@ const struct imx_mxc_nand_data imx21_mxc_nand_data __initconst =
 	imx_mxc_nand_data_entry_single(MX21, "imx21-nand", SZ_4K);
 #endif /* ifdef CONFIG_SOC_IMX21 */
 
-#ifdef CONFIG_SOC_IMX25
-const struct imx_mxc_nand_data imx25_mxc_nand_data __initconst =
-	imx_mxc_nand_data_entry_single(MX25, "imx25-nand", SZ_8K);
-#endif /* ifdef CONFIG_SOC_IMX25 */
-
 #ifdef CONFIG_SOC_IMX27
 const struct imx_mxc_nand_data imx27_mxc_nand_data __initconst =
 	imx_mxc_nand_data_entry_single(MX27, "imx27-nand", SZ_4K);

arch/arm/mach-imx/devices/platform-spi_imx.c +0 ~~-11~~

index aca825d..5e9707b 100644
@@ -39,17 +39,6 @@ const struct imx_spi_imx_data imx21_cspi_data[] __initconst = {
 };
 #endif
 
-#ifdef CONFIG_SOC_IMX25
-/* i.mx25 has the i.mx35 type cspi */
-const struct imx_spi_imx_data imx25_cspi_data[] __initconst = {
-#define imx25_cspi_data_entry(_id, _hwid)				\
-	imx_spi_imx_data_entry(MX25, CSPI, "imx35-cspi", _id, _hwid, SZ_16K)
-	imx25_cspi_data_entry(0, 1),
-	imx25_cspi_data_entry(1, 2),
-	imx25_cspi_data_entry(2, 3),
-};
-#endif /* ifdef CONFIG_SOC_IMX25 */
-
 #ifdef CONFIG_SOC_IMX27
 const struct imx_spi_imx_data imx27_cspi_data[] __initconst = {
 #define imx27_cspi_data_entry(_id, _hwid)				\

arch/arm/mach-imx/hardware.h +0 -1

index 66b2b56..76af2c0 100644
@@ -112,7 +112,6 @@
 #include "mx21.h"
 #include "mx27.h"
 #include "mx1.h"
-#include "mx25.h"
 
 #define imx_map_entry(soc, name, _type)	{				\
 	.virtual = soc ## _IO_P2V(soc ## _ ## name ## _BASE_ADDR),	\

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

117 lines not on this page · raw message

Signature · 1 line

1.9.1

Fabio Estevam

author reviewer

2015-03-11 12:58 UTC #7 lore raw

PATCH 5/7 ARM: mx25: Remove "mx25.h" header file

Hi Shawn,

Quoted 3 lines · Fabio Estevam

From: Fabio Estevam <[email protected]>
As mx27 has been converted to a dt-only platform, we do not need the "mx25.h"

"mx25 has been converted", not mx27. Maybe you could fix this while applying? Otherwise I can send a v2.

Fabio Estevam

author reviewer

2015-03-11 12:43 UTC #8 lore raw

PATCH 6/7 ARM: mx25: Remove imxdi_rtc platform code

In reply to Fabio Estevam

From: Fabio Estevam <[email protected]>

platform-imxdi_rtc.c can is only used by mx25, so it can safely go away now that mx25 has been converted to dt.

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

---
 arch/arm/mach-imx/devices/Kconfig              |  3 --
 arch/arm/mach-imx/devices/Makefile             |  1 -
 arch/arm/mach-imx/devices/platform-imxdi_rtc.c | 42 --------------------------
 3 files changed, 46 deletions(-)
 delete mode 100644 arch/arm/mach-imx/devices/platform-imxdi_rtc.c

arch/arm/mach-imx/devices/Kconfig +0 -3

index 1d2cc18..3a55298 100644
@@ -21,9 +21,6 @@ config IMX_HAVE_PLATFORM_IMX27_CODA
 config IMX_HAVE_PLATFORM_IMX2_WDT
 	bool
 
-config IMX_HAVE_PLATFORM_IMXDI_RTC
-	bool
-
 config IMX_HAVE_PLATFORM_IMX_FB
 	bool

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

index 8fdb12b..e5cf587 100644
@@ -8,7 +8,6 @@ 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-$(CONFIG_IMX_HAVE_PLATFORM_IMXDI_RTC) += platform-imxdi_rtc.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

arch/arm/mach-imx/devices/platform-imxdi_rtc.c deleted +0 ~~-42~~

42 lines not on this page · raw message

Signature · 1 line

1.9.1

Fabio Estevam

author reviewer

2015-03-11 12:43 UTC #9 lore raw

PATCH 7/7 ARM: imx_v4_v5_defconfig: Remove CONFIG_MACH_MX25_3DS

In reply to Fabio Estevam

From: Fabio Estevam <[email protected]>

We do not have CONFIG_MACH_MX25_3DS platform anymore, so update the defconfig.

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

---
 arch/arm/configs/imx_v4_v5_defconfig | 1 -
 1 file changed, 1 deletion(-)

arch/arm/configs/imx_v4_v5_defconfig +0 -1

index b959617..af07e05 100644
@@ -24,7 +24,6 @@ CONFIG_ARCH_MXC=y
 CONFIG_MACH_SCB9328=y
 CONFIG_MACH_APF9328=y
 CONFIG_MACH_MX21ADS=y
-CONFIG_MACH_MX25_3DS=y
 CONFIG_MACH_EUKREA_CPUIMX25SD=y
 CONFIG_SOC_IMX25=y
 CONFIG_MACH_MX27ADS=y

Signature · 1 line

1.9.1