[PATCH v2 for 2.6.36 1/2] cpuimx27: fix compile when ULPI is selected

[PATCH v2 for 2.6.36 1/2] cpuimx27: fix compile when ULPI is selected

[Eric Bénard]

without this patch we get :
arch/arm/mach-imx/built-in.o: In function `eukrea_cpuimx27_init':
eukrea_mbimx27-baseboard.c:(.init.text+0x44c): undefined reference to `mxc_ulpi_access_ops'

Signed-off-by: Eric B?nard <eric@eukrea.com>
---
v2 : remove SPI's select which leaked in previous patch
 arch/arm/mach-imx/Kconfig |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig
index c5c0369..2f7e272 100644
--- a/arch/arm/mach-imx/Kconfig
+++ b/arch/arm/mach-imx/Kconfig
@@ -122,6 +122,7 @@ config MACH_CPUIMX27
 	select IMX_HAVE_PLATFORM_IMX_I2C
 	select IMX_HAVE_PLATFORM_IMX_UART
 	select IMX_HAVE_PLATFORM_MXC_NAND
+	select MXC_ULPI if USB_ULPI
 	help
 	  Include support for Eukrea CPUIMX27 platform. This includes
 	  specific configurations for the module and its peripherals.
-- 
1.7.0.4

[PATCH for 2.6.36 2/2] cpuimx27: fix i2c bus selection

[Eric Bénard]

Recent clean of i.MX devices registration changed the i2C bus number
selected for our platform (Freescale start peripheral ID at 1, kernel
now start it at 0 so i.MX27's i2c 1 is kernel's i2c 0).
Without this fix, i2c is unusable on this platform.

Signed-off-by: Eric B?nard <eric@eukrea.com>
Acked-by: Uwe Kleine-K?nig <u.kleine-koenig@pengutronix.de>
---
 arch/arm/mach-imx/mach-cpuimx27.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/arch/arm/mach-imx/mach-cpuimx27.c b/arch/arm/mach-imx/mach-cpuimx27.c
index 339150a..6830afd 100644
--- a/arch/arm/mach-imx/mach-cpuimx27.c
+++ b/arch/arm/mach-imx/mach-cpuimx27.c
@@ -259,7 +259,7 @@ static void __init eukrea_cpuimx27_init(void)
 	i2c_register_board_info(0, eukrea_cpuimx27_i2c_devices,
 				ARRAY_SIZE(eukrea_cpuimx27_i2c_devices));
 
-	imx27_add_i2c_imx1(&cpuimx27_i2c1_data);
+	imx27_add_i2c_imx0(&cpuimx27_i2c1_data);
 
 	platform_add_devices(platform_devices, ARRAY_SIZE(platform_devices));
 
-- 
1.7.0.4

[PATCH for 2.6.36 2/2] cpuimx27: fix i2c bus selection

[Uwe Kleine-König]

On Fri, Oct 08, 2010 at 10:37:41AM +0200, Eric B?nard wrote:
> Recent clean of i.MX devices registration changed the i2C bus number
s/clean/clean up/ ?

> selected for our platform (Freescale start peripheral ID at 1, kernel
> now start it at 0 so i.MX27's i2c 1 is kernel's i2c 0).
Note that I didn't change the base for numbering devices.  If you look
at c69871597dd173af2d7615429c0ee6aa10fae42b, it has:

-       mxc_register_device(&mxc_i2c_device0, &eukrea_cpuimx27_i2c_1_data);
+       imx27_add_i2c_imx1(&cpuimx27_i2c1_data);

So I just used imx27_add_i2c_imx1 to replace registering of
mxc_i2c_device0, probably I did this because of the 1 in the name of the
platform data (that was already inconsistant before).  I'd suggest do
change it to cpuimx27_i2c0_data, too.

And I'd like to have the commit id for the breaking patch in the commit
log please.

Best regards
Uwe

> Without this fix, i2c is unusable on this platform.
> 
> Signed-off-by: Eric B?nard <eric@eukrea.com>
> Acked-by: Uwe Kleine-K?nig <u.kleine-koenig@pengutronix.de>
> ---
>  arch/arm/mach-imx/mach-cpuimx27.c |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/arch/arm/mach-imx/mach-cpuimx27.c b/arch/arm/mach-imx/mach-cpuimx27.c
> index 339150a..6830afd 100644
> --- a/arch/arm/mach-imx/mach-cpuimx27.c
> +++ b/arch/arm/mach-imx/mach-cpuimx27.c
> @@ -259,7 +259,7 @@ static void __init eukrea_cpuimx27_init(void)
>  	i2c_register_board_info(0, eukrea_cpuimx27_i2c_devices,
>  				ARRAY_SIZE(eukrea_cpuimx27_i2c_devices));
>  
> -	imx27_add_i2c_imx1(&cpuimx27_i2c1_data);
> +	imx27_add_i2c_imx0(&cpuimx27_i2c1_data);
>  
>  	platform_add_devices(platform_devices, ARRAY_SIZE(platform_devices));
>  
> -- 
> 1.7.0.4
> 
> 

-- 
Pengutronix e.K.                           | Uwe Kleine-K?nig            |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |

[PATCH v2 for 2.6.36 1/2] cpuimx27: fix compile when ULPI is selected

[Uwe Kleine-König]

On Fri, Oct 08, 2010 at 10:37:40AM +0200, Eric B?nard wrote:
> without this patch we get :
> arch/arm/mach-imx/built-in.o: In function `eukrea_cpuimx27_init':
> eukrea_mbimx27-baseboard.c:(.init.text+0x44c): undefined reference to `mxc_ulpi_access_ops'
> 
> Signed-off-by: Eric B?nard <eric@eukrea.com>
Acked-by: Uwe Kleine-K?nig <u.kleine-koenig@pengutronix.de>
> ---
> v2 : remove SPI's select which leaked in previous patch
>  arch/arm/mach-imx/Kconfig |    1 +
>  1 files changed, 1 insertions(+), 0 deletions(-)
> 
> diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig
> index c5c0369..2f7e272 100644
> --- a/arch/arm/mach-imx/Kconfig
> +++ b/arch/arm/mach-imx/Kconfig
> @@ -122,6 +122,7 @@ config MACH_CPUIMX27
>  	select IMX_HAVE_PLATFORM_IMX_I2C
>  	select IMX_HAVE_PLATFORM_IMX_UART
>  	select IMX_HAVE_PLATFORM_MXC_NAND
> +	select MXC_ULPI if USB_ULPI
>  	help
>  	  Include support for Eukrea CPUIMX27 platform. This includes
>  	  specific configurations for the module and its peripherals.
> -- 
> 1.7.0.4
> 
> 
> _______________________________________________
> linux-arm-kernel mailing list
> linux-arm-kernel at lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

-- 
Pengutronix e.K.                           | Uwe Kleine-K?nig            |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |