public inbox for linux-omap@vger.kernel.org
 help / color / mirror / Atom feed
* [PATCH] Fix n800 build - only register HW keyboard on i2c board if CONFIG_MACH_NOKIA_N810
@ 2008-05-02 13:05 trickie
  2008-05-02 13:17 ` Felipe Balbi
  0 siblings, 1 reply; 4+ messages in thread
From: trickie @ 2008-05-02 13:05 UTC (permalink / raw)
  To: linux-omap; +Cc: Nick Loeve

lm8323_pdata is only present if CONFIG_MACH_NOKIA_N810

Signed-off-by: Nick Loeve <trickie@gmail.com>
---
 arch/arm/mach-omap2/board-n800.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/arch/arm/mach-omap2/board-n800.c b/arch/arm/mach-omap2/board-n800.c
index 8b5956b..b62f2d5 100644
--- a/arch/arm/mach-omap2/board-n800.c
+++ b/arch/arm/mach-omap2/board-n800.c
@@ -654,12 +654,14 @@ static struct i2c_board_info __initdata n800_i2c_board_info_2[] = {
 		I2C_BOARD_INFO("tea5761", 0x10),
 	},
 #endif
+#ifdef CONFIG_MACH_NOKIA_N810
 	{
 		I2C_BOARD_INFO("lm8323", 0x45),
 		.type		= "lm8323",
 		.irq		= OMAP_GPIO_IRQ(109),
 		.platform_data	= &lm8323_pdata,
 	},
+#endif
 	{
 		I2C_BOARD_INFO("tsl2563", 0x29),
 		.type		= "tsl2563",
-- 
1.5.5.1


^ permalink raw reply related	[flat|nested] 4+ messages in thread

* Re: [PATCH] Fix n800 build - only register HW keyboard on i2c board if CONFIG_MACH_NOKIA_N810
  2008-05-02 13:05 [PATCH] Fix n800 build - only register HW keyboard on i2c board if CONFIG_MACH_NOKIA_N810 trickie
@ 2008-05-02 13:17 ` Felipe Balbi
  2008-05-02 13:24   ` nick loeve
  0 siblings, 1 reply; 4+ messages in thread
From: Felipe Balbi @ 2008-05-02 13:17 UTC (permalink / raw)
  To: trickie; +Cc: linux-omap



On Fri,  2 May 2008 15:05:35 +0200, trickie@gmail.com wrote:
> lm8323_pdata is only present if CONFIG_MACH_NOKIA_N810

that's true but CONFIG_MACH_NOKIA_N810 is always true
if you use n800_defconfig.

Anyways, good catch.

> Signed-off-by: Nick Loeve <trickie@gmail.com>
> ---
>  arch/arm/mach-omap2/board-n800.c |    2 ++
>  1 files changed, 2 insertions(+), 0 deletions(-)
> 
> diff --git a/arch/arm/mach-omap2/board-n800.c
> b/arch/arm/mach-omap2/board-n800.c
> index 8b5956b..b62f2d5 100644
> --- a/arch/arm/mach-omap2/board-n800.c
> +++ b/arch/arm/mach-omap2/board-n800.c
> @@ -654,12 +654,14 @@ static struct i2c_board_info __initdata
> n800_i2c_board_info_2[] = {
>  		I2C_BOARD_INFO("tea5761", 0x10),
>  	},
>  #endif
> +#ifdef CONFIG_MACH_NOKIA_N810
>  	{
>  		I2C_BOARD_INFO("lm8323", 0x45),
>  		.type		= "lm8323",
>  		.irq		= OMAP_GPIO_IRQ(109),
>  		.platform_data	= &lm8323_pdata,
>  	},
> +#endif
>  	{
>  		I2C_BOARD_INFO("tsl2563", 0x29),
>  		.type		= "tsl2563",
> --
> 1.5.5.1
> 
> --
> 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
-- 
Best Regards,

Felipe Balbi
http://felipebalbi.com
me@felipebalbi.com


^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [PATCH] Fix n800 build - only register HW keyboard on i2c board if CONFIG_MACH_NOKIA_N810
  2008-05-02 13:17 ` Felipe Balbi
@ 2008-05-02 13:24   ` nick loeve
  2008-05-02 23:34     ` Tony Lindgren
  0 siblings, 1 reply; 4+ messages in thread
From: nick loeve @ 2008-05-02 13:24 UTC (permalink / raw)
  To: Felipe Balbi; +Cc: linux-omap

Hi,

On Fri, May 2, 2008 at 3:17 PM, Felipe Balbi <me@felipebalbi.com> wrote:
>
>
> On Fri,  2 May 2008 15:05:35 +0200, trickie@gmail.com wrote:
>> lm8323_pdata is only present if CONFIG_MACH_NOKIA_N810
>
> that's true but CONFIG_MACH_NOKIA_N810 is always true
> if you use n800_defconfig.

Yes true. I have been playing with a custom .config based on Tony's
experiments here: http://www.muru.com/linux/n8x0/ but for my n800
only.

Hence I noticed this if CONFIG_MACH_NOKIA_N810 is not defined.

>
> Anyways, good catch.
>
>> Signed-off-by: Nick Loeve <trickie@gmail.com>
>> ---
>>  arch/arm/mach-omap2/board-n800.c |    2 ++
>>  1 files changed, 2 insertions(+), 0 deletions(-)
>>
>> diff --git a/arch/arm/mach-omap2/board-n800.c
>> b/arch/arm/mach-omap2/board-n800.c
>> index 8b5956b..b62f2d5 100644
>> --- a/arch/arm/mach-omap2/board-n800.c
>> +++ b/arch/arm/mach-omap2/board-n800.c
>> @@ -654,12 +654,14 @@ static struct i2c_board_info __initdata
>> n800_i2c_board_info_2[] = {
>>               I2C_BOARD_INFO("tea5761", 0x10),
>>       },
>>  #endif
>> +#ifdef CONFIG_MACH_NOKIA_N810
>>       {
>>               I2C_BOARD_INFO("lm8323", 0x45),
>>               .type           = "lm8323",
>>               .irq            = OMAP_GPIO_IRQ(109),
>>               .platform_data  = &lm8323_pdata,
>>       },
>> +#endif
>>       {
>>               I2C_BOARD_INFO("tsl2563", 0x29),
>>               .type           = "tsl2563",
>> --
>> 1.5.5.1
>>
>> --
>> 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
> --
> Best Regards,
>
> Felipe Balbi
> http://felipebalbi.com
> me@felipebalbi.com
>
>



-- 
Nick Loeve

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [PATCH] Fix n800 build - only register HW keyboard on i2c board if CONFIG_MACH_NOKIA_N810
  2008-05-02 13:24   ` nick loeve
@ 2008-05-02 23:34     ` Tony Lindgren
  0 siblings, 0 replies; 4+ messages in thread
From: Tony Lindgren @ 2008-05-02 23:34 UTC (permalink / raw)
  To: nick loeve; +Cc: Felipe Balbi, linux-omap

* nick loeve <trickie@gmail.com> [080502 06:25]:
> Hi,
> 
> On Fri, May 2, 2008 at 3:17 PM, Felipe Balbi <me@felipebalbi.com> wrote:
> >
> >
> > On Fri,  2 May 2008 15:05:35 +0200, trickie@gmail.com wrote:
> >> lm8323_pdata is only present if CONFIG_MACH_NOKIA_N810
> >
> > that's true but CONFIG_MACH_NOKIA_N810 is always true
> > if you use n800_defconfig.
> 
> Yes true. I have been playing with a custom .config based on Tony's
> experiments here: http://www.muru.com/linux/n8x0/ but for my n800
> only.
> 
> Hence I noticed this if CONFIG_MACH_NOKIA_N810 is not defined.

Pushing today.

Tony


> >
> > Anyways, good catch.
> >
> >> Signed-off-by: Nick Loeve <trickie@gmail.com>
> >> ---
> >>  arch/arm/mach-omap2/board-n800.c |    2 ++
> >>  1 files changed, 2 insertions(+), 0 deletions(-)
> >>
> >> diff --git a/arch/arm/mach-omap2/board-n800.c
> >> b/arch/arm/mach-omap2/board-n800.c
> >> index 8b5956b..b62f2d5 100644
> >> --- a/arch/arm/mach-omap2/board-n800.c
> >> +++ b/arch/arm/mach-omap2/board-n800.c
> >> @@ -654,12 +654,14 @@ static struct i2c_board_info __initdata
> >> n800_i2c_board_info_2[] = {
> >>               I2C_BOARD_INFO("tea5761", 0x10),
> >>       },
> >>  #endif
> >> +#ifdef CONFIG_MACH_NOKIA_N810
> >>       {
> >>               I2C_BOARD_INFO("lm8323", 0x45),
> >>               .type           = "lm8323",
> >>               .irq            = OMAP_GPIO_IRQ(109),
> >>               .platform_data  = &lm8323_pdata,
> >>       },
> >> +#endif
> >>       {
> >>               I2C_BOARD_INFO("tsl2563", 0x29),
> >>               .type           = "tsl2563",
> >> --
> >> 1.5.5.1
> >>
> >> --
> >> 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
> > --
> > Best Regards,
> >
> > Felipe Balbi
> > http://felipebalbi.com
> > me@felipebalbi.com
> >
> >
> 
> 
> 
> -- 
> Nick Loeve
> --
> 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] 4+ messages in thread

end of thread, other threads:[~2008-05-02 23:34 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-05-02 13:05 [PATCH] Fix n800 build - only register HW keyboard on i2c board if CONFIG_MACH_NOKIA_N810 trickie
2008-05-02 13:17 ` Felipe Balbi
2008-05-02 13:24   ` nick loeve
2008-05-02 23:34     ` Tony Lindgren

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox