All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH v2 0/2] minor cleanups on imx
@ 2012-04-24 15:48 Marc Kleine-Budde
  2012-04-24 15:48 ` [PATCH v2 1/2] arm: imx: make various struct sys_timer static Marc Kleine-Budde
                   ` (2 more replies)
  0 siblings, 3 replies; 4+ messages in thread
From: Marc Kleine-Budde @ 2012-04-24 15:48 UTC (permalink / raw)
  To: linux-arm-kernel

this series applies to v3.4-rc4, it adds a missing static to struct sys_timer
in some imx platforms and adds some missing IMX_HAVE_PLATFORM to MACH_MX35_3DS
in Kconfig.

regards, Marc

^ permalink raw reply	[flat|nested] 4+ messages in thread
* [PATCH v2 1/2] arm: imx: make various struct sys_timer static
  2012-04-24 15:48 [PATCH v2 0/2] minor cleanups on imx Marc Kleine-Budde
@ 2012-04-24 15:48 ` Marc Kleine-Budde
  2012-04-24 15:48 ` [PATCH v2 2/2] arm: imx: add missing select IMX_HAVE_PLATFORM for MACH_MX35_3DS in Kconfig Marc Kleine-Budde
  2012-04-26  7:44 ` [PATCH v2 0/2] minor cleanups on imx Sascha Hauer
  2 siblings, 0 replies; 4+ messages in thread
From: Marc Kleine-Budde @ 2012-04-24 15:48 UTC (permalink / raw)
  To: linux-arm-kernel

Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
---

Changes since v1:
* add missing static other mach-imx board files, too

 arch/arm/mach-imx/mach-cpuimx35.c    |    2 +-
 arch/arm/mach-imx/mach-mx1ads.c      |    2 +-
 arch/arm/mach-imx/mach-mx31lite.c    |    2 +-
 arch/arm/mach-imx/mach-mx31moboard.c |    2 +-
 arch/arm/mach-imx/mach-mx35_3ds.c    |    2 +-
 arch/arm/mach-imx/mach-pcm037.c      |    2 +-
 arch/arm/mach-imx/mach-pcm043.c      |    2 +-
 arch/arm/mach-imx/mach-vpr200.c      |    2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/arch/arm/mach-imx/mach-cpuimx35.c b/arch/arm/mach-imx/mach-cpuimx35.c
index 8ecc872..c515f8e 100644
--- a/arch/arm/mach-imx/mach-cpuimx35.c
+++ b/arch/arm/mach-imx/mach-cpuimx35.c
@@ -194,7 +194,7 @@ static void __init eukrea_cpuimx35_timer_init(void)
 	mx35_clocks_init();
 }
 
-struct sys_timer eukrea_cpuimx35_timer = {
+static struct sys_timer eukrea_cpuimx35_timer = {
 	.init	= eukrea_cpuimx35_timer_init,
 };
 
diff --git a/arch/arm/mach-imx/mach-mx1ads.c b/arch/arm/mach-imx/mach-mx1ads.c
index 9704608..7274e79 100644
--- a/arch/arm/mach-imx/mach-mx1ads.c
+++ b/arch/arm/mach-imx/mach-mx1ads.c
@@ -134,7 +134,7 @@ static void __init mx1ads_timer_init(void)
 	mx1_clocks_init(32000);
 }
 
-struct sys_timer mx1ads_timer = {
+static struct sys_timer mx1ads_timer = {
 	.init	= mx1ads_timer_init,
 };
 
diff --git a/arch/arm/mach-imx/mach-mx31lite.c b/arch/arm/mach-imx/mach-mx31lite.c
index 0abef5f..686c605 100644
--- a/arch/arm/mach-imx/mach-mx31lite.c
+++ b/arch/arm/mach-imx/mach-mx31lite.c
@@ -283,7 +283,7 @@ static void __init mx31lite_timer_init(void)
 	mx31_clocks_init(26000000);
 }
 
-struct sys_timer mx31lite_timer = {
+static struct sys_timer mx31lite_timer = {
 	.init	= mx31lite_timer_init,
 };
 
diff --git a/arch/arm/mach-imx/mach-mx31moboard.c b/arch/arm/mach-imx/mach-mx31moboard.c
index f17a15f..1dfe3c7 100644
--- a/arch/arm/mach-imx/mach-mx31moboard.c
+++ b/arch/arm/mach-imx/mach-mx31moboard.c
@@ -580,7 +580,7 @@ static void __init mx31moboard_timer_init(void)
 	mx31_clocks_init(26000000);
 }
 
-struct sys_timer mx31moboard_timer = {
+static struct sys_timer mx31moboard_timer = {
 	.init	= mx31moboard_timer_init,
 };
 
diff --git a/arch/arm/mach-imx/mach-mx35_3ds.c b/arch/arm/mach-imx/mach-mx35_3ds.c
index 6ae51c6..c433187 100644
--- a/arch/arm/mach-imx/mach-mx35_3ds.c
+++ b/arch/arm/mach-imx/mach-mx35_3ds.c
@@ -419,7 +419,7 @@ static void __init mx35pdk_timer_init(void)
 	mx35_clocks_init();
 }
 
-struct sys_timer mx35pdk_timer = {
+static struct sys_timer mx35pdk_timer = {
 	.init	= mx35pdk_timer_init,
 };
 
diff --git a/arch/arm/mach-imx/mach-pcm037.c b/arch/arm/mach-imx/mach-pcm037.c
index 5fddf94..10c9795 100644
--- a/arch/arm/mach-imx/mach-pcm037.c
+++ b/arch/arm/mach-imx/mach-pcm037.c
@@ -683,7 +683,7 @@ static void __init pcm037_timer_init(void)
 	mx31_clocks_init(26000000);
 }
 
-struct sys_timer pcm037_timer = {
+static struct sys_timer pcm037_timer = {
 	.init	= pcm037_timer_init,
 };
 
diff --git a/arch/arm/mach-imx/mach-pcm043.c b/arch/arm/mach-imx/mach-pcm043.c
index 237474f..73585f5 100644
--- a/arch/arm/mach-imx/mach-pcm043.c
+++ b/arch/arm/mach-imx/mach-pcm043.c
@@ -399,7 +399,7 @@ static void __init pcm043_timer_init(void)
 	mx35_clocks_init();
 }
 
-struct sys_timer pcm043_timer = {
+static struct sys_timer pcm043_timer = {
 	.init	= pcm043_timer_init,
 };
 
diff --git a/arch/arm/mach-imx/mach-vpr200.c b/arch/arm/mach-imx/mach-vpr200.c
index 033257e..add8c69 100644
--- a/arch/arm/mach-imx/mach-vpr200.c
+++ b/arch/arm/mach-imx/mach-vpr200.c
@@ -310,7 +310,7 @@ static void __init vpr200_timer_init(void)
 	mx35_clocks_init();
 }
 
-struct sys_timer vpr200_timer = {
+static struct sys_timer vpr200_timer = {
 	.init	= vpr200_timer_init,
 };
 
-- 
1.7.4.1

^ permalink raw reply related	[flat|nested] 4+ messages in thread
* [PATCH v2 2/2] arm: imx: add missing select IMX_HAVE_PLATFORM for MACH_MX35_3DS in Kconfig
  2012-04-24 15:48 [PATCH v2 0/2] minor cleanups on imx Marc Kleine-Budde
  2012-04-24 15:48 ` [PATCH v2 1/2] arm: imx: make various struct sys_timer static Marc Kleine-Budde
@ 2012-04-24 15:48 ` Marc Kleine-Budde
  2012-04-26  7:44 ` [PATCH v2 0/2] minor cleanups on imx Sascha Hauer
  2 siblings, 0 replies; 4+ messages in thread
From: Marc Kleine-Budde @ 2012-04-24 15:48 UTC (permalink / raw)
  To: linux-arm-kernel

This patch fixes the following linker error:
arch/arm/mach-imx/built-in.o: In function `mx35_3ds_init':
mach-mx35_3ds.c:(.init.text+0x4b0): undefined reference to `imx_add_ipu_core'
mach-mx35_3ds.c:(.init.text+0x4c4): undefined reference to `imx_alloc_mx3_camera'
mach-mx35_3ds.c:(.init.text+0x520): undefined reference to `imx_add_mx3_sdc_fb'
mach-mx35_3ds.c:(.init.text+0x590): undefined reference to `imx35_ipu_core_data'

Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
Cc: Fabio Estevam <festevam@gmail.com>
---

Changes since v1:
* don't select IMX_HAVE_PLATFORM_MX2_CAMERA (thanks Fabio)

 arch/arm/mach-imx/Kconfig |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig
index 7561eca..f72d399 100644
--- a/arch/arm/mach-imx/Kconfig
+++ b/arch/arm/mach-imx/Kconfig
@@ -571,8 +571,10 @@ config MACH_MX35_3DS
 	select MXC_DEBUG_BOARD
 	select IMX_HAVE_PLATFORM_FSL_USB2_UDC
 	select IMX_HAVE_PLATFORM_IMX2_WDT
+	select IMX_HAVE_PLATFORM_IMX_FB
 	select IMX_HAVE_PLATFORM_IMX_I2C
 	select IMX_HAVE_PLATFORM_IMX_UART
+	select IMX_HAVE_PLATFORM_IPU_CORE
 	select IMX_HAVE_PLATFORM_MXC_EHCI
 	select IMX_HAVE_PLATFORM_MXC_NAND
 	select IMX_HAVE_PLATFORM_SDHCI_ESDHC_IMX
-- 
1.7.4.1

^ permalink raw reply related	[flat|nested] 4+ messages in thread
* [PATCH v2 0/2] minor cleanups on imx
  2012-04-24 15:48 [PATCH v2 0/2] minor cleanups on imx Marc Kleine-Budde
  2012-04-24 15:48 ` [PATCH v2 1/2] arm: imx: make various struct sys_timer static Marc Kleine-Budde
  2012-04-24 15:48 ` [PATCH v2 2/2] arm: imx: add missing select IMX_HAVE_PLATFORM for MACH_MX35_3DS in Kconfig Marc Kleine-Budde
@ 2012-04-26  7:44 ` Sascha Hauer
  2 siblings, 0 replies; 4+ messages in thread
From: Sascha Hauer @ 2012-04-26  7:44 UTC (permalink / raw)
  To: linux-arm-kernel

On Tue, Apr 24, 2012 at 05:48:16PM +0200, Marc Kleine-Budde wrote:
> this series applies to v3.4-rc4, it adds a missing static to struct sys_timer
> in some imx platforms and adds some missing IMX_HAVE_PLATFORM to MACH_MX35_3DS
> in Kconfig.

Applied, thanks

Sascha

> 
> regards, Marc
> 
> 

-- 
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] 4+ messages in thread
end of thread, other threads:[~2012-04-26  7:44 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-04-24 15:48 [PATCH v2 0/2] minor cleanups on imx Marc Kleine-Budde
2012-04-24 15:48 ` [PATCH v2 1/2] arm: imx: make various struct sys_timer static Marc Kleine-Budde
2012-04-24 15:48 ` [PATCH v2 2/2] arm: imx: add missing select IMX_HAVE_PLATFORM for MACH_MX35_3DS in Kconfig Marc Kleine-Budde
2012-04-26  7:44 ` [PATCH v2 0/2] minor cleanups on imx Sascha Hauer

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.