[PATCH 0/2] fix minor problems on mx35_3ds/mx35pdk

[PATCH 0/2] fix minor problems on mx35_3ds/mx35pdk

[Marc Kleine-Budde]

Hello,

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

regards, Marc

[PATCH 1/2] arm: imx: mx35_3ds: make mx35pdk_timer static

[Marc Kleine-Budde]

Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
---
 arch/arm/mach-imx/mach-mx35_3ds.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

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,
 };
 
-- 
1.7.4.1

[PATCH 2/2] arm: imx: add missing select IMX_HAVE_PLATFORM for MACH_MX35_3DS in Kconfig

[Marc Kleine-Budde]

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>
---
 arch/arm/mach-imx/Kconfig |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig
index 7561eca..e18d4199 100644
--- a/arch/arm/mach-imx/Kconfig
+++ b/arch/arm/mach-imx/Kconfig
@@ -571,8 +571,11 @@ 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_MX2_CAMERA
 	select IMX_HAVE_PLATFORM_MXC_EHCI
 	select IMX_HAVE_PLATFORM_MXC_NAND
 	select IMX_HAVE_PLATFORM_SDHCI_ESDHC_IMX
-- 
1.7.4.1

[PATCH 2/2] arm: imx: add missing select IMX_HAVE_PLATFORM for MACH_MX35_3DS in Kconfig

[Fabio Estevam]

On Tue, Apr 24, 2012 at 12:13 PM, Marc Kleine-Budde <mkl@pengutronix.de> wrote:

> @@ -571,8 +571,11 @@ 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_MX2_CAMERA

mx35 should not select IMX_HAVE_PLATFORM_MX2_CAMERA as this only
applies for mx25/27.