* [PATCH] ARM: i.MX: Remove excess symbols ARCH_MX1, ARCH_MX25 and MACH_MX27
@ 2014-07-05 4:51 Alexander Shiyan
2014-07-07 6:11 ` Shawn Guo
0 siblings, 1 reply; 8+ messages in thread
From: Alexander Shiyan @ 2014-07-05 4:51 UTC (permalink / raw)
To: linux-arm-kernel
This patch removes excess symbols ARCH_MX1, ARCH_MX25 and MACH_MX27.
Instead we use SOC_IMX*.
Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
---
arch/arm/mach-imx/Kconfig | 12 ------------
arch/arm/mach-imx/devices/Kconfig | 2 +-
2 files changed, 1 insertion(+), 13 deletions(-)
diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig
index 325a8d32..7cbfc0d 100644
--- a/arch/arm/mach-imx/Kconfig
+++ b/arch/arm/mach-imx/Kconfig
@@ -65,18 +65,8 @@ config IMX_HAVE_IOMUX_V1
config ARCH_MXC_IOMUX_V3
bool
-config ARCH_MX1
- bool
-
-config ARCH_MX25
- bool
-
-config MACH_MX27
- bool
-
config SOC_IMX1
bool
- select ARCH_MX1
select CPU_ARM920T
select IMX_HAVE_IOMUX_V1
select MXC_AVIC
@@ -89,7 +79,6 @@ config SOC_IMX21
config SOC_IMX25
bool
- select ARCH_MX25
select ARCH_MXC_IOMUX_V3
select CPU_ARM926T
select MXC_AVIC
@@ -100,7 +89,6 @@ config SOC_IMX27
select ARCH_HAS_OPP
select CPU_ARM926T
select IMX_HAVE_IOMUX_V1
- select MACH_MX27
select MXC_AVIC
select PINCTRL_IMX27
diff --git a/arch/arm/mach-imx/devices/Kconfig b/arch/arm/mach-imx/devices/Kconfig
index 73a1dce..1d2cc18 100644
--- a/arch/arm/mach-imx/devices/Kconfig
+++ b/arch/arm/mach-imx/devices/Kconfig
@@ -1,6 +1,6 @@
config IMX_HAVE_PLATFORM_FEC
bool
- default y if ARCH_MX25 || SOC_IMX27 || SOC_IMX35
+ default y if SOC_IMX25 || SOC_IMX27 || SOC_IMX35
config IMX_HAVE_PLATFORM_FLEXCAN
bool
--
1.8.5.5
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH] ARM: i.MX: Remove excess symbols ARCH_MX1, ARCH_MX25 and MACH_MX27
2014-07-05 4:51 [PATCH] ARM: i.MX: Remove excess symbols ARCH_MX1, ARCH_MX25 and MACH_MX27 Alexander Shiyan
@ 2014-07-07 6:11 ` Shawn Guo
0 siblings, 0 replies; 8+ messages in thread
From: Shawn Guo @ 2014-07-07 6:11 UTC (permalink / raw)
To: linux-arm-kernel
On Sat, Jul 05, 2014 at 08:51:57AM +0400, Alexander Shiyan wrote:
> This patch removes excess symbols ARCH_MX1, ARCH_MX25 and MACH_MX27.
> Instead we use SOC_IMX*.
>
> Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
Applied, thanks.
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH] ARM: i.MX: Remove excess symbols ARCH_MX1, ARCH_MX25 and MACH_MX27
2014-05-11 8:50 ` Alexander Shiyan
@ 2014-05-12 14:13 ` Shawn Guo
-1 siblings, 0 replies; 8+ messages in thread
From: Shawn Guo @ 2014-05-12 14:13 UTC (permalink / raw)
To: Alexander Shiyan
Cc: linux-arm-kernel, linux-media, Guennadi Liakhovetski,
Mauro Carvalho Chehab, Sascha Hauer
On Sun, May 11, 2014 at 12:50:06PM +0400, Alexander Shiyan wrote:
> This patch removes excess symbols ARCH_MX1, ARCH_MX25 and MACH_MX27.
> Instead we use SOC_IMX*.
>
> Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
> ---
> arch/arm/mach-imx/Kconfig | 12 ------------
> arch/arm/mach-imx/devices/Kconfig | 2 +-
> drivers/media/platform/soc_camera/Kconfig | 2 +-
We need to either split this file change into another patch or get an
ACK from Mauro or Guennadi.
Shawn
> 3 files changed, 2 insertions(+), 14 deletions(-)
>
> diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig
> index d56eb1a..c28fa7c 100644
> --- a/arch/arm/mach-imx/Kconfig
> +++ b/arch/arm/mach-imx/Kconfig
> @@ -67,18 +67,8 @@ config IMX_HAVE_IOMUX_V1
> config ARCH_MXC_IOMUX_V3
> bool
>
> -config ARCH_MX1
> - bool
> -
> -config ARCH_MX25
> - bool
> -
> -config MACH_MX27
> - bool
> -
> config SOC_IMX1
> bool
> - select ARCH_MX1
> select CPU_ARM920T
> select IMX_HAVE_IOMUX_V1
> select MXC_AVIC
> @@ -91,7 +81,6 @@ config SOC_IMX21
>
> config SOC_IMX25
> bool
> - select ARCH_MX25
> select ARCH_MXC_IOMUX_V3
> select CPU_ARM926T
> select MXC_AVIC
> @@ -103,7 +92,6 @@ config SOC_IMX27
> select ARCH_HAS_OPP
> select CPU_ARM926T
> select IMX_HAVE_IOMUX_V1
> - select MACH_MX27
> select MXC_AVIC
> select PINCTRL_IMX27
>
> diff --git a/arch/arm/mach-imx/devices/Kconfig b/arch/arm/mach-imx/devices/Kconfig
> index 846c019..1f9d4a6 100644
> --- a/arch/arm/mach-imx/devices/Kconfig
> +++ b/arch/arm/mach-imx/devices/Kconfig
> @@ -1,6 +1,6 @@
> config IMX_HAVE_PLATFORM_FEC
> bool
> - default y if ARCH_MX25 || SOC_IMX27 || SOC_IMX35 || SOC_IMX51 || SOC_IMX53
> + default y if SOC_IMX25 || SOC_IMX27 || SOC_IMX35 || SOC_IMX51 || SOC_IMX53
>
> config IMX_HAVE_PLATFORM_FLEXCAN
> bool
> diff --git a/drivers/media/platform/soc_camera/Kconfig b/drivers/media/platform/soc_camera/Kconfig
> index 122e03a..f0ccedd 100644
> --- a/drivers/media/platform/soc_camera/Kconfig
> +++ b/drivers/media/platform/soc_camera/Kconfig
> @@ -63,7 +63,7 @@ config VIDEO_OMAP1
>
> config VIDEO_MX2
> tristate "i.MX27 Camera Sensor Interface driver"
> - depends on VIDEO_DEV && SOC_CAMERA && MACH_MX27
> + depends on VIDEO_DEV && SOC_CAMERA && SOC_IMX27
> select VIDEOBUF2_DMA_CONTIG
> ---help---
> This is a v4l2 driver for the i.MX27 Camera Sensor Interface
> --
> 1.8.3.2
>
^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH] ARM: i.MX: Remove excess symbols ARCH_MX1, ARCH_MX25 and MACH_MX27
@ 2014-05-12 14:13 ` Shawn Guo
0 siblings, 0 replies; 8+ messages in thread
From: Shawn Guo @ 2014-05-12 14:13 UTC (permalink / raw)
To: linux-arm-kernel
On Sun, May 11, 2014 at 12:50:06PM +0400, Alexander Shiyan wrote:
> This patch removes excess symbols ARCH_MX1, ARCH_MX25 and MACH_MX27.
> Instead we use SOC_IMX*.
>
> Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
> ---
> arch/arm/mach-imx/Kconfig | 12 ------------
> arch/arm/mach-imx/devices/Kconfig | 2 +-
> drivers/media/platform/soc_camera/Kconfig | 2 +-
We need to either split this file change into another patch or get an
ACK from Mauro or Guennadi.
Shawn
> 3 files changed, 2 insertions(+), 14 deletions(-)
>
> diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig
> index d56eb1a..c28fa7c 100644
> --- a/arch/arm/mach-imx/Kconfig
> +++ b/arch/arm/mach-imx/Kconfig
> @@ -67,18 +67,8 @@ config IMX_HAVE_IOMUX_V1
> config ARCH_MXC_IOMUX_V3
> bool
>
> -config ARCH_MX1
> - bool
> -
> -config ARCH_MX25
> - bool
> -
> -config MACH_MX27
> - bool
> -
> config SOC_IMX1
> bool
> - select ARCH_MX1
> select CPU_ARM920T
> select IMX_HAVE_IOMUX_V1
> select MXC_AVIC
> @@ -91,7 +81,6 @@ config SOC_IMX21
>
> config SOC_IMX25
> bool
> - select ARCH_MX25
> select ARCH_MXC_IOMUX_V3
> select CPU_ARM926T
> select MXC_AVIC
> @@ -103,7 +92,6 @@ config SOC_IMX27
> select ARCH_HAS_OPP
> select CPU_ARM926T
> select IMX_HAVE_IOMUX_V1
> - select MACH_MX27
> select MXC_AVIC
> select PINCTRL_IMX27
>
> diff --git a/arch/arm/mach-imx/devices/Kconfig b/arch/arm/mach-imx/devices/Kconfig
> index 846c019..1f9d4a6 100644
> --- a/arch/arm/mach-imx/devices/Kconfig
> +++ b/arch/arm/mach-imx/devices/Kconfig
> @@ -1,6 +1,6 @@
> config IMX_HAVE_PLATFORM_FEC
> bool
> - default y if ARCH_MX25 || SOC_IMX27 || SOC_IMX35 || SOC_IMX51 || SOC_IMX53
> + default y if SOC_IMX25 || SOC_IMX27 || SOC_IMX35 || SOC_IMX51 || SOC_IMX53
>
> config IMX_HAVE_PLATFORM_FLEXCAN
> bool
> diff --git a/drivers/media/platform/soc_camera/Kconfig b/drivers/media/platform/soc_camera/Kconfig
> index 122e03a..f0ccedd 100644
> --- a/drivers/media/platform/soc_camera/Kconfig
> +++ b/drivers/media/platform/soc_camera/Kconfig
> @@ -63,7 +63,7 @@ config VIDEO_OMAP1
>
> config VIDEO_MX2
> tristate "i.MX27 Camera Sensor Interface driver"
> - depends on VIDEO_DEV && SOC_CAMERA && MACH_MX27
> + depends on VIDEO_DEV && SOC_CAMERA && SOC_IMX27
> select VIDEOBUF2_DMA_CONTIG
> ---help---
> This is a v4l2 driver for the i.MX27 Camera Sensor Interface
> --
> 1.8.3.2
>
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH] ARM: i.MX: Remove excess symbols ARCH_MX1, ARCH_MX25 and MACH_MX27
2014-05-11 8:50 ` Alexander Shiyan
@ 2014-05-11 8:57 ` Uwe Kleine-König
-1 siblings, 0 replies; 8+ messages in thread
From: Uwe Kleine-König @ 2014-05-11 8:57 UTC (permalink / raw)
To: Alexander Shiyan
Cc: linux-arm-kernel, linux-media, Guennadi Liakhovetski,
Mauro Carvalho Chehab, Shawn Guo, Sascha Hauer
On Sun, May 11, 2014 at 12:50:06PM +0400, Alexander Shiyan wrote:
> This patch removes excess symbols ARCH_MX1, ARCH_MX25 and MACH_MX27.
> Instead we use SOC_IMX*.
>
> Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
Acked-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Thanks
Uwe
--
Pengutronix e.K. | Uwe Kleine-König |
Industrial Linux Solutions | http://www.pengutronix.de/ |
^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH] ARM: i.MX: Remove excess symbols ARCH_MX1, ARCH_MX25 and MACH_MX27
@ 2014-05-11 8:57 ` Uwe Kleine-König
0 siblings, 0 replies; 8+ messages in thread
From: Uwe Kleine-König @ 2014-05-11 8:57 UTC (permalink / raw)
To: linux-arm-kernel
On Sun, May 11, 2014 at 12:50:06PM +0400, Alexander Shiyan wrote:
> This patch removes excess symbols ARCH_MX1, ARCH_MX25 and MACH_MX27.
> Instead we use SOC_IMX*.
>
> Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
Acked-by: Uwe Kleine-K?nig <u.kleine-koenig@pengutronix.de>
Thanks
Uwe
--
Pengutronix e.K. | Uwe Kleine-K?nig |
Industrial Linux Solutions | http://www.pengutronix.de/ |
^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH] ARM: i.MX: Remove excess symbols ARCH_MX1, ARCH_MX25 and MACH_MX27
@ 2014-05-11 8:50 ` Alexander Shiyan
0 siblings, 0 replies; 8+ messages in thread
From: Alexander Shiyan @ 2014-05-11 8:50 UTC (permalink / raw)
To: linux-arm-kernel
Cc: linux-media, Guennadi Liakhovetski, Mauro Carvalho Chehab,
Shawn Guo, Sascha Hauer, Alexander Shiyan
This patch removes excess symbols ARCH_MX1, ARCH_MX25 and MACH_MX27.
Instead we use SOC_IMX*.
Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
---
arch/arm/mach-imx/Kconfig | 12 ------------
arch/arm/mach-imx/devices/Kconfig | 2 +-
drivers/media/platform/soc_camera/Kconfig | 2 +-
3 files changed, 2 insertions(+), 14 deletions(-)
diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig
index d56eb1a..c28fa7c 100644
--- a/arch/arm/mach-imx/Kconfig
+++ b/arch/arm/mach-imx/Kconfig
@@ -67,18 +67,8 @@ config IMX_HAVE_IOMUX_V1
config ARCH_MXC_IOMUX_V3
bool
-config ARCH_MX1
- bool
-
-config ARCH_MX25
- bool
-
-config MACH_MX27
- bool
-
config SOC_IMX1
bool
- select ARCH_MX1
select CPU_ARM920T
select IMX_HAVE_IOMUX_V1
select MXC_AVIC
@@ -91,7 +81,6 @@ config SOC_IMX21
config SOC_IMX25
bool
- select ARCH_MX25
select ARCH_MXC_IOMUX_V3
select CPU_ARM926T
select MXC_AVIC
@@ -103,7 +92,6 @@ config SOC_IMX27
select ARCH_HAS_OPP
select CPU_ARM926T
select IMX_HAVE_IOMUX_V1
- select MACH_MX27
select MXC_AVIC
select PINCTRL_IMX27
diff --git a/arch/arm/mach-imx/devices/Kconfig b/arch/arm/mach-imx/devices/Kconfig
index 846c019..1f9d4a6 100644
--- a/arch/arm/mach-imx/devices/Kconfig
+++ b/arch/arm/mach-imx/devices/Kconfig
@@ -1,6 +1,6 @@
config IMX_HAVE_PLATFORM_FEC
bool
- default y if ARCH_MX25 || SOC_IMX27 || SOC_IMX35 || SOC_IMX51 || SOC_IMX53
+ default y if SOC_IMX25 || SOC_IMX27 || SOC_IMX35 || SOC_IMX51 || SOC_IMX53
config IMX_HAVE_PLATFORM_FLEXCAN
bool
diff --git a/drivers/media/platform/soc_camera/Kconfig b/drivers/media/platform/soc_camera/Kconfig
index 122e03a..f0ccedd 100644
--- a/drivers/media/platform/soc_camera/Kconfig
+++ b/drivers/media/platform/soc_camera/Kconfig
@@ -63,7 +63,7 @@ config VIDEO_OMAP1
config VIDEO_MX2
tristate "i.MX27 Camera Sensor Interface driver"
- depends on VIDEO_DEV && SOC_CAMERA && MACH_MX27
+ depends on VIDEO_DEV && SOC_CAMERA && SOC_IMX27
select VIDEOBUF2_DMA_CONTIG
---help---
This is a v4l2 driver for the i.MX27 Camera Sensor Interface
--
1.8.3.2
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH] ARM: i.MX: Remove excess symbols ARCH_MX1, ARCH_MX25 and MACH_MX27
@ 2014-05-11 8:50 ` Alexander Shiyan
0 siblings, 0 replies; 8+ messages in thread
From: Alexander Shiyan @ 2014-05-11 8:50 UTC (permalink / raw)
To: linux-arm-kernel
This patch removes excess symbols ARCH_MX1, ARCH_MX25 and MACH_MX27.
Instead we use SOC_IMX*.
Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
---
arch/arm/mach-imx/Kconfig | 12 ------------
arch/arm/mach-imx/devices/Kconfig | 2 +-
drivers/media/platform/soc_camera/Kconfig | 2 +-
3 files changed, 2 insertions(+), 14 deletions(-)
diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig
index d56eb1a..c28fa7c 100644
--- a/arch/arm/mach-imx/Kconfig
+++ b/arch/arm/mach-imx/Kconfig
@@ -67,18 +67,8 @@ config IMX_HAVE_IOMUX_V1
config ARCH_MXC_IOMUX_V3
bool
-config ARCH_MX1
- bool
-
-config ARCH_MX25
- bool
-
-config MACH_MX27
- bool
-
config SOC_IMX1
bool
- select ARCH_MX1
select CPU_ARM920T
select IMX_HAVE_IOMUX_V1
select MXC_AVIC
@@ -91,7 +81,6 @@ config SOC_IMX21
config SOC_IMX25
bool
- select ARCH_MX25
select ARCH_MXC_IOMUX_V3
select CPU_ARM926T
select MXC_AVIC
@@ -103,7 +92,6 @@ config SOC_IMX27
select ARCH_HAS_OPP
select CPU_ARM926T
select IMX_HAVE_IOMUX_V1
- select MACH_MX27
select MXC_AVIC
select PINCTRL_IMX27
diff --git a/arch/arm/mach-imx/devices/Kconfig b/arch/arm/mach-imx/devices/Kconfig
index 846c019..1f9d4a6 100644
--- a/arch/arm/mach-imx/devices/Kconfig
+++ b/arch/arm/mach-imx/devices/Kconfig
@@ -1,6 +1,6 @@
config IMX_HAVE_PLATFORM_FEC
bool
- default y if ARCH_MX25 || SOC_IMX27 || SOC_IMX35 || SOC_IMX51 || SOC_IMX53
+ default y if SOC_IMX25 || SOC_IMX27 || SOC_IMX35 || SOC_IMX51 || SOC_IMX53
config IMX_HAVE_PLATFORM_FLEXCAN
bool
diff --git a/drivers/media/platform/soc_camera/Kconfig b/drivers/media/platform/soc_camera/Kconfig
index 122e03a..f0ccedd 100644
--- a/drivers/media/platform/soc_camera/Kconfig
+++ b/drivers/media/platform/soc_camera/Kconfig
@@ -63,7 +63,7 @@ config VIDEO_OMAP1
config VIDEO_MX2
tristate "i.MX27 Camera Sensor Interface driver"
- depends on VIDEO_DEV && SOC_CAMERA && MACH_MX27
+ depends on VIDEO_DEV && SOC_CAMERA && SOC_IMX27
select VIDEOBUF2_DMA_CONTIG
---help---
This is a v4l2 driver for the i.MX27 Camera Sensor Interface
--
1.8.3.2
^ permalink raw reply related [flat|nested] 8+ messages in thread
end of thread, other threads:[~2014-07-07 6:11 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-07-05 4:51 [PATCH] ARM: i.MX: Remove excess symbols ARCH_MX1, ARCH_MX25 and MACH_MX27 Alexander Shiyan
2014-07-07 6:11 ` Shawn Guo
-- strict thread matches above, loose matches on Subject: below --
2014-05-11 8:50 Alexander Shiyan
2014-05-11 8:50 ` Alexander Shiyan
2014-05-11 8:57 ` Uwe Kleine-König
2014-05-11 8:57 ` Uwe Kleine-König
2014-05-12 14:13 ` Shawn Guo
2014-05-12 14:13 ` Shawn Guo
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.