Skip to contentSkip to conversation

ARM: mx5: introduce SOC_IMX51

PATCH New Uwe Kleine-König 2 participants 4 messages Nov 26, 2010 – Dec 8, 2010 2 messages not in the archive

lore
Share & tools
lore

A message that is not in the archive (sent off-list or not yet received): 1290724946-23516-1-git-send-email-user@fabio-desktop

#1 lore raw

PATCH v2 1/2 ARM: mx5: introduce SOC_IMX51

Quoted 24 lines · Fabio Estevam

Introduce SOC_IMX51 to keep consistency with the other i.MX devices.

---
applies on Sascha's for-next tree

 arch/arm/mach-mx5/Kconfig                          |   10 +++++++++-
 arch/arm/plat-mxc/devices/Kconfig                  |    4 ++--
 arch/arm/plat-mxc/devices/platform-fec.c           |    2 +-
 arch/arm/plat-mxc/devices/platform-imx-dma.c       |    6 +++---
 arch/arm/plat-mxc/devices/platform-imx-i2c.c       |    4 ++--
 arch/arm/plat-mxc/devices/platform-imx-ssi.c       |    4 ++--
 arch/arm/plat-mxc/devices/platform-imx-uart.c      |    4 ++--
 arch/arm/plat-mxc/devices/platform-mxc_nand.c      |    2 +-
 .../plat-mxc/devices/platform-sdhci-esdhc-imx.c    |    4 ++--
 arch/arm/plat-mxc/devices/platform-spi_imx.c       |    4 ++--
 arch/arm/plat-mxc/ehci.c                           |    2 +-
 11 files changed, 27 insertions(+), 19 deletions(-)
arch/arm/mach-mx5/Kconfig +0 -0
index 88f0c66..be5d9bd 100644

arch/arm/mach-mx5/Kconfig if ARCH_MX5 · line 2

Quoted 1 line
arch/arm/mach-mx5/Kconfig +0 -0
@@ -2,16 +2,20 @@ if ARCH_MX5
 

Maybe add a comment here similar to the one I added to ARCH_MX31?

Other than that looks OK.

Uwe

Quoted 250 lines
arch/arm/mach-mx5/Kconfig +9 -1
 config ARCH_MX51
 	bool
-	default y
+
+config	SOC_IMX51
+	bool
 	select MXC_TZIC
 	select ARCH_MXC_IOMUX_V3
 	select ARCH_MXC_AUDMUX_V2
 	select ARCH_HAS_CPUFREQ
+	select ARCH_MX51
 
 comment "MX5 platforms:"
 
 config MACH_MX51_BABBAGE
 	bool "Support MX51 BABBAGE platforms"
+	select SOC_IMX51
 	select IMX_HAVE_PLATFORM_IMX_I2C
 	select IMX_HAVE_PLATFORM_IMX_UART
 	select IMX_HAVE_PLATFORM_SDHCI_ESDHC_IMX
@@ -23,6 +27,7 @@ config MACH_MX51_BABBAGE
 
 config MACH_MX51_3DS
 	bool "Support MX51PDK (3DS)"
+	select SOC_IMX51
 	select IMX_HAVE_PLATFORM_ESDHC
 	select IMX_HAVE_PLATFORM_IMX_UART
 	select IMX_HAVE_PLATFORM_SPI_IMX
@@ -33,6 +38,7 @@ config MACH_MX51_3DS
 
 config MACH_EUKREA_CPUIMX51
 	bool "Support Eukrea CPUIMX51 module"
+	select SOC_IMX51
 	select IMX_HAVE_PLATFORM_IMX_I2C
 	select IMX_HAVE_PLATFORM_IMX_UART
 	select IMX_HAVE_PLATFORM_MXC_NAND
@@ -58,6 +64,7 @@ endchoice
 
 config MACH_EUKREA_CPUIMX51SD
 	bool "Support Eukrea CPUIMX51SD module"
+	select SOC_IMX51
 	select IMX_HAVE_PLATFORM_IMX_I2C
 	select IMX_HAVE_PLATFORM_SPI_IMX
 	select IMX_HAVE_PLATFORM_IMX_UART
@@ -83,6 +90,7 @@ endchoice
 
 config MACH_MX51_EFIKAMX
 	bool "Support MX51 Genesi Efika MX nettop"
+	select SOC_IMX51
 	select IMX_HAVE_PLATFORM_ESDHC
 	select IMX_HAVE_PLATFORM_IMX_UART
 	select IMX_HAVE_PLATFORM_SPI_IMX
arch/arm/plat-mxc/devices/Kconfig +2 -2
index b391f4d..2537166 100644
@@ -1,6 +1,6 @@
 config IMX_HAVE_PLATFORM_FEC
 	bool
-	default y if ARCH_MX25 || SOC_IMX27 || SOC_IMX35 || ARCH_MX51
+	default y if ARCH_MX25 || SOC_IMX27 || SOC_IMX35 || SOC_IMX51
 
 config IMX_HAVE_PLATFORM_FLEXCAN
 	select HAVE_CAN_FLEXCAN if CAN
@@ -11,7 +11,7 @@ config IMX_HAVE_PLATFORM_FSL_USB2_UDC
 
 config IMX_HAVE_PLATFORM_GPIO_KEYS
 	bool
-	default y if ARCH_MX51
+	default y if SOC_IMX51
 
 config IMX_HAVE_PLATFORM_IMX21_HCD
 	bool
arch/arm/plat-mxc/devices/platform-fec.c +1 -1
index 8d78aed..269ec78 100644
@@ -31,7 +31,7 @@ const struct imx_fec_data imx35_fec_data __initconst =
 	imx_fec_data_entry_single(MX35);
 #endif
 
-#ifdef CONFIG_ARCH_MX51
+#ifdef CONFIG_SOC_IMX51
 const struct imx_fec_data imx51_fec_data __initconst =
 	imx_fec_data_entry_single(MX51);
 #endif
arch/arm/plat-mxc/devices/platform-imx-dma.c +3 -3
index 89ec637..33530d2 100644
@@ -46,10 +46,10 @@ struct imx_imx_sdma_data imx35_imx_sdma_data __initdata =
 	imx_imx_sdma_data_entry_single(MX35, 2, "imx35", 0);
 #endif /* ifdef CONFIG_SOC_IMX35 */
 
-#ifdef CONFIG_ARCH_MX51
+#ifdef CONFIG_SOC_IMX51
 struct imx_imx_sdma_data imx51_imx_sdma_data __initconst =
 	imx_imx_sdma_data_entry_single(MX51, 2, "imx51", 0);
-#endif /* ifdef CONFIG_ARCH_MX51 */
+#endif /* ifdef CONFIG_SOC_IMX51 */
 
 static struct platform_device __init __maybe_unused *imx_add_imx_sdma(
 		const struct imx_imx_sdma_data *data)
@@ -138,7 +138,7 @@ static struct sdma_script_start_addrs addr_imx35_to2 = {
 };
 #endif
 
-#ifdef CONFIG_ARCH_MX51
+#ifdef CONFIG_SOC_IMX51
 static struct sdma_script_start_addrs addr_imx51_to1 = {
 	.ap_2_ap_addr = 642,
 	.uart_2_mcu_addr = 817,
arch/arm/plat-mxc/devices/platform-imx-i2c.c +2 -2
index 075bd8e..72ba880 100644
@@ -69,14 +69,14 @@ const struct imx_imx_i2c_data imx35_imx_i2c_data[] __initconst = {
 };
 #endif /* ifdef CONFIG_SOC_IMX35 */
 
-#ifdef CONFIG_ARCH_MX51
+#ifdef CONFIG_SOC_IMX51
 const struct imx_imx_i2c_data imx51_imx_i2c_data[] __initconst = {
 #define imx51_imx_i2c_data_entry(_id, _hwid)				\
 	imx_imx_i2c_data_entry(MX51, _id, _hwid, SZ_4K)
 	imx51_imx_i2c_data_entry(0, 1),
 	imx51_imx_i2c_data_entry(1, 2),
 };
-#endif /* ifdef CONFIG_ARCH_MX51 */
+#endif /* ifdef CONFIG_SOC_IMX51 */
 
 struct platform_device *__init imx_add_imx_i2c(
 		const struct imx_imx_i2c_data *data,
arch/arm/plat-mxc/devices/platform-imx-ssi.c +2 -2
index 02002fc..ac3d572 100644
@@ -66,14 +66,14 @@ const struct imx_imx_ssi_data imx35_imx_ssi_data[] __initconst = {
 };
 #endif /* ifdef CONFIG_SOC_IMX35 */
 
-#ifdef CONFIG_ARCH_MX51
+#ifdef CONFIG_SOC_IMX51
 const struct imx_imx_ssi_data imx51_imx_ssi_data[] __initconst = {
 #define imx51_imx_ssi_data_entry(_id, _hwid)				\
 	imx_imx_ssi_data_entry(MX51, _id, _hwid, SZ_4K)
 	imx51_imx_ssi_data_entry(0, 1),
 	imx51_imx_ssi_data_entry(1, 2),
 };
-#endif /* ifdef CONFIG_ARCH_MX51 */
+#endif /* ifdef CONFIG_SOC_IMX51 */
 
 struct platform_device *__init imx_add_imx_ssi(
 		const struct imx_imx_ssi_data *data,
arch/arm/plat-mxc/devices/platform-imx-uart.c +2 -2
index 08bbd65..7b45b78 100644
@@ -94,7 +94,7 @@ const struct imx_imx_uart_1irq_data imx35_imx_uart_data[] __initconst = {
 };
 #endif /* ifdef CONFIG_SOC_IMX35 */
 
-#ifdef CONFIG_ARCH_MX51
+#ifdef CONFIG_SOC_IMX51
 const struct imx_imx_uart_1irq_data imx51_imx_uart_data[] __initconst = {
 #define imx51_imx_uart_data_entry(_id, _hwid)				\
 	imx_imx_uart_1irq_data_entry(MX51, _id, _hwid, SZ_4K)
@@ -102,7 +102,7 @@ const struct imx_imx_uart_1irq_data imx51_imx_uart_data[] __initconst = {
 	imx51_imx_uart_data_entry(1, 2),
 	imx51_imx_uart_data_entry(2, 3),
 };
-#endif /* ifdef CONFIG_ARCH_MX51 */
+#endif /* ifdef CONFIG_SOC_IMX51 */
 
 struct platform_device *__init imx_add_imx_uart_3irq(
 		const struct imx_imx_uart_3irq_data *data,
arch/arm/plat-mxc/devices/platform-mxc_nand.c +1 -1
index f5beac0..1568f39 100644
@@ -51,7 +51,7 @@ const struct imx_mxc_nand_data imx35_mxc_nand_data __initconst =
 	imx_mxc_nand_data_entry_single(MX35, SZ_8K);
 #endif
 
-#ifdef CONFIG_ARCH_MX51
+#ifdef CONFIG_SOC_IMX51
 const struct imx_mxc_nand_data imx51_mxc_nand_data __initconst =
 	imx_mxc_nandv3_data_entry_single(MX51, SZ_16K);
 #endif
arch/arm/plat-mxc/devices/platform-sdhci-esdhc-imx.c +2 -2
index 167cce8..b352564 100644
@@ -41,7 +41,7 @@ imx35_sdhci_esdhc_imx_data[] __initconst = {
 };
 #endif /* ifdef CONFIG_SOC_IMX35 */
 
-#ifdef CONFIG_ARCH_MX51
+#ifdef CONFIG_SOC_IMX51
 const struct imx_sdhci_esdhc_imx_data
 imx51_sdhci_esdhc_imx_data[] __initconst = {
 #define imx51_sdhci_esdhc_imx_data_entry(_id, _hwid)			\
@@ -51,7 +51,7 @@ imx51_sdhci_esdhc_imx_data[] __initconst = {
 	imx51_sdhci_esdhc_imx_data_entry(2, 3),
 	imx51_sdhci_esdhc_imx_data_entry(3, 4),
 };
-#endif /* ifdef CONFIG_ARCH_MX51 */
+#endif /* ifdef CONFIG_SOC_IMX51 */
 
 struct platform_device *__init imx_add_sdhci_esdhc_imx(
 		const struct imx_sdhci_esdhc_imx_data *data,
arch/arm/plat-mxc/devices/platform-spi_imx.c +2 -2
index 6893c8b..8ea49ad 100644
@@ -69,7 +69,7 @@ const struct imx_spi_imx_data imx35_cspi_data[] __initconst = {
 };
 #endif /* ifdef CONFIG_SOC_IMX35 */
 
-#ifdef CONFIG_ARCH_MX51
+#ifdef CONFIG_SOC_IMX51
 const struct imx_spi_imx_data imx51_cspi_data __initconst =
 	imx_spi_imx_data_entry_single(MX51, CSPI, "imx51-cspi", 0, , SZ_4K);
 
@@ -79,7 +79,7 @@ const struct imx_spi_imx_data imx51_ecspi_data[] __initconst = {
 	imx51_ecspi_data_entry(0, 1),
 	imx51_ecspi_data_entry(1, 2),
 };
-#endif /* ifdef CONFIG_ARCH_MX51 */
+#endif /* ifdef CONFIG_SOC_IMX51 */
 
 struct platform_device *__init imx_add_spi_imx(
 		const struct imx_spi_imx_data *data,
arch/arm/plat-mxc/ehci.c +1 -1
index 4bac3d5..1c7ecd9 100644
@@ -246,7 +246,7 @@ int mxc_initialize_usb_hw(int port, unsigned int flags)
 		return 0;
 	}
 #endif /* CONFIG_MACH_MX27 */
-#ifdef CONFIG_ARCH_MX51
+#ifdef CONFIG_SOC_IMX51
 	if (cpu_is_mx51()) {
 		void __iomem *usb_base;
 		void __iomem *usbotg_base;
Signature · 1 line
1.6.0.4
Signature · 2 lines
Pengutronix e.K.                           | Uwe Kleine-K?nig            |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
#2 lore raw

PATCH v2 1/2 ARM: mx5: introduce SOC_IMX51

Hi Fabio and Uwe,

Why do we have both ARCH_MX51 and SOC_IMX51? It looks redundant. Will ARCH_MX51 be removed after all other places are replace by SOC_IMX51?

I don't need to define ARCH_MX50 any more, correct?

Thanks
Richard

2010/11/26 Uwe Kleine-K?nig <[email protected]>:

Quoted 292 lines · Fabio Estevam
Quoted 24 lines

Introduce SOC_IMX51 to keep consistency with the other i.MX devices.

---
applies on Sascha's for-next tree

?arch/arm/mach-mx5/Kconfig ? ? ? ? ? ? ? ? ? ? ? ? ?| ? 10 +++++++++-
?arch/arm/plat-mxc/devices/Kconfig ? ? ? ? ? ? ? ? ?| ? ?4 ++--
?arch/arm/plat-mxc/devices/platform-fec.c ? ? ? ? ? | ? ?2 +-
?arch/arm/plat-mxc/devices/platform-imx-dma.c ? ? ? | ? ?6 +++---
?arch/arm/plat-mxc/devices/platform-imx-i2c.c ? ? ? | ? ?4 ++--
?arch/arm/plat-mxc/devices/platform-imx-ssi.c ? ? ? | ? ?4 ++--
?arch/arm/plat-mxc/devices/platform-imx-uart.c ? ? ?| ? ?4 ++--
?arch/arm/plat-mxc/devices/platform-mxc_nand.c ? ? ?| ? ?2 +-
?.../plat-mxc/devices/platform-sdhci-esdhc-imx.c ? ?| ? ?4 ++--
?arch/arm/plat-mxc/devices/platform-spi_imx.c ? ? ? | ? ?4 ++--
?arch/arm/plat-mxc/ehci.c ? ? ? ? ? ? ? ? ? ? ? ? ? | ? ?2 +-

?11 files changed, 27 insertions(+), 19 deletions(-)

arch/arm/mach-mx5/Kconfig +0 -0
index 88f0c66..be5d9bd 100644

arch/arm/mach-mx5/Kconfig if ARCH_MX5 · line 2

Quoted 1 line
arch/arm/mach-mx5/Kconfig +0 -0
@@ -2,16 +2,20 @@ if ARCH_MX5
 

Maybe add a comment here similar to the one I added to ARCH_MX31?

Other than that looks OK.

Uwe

Quoted 243 lines

?config ARCH_MX51
? ? ? bool
- ? ? default y

arch/arm/mach-mx5/Kconfig +3 -0
+
+config ? ? ? SOC_IMX51
+ ? ? bool

? ? ? select MXC_TZIC
? ? ? select ARCH_MXC_IOMUX_V3
? ? ? select ARCH_MXC_AUDMUX_V2
? ? ? select ARCH_HAS_CPUFREQ
+ ? ? select ARCH_MX51

?comment "MX5 platforms:"

?config MACH_MX51_BABBAGE
? ? ? bool "Support MX51 BABBAGE platforms"
+ ? ? select SOC_IMX51
? ? ? select IMX_HAVE_PLATFORM_IMX_I2C
? ? ? select IMX_HAVE_PLATFORM_IMX_UART
? ? ? select IMX_HAVE_PLATFORM_SDHCI_ESDHC_IMX

arch/arm/mach-mx5/Kconfig +0 -0
@@ -23,6 +27,7 @@ config MACH_MX51_BABBAGE
 

?config MACH_MX51_3DS
? ? ? bool "Support MX51PDK (3DS)"
+ ? ? select SOC_IMX51
? ? ? select IMX_HAVE_PLATFORM_ESDHC
? ? ? select IMX_HAVE_PLATFORM_IMX_UART
? ? ? select IMX_HAVE_PLATFORM_SPI_IMX

arch/arm/mach-mx5/Kconfig +0 -0
@@ -33,6 +38,7 @@ config MACH_MX51_3DS
 

?config MACH_EUKREA_CPUIMX51
? ? ? bool "Support Eukrea CPUIMX51 module"
+ ? ? select SOC_IMX51
? ? ? select IMX_HAVE_PLATFORM_IMX_I2C
? ? ? select IMX_HAVE_PLATFORM_IMX_UART
? ? ? select IMX_HAVE_PLATFORM_MXC_NAND

arch/arm/mach-mx5/Kconfig +0 -0
@@ -58,6 +64,7 @@ endchoice
 

?config MACH_EUKREA_CPUIMX51SD
? ? ? bool "Support Eukrea CPUIMX51SD module"
+ ? ? select SOC_IMX51
? ? ? select IMX_HAVE_PLATFORM_IMX_I2C
? ? ? select IMX_HAVE_PLATFORM_SPI_IMX
? ? ? select IMX_HAVE_PLATFORM_IMX_UART

arch/arm/mach-mx5/Kconfig +0 -0
@@ -83,6 +90,7 @@ endchoice
 

?config MACH_MX51_EFIKAMX
? ? ? bool "Support MX51 Genesi Efika MX nettop"
+ ? ? select SOC_IMX51
? ? ? select IMX_HAVE_PLATFORM_ESDHC
? ? ? select IMX_HAVE_PLATFORM_IMX_UART
? ? ? select IMX_HAVE_PLATFORM_SPI_IMX

arch/arm/plat-mxc/devices/Kconfig +0 -0
index b391f4d..2537166 100644
@@ -1,6 +1,6 @@

?config IMX_HAVE_PLATFORM_FEC
? ? ? bool

- ? ? default y if ARCH_MX25 || SOC_IMX27 || SOC_IMX35 || ARCH_MX51
+ ? ? default y if ARCH_MX25 || SOC_IMX27 || SOC_IMX35 || SOC_IMX51

?config IMX_HAVE_PLATFORM_FLEXCAN
? ? ? select HAVE_CAN_FLEXCAN if CAN

arch/arm/plat-mxc/devices/Kconfig +0 -0
@@ -11,7 +11,7 @@ config IMX_HAVE_PLATFORM_FSL_USB2_UDC
 

?config IMX_HAVE_PLATFORM_GPIO_KEYS
? ? ? bool
- ? ? default y if ARCH_MX51
+ ? ? default y if SOC_IMX51

?config IMX_HAVE_PLATFORM_IMX21_HCD
? ? ? bool

arch/arm/plat-mxc/devices/platform-fec.c +0 -0
index 8d78aed..269ec78 100644
@@ -31,7 +31,7 @@ const struct imx_fec_data imx35_fec_data __initconst =
 ? ? ? imx_fec_data_entry_single(MX35);

?#endif

arch/arm/plat-mxc/devices/platform-fec.c +1 -1
-#ifdef CONFIG_ARCH_MX51
+#ifdef CONFIG_SOC_IMX51

?const struct imx_fec_data imx51_fec_data __initconst = ? ? ? imx_fec_data_entry_single(MX51);
?#endif

arch/arm/plat-mxc/devices/platform-imx-dma.c +0 -0
index 89ec637..33530d2 100644
@@ -46,10 +46,10 @@ struct imx_imx_sdma_data imx35_imx_sdma_data __initdata =
 ? ? ? imx_imx_sdma_data_entry_single(MX35, 2, "imx35", 0);

?#endif /* ifdef CONFIG_SOC_IMX35 */

arch/arm/plat-mxc/devices/platform-imx-dma.c +1 -1
-#ifdef CONFIG_ARCH_MX51
+#ifdef CONFIG_SOC_IMX51

?struct imx_imx_sdma_data imx51_imx_sdma_data __initconst = ? ? ? imx_imx_sdma_data_entry_single(MX51, 2, "imx51", 0);

arch/arm/plat-mxc/devices/platform-imx-dma.c +1 -1
-#endif /* ifdef CONFIG_ARCH_MX51 */
+#endif /* ifdef CONFIG_SOC_IMX51 */

?static struct platform_device __init __maybe_unused *imx_add_imx_sdma( ? ? ? ? ? ? ? const struct imx_imx_sdma_data *data)

arch/arm/plat-mxc/devices/platform-imx-dma.c +0 -0
@@ -138,7 +138,7 @@ static struct sdma_script_start_addrs addr_imx35_to2 = {
 ?};

?#endif

arch/arm/plat-mxc/devices/platform-imx-dma.c +1 -1
-#ifdef CONFIG_ARCH_MX51
+#ifdef CONFIG_SOC_IMX51

?static struct sdma_script_start_addrs addr_imx51_to1 = { ? ? ? .ap_2_ap_addr = 642,
? ? ? .uart_2_mcu_addr = 817,

arch/arm/plat-mxc/devices/platform-imx-i2c.c +0 -0
index 075bd8e..72ba880 100644
@@ -69,14 +69,14 @@ const struct imx_imx_i2c_data imx35_imx_i2c_data[] __initconst = {
 ?};

?#endif /* ifdef CONFIG_SOC_IMX35 */

arch/arm/plat-mxc/devices/platform-imx-i2c.c +1 -1
-#ifdef CONFIG_ARCH_MX51
+#ifdef CONFIG_SOC_IMX51

?const struct imx_imx_i2c_data imx51_imx_i2c_data[] __initconst = { ?#define imx51_imx_i2c_data_entry(_id, _hwid) ? ? ? ? ? ? ? ? ? ? ? ? \
? ? ? imx_imx_i2c_data_entry(MX51, _id, _hwid, SZ_4K)
? ? ? imx51_imx_i2c_data_entry(0, 1),
? ? ? imx51_imx_i2c_data_entry(1, 2),
?};

arch/arm/plat-mxc/devices/platform-imx-i2c.c +1 -1
-#endif /* ifdef CONFIG_ARCH_MX51 */
+#endif /* ifdef CONFIG_SOC_IMX51 */

?struct platform_device *__init imx_add_imx_i2c( ? ? ? ? ? ? ? const struct imx_imx_i2c_data *data,

arch/arm/plat-mxc/devices/platform-imx-ssi.c +0 -0
index 02002fc..ac3d572 100644
@@ -66,14 +66,14 @@ const struct imx_imx_ssi_data imx35_imx_ssi_data[] __initconst = {
 ?};

?#endif /* ifdef CONFIG_SOC_IMX35 */

arch/arm/plat-mxc/devices/platform-imx-ssi.c +1 -1
-#ifdef CONFIG_ARCH_MX51
+#ifdef CONFIG_SOC_IMX51

?const struct imx_imx_ssi_data imx51_imx_ssi_data[] __initconst = { ?#define imx51_imx_ssi_data_entry(_id, _hwid) ? ? ? ? ? ? ? ? ? ? ? ? \
? ? ? imx_imx_ssi_data_entry(MX51, _id, _hwid, SZ_4K)
? ? ? imx51_imx_ssi_data_entry(0, 1),
? ? ? imx51_imx_ssi_data_entry(1, 2),
?};

arch/arm/plat-mxc/devices/platform-imx-ssi.c +1 -1
-#endif /* ifdef CONFIG_ARCH_MX51 */
+#endif /* ifdef CONFIG_SOC_IMX51 */

?struct platform_device *__init imx_add_imx_ssi( ? ? ? ? ? ? ? const struct imx_imx_ssi_data *data,

arch/arm/plat-mxc/devices/platform-imx-uart.c +0 -0
index 08bbd65..7b45b78 100644
@@ -94,7 +94,7 @@ const struct imx_imx_uart_1irq_data imx35_imx_uart_data[] __initconst = {
 ?};

?#endif /* ifdef CONFIG_SOC_IMX35 */

arch/arm/plat-mxc/devices/platform-imx-uart.c +1 -1
-#ifdef CONFIG_ARCH_MX51
+#ifdef CONFIG_SOC_IMX51

?const struct imx_imx_uart_1irq_data imx51_imx_uart_data[] __initconst = { ?#define imx51_imx_uart_data_entry(_id, _hwid) ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ?\
? ? ? imx_imx_uart_1irq_data_entry(MX51, _id, _hwid, SZ_4K)

arch/arm/plat-mxc/devices/platform-imx-uart.c +1 -1
@@ -102,7 +102,7 @@ const struct imx_imx_uart_1irq_data imx51_imx_uart_data[] __initconst = {
 ? ? ? imx51_imx_uart_data_entry(1, 2),
 ? ? ? imx51_imx_uart_data_entry(2, 3),
 ?};
-#endif /* ifdef CONFIG_ARCH_MX51 */
+#endif /* ifdef CONFIG_SOC_IMX51 */
 

?struct platform_device *__init imx_add_imx_uart_3irq( ? ? ? ? ? ? ? const struct imx_imx_uart_3irq_data *data,

arch/arm/plat-mxc/devices/platform-mxc_nand.c +0 -0
index f5beac0..1568f39 100644
@@ -51,7 +51,7 @@ const struct imx_mxc_nand_data imx35_mxc_nand_data __initconst =
 ? ? ? imx_mxc_nand_data_entry_single(MX35, SZ_8K);

?#endif

arch/arm/plat-mxc/devices/platform-mxc_nand.c +1 -1
-#ifdef CONFIG_ARCH_MX51
+#ifdef CONFIG_SOC_IMX51

?const struct imx_mxc_nand_data imx51_mxc_nand_data __initconst = ? ? ? imx_mxc_nandv3_data_entry_single(MX51, SZ_16K); ?#endif

arch/arm/plat-mxc/devices/platform-sdhci-esdhc-imx.c +0 -0
index 167cce8..b352564 100644
@@ -41,7 +41,7 @@ imx35_sdhci_esdhc_imx_data[] __initconst = {
 ?};

?#endif /* ifdef CONFIG_SOC_IMX35 */

arch/arm/plat-mxc/devices/platform-sdhci-esdhc-imx.c +1 -1
-#ifdef CONFIG_ARCH_MX51
+#ifdef CONFIG_SOC_IMX51

?const struct imx_sdhci_esdhc_imx_data ?imx51_sdhci_esdhc_imx_data[] __initconst = {
?#define imx51_sdhci_esdhc_imx_data_entry(_id, _hwid) ? ? ? ? ? ? ? ? \

arch/arm/plat-mxc/devices/platform-sdhci-esdhc-imx.c +1 -1
@@ -51,7 +51,7 @@ imx51_sdhci_esdhc_imx_data[] __initconst = {
 ? ? ? imx51_sdhci_esdhc_imx_data_entry(2, 3),
 ? ? ? imx51_sdhci_esdhc_imx_data_entry(3, 4),
 ?};
-#endif /* ifdef CONFIG_ARCH_MX51 */
+#endif /* ifdef CONFIG_SOC_IMX51 */
 

?struct platform_device *__init imx_add_sdhci_esdhc_imx( ? ? ? ? ? ? ? const struct imx_sdhci_esdhc_imx_data *data,

arch/arm/plat-mxc/devices/platform-spi_imx.c +0 -0
index 6893c8b..8ea49ad 100644
@@ -69,7 +69,7 @@ const struct imx_spi_imx_data imx35_cspi_data[] __initconst = {
 ?};

?#endif /* ifdef CONFIG_SOC_IMX35 */

arch/arm/plat-mxc/devices/platform-spi_imx.c +1 -1
-#ifdef CONFIG_ARCH_MX51
+#ifdef CONFIG_SOC_IMX51

?const struct imx_spi_imx_data imx51_cspi_data __initconst =
? ? ? imx_spi_imx_data_entry_single(MX51, CSPI, "imx51-cspi", 0, , SZ_4K);

arch/arm/plat-mxc/devices/platform-spi_imx.c +1 -1
@@ -79,7 +79,7 @@ const struct imx_spi_imx_data imx51_ecspi_data[] __initconst = {
 ? ? ? imx51_ecspi_data_entry(0, 1),
 ? ? ? imx51_ecspi_data_entry(1, 2),
 ?};
-#endif /* ifdef CONFIG_ARCH_MX51 */
+#endif /* ifdef CONFIG_SOC_IMX51 */
 

?struct platform_device *__init imx_add_spi_imx( ? ? ? ? ? ? ? const struct imx_spi_imx_data *data,

arch/arm/plat-mxc/ehci.c +0 -0
index 4bac3d5..1c7ecd9 100644
@@ -246,7 +246,7 @@ int mxc_initialize_usb_hw(int port, unsigned int flags)
 ? ? ? ? ? ? ? return 0;
 ? ? ? }

?#endif /* CONFIG_MACH_MX27 */

arch/arm/plat-mxc/ehci.c +1 -1
-#ifdef CONFIG_ARCH_MX51
+#ifdef CONFIG_SOC_IMX51
Quoted 7 lines

? ? ? if (cpu_is_mx51()) {
? ? ? ? ? ? ? void __iomem *usb_base;
? ? ? ? ? ? ? void __iomem *usbotg_base;
--
1.6.0.4

--

Pengutronix e.K. ? ? ? ? ? ? ? ? ? ? ? ? ? | Uwe Kleine-K?nig ? ? ? ? ? ?|
Industrial Linux Solutions ? ? ? ? ? ? ? ? | http://www.pengutronix.de/ ?|

_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel at lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

#3 lore raw

PATCH v2 1/2 ARM: mx5: introduce SOC_IMX51

Quoted 4 lines · Richard Zhao

Hi Fabio and Uwe,

Why do we have both ARCH_MX51 and SOC_IMX51? It looks redundant. Will ARCH_MX51 be removed after all other places are replace by SOC_IMX51?

yes

Quoted 1 line

I don't need to define ARCH_MX50 any more, correct?

The motivation for SOC_... is described in arch/arm/mach-mx3/Kconfig[1]. So if you have multi-soc kernels in mind when using SOC_IMX50 not adding ARCH_MX50 is fine (and prefered).

Best regards
UWe

[1]
http://git.pengutronix.de/?p=imx/linux-2.6.git;a=blob;f=arch/arm/mach-mx3/Kconfig;hb=imx-for-2.6.38

Signature · 2 lines
Pengutronix e.K.                           | Uwe Kleine-K?nig            |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |

A message that is not in the archive (sent off-list or not yet received): 1290724946-23516-2-git-send-email-user@fabio-desktop

#5 lore raw

PATCH v2 2/2 ARM: mx5: dynamically allocate imx2-wdt devices

Quoted 1 line · Fabio Estevam

Thanks
Uwe

Quoted 76 lines
---
 arch/arm/mach-mx5/devices-imx51.h             |    4 ++++
 arch/arm/mach-mx5/devices.c                   |   15 ---------------
 arch/arm/mach-mx5/devices.h                   |    1 -
 arch/arm/plat-mxc/devices/platform-imx2-wdt.c |    5 +++++
 4 files changed, 9 insertions(+), 16 deletions(-)
arch/arm/mach-mx5/devices-imx51.h +4 -0
index 01b71ef..939d2e8 100644
@@ -43,3 +43,7 @@ extern const struct imx_spi_imx_data imx51_cspi_data __initconst;
 extern const struct imx_spi_imx_data imx51_ecspi_data[] __initconst;
 #define imx51_add_ecspi(id, pdata)	\
 	imx_add_spi_imx(&imx51_ecspi_data[id], pdata)
+
+extern const struct imx_imx2_wdt_data imx51_imx2_wdt_data __initconst;
+#define imx51_imx2_wdt_data(pdata)	\
+	imx_add_imx2_wdt_data(&imx51_imx2_wdt_data, pdata)
arch/arm/mach-mx5/devices.c +0 -15
index d926203..ac55f7f 100644
@@ -97,21 +97,6 @@ struct platform_device mxc_usbh1_device = {
 	},
 };
 
-static struct resource mxc_wdt_resources[] = {
-	{
-		.start = MX51_WDOG_BASE_ADDR,
-		.end = MX51_WDOG_BASE_ADDR + SZ_16K - 1,
-		.flags = IORESOURCE_MEM,
-	},
-};
-
-struct platform_device mxc_wdt = {
-	.name = "imx2-wdt",
-	.id = 0,
-	.num_resources = ARRAY_SIZE(mxc_wdt_resources),
-	.resource = mxc_wdt_resources,
-};
-
 static struct resource mxc_kpp_resources[] = {
 	{
 		.start = MX51_MXC_INT_KPP,
arch/arm/mach-mx5/devices.h +0 -1
index af1d07c..ccb7cdc 100644
@@ -1,6 +1,5 @@
 extern struct platform_device mxc_usbdr_host_device;
 extern struct platform_device mxc_usbh1_device;
 extern struct platform_device mxc_usbdr_udc_device;
-extern struct platform_device mxc_wdt;
 extern struct platform_device mxc_hsi2c_device;
 extern struct platform_device mxc_keypad_device;
arch/arm/plat-mxc/devices/platform-imx2-wdt.c +5 -0
index c61bd4e..8dc19f6 100644
@@ -41,6 +41,11 @@ const struct imx_imx2_wdt_data imx35_imx2_wdt_data __initconst =
 	imx_imx2_wdt_data_entry_single(MX35, SZ_16K);
 #endif /* ifdef CONFIG_SOC_IMX35 */
 
+#ifdef CONFIG_SOC_IMX51
+const struct imx_imx2_wdt_data imx51_imx2_wdt_data __initconst =
+	imx_imx2_wdt_data_entry_single(MX51, SZ_16K);
+#endif /* ifdef CONFIG_SOC_IMX51 */
+
 struct platform_device *__init imx_add_imx2_wdt(
 		const struct imx_imx2_wdt_data *data)
 {
Signature · 1 line
1.6.0.4
Signature · 2 lines
Pengutronix e.K.                           | Uwe Kleine-K?nig            |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |