* [PATCH 1/2] ARM: imx5x: clean up ARCH_MX5X
@ 2011-03-03 8:40 Richard Zhao
2011-03-03 8:40 ` [PATCH 2/2] ARM: imx3x: clean up ARCH_MX3X Richard Zhao
` (2 more replies)
0 siblings, 3 replies; 8+ messages in thread
From: Richard Zhao @ 2011-03-03 8:40 UTC (permalink / raw)
To: linux-arm-kernel
Move to SOC_SOC_IMX5X. Leave only places which prevent multi-soc
using ARCH_MX5X.
Signed-off-by: Richard Zhao <richard.zhao@freescale.com>
diff --git a/arch/arm/mach-mx5/Kconfig b/arch/arm/mach-mx5/Kconfig
index 03ec6e9..83ee088 100644
--- a/arch/arm/mach-mx5/Kconfig
+++ b/arch/arm/mach-mx5/Kconfig
@@ -1,5 +1,6 @@
if ARCH_MX5
-# ARCH_MX51 and ARCH_MX50 are left for compatibility
+# ARCH_MX50/51/53 are left to mark places where prevent multi-soc in single
+# image. So for most time, SOC_IMX50/51/53 should be used.
config ARCH_MX50
bool
diff --git a/arch/arm/plat-mxc/devices/platform-imx-dma.c b/arch/arm/plat-mxc/devices/platform-imx-dma.c
index 33530d2..be7df13 100644
--- a/arch/arm/plat-mxc/devices/platform-imx-dma.c
+++ b/arch/arm/plat-mxc/devices/platform-imx-dma.c
@@ -194,7 +194,7 @@ static int __init imxXX_add_imx_dma(void)
} else
#endif
-#if defined(CONFIG_ARCH_MX51)
+#if defined(CONFIG_SOC_IMX51)
if (cpu_is_mx51()) {
imx51_imx_sdma_data.pdata.script_addrs = &addr_imx51_to1;
ret = imx_add_imx_sdma(&imx51_imx_sdma_data);
diff --git a/arch/arm/plat-mxc/include/mach/irqs.h b/arch/arm/plat-mxc/include/mach/irqs.h
index ba65c92..a3d930d 100644
--- a/arch/arm/plat-mxc/include/mach/irqs.h
+++ b/arch/arm/plat-mxc/include/mach/irqs.h
@@ -23,17 +23,17 @@
#define MXC_GPIO_IRQ_START MXC_INTERNAL_IRQS
/* these are ordered by size to support multi-SoC kernels */
-#if defined CONFIG_ARCH_MX53
+#if defined CONFIG_SOC_IMX53
#define MXC_GPIO_IRQS (32 * 7)
#elif defined CONFIG_ARCH_MX2
#define MXC_GPIO_IRQS (32 * 6)
-#elif defined CONFIG_ARCH_MX50
+#elif defined CONFIG_SOC_IMX50
#define MXC_GPIO_IRQS (32 * 6)
#elif defined CONFIG_ARCH_MX1
#define MXC_GPIO_IRQS (32 * 4)
#elif defined CONFIG_ARCH_MX25
#define MXC_GPIO_IRQS (32 * 4)
-#elif defined CONFIG_ARCH_MX51
+#elif defined CONFIG_SOC_IMX51
#define MXC_GPIO_IRQS (32 * 4)
#elif defined CONFIG_ARCH_MXC91231
#define MXC_GPIO_IRQS (32 * 4)
diff --git a/arch/arm/plat-mxc/include/mach/mxc.h b/arch/arm/plat-mxc/include/mach/mxc.h
index 04c7a26..3781f2f 100644
--- a/arch/arm/plat-mxc/include/mach/mxc.h
+++ b/arch/arm/plat-mxc/include/mach/mxc.h
@@ -127,7 +127,7 @@ extern unsigned int __mxc_cpu_type;
# define cpu_is_mx35() (0)
#endif
-#ifdef CONFIG_ARCH_MX50
+#ifdef CONFIG_SOC_IMX50
# ifdef mxc_cpu_type
# undef mxc_cpu_type
# define mxc_cpu_type __mxc_cpu_type
@@ -139,7 +139,7 @@ extern unsigned int __mxc_cpu_type;
# define cpu_is_mx50() (0)
#endif
-#ifdef CONFIG_ARCH_MX51
+#ifdef CONFIG_SOC_IMX51
# ifdef mxc_cpu_type
# undef mxc_cpu_type
# define mxc_cpu_type __mxc_cpu_type
@@ -151,7 +151,7 @@ extern unsigned int __mxc_cpu_type;
# define cpu_is_mx51() (0)
#endif
-#ifdef CONFIG_ARCH_MX53
+#ifdef CONFIG_SOC_IMX53
# ifdef mxc_cpu_type
# undef mxc_cpu_type
# define mxc_cpu_type __mxc_cpu_type
diff --git a/drivers/mtd/nand/Kconfig b/drivers/mtd/nand/Kconfig
index c895922..450afc5 100644
--- a/drivers/mtd/nand/Kconfig
+++ b/drivers/mtd/nand/Kconfig
@@ -476,7 +476,7 @@ config MTD_NAND_MPC5121_NFC
config MTD_NAND_MXC
tristate "MXC NAND support"
- depends on ARCH_MX2 || ARCH_MX25 || ARCH_MX3 || ARCH_MX51
+ depends on IMX_HAVE_PLATFORM_MXC_NAND
help
This enables the driver for the NAND flash controller on the
MXC processors.
diff --git a/drivers/spi/Kconfig b/drivers/spi/Kconfig
index bb233a9..9f9d3f7 100644
--- a/drivers/spi/Kconfig
+++ b/drivers/spi/Kconfig
@@ -164,10 +164,10 @@ config SPI_IMX_VER_0_4
def_bool y if ARCH_MX31
config SPI_IMX_VER_0_7
- def_bool y if ARCH_MX25 || ARCH_MX35 || ARCH_MX51 || ARCH_MX53
+ def_bool y if ARCH_MX25 || ARCH_MX35 || SOC_IMX51 || SOC_IMX53
config SPI_IMX_VER_2_3
- def_bool y if ARCH_MX51 || ARCH_MX53
+ def_bool y if SOC_IMX51 || SOC_IMX53
config SPI_IMX
tristate "Freescale i.MX SPI controllers"
--
1.7.1
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH 2/2] ARM: imx3x: clean up ARCH_MX3X
2011-03-03 8:40 [PATCH 1/2] ARM: imx5x: clean up ARCH_MX5X Richard Zhao
@ 2011-03-03 8:40 ` Richard Zhao
2011-03-03 8:50 ` [PATCH 1/2] ARM: imx5x: clean up ARCH_MX5X Uwe Kleine-König
2011-03-03 10:48 ` Shawn Guo
2 siblings, 0 replies; 8+ messages in thread
From: Richard Zhao @ 2011-03-03 8:40 UTC (permalink / raw)
To: linux-arm-kernel
Move to SOC_SOC_IMX3X.
Leave ARCH_MX31/35 definitions there, in case some place prevent multi-soc
single image.
Signed-off-by: Richard Zhao <richard.zhao@freescale.com>
diff --git a/arch/arm/mm/Kconfig b/arch/arm/mm/Kconfig
index e4509ba..2bd4ccf 100644
--- a/arch/arm/mm/Kconfig
+++ b/arch/arm/mm/Kconfig
@@ -811,7 +811,7 @@ config CACHE_FEROCEON_L2_WRITETHROUGH
config CACHE_L2X0
bool "Enable the L2x0 outer cache controller"
depends on REALVIEW_EB_ARM11MP || MACH_REALVIEW_PB11MP || MACH_REALVIEW_PB1176 || \
- REALVIEW_EB_A9MP || ARCH_MX35 || ARCH_MX31 || MACH_REALVIEW_PBX || \
+ REALVIEW_EB_A9MP || SOC_IMX35 || SOC_IMX31 || MACH_REALVIEW_PBX || \
ARCH_NOMADIK || ARCH_OMAP4 || ARCH_S5PV310 || ARCH_TEGRA || \
ARCH_U8500 || ARCH_VEXPRESS_CA9X4 || ARCH_SHMOBILE
default y
diff --git a/arch/arm/plat-mxc/devices/platform-imx-dma.c b/arch/arm/plat-mxc/devices/platform-imx-dma.c
index be7df13..3538b85 100644
--- a/arch/arm/plat-mxc/devices/platform-imx-dma.c
+++ b/arch/arm/plat-mxc/devices/platform-imx-dma.c
@@ -94,7 +94,7 @@ static struct sdma_script_start_addrs addr_imx25_to1 = {
};
#endif
-#ifdef CONFIG_ARCH_MX31
+#ifdef CONFIG_SOC_IMX31
static struct sdma_script_start_addrs addr_imx31_to1 = {
.per_2_per_addr = 1677,
};
@@ -106,7 +106,7 @@ static struct sdma_script_start_addrs addr_imx31_to2 = {
};
#endif
-#ifdef CONFIG_ARCH_MX35
+#ifdef CONFIG_SOC_IMX35
static struct sdma_script_start_addrs addr_imx35_to1 = {
.ap_2_ap_addr = 642,
.uart_2_mcu_addr = 817,
diff --git a/arch/arm/plat-mxc/include/mach/mxc.h b/arch/arm/plat-mxc/include/mach/mxc.h
index 3781f2f..7e07263 100644
--- a/arch/arm/plat-mxc/include/mach/mxc.h
+++ b/arch/arm/plat-mxc/include/mach/mxc.h
@@ -103,7 +103,7 @@ extern unsigned int __mxc_cpu_type;
# define cpu_is_mx27() (0)
#endif
-#ifdef CONFIG_ARCH_MX31
+#ifdef CONFIG_SOC_IMX31
# ifdef mxc_cpu_type
# undef mxc_cpu_type
# define mxc_cpu_type __mxc_cpu_type
@@ -115,7 +115,7 @@ extern unsigned int __mxc_cpu_type;
# define cpu_is_mx31() (0)
#endif
-#ifdef CONFIG_ARCH_MX35
+#ifdef CONFIG_SOC_IMX35
# ifdef mxc_cpu_type
# undef mxc_cpu_type
# define mxc_cpu_type __mxc_cpu_type
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 0382332..9928115 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -1944,7 +1944,7 @@ config 68360_ENET
config FEC
bool "FEC ethernet controller (of ColdFire and some i.MX CPUs)"
depends on M523x || M527x || M5272 || M528x || M520x || M532x || \
- MACH_MX27 || ARCH_MX35 || ARCH_MX25 || ARCH_MX5 || SOC_IMX28
+ IMX_HAVE_PLATFORM_FEC || SOC_IMX28
select PHYLIB
help
Say Y here if you want to use the built-in 10/100 Fast ethernet
diff --git a/drivers/spi/Kconfig b/drivers/spi/Kconfig
index 9f9d3f7..bd9dad5 100644
--- a/drivers/spi/Kconfig
+++ b/drivers/spi/Kconfig
@@ -161,10 +161,10 @@ config SPI_IMX_VER_0_0
def_bool y if SOC_IMX21 || SOC_IMX27
config SPI_IMX_VER_0_4
- def_bool y if ARCH_MX31
+ def_bool y if SOC_MX31
config SPI_IMX_VER_0_7
- def_bool y if ARCH_MX25 || ARCH_MX35 || SOC_IMX51 || SOC_IMX53
+ def_bool y if ARCH_MX25 || SOC_IMX35 || SOC_IMX51 || SOC_IMX53
config SPI_IMX_VER_2_3
def_bool y if SOC_IMX51 || SOC_IMX53
diff --git a/drivers/usb/gadget/fsl_mxc_udc.c b/drivers/usb/gadget/fsl_mxc_udc.c
index 77b1eb5..834fe94 100644
--- a/drivers/usb/gadget/fsl_mxc_udc.c
+++ b/drivers/usb/gadget/fsl_mxc_udc.c
@@ -88,7 +88,7 @@ eenahb:
void fsl_udc_clk_finalize(struct platform_device *pdev)
{
struct fsl_usb2_platform_data *pdata = pdev->dev.platform_data;
-#if defined(CONFIG_ARCH_MX35)
+#if defined(CONFIG_SOC_IMX35)
unsigned int v;
/* workaround ENGcm09152 for i.MX35 */
--
1.7.1
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH 1/2] ARM: imx5x: clean up ARCH_MX5X
2011-03-03 8:40 [PATCH 1/2] ARM: imx5x: clean up ARCH_MX5X Richard Zhao
2011-03-03 8:40 ` [PATCH 2/2] ARM: imx3x: clean up ARCH_MX3X Richard Zhao
@ 2011-03-03 8:50 ` Uwe Kleine-König
2011-03-03 9:15 ` Richard Zhao
2011-03-03 10:48 ` Shawn Guo
2 siblings, 1 reply; 8+ messages in thread
From: Uwe Kleine-König @ 2011-03-03 8:50 UTC (permalink / raw)
To: linux-arm-kernel
On Thu, Mar 03, 2011 at 04:40:02PM +0800, Richard Zhao wrote:
> Move to SOC_SOC_IMX5X. Leave only places which prevent multi-soc
> using ARCH_MX5X.
>
> Signed-off-by: Richard Zhao <richard.zhao@freescale.com>
Looks OK, probably you need to split off the changes that touch files in
drivers/ though.
(Hmm, no diffstat?)
Best regards
Uwe
> diff --git a/arch/arm/mach-mx5/Kconfig b/arch/arm/mach-mx5/Kconfig
> index 03ec6e9..83ee088 100644
> --- a/arch/arm/mach-mx5/Kconfig
> +++ b/arch/arm/mach-mx5/Kconfig
> @@ -1,5 +1,6 @@
> if ARCH_MX5
> -# ARCH_MX51 and ARCH_MX50 are left for compatibility
> +# ARCH_MX50/51/53 are left to mark places where prevent multi-soc in single
> +# image. So for most time, SOC_IMX50/51/53 should be used.
>
> config ARCH_MX50
> bool
> diff --git a/arch/arm/plat-mxc/devices/platform-imx-dma.c b/arch/arm/plat-mxc/devices/platform-imx-dma.c
> index 33530d2..be7df13 100644
> --- a/arch/arm/plat-mxc/devices/platform-imx-dma.c
> +++ b/arch/arm/plat-mxc/devices/platform-imx-dma.c
> @@ -194,7 +194,7 @@ static int __init imxXX_add_imx_dma(void)
> } else
> #endif
>
> -#if defined(CONFIG_ARCH_MX51)
> +#if defined(CONFIG_SOC_IMX51)
> if (cpu_is_mx51()) {
> imx51_imx_sdma_data.pdata.script_addrs = &addr_imx51_to1;
> ret = imx_add_imx_sdma(&imx51_imx_sdma_data);
> diff --git a/arch/arm/plat-mxc/include/mach/irqs.h b/arch/arm/plat-mxc/include/mach/irqs.h
> index ba65c92..a3d930d 100644
> --- a/arch/arm/plat-mxc/include/mach/irqs.h
> +++ b/arch/arm/plat-mxc/include/mach/irqs.h
> @@ -23,17 +23,17 @@
> #define MXC_GPIO_IRQ_START MXC_INTERNAL_IRQS
>
> /* these are ordered by size to support multi-SoC kernels */
> -#if defined CONFIG_ARCH_MX53
> +#if defined CONFIG_SOC_IMX53
> #define MXC_GPIO_IRQS (32 * 7)
> #elif defined CONFIG_ARCH_MX2
> #define MXC_GPIO_IRQS (32 * 6)
> -#elif defined CONFIG_ARCH_MX50
> +#elif defined CONFIG_SOC_IMX50
> #define MXC_GPIO_IRQS (32 * 6)
> #elif defined CONFIG_ARCH_MX1
> #define MXC_GPIO_IRQS (32 * 4)
> #elif defined CONFIG_ARCH_MX25
> #define MXC_GPIO_IRQS (32 * 4)
> -#elif defined CONFIG_ARCH_MX51
> +#elif defined CONFIG_SOC_IMX51
> #define MXC_GPIO_IRQS (32 * 4)
> #elif defined CONFIG_ARCH_MXC91231
> #define MXC_GPIO_IRQS (32 * 4)
> diff --git a/arch/arm/plat-mxc/include/mach/mxc.h b/arch/arm/plat-mxc/include/mach/mxc.h
> index 04c7a26..3781f2f 100644
> --- a/arch/arm/plat-mxc/include/mach/mxc.h
> +++ b/arch/arm/plat-mxc/include/mach/mxc.h
> @@ -127,7 +127,7 @@ extern unsigned int __mxc_cpu_type;
> # define cpu_is_mx35() (0)
> #endif
>
> -#ifdef CONFIG_ARCH_MX50
> +#ifdef CONFIG_SOC_IMX50
> # ifdef mxc_cpu_type
> # undef mxc_cpu_type
> # define mxc_cpu_type __mxc_cpu_type
> @@ -139,7 +139,7 @@ extern unsigned int __mxc_cpu_type;
> # define cpu_is_mx50() (0)
> #endif
>
> -#ifdef CONFIG_ARCH_MX51
> +#ifdef CONFIG_SOC_IMX51
> # ifdef mxc_cpu_type
> # undef mxc_cpu_type
> # define mxc_cpu_type __mxc_cpu_type
> @@ -151,7 +151,7 @@ extern unsigned int __mxc_cpu_type;
> # define cpu_is_mx51() (0)
> #endif
>
> -#ifdef CONFIG_ARCH_MX53
> +#ifdef CONFIG_SOC_IMX53
> # ifdef mxc_cpu_type
> # undef mxc_cpu_type
> # define mxc_cpu_type __mxc_cpu_type
> diff --git a/drivers/mtd/nand/Kconfig b/drivers/mtd/nand/Kconfig
> index c895922..450afc5 100644
> --- a/drivers/mtd/nand/Kconfig
> +++ b/drivers/mtd/nand/Kconfig
> @@ -476,7 +476,7 @@ config MTD_NAND_MPC5121_NFC
>
> config MTD_NAND_MXC
> tristate "MXC NAND support"
> - depends on ARCH_MX2 || ARCH_MX25 || ARCH_MX3 || ARCH_MX51
> + depends on IMX_HAVE_PLATFORM_MXC_NAND
> help
> This enables the driver for the NAND flash controller on the
> MXC processors.
> diff --git a/drivers/spi/Kconfig b/drivers/spi/Kconfig
> index bb233a9..9f9d3f7 100644
> --- a/drivers/spi/Kconfig
> +++ b/drivers/spi/Kconfig
> @@ -164,10 +164,10 @@ config SPI_IMX_VER_0_4
> def_bool y if ARCH_MX31
>
> config SPI_IMX_VER_0_7
> - def_bool y if ARCH_MX25 || ARCH_MX35 || ARCH_MX51 || ARCH_MX53
> + def_bool y if ARCH_MX25 || ARCH_MX35 || SOC_IMX51 || SOC_IMX53
>
> config SPI_IMX_VER_2_3
> - def_bool y if ARCH_MX51 || ARCH_MX53
> + def_bool y if SOC_IMX51 || SOC_IMX53
>
> config SPI_IMX
> tristate "Freescale i.MX SPI controllers"
> --
> 1.7.1
>
>
>
--
Pengutronix e.K. | Uwe Kleine-K?nig |
Industrial Linux Solutions | http://www.pengutronix.de/ |
^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH 1/2] ARM: imx5x: clean up ARCH_MX5X
2011-03-03 8:50 ` [PATCH 1/2] ARM: imx5x: clean up ARCH_MX5X Uwe Kleine-König
@ 2011-03-03 9:15 ` Richard Zhao
2011-03-03 10:53 ` Sascha Hauer
0 siblings, 1 reply; 8+ messages in thread
From: Richard Zhao @ 2011-03-03 9:15 UTC (permalink / raw)
To: linux-arm-kernel
Hi Uwe,
On Thu, Mar 03, 2011 at 09:50:33AM +0100, Uwe Kleine-K?nig wrote:
> On Thu, Mar 03, 2011 at 04:40:02PM +0800, Richard Zhao wrote:
> > Move to SOC_SOC_IMX5X. Leave only places which prevent multi-soc
> > using ARCH_MX5X.
> >
> > Signed-off-by: Richard Zhao <richard.zhao@freescale.com>
> Looks OK, probably you need to split off the changes that touch files in
> drivers/ though.
Yes. Will Sashca merge drivers part too, or someone else?
>
> (Hmm, no diffstat?)
ah, removing "-p".
Thanks
Richard
>
> Best regards
> Uwe
>
> > diff --git a/arch/arm/mach-mx5/Kconfig b/arch/arm/mach-mx5/Kconfig
> > index 03ec6e9..83ee088 100644
> > --- a/arch/arm/mach-mx5/Kconfig
> > +++ b/arch/arm/mach-mx5/Kconfig
> > @@ -1,5 +1,6 @@
> > if ARCH_MX5
> > -# ARCH_MX51 and ARCH_MX50 are left for compatibility
> > +# ARCH_MX50/51/53 are left to mark places where prevent multi-soc in single
> > +# image. So for most time, SOC_IMX50/51/53 should be used.
> >
> > config ARCH_MX50
> > bool
> > diff --git a/arch/arm/plat-mxc/devices/platform-imx-dma.c b/arch/arm/plat-mxc/devices/platform-imx-dma.c
> > index 33530d2..be7df13 100644
> > --- a/arch/arm/plat-mxc/devices/platform-imx-dma.c
> > +++ b/arch/arm/plat-mxc/devices/platform-imx-dma.c
> > @@ -194,7 +194,7 @@ static int __init imxXX_add_imx_dma(void)
> > } else
> > #endif
> >
> > -#if defined(CONFIG_ARCH_MX51)
> > +#if defined(CONFIG_SOC_IMX51)
> > if (cpu_is_mx51()) {
> > imx51_imx_sdma_data.pdata.script_addrs = &addr_imx51_to1;
> > ret = imx_add_imx_sdma(&imx51_imx_sdma_data);
> > diff --git a/arch/arm/plat-mxc/include/mach/irqs.h b/arch/arm/plat-mxc/include/mach/irqs.h
> > index ba65c92..a3d930d 100644
> > --- a/arch/arm/plat-mxc/include/mach/irqs.h
> > +++ b/arch/arm/plat-mxc/include/mach/irqs.h
> > @@ -23,17 +23,17 @@
> > #define MXC_GPIO_IRQ_START MXC_INTERNAL_IRQS
> >
> > /* these are ordered by size to support multi-SoC kernels */
> > -#if defined CONFIG_ARCH_MX53
> > +#if defined CONFIG_SOC_IMX53
> > #define MXC_GPIO_IRQS (32 * 7)
> > #elif defined CONFIG_ARCH_MX2
> > #define MXC_GPIO_IRQS (32 * 6)
> > -#elif defined CONFIG_ARCH_MX50
> > +#elif defined CONFIG_SOC_IMX50
> > #define MXC_GPIO_IRQS (32 * 6)
> > #elif defined CONFIG_ARCH_MX1
> > #define MXC_GPIO_IRQS (32 * 4)
> > #elif defined CONFIG_ARCH_MX25
> > #define MXC_GPIO_IRQS (32 * 4)
> > -#elif defined CONFIG_ARCH_MX51
> > +#elif defined CONFIG_SOC_IMX51
> > #define MXC_GPIO_IRQS (32 * 4)
> > #elif defined CONFIG_ARCH_MXC91231
> > #define MXC_GPIO_IRQS (32 * 4)
> > diff --git a/arch/arm/plat-mxc/include/mach/mxc.h b/arch/arm/plat-mxc/include/mach/mxc.h
> > index 04c7a26..3781f2f 100644
> > --- a/arch/arm/plat-mxc/include/mach/mxc.h
> > +++ b/arch/arm/plat-mxc/include/mach/mxc.h
> > @@ -127,7 +127,7 @@ extern unsigned int __mxc_cpu_type;
> > # define cpu_is_mx35() (0)
> > #endif
> >
> > -#ifdef CONFIG_ARCH_MX50
> > +#ifdef CONFIG_SOC_IMX50
> > # ifdef mxc_cpu_type
> > # undef mxc_cpu_type
> > # define mxc_cpu_type __mxc_cpu_type
> > @@ -139,7 +139,7 @@ extern unsigned int __mxc_cpu_type;
> > # define cpu_is_mx50() (0)
> > #endif
> >
> > -#ifdef CONFIG_ARCH_MX51
> > +#ifdef CONFIG_SOC_IMX51
> > # ifdef mxc_cpu_type
> > # undef mxc_cpu_type
> > # define mxc_cpu_type __mxc_cpu_type
> > @@ -151,7 +151,7 @@ extern unsigned int __mxc_cpu_type;
> > # define cpu_is_mx51() (0)
> > #endif
> >
> > -#ifdef CONFIG_ARCH_MX53
> > +#ifdef CONFIG_SOC_IMX53
> > # ifdef mxc_cpu_type
> > # undef mxc_cpu_type
> > # define mxc_cpu_type __mxc_cpu_type
> > diff --git a/drivers/mtd/nand/Kconfig b/drivers/mtd/nand/Kconfig
> > index c895922..450afc5 100644
> > --- a/drivers/mtd/nand/Kconfig
> > +++ b/drivers/mtd/nand/Kconfig
> > @@ -476,7 +476,7 @@ config MTD_NAND_MPC5121_NFC
> >
> > config MTD_NAND_MXC
> > tristate "MXC NAND support"
> > - depends on ARCH_MX2 || ARCH_MX25 || ARCH_MX3 || ARCH_MX51
> > + depends on IMX_HAVE_PLATFORM_MXC_NAND
> > help
> > This enables the driver for the NAND flash controller on the
> > MXC processors.
> > diff --git a/drivers/spi/Kconfig b/drivers/spi/Kconfig
> > index bb233a9..9f9d3f7 100644
> > --- a/drivers/spi/Kconfig
> > +++ b/drivers/spi/Kconfig
> > @@ -164,10 +164,10 @@ config SPI_IMX_VER_0_4
> > def_bool y if ARCH_MX31
> >
> > config SPI_IMX_VER_0_7
> > - def_bool y if ARCH_MX25 || ARCH_MX35 || ARCH_MX51 || ARCH_MX53
> > + def_bool y if ARCH_MX25 || ARCH_MX35 || SOC_IMX51 || SOC_IMX53
> >
> > config SPI_IMX_VER_2_3
> > - def_bool y if ARCH_MX51 || ARCH_MX53
> > + def_bool y if SOC_IMX51 || SOC_IMX53
> >
> > config SPI_IMX
> > tristate "Freescale i.MX SPI controllers"
> > --
> > 1.7.1
> >
> >
> >
>
> --
> Pengutronix e.K. | Uwe Kleine-K?nig |
> Industrial Linux Solutions | http://www.pengutronix.de/ |
>
^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH 1/2] ARM: imx5x: clean up ARCH_MX5X
2011-03-03 8:40 [PATCH 1/2] ARM: imx5x: clean up ARCH_MX5X Richard Zhao
2011-03-03 8:40 ` [PATCH 2/2] ARM: imx3x: clean up ARCH_MX3X Richard Zhao
2011-03-03 8:50 ` [PATCH 1/2] ARM: imx5x: clean up ARCH_MX5X Uwe Kleine-König
@ 2011-03-03 10:48 ` Shawn Guo
2011-03-03 10:56 ` Shawn Guo
2 siblings, 1 reply; 8+ messages in thread
From: Shawn Guo @ 2011-03-03 10:48 UTC (permalink / raw)
To: linux-arm-kernel
On Thu, Mar 03, 2011 at 04:40:02PM +0800, Richard Zhao wrote:
> Move to SOC_SOC_IMX5X. Leave only places which prevent multi-soc
^^^^^^^^^^^^^
SOC_IMX51? Same question on SOC_SOC_IMX3X in the second patch.
> using ARCH_MX5X.
>
> Signed-off-by: Richard Zhao <richard.zhao@freescale.com>
>
--
Regards,
Shawn
^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH 1/2] ARM: imx5x: clean up ARCH_MX5X
2011-03-03 9:15 ` Richard Zhao
@ 2011-03-03 10:53 ` Sascha Hauer
0 siblings, 0 replies; 8+ messages in thread
From: Sascha Hauer @ 2011-03-03 10:53 UTC (permalink / raw)
To: linux-arm-kernel
On Thu, Mar 03, 2011 at 05:15:59PM +0800, Richard Zhao wrote:
> Hi Uwe,
>
> On Thu, Mar 03, 2011 at 09:50:33AM +0100, Uwe Kleine-K?nig wrote:
> > On Thu, Mar 03, 2011 at 04:40:02PM +0800, Richard Zhao wrote:
> > > Move to SOC_SOC_IMX5X. Leave only places which prevent multi-soc
> > > using ARCH_MX5X.
> > >
> > > Signed-off-by: Richard Zhao <richard.zhao@freescale.com>
> > Looks OK, probably you need to split off the changes that touch files in
> > drivers/ though.
> Yes. Will Sashca merge drivers part too, or someone else?
I think I can take them as they are.
Sascha
> >
> > (Hmm, no diffstat?)
> ah, removing "-p".
>
> Thanks
> Richard
> >
> > Best regards
> > Uwe
> >
> > > diff --git a/arch/arm/mach-mx5/Kconfig b/arch/arm/mach-mx5/Kconfig
> > > index 03ec6e9..83ee088 100644
> > > --- a/arch/arm/mach-mx5/Kconfig
> > > +++ b/arch/arm/mach-mx5/Kconfig
> > > @@ -1,5 +1,6 @@
> > > if ARCH_MX5
> > > -# ARCH_MX51 and ARCH_MX50 are left for compatibility
> > > +# ARCH_MX50/51/53 are left to mark places where prevent multi-soc in single
> > > +# image. So for most time, SOC_IMX50/51/53 should be used.
> > >
> > > config ARCH_MX50
> > > bool
> > > diff --git a/arch/arm/plat-mxc/devices/platform-imx-dma.c b/arch/arm/plat-mxc/devices/platform-imx-dma.c
> > > index 33530d2..be7df13 100644
> > > --- a/arch/arm/plat-mxc/devices/platform-imx-dma.c
> > > +++ b/arch/arm/plat-mxc/devices/platform-imx-dma.c
> > > @@ -194,7 +194,7 @@ static int __init imxXX_add_imx_dma(void)
> > > } else
> > > #endif
> > >
> > > -#if defined(CONFIG_ARCH_MX51)
> > > +#if defined(CONFIG_SOC_IMX51)
> > > if (cpu_is_mx51()) {
> > > imx51_imx_sdma_data.pdata.script_addrs = &addr_imx51_to1;
> > > ret = imx_add_imx_sdma(&imx51_imx_sdma_data);
> > > diff --git a/arch/arm/plat-mxc/include/mach/irqs.h b/arch/arm/plat-mxc/include/mach/irqs.h
> > > index ba65c92..a3d930d 100644
> > > --- a/arch/arm/plat-mxc/include/mach/irqs.h
> > > +++ b/arch/arm/plat-mxc/include/mach/irqs.h
> > > @@ -23,17 +23,17 @@
> > > #define MXC_GPIO_IRQ_START MXC_INTERNAL_IRQS
> > >
> > > /* these are ordered by size to support multi-SoC kernels */
> > > -#if defined CONFIG_ARCH_MX53
> > > +#if defined CONFIG_SOC_IMX53
> > > #define MXC_GPIO_IRQS (32 * 7)
> > > #elif defined CONFIG_ARCH_MX2
> > > #define MXC_GPIO_IRQS (32 * 6)
> > > -#elif defined CONFIG_ARCH_MX50
> > > +#elif defined CONFIG_SOC_IMX50
> > > #define MXC_GPIO_IRQS (32 * 6)
> > > #elif defined CONFIG_ARCH_MX1
> > > #define MXC_GPIO_IRQS (32 * 4)
> > > #elif defined CONFIG_ARCH_MX25
> > > #define MXC_GPIO_IRQS (32 * 4)
> > > -#elif defined CONFIG_ARCH_MX51
> > > +#elif defined CONFIG_SOC_IMX51
> > > #define MXC_GPIO_IRQS (32 * 4)
> > > #elif defined CONFIG_ARCH_MXC91231
> > > #define MXC_GPIO_IRQS (32 * 4)
> > > diff --git a/arch/arm/plat-mxc/include/mach/mxc.h b/arch/arm/plat-mxc/include/mach/mxc.h
> > > index 04c7a26..3781f2f 100644
> > > --- a/arch/arm/plat-mxc/include/mach/mxc.h
> > > +++ b/arch/arm/plat-mxc/include/mach/mxc.h
> > > @@ -127,7 +127,7 @@ extern unsigned int __mxc_cpu_type;
> > > # define cpu_is_mx35() (0)
> > > #endif
> > >
> > > -#ifdef CONFIG_ARCH_MX50
> > > +#ifdef CONFIG_SOC_IMX50
> > > # ifdef mxc_cpu_type
> > > # undef mxc_cpu_type
> > > # define mxc_cpu_type __mxc_cpu_type
> > > @@ -139,7 +139,7 @@ extern unsigned int __mxc_cpu_type;
> > > # define cpu_is_mx50() (0)
> > > #endif
> > >
> > > -#ifdef CONFIG_ARCH_MX51
> > > +#ifdef CONFIG_SOC_IMX51
> > > # ifdef mxc_cpu_type
> > > # undef mxc_cpu_type
> > > # define mxc_cpu_type __mxc_cpu_type
> > > @@ -151,7 +151,7 @@ extern unsigned int __mxc_cpu_type;
> > > # define cpu_is_mx51() (0)
> > > #endif
> > >
> > > -#ifdef CONFIG_ARCH_MX53
> > > +#ifdef CONFIG_SOC_IMX53
> > > # ifdef mxc_cpu_type
> > > # undef mxc_cpu_type
> > > # define mxc_cpu_type __mxc_cpu_type
> > > diff --git a/drivers/mtd/nand/Kconfig b/drivers/mtd/nand/Kconfig
> > > index c895922..450afc5 100644
> > > --- a/drivers/mtd/nand/Kconfig
> > > +++ b/drivers/mtd/nand/Kconfig
> > > @@ -476,7 +476,7 @@ config MTD_NAND_MPC5121_NFC
> > >
> > > config MTD_NAND_MXC
> > > tristate "MXC NAND support"
> > > - depends on ARCH_MX2 || ARCH_MX25 || ARCH_MX3 || ARCH_MX51
> > > + depends on IMX_HAVE_PLATFORM_MXC_NAND
> > > help
> > > This enables the driver for the NAND flash controller on the
> > > MXC processors.
> > > diff --git a/drivers/spi/Kconfig b/drivers/spi/Kconfig
> > > index bb233a9..9f9d3f7 100644
> > > --- a/drivers/spi/Kconfig
> > > +++ b/drivers/spi/Kconfig
> > > @@ -164,10 +164,10 @@ config SPI_IMX_VER_0_4
> > > def_bool y if ARCH_MX31
> > >
> > > config SPI_IMX_VER_0_7
> > > - def_bool y if ARCH_MX25 || ARCH_MX35 || ARCH_MX51 || ARCH_MX53
> > > + def_bool y if ARCH_MX25 || ARCH_MX35 || SOC_IMX51 || SOC_IMX53
> > >
> > > config SPI_IMX_VER_2_3
> > > - def_bool y if ARCH_MX51 || ARCH_MX53
> > > + def_bool y if SOC_IMX51 || SOC_IMX53
> > >
> > > config SPI_IMX
> > > tristate "Freescale i.MX SPI controllers"
> > > --
> > > 1.7.1
> > >
> > >
> > >
> >
> > --
> > 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
>
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH 1/2] ARM: imx5x: clean up ARCH_MX5X
2011-03-03 10:48 ` Shawn Guo
@ 2011-03-03 10:56 ` Shawn Guo
2011-03-04 3:22 ` Shawn Guo
0 siblings, 1 reply; 8+ messages in thread
From: Shawn Guo @ 2011-03-03 10:56 UTC (permalink / raw)
To: linux-arm-kernel
On Thu, Mar 03, 2011 at 06:48:23PM +0800, Shawn Guo wrote:
> On Thu, Mar 03, 2011 at 04:40:02PM +0800, Richard Zhao wrote:
> > Move to SOC_SOC_IMX5X. Leave only places which prevent multi-soc
> ^^^^^^^^^^^^^
> SOC_IMX51? Same question on SOC_SOC_IMX3X in the second patch.
>
What I meant is SOC_IMX5X. Double 'SOC_' bothers me.
--
Regards,
Shawn
^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH 1/2] ARM: imx5x: clean up ARCH_MX5X
2011-03-03 10:56 ` Shawn Guo
@ 2011-03-04 3:22 ` Shawn Guo
0 siblings, 0 replies; 8+ messages in thread
From: Shawn Guo @ 2011-03-04 3:22 UTC (permalink / raw)
To: linux-arm-kernel
On Thu, Mar 03, 2011 at 06:56:38PM +0800, Shawn Guo wrote:
> On Thu, Mar 03, 2011 at 06:48:23PM +0800, Shawn Guo wrote:
> > On Thu, Mar 03, 2011 at 04:40:02PM +0800, Richard Zhao wrote:
> > > Move to SOC_SOC_IMX5X. Leave only places which prevent multi-soc
> > ^^^^^^^^^^^^^
> > SOC_IMX51? Same question on SOC_SOC_IMX3X in the second patch.
> >
> What I meant is SOC_IMX5X. Double 'SOC_' bothers me.
>
My mail box went wrong yesterday. The messages were not delivered.
As Sascha has picked them up, it may not worth a fix.
--
Regards,
Shawn
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2011-03-04 3:22 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-03-03 8:40 [PATCH 1/2] ARM: imx5x: clean up ARCH_MX5X Richard Zhao
2011-03-03 8:40 ` [PATCH 2/2] ARM: imx3x: clean up ARCH_MX3X Richard Zhao
2011-03-03 8:50 ` [PATCH 1/2] ARM: imx5x: clean up ARCH_MX5X Uwe Kleine-König
2011-03-03 9:15 ` Richard Zhao
2011-03-03 10:53 ` Sascha Hauer
2011-03-03 10:48 ` Shawn Guo
2011-03-03 10:56 ` Shawn Guo
2011-03-04 3:22 ` Shawn Guo
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox