* [PATCH] ARM: imx: drop 'ARCH_MX31' and 'ARCH_MX35'
@ 2011-11-21 13:34 Paul Bolle
2011-11-21 13:36 ` Russell King - ARM Linux
2011-11-22 10:33 ` Sascha Hauer
0 siblings, 2 replies; 5+ messages in thread
From: Paul Bolle @ 2011-11-21 13:34 UTC (permalink / raw)
To: linux-arm-kernel
Commit 27ad4bf72a ("ARM: imx: move mx3 support to mach-imx") kept
ARCH_MX31 and ARCH_MX35 'for compatibility'. Now that they aren't
actually used anymore, they can be dropped entirely.
Signed-off-by: Paul Bolle <pebolle@tiscali.nl>
---
"git grep" tested only.
arch/arm/mach-imx/Kconfig | 13 -------------
1 files changed, 0 insertions(+), 13 deletions(-)
diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig
index 5f7f9c2..c44aa97 100644
--- a/arch/arm/mach-imx/Kconfig
+++ b/arch/arm/mach-imx/Kconfig
@@ -10,11 +10,6 @@ config HAVE_IMX_MMDC
config HAVE_IMX_SRC
bool
-#
-# ARCH_MX31 and ARCH_MX35 are left for compatibility
-# Some usages assume that having one of them implies not having (e.g.) ARCH_MX2.
-# To easily distinguish good and reviewed from unreviewed usages new (and IMHO
-# more sensible) names are used: SOC_IMX31 and SOC_IMX35
config ARCH_MX1
bool
@@ -27,12 +22,6 @@ config ARCH_MX25
config MACH_MX27
bool
-config ARCH_MX31
- bool
-
-config ARCH_MX35
- bool
-
config SOC_IMX1
bool
select ARCH_MX1
@@ -72,7 +61,6 @@ config SOC_IMX31
select CPU_V6
select IMX_HAVE_PLATFORM_MXC_RNGA
select ARCH_MXC_AUDMUX_V2
- select ARCH_MX31
select MXC_AVIC
select SMP_ON_UP if SMP
@@ -82,7 +70,6 @@ config SOC_IMX35
select ARCH_MXC_IOMUX_V3
select ARCH_MXC_AUDMUX_V2
select HAVE_EPIT
- select ARCH_MX35
select MXC_AVIC
select SMP_ON_UP if SMP
--
1.7.7.3
^ permalink raw reply related [flat|nested] 5+ messages in thread* [PATCH] ARM: imx: drop 'ARCH_MX31' and 'ARCH_MX35'
2011-11-21 13:34 [PATCH] ARM: imx: drop 'ARCH_MX31' and 'ARCH_MX35' Paul Bolle
@ 2011-11-21 13:36 ` Russell King - ARM Linux
2011-11-22 9:07 ` Sascha Hauer
2011-11-22 10:33 ` Sascha Hauer
1 sibling, 1 reply; 5+ messages in thread
From: Russell King - ARM Linux @ 2011-11-21 13:36 UTC (permalink / raw)
To: linux-arm-kernel
On Mon, Nov 21, 2011 at 02:34:05PM +0100, Paul Bolle wrote:
> Commit 27ad4bf72a ("ARM: imx: move mx3 support to mach-imx") kept
> ARCH_MX31 and ARCH_MX35 'for compatibility'. Now that they aren't
> actually used anymore, they can be dropped entirely.
>
> Signed-off-by: Paul Bolle <pebolle@tiscali.nl>
Sascha should be handing this patch.
ARM/FREESCALE IMX / MXC ARM ARCHITECTURE
M: Sascha Hauer <kernel@pengutronix.de>
L: linux-arm-kernel at lists.infradead.org (moderated for non-subscribers)
S: Maintained
T: git git://git.pengutronix.de/git/imx/linux-2.6.git
F: arch/arm/mach-mx*/
F: arch/arm/plat-mxc/
It may be an idea if MAINTAINERS gets updated too, so these patches find
their way to the right person...
> ---
> "git grep" tested only.
>
> arch/arm/mach-imx/Kconfig | 13 -------------
> 1 files changed, 0 insertions(+), 13 deletions(-)
>
> diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig
> index 5f7f9c2..c44aa97 100644
> --- a/arch/arm/mach-imx/Kconfig
> +++ b/arch/arm/mach-imx/Kconfig
> @@ -10,11 +10,6 @@ config HAVE_IMX_MMDC
> config HAVE_IMX_SRC
> bool
>
> -#
> -# ARCH_MX31 and ARCH_MX35 are left for compatibility
> -# Some usages assume that having one of them implies not having (e.g.) ARCH_MX2.
> -# To easily distinguish good and reviewed from unreviewed usages new (and IMHO
> -# more sensible) names are used: SOC_IMX31 and SOC_IMX35
> config ARCH_MX1
> bool
>
> @@ -27,12 +22,6 @@ config ARCH_MX25
> config MACH_MX27
> bool
>
> -config ARCH_MX31
> - bool
> -
> -config ARCH_MX35
> - bool
> -
> config SOC_IMX1
> bool
> select ARCH_MX1
> @@ -72,7 +61,6 @@ config SOC_IMX31
> select CPU_V6
> select IMX_HAVE_PLATFORM_MXC_RNGA
> select ARCH_MXC_AUDMUX_V2
> - select ARCH_MX31
> select MXC_AVIC
> select SMP_ON_UP if SMP
>
> @@ -82,7 +70,6 @@ config SOC_IMX35
> select ARCH_MXC_IOMUX_V3
> select ARCH_MXC_AUDMUX_V2
> select HAVE_EPIT
> - select ARCH_MX35
> select MXC_AVIC
> select SMP_ON_UP if SMP
>
> --
> 1.7.7.3
>
^ permalink raw reply [flat|nested] 5+ messages in thread* [PATCH] ARM: imx: drop 'ARCH_MX31' and 'ARCH_MX35'
2011-11-21 13:36 ` Russell King - ARM Linux
@ 2011-11-22 9:07 ` Sascha Hauer
2011-11-24 6:37 ` Shawn Guo
0 siblings, 1 reply; 5+ messages in thread
From: Sascha Hauer @ 2011-11-22 9:07 UTC (permalink / raw)
To: linux-arm-kernel
On Mon, Nov 21, 2011 at 01:36:03PM +0000, Russell King - ARM Linux wrote:
> On Mon, Nov 21, 2011 at 02:34:05PM +0100, Paul Bolle wrote:
> > Commit 27ad4bf72a ("ARM: imx: move mx3 support to mach-imx") kept
> > ARCH_MX31 and ARCH_MX35 'for compatibility'. Now that they aren't
> > actually used anymore, they can be dropped entirely.
> >
> > Signed-off-by: Paul Bolle <pebolle@tiscali.nl>
>
> Sascha should be handing this patch.
>
> ARM/FREESCALE IMX / MXC ARM ARCHITECTURE
> M: Sascha Hauer <kernel@pengutronix.de>
> L: linux-arm-kernel at lists.infradead.org (moderated for non-subscribers)
> S: Maintained
> T: git git://git.pengutronix.de/git/imx/linux-2.6.git
> F: arch/arm/mach-mx*/
> F: arch/arm/plat-mxc/
>
> It may be an idea if MAINTAINERS gets updated too, so these patches find
> their way to the right person...
Indeed, I never realized that it's missing arch/arm/mach-imx
8<----------------------------------------
MAINTAINERS: Add missing directory
arch/arm/mach-imx/ is part of the i.MX support. Add it.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
MAINTAINERS | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/MAINTAINERS b/MAINTAINERS
index 071a996..c9ae02a 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -789,6 +789,7 @@ L: linux-arm-kernel at lists.infradead.org (moderated for non-subscribers)
S: Maintained
T: git git://git.pengutronix.de/git/imx/linux-2.6.git
F: arch/arm/mach-mx*/
+F: arch/arm/mach-imx/
F: arch/arm/plat-mxc/
ARM/FREESCALE IMX51
--
1.7.7.1
--
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 related [flat|nested] 5+ messages in thread* [PATCH] ARM: imx: drop 'ARCH_MX31' and 'ARCH_MX35'
2011-11-22 9:07 ` Sascha Hauer
@ 2011-11-24 6:37 ` Shawn Guo
0 siblings, 0 replies; 5+ messages in thread
From: Shawn Guo @ 2011-11-24 6:37 UTC (permalink / raw)
To: linux-arm-kernel
On Tue, Nov 22, 2011 at 10:07:18AM +0100, Sascha Hauer wrote:
[...]
> Indeed, I never realized that it's missing arch/arm/mach-imx
>
> 8<----------------------------------------
>
> MAINTAINERS: Add missing directory
>
> arch/arm/mach-imx/ is part of the i.MX support. Add it.
>
> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
> ---
> MAINTAINERS | 1 +
> 1 files changed, 1 insertions(+), 0 deletions(-)
>
> diff --git a/MAINTAINERS b/MAINTAINERS
> index 071a996..c9ae02a 100644
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@ -789,6 +789,7 @@ L: linux-arm-kernel at lists.infradead.org (moderated for non-subscribers)
> S: Maintained
> T: git git://git.pengutronix.de/git/imx/linux-2.6.git
> F: arch/arm/mach-mx*/
> +F: arch/arm/mach-imx/
> F: arch/arm/plat-mxc/
>
> ARM/FREESCALE IMX51
I think as the part of the update, 'arch/arm/mach-mx*/' should be
removed, since I'm now responsible for maintaining mach-mxs, and
mach-mx5 is going into mach-imx anyway.
--
Regards,
Shawn
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH] ARM: imx: drop 'ARCH_MX31' and 'ARCH_MX35'
2011-11-21 13:34 [PATCH] ARM: imx: drop 'ARCH_MX31' and 'ARCH_MX35' Paul Bolle
2011-11-21 13:36 ` Russell King - ARM Linux
@ 2011-11-22 10:33 ` Sascha Hauer
1 sibling, 0 replies; 5+ messages in thread
From: Sascha Hauer @ 2011-11-22 10:33 UTC (permalink / raw)
To: linux-arm-kernel
On Mon, Nov 21, 2011 at 02:34:05PM +0100, Paul Bolle wrote:
> Commit 27ad4bf72a ("ARM: imx: move mx3 support to mach-imx") kept
> ARCH_MX31 and ARCH_MX35 'for compatibility'. Now that they aren't
> actually used anymore, they can be dropped entirely.
Added.
Thanks
Sascha
>
> Signed-off-by: Paul Bolle <pebolle@tiscali.nl>
> ---
> "git grep" tested only.
>
> arch/arm/mach-imx/Kconfig | 13 -------------
> 1 files changed, 0 insertions(+), 13 deletions(-)
>
> diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig
> index 5f7f9c2..c44aa97 100644
> --- a/arch/arm/mach-imx/Kconfig
> +++ b/arch/arm/mach-imx/Kconfig
> @@ -10,11 +10,6 @@ config HAVE_IMX_MMDC
> config HAVE_IMX_SRC
> bool
>
> -#
> -# ARCH_MX31 and ARCH_MX35 are left for compatibility
> -# Some usages assume that having one of them implies not having (e.g.) ARCH_MX2.
> -# To easily distinguish good and reviewed from unreviewed usages new (and IMHO
> -# more sensible) names are used: SOC_IMX31 and SOC_IMX35
> config ARCH_MX1
> bool
>
> @@ -27,12 +22,6 @@ config ARCH_MX25
> config MACH_MX27
> bool
>
> -config ARCH_MX31
> - bool
> -
> -config ARCH_MX35
> - bool
> -
> config SOC_IMX1
> bool
> select ARCH_MX1
> @@ -72,7 +61,6 @@ config SOC_IMX31
> select CPU_V6
> select IMX_HAVE_PLATFORM_MXC_RNGA
> select ARCH_MXC_AUDMUX_V2
> - select ARCH_MX31
> select MXC_AVIC
> select SMP_ON_UP if SMP
>
> @@ -82,7 +70,6 @@ config SOC_IMX35
> select ARCH_MXC_IOMUX_V3
> select ARCH_MXC_AUDMUX_V2
> select HAVE_EPIT
> - select ARCH_MX35
> select MXC_AVIC
> select SMP_ON_UP if SMP
>
> --
> 1.7.7.3
>
>
> _______________________________________________
> 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] 5+ messages in thread
end of thread, other threads:[~2011-11-24 6:37 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-11-21 13:34 [PATCH] ARM: imx: drop 'ARCH_MX31' and 'ARCH_MX35' Paul Bolle
2011-11-21 13:36 ` Russell King - ARM Linux
2011-11-22 9:07 ` Sascha Hauer
2011-11-24 6:37 ` Shawn Guo
2011-11-22 10:33 ` Sascha Hauer
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).