* [PATCH for 2.6.36 1/2] cpuimx27: fix compile when ULPI is selected
@ 2010-10-06 8:53 Eric Bénard
2010-10-06 8:53 ` [PATCH for 2.6.36 2/2] cpuimx27: fix i2c bus selection Eric Bénard
2010-10-06 13:05 ` [PATCH for 2.6.36 1/2] cpuimx27: fix compile when ULPI is selected Uwe Kleine-König
0 siblings, 2 replies; 8+ messages in thread
From: Eric Bénard @ 2010-10-06 8:53 UTC (permalink / raw)
To: linux-arm-kernel
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>
---
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 c5c0369..6348017 100644
--- a/arch/arm/mach-imx/Kconfig
+++ b/arch/arm/mach-imx/Kconfig
@@ -122,6 +122,8 @@ config MACH_CPUIMX27
select IMX_HAVE_PLATFORM_IMX_I2C
select IMX_HAVE_PLATFORM_IMX_UART
select IMX_HAVE_PLATFORM_MXC_NAND
+ select IMX_HAVE_PLATFORM_SPI_IMX
+ 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
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH for 2.6.36 2/2] cpuimx27: fix i2c bus selection
2010-10-06 8:53 [PATCH for 2.6.36 1/2] cpuimx27: fix compile when ULPI is selected Eric Bénard
@ 2010-10-06 8:53 ` Eric Bénard
2010-10-06 13:07 ` Uwe Kleine-König
2010-10-06 13:05 ` [PATCH for 2.6.36 1/2] cpuimx27: fix compile when ULPI is selected Uwe Kleine-König
1 sibling, 1 reply; 8+ messages in thread
From: Eric Bénard @ 2010-10-06 8:53 UTC (permalink / raw)
To: linux-arm-kernel
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>
---
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
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH for 2.6.36 2/2] cpuimx27: fix i2c bus selection
2010-10-06 8:53 ` [PATCH for 2.6.36 2/2] cpuimx27: fix i2c bus selection Eric Bénard
@ 2010-10-06 13:07 ` Uwe Kleine-König
2010-10-06 13:22 ` Eric Bénard
2010-10-06 13:27 ` Uwe Kleine-König
0 siblings, 2 replies; 8+ messages in thread
From: Uwe Kleine-König @ 2010-10-06 13:07 UTC (permalink / raw)
To: linux-arm-kernel
On Wed, Oct 06, 2010 at 10:53:50AM +0200, Eric B?nard wrote:
> 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>
> ---
> 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);
This doesn't fit on Sascha's current tree. Can you please rebase it?
Best regards
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 for 2.6.36 2/2] cpuimx27: fix i2c bus selection
2010-10-06 13:07 ` Uwe Kleine-König
@ 2010-10-06 13:22 ` Eric Bénard
2010-10-06 13:27 ` Uwe Kleine-König
1 sibling, 0 replies; 8+ messages in thread
From: Eric Bénard @ 2010-10-06 13:22 UTC (permalink / raw)
To: linux-arm-kernel
Hi Uwe,
Le 06/10/2010 15:07, Uwe Kleine-K?nig a ?crit :
> On Wed, Oct 06, 2010 at 10:53:50AM +0200, Eric B?nard wrote:
>> 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>
>> ---
>> 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);
> This doesn't fit on Sascha's current tree. Can you please rebase it?
>
against which branch ?
Eric
^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH for 2.6.36 2/2] cpuimx27: fix i2c bus selection
2010-10-06 13:07 ` Uwe Kleine-König
2010-10-06 13:22 ` Eric Bénard
@ 2010-10-06 13:27 ` Uwe Kleine-König
1 sibling, 0 replies; 8+ messages in thread
From: Uwe Kleine-König @ 2010-10-06 13:27 UTC (permalink / raw)
To: linux-arm-kernel
On Wed, Oct 06, 2010 at 03:07:04PM +0200, Uwe Kleine-K?nig wrote:
> On Wed, Oct 06, 2010 at 10:53:50AM +0200, Eric B?nard wrote:
> > 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>
> > ---
> > 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);
> This doesn't fit on Sascha's current tree. Can you please rebase it?
I need to be more precise here: It doesn't fit Sascha's for-2.6.37
branch. If you want it to go in before .36, then it's obviously OK.
Maybe you want to add the offending commit to the log (it's
c69871597dd173af2d7615429c0ee6aa10fae42b). And you can add my
Acked-and-blame-taken-by: Uwe Kleine-K?nig <u.kleine-koenig@pengutronix.de>
Best regards and sorry for that,
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 for 2.6.36 1/2] cpuimx27: fix compile when ULPI is selected
2010-10-06 8:53 [PATCH for 2.6.36 1/2] cpuimx27: fix compile when ULPI is selected Eric Bénard
2010-10-06 8:53 ` [PATCH for 2.6.36 2/2] cpuimx27: fix i2c bus selection Eric Bénard
@ 2010-10-06 13:05 ` Uwe Kleine-König
1 sibling, 0 replies; 8+ messages in thread
From: Uwe Kleine-König @ 2010-10-06 13:05 UTC (permalink / raw)
To: linux-arm-kernel
On Wed, Oct 06, 2010 at 10:53:49AM +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>
> ---
> 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 c5c0369..6348017 100644
> --- a/arch/arm/mach-imx/Kconfig
> +++ b/arch/arm/mach-imx/Kconfig
> @@ -122,6 +122,8 @@ config MACH_CPUIMX27
> select IMX_HAVE_PLATFORM_IMX_I2C
> select IMX_HAVE_PLATFORM_IMX_UART
> select IMX_HAVE_PLATFORM_MXC_NAND
> + select IMX_HAVE_PLATFORM_SPI_IMX
> + select MXC_ULPI if USB_ULPI
the spi part is not related to the commit log?
Best regards
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 v2 for 2.6.36 1/2] cpuimx27: fix compile when ULPI is selected
@ 2010-10-08 8:37 Eric Bénard
2010-10-08 8:37 ` [PATCH for 2.6.36 2/2] cpuimx27: fix i2c bus selection Eric Bénard
0 siblings, 1 reply; 8+ messages in thread
From: Eric Bénard @ 2010-10-08 8:37 UTC (permalink / raw)
To: linux-arm-kernel
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
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH for 2.6.36 2/2] cpuimx27: fix i2c bus selection
2010-10-08 8:37 [PATCH v2 " Eric Bénard
@ 2010-10-08 8:37 ` Eric Bénard
2010-10-08 8:51 ` Uwe Kleine-König
0 siblings, 1 reply; 8+ messages in thread
From: Eric Bénard @ 2010-10-08 8:37 UTC (permalink / raw)
To: linux-arm-kernel
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
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH for 2.6.36 2/2] cpuimx27: fix i2c bus selection
2010-10-08 8:37 ` [PATCH for 2.6.36 2/2] cpuimx27: fix i2c bus selection Eric Bénard
@ 2010-10-08 8:51 ` Uwe Kleine-König
0 siblings, 0 replies; 8+ messages in thread
From: Uwe Kleine-König @ 2010-10-08 8:51 UTC (permalink / raw)
To: linux-arm-kernel
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/ |
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2010-10-08 8:51 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-10-06 8:53 [PATCH for 2.6.36 1/2] cpuimx27: fix compile when ULPI is selected Eric Bénard
2010-10-06 8:53 ` [PATCH for 2.6.36 2/2] cpuimx27: fix i2c bus selection Eric Bénard
2010-10-06 13:07 ` Uwe Kleine-König
2010-10-06 13:22 ` Eric Bénard
2010-10-06 13:27 ` Uwe Kleine-König
2010-10-06 13:05 ` [PATCH for 2.6.36 1/2] cpuimx27: fix compile when ULPI is selected Uwe Kleine-König
-- strict thread matches above, loose matches on Subject: below --
2010-10-08 8:37 [PATCH v2 " Eric Bénard
2010-10-08 8:37 ` [PATCH for 2.6.36 2/2] cpuimx27: fix i2c bus selection Eric Bénard
2010-10-08 8:51 ` Uwe Kleine-König
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).