* [PATCH] ARM: OMAP2: Fix Nokia N8x0 second I2C bus device registration
@ 2008-09-01 13:05 Jarkko Nikula
2008-09-01 19:11 ` Riku Voipio
0 siblings, 1 reply; 3+ messages in thread
From: Jarkko Nikula @ 2008-09-01 13:05 UTC (permalink / raw)
To: linux-omap; +Cc: Riku Voipio, Jarkko Nikula
- TSL2563 and LP5521 are found only in N810
- Fix one typo
Signed-off-by: Jarkko Nikula <jarkko.nikula@nokia.com>
---
arch/arm/mach-omap2/board-n800.c | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/arch/arm/mach-omap2/board-n800.c b/arch/arm/mach-omap2/board-n800.c
index 95cc84a..1df9f3d 100644
--- a/arch/arm/mach-omap2/board-n800.c
+++ b/arch/arm/mach-omap2/board-n800.c
@@ -649,12 +649,6 @@ static struct i2c_board_info __initdata_or_module n8x0_i2c_board_info_2[] = {
.platform_data = &n800_tcm825x_platform_data,
#endif
},
- {
- I2C_BOARD_INFO("tsl2563", 0x29),
- },
- {
- I2C_BOARD_INFO("lp5521", 0x32),
- },
};
@@ -670,6 +664,12 @@ static struct i2c_board_info __initdata_or_module n810_i2c_board_info_2[] = {
.irq = OMAP_GPIO_IRQ(109),
.platform_data = &lm8323_pdata,
},
+ {
+ I2C_BOARD_INFO("tsl2563", 0x29),
+ },
+ {
+ I2C_BOARD_INFO("lp5521", 0x32),
+ },
};
void __init nokia_n800_common_init(void)
@@ -694,7 +694,7 @@ void __init nokia_n800_common_init(void)
omap_register_i2c_bus(1, 400, n800_i2c_board_info_1,
ARRAY_SIZE(n800_i2c_board_info_1));
omap_register_i2c_bus(2, 400, n8x0_i2c_board_info_2,
- ARRAY_SIZE(n800_i2c_board_info_2));
+ ARRAY_SIZE(n8x0_i2c_board_info_2));
if (machine_is_nokia_n800())
i2c_register_board_info(2, n800_i2c_board_info_2,
ARRAY_SIZE(n800_i2c_board_info_2));
--
1.5.6.3
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH] ARM: OMAP2: Fix Nokia N8x0 second I2C bus device registration
2008-09-01 13:05 [PATCH] ARM: OMAP2: Fix Nokia N8x0 second I2C bus device registration Jarkko Nikula
@ 2008-09-01 19:11 ` Riku Voipio
2008-09-05 16:11 ` Tony Lindgren
0 siblings, 1 reply; 3+ messages in thread
From: Riku Voipio @ 2008-09-01 19:11 UTC (permalink / raw)
To: Jarkko Nikula; +Cc: linux-omap
On Mon, Sep 01, 2008 at 04:05:04PM +0300, Jarkko Nikula wrote:
> - TSL2563 and LP5521 are found only in N810
> - Fix one typo
> Signed-off-by: Jarkko Nikula <jarkko.nikula@nokia.com>
Acked-by: Riku voipio <riku.voipio@iki.fi>
> ---
> arch/arm/mach-omap2/board-n800.c | 14 +++++++-------
> 1 files changed, 7 insertions(+), 7 deletions(-)
>
> diff --git a/arch/arm/mach-omap2/board-n800.c b/arch/arm/mach-omap2/board-n800.c
> index 95cc84a..1df9f3d 100644
> --- a/arch/arm/mach-omap2/board-n800.c
> +++ b/arch/arm/mach-omap2/board-n800.c
> @@ -649,12 +649,6 @@ static struct i2c_board_info __initdata_or_module n8x0_i2c_board_info_2[] = {
> .platform_data = &n800_tcm825x_platform_data,
> #endif
> },
> - {
> - I2C_BOARD_INFO("tsl2563", 0x29),
> - },
> - {
> - I2C_BOARD_INFO("lp5521", 0x32),
> - },
> };
>
>
> @@ -670,6 +664,12 @@ static struct i2c_board_info __initdata_or_module n810_i2c_board_info_2[] = {
> .irq = OMAP_GPIO_IRQ(109),
> .platform_data = &lm8323_pdata,
> },
> + {
> + I2C_BOARD_INFO("tsl2563", 0x29),
> + },
> + {
> + I2C_BOARD_INFO("lp5521", 0x32),
> + },
> };
>
> void __init nokia_n800_common_init(void)
> @@ -694,7 +694,7 @@ void __init nokia_n800_common_init(void)
> omap_register_i2c_bus(1, 400, n800_i2c_board_info_1,
> ARRAY_SIZE(n800_i2c_board_info_1));
> omap_register_i2c_bus(2, 400, n8x0_i2c_board_info_2,
> - ARRAY_SIZE(n800_i2c_board_info_2));
> + ARRAY_SIZE(n8x0_i2c_board_info_2));
> if (machine_is_nokia_n800())
> i2c_register_board_info(2, n800_i2c_board_info_2,
> ARRAY_SIZE(n800_i2c_board_info_2));
> --
> 1.5.6.3
--
"rm -rf" only sounds scary if you don't have backups
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] ARM: OMAP2: Fix Nokia N8x0 second I2C bus device registration
2008-09-01 19:11 ` Riku Voipio
@ 2008-09-05 16:11 ` Tony Lindgren
0 siblings, 0 replies; 3+ messages in thread
From: Tony Lindgren @ 2008-09-05 16:11 UTC (permalink / raw)
To: Riku Voipio; +Cc: Jarkko Nikula, linux-omap
* Riku Voipio <riku.voipio@iki.fi> [080901 12:12]:
> On Mon, Sep 01, 2008 at 04:05:04PM +0300, Jarkko Nikula wrote:
> > - TSL2563 and LP5521 are found only in N810
> > - Fix one typo
>
> > Signed-off-by: Jarkko Nikula <jarkko.nikula@nokia.com>
>
> Acked-by: Riku voipio <riku.voipio@iki.fi>
Pushing today.
Tony
>
> > ---
> > arch/arm/mach-omap2/board-n800.c | 14 +++++++-------
> > 1 files changed, 7 insertions(+), 7 deletions(-)
> >
> > diff --git a/arch/arm/mach-omap2/board-n800.c b/arch/arm/mach-omap2/board-n800.c
> > index 95cc84a..1df9f3d 100644
> > --- a/arch/arm/mach-omap2/board-n800.c
> > +++ b/arch/arm/mach-omap2/board-n800.c
> > @@ -649,12 +649,6 @@ static struct i2c_board_info __initdata_or_module n8x0_i2c_board_info_2[] = {
> > .platform_data = &n800_tcm825x_platform_data,
> > #endif
> > },
> > - {
> > - I2C_BOARD_INFO("tsl2563", 0x29),
> > - },
> > - {
> > - I2C_BOARD_INFO("lp5521", 0x32),
> > - },
> > };
> >
> >
> > @@ -670,6 +664,12 @@ static struct i2c_board_info __initdata_or_module n810_i2c_board_info_2[] = {
> > .irq = OMAP_GPIO_IRQ(109),
> > .platform_data = &lm8323_pdata,
> > },
> > + {
> > + I2C_BOARD_INFO("tsl2563", 0x29),
> > + },
> > + {
> > + I2C_BOARD_INFO("lp5521", 0x32),
> > + },
> > };
> >
> > void __init nokia_n800_common_init(void)
> > @@ -694,7 +694,7 @@ void __init nokia_n800_common_init(void)
> > omap_register_i2c_bus(1, 400, n800_i2c_board_info_1,
> > ARRAY_SIZE(n800_i2c_board_info_1));
> > omap_register_i2c_bus(2, 400, n8x0_i2c_board_info_2,
> > - ARRAY_SIZE(n800_i2c_board_info_2));
> > + ARRAY_SIZE(n8x0_i2c_board_info_2));
> > if (machine_is_nokia_n800())
> > i2c_register_board_info(2, n800_i2c_board_info_2,
> > ARRAY_SIZE(n800_i2c_board_info_2));
> > --
> > 1.5.6.3
>
> --
> "rm -rf" only sounds scary if you don't have backups
> --
> To unsubscribe from this list: send the line "unsubscribe linux-omap" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2008-09-05 16:11 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-09-01 13:05 [PATCH] ARM: OMAP2: Fix Nokia N8x0 second I2C bus device registration Jarkko Nikula
2008-09-01 19:11 ` Riku Voipio
2008-09-05 16:11 ` Tony Lindgren
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox