Fix n800 build - only register HW keyboard on i2c board if CONFIG_MACH_NOKIA_N810
Subsystems (3)
PATCH 1/1 Fix n800 build - only register HW keyboard on i2c board if CONFIG_MACH_NOKIA_N810
lm8323_pdata is only present if CONFIG_MACH_NOKIA_N810
--- arch/arm/mach-omap2/board-n800.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-)
arch/arm/mach-omap2/board-n800.c +2 -0
@@ -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",
Signature · 1 line
1.5.5.1
Quoted 1 line · On Fri, 2 May 2008 15:05:35 +0200, [email protected] wrote:
lm8323_pdatais only present ifCONFIG_MACH_NOKIA_N810
that's true but CONFIG_MACH_NOKIA_N810 is always true if you use n800_defconfig.
Anyways, good catch.
Quoted 33 lines
Signed-off-by Nick Loeve <[email protected]>--- arch/arm/mach-omap2/board-n800.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-)arch/arm/mach-omap2/board-n800.c +2
-0@@ -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 [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Signature · 5 lines
Best Regards, Felipe Balbi http://felipebalbi.com [email protected]
Hi,
Quoted 7 lines · Felipe Balbi
Quoted 1 line · On Fri, 2 May 2008 15:05:35 +0200, [email protected] wrote:
lm8323_pdatais only present ifCONFIG_MACH_NOKIA_N810that's true but
CONFIG_MACH_NOKIA_N810is always true if you usen800_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.
Quoted 44 lines
Anyways, good catch.
Quoted 26 lines
Signed-off-by Nick Loeve <[email protected]>--- arch/arm/mach-omap2/board-n800.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-)arch/arm/mach-omap2/board-n800.c +2
-0@@ -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",Quoted 7 lines
--
1.5.5.1--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html--
Best Regards,Felipe Balbi
http://felipebalbi.com
[email protected]
Signature · 1 line
Nick Loeve
Tony Lindgren
maintainerQuoted 8 lines · nick loeve
Hi,
Quoted 5 lines · Felipe Balbi
Quoted 1 line · On Fri, 2 May 2008 15:05:35 +0200, [email protected] wrote:
lm8323_pdatais only present ifCONFIG_MACH_NOKIA_N810
Quoted 8 lines
Quoted 2 lines
that's true but
CONFIG_MACH_NOKIA_N810is always true if you usen800_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_N810is not defined.
Pushing today.
Tony
Quoted 53 lines
Quoted 44 lines
Anyways, good catch.
Quoted 26 lines
Signed-off-by Nick Loeve <[email protected]>--- arch/arm/mach-omap2/board-n800.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-)arch/arm/mach-omap2/board-n800.c +2
-0@@ -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",Quoted 7 lines
--
1.5.5.1--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html--
Best Regards,Felipe Balbi
http://felipebalbi.com
[email protected]Signature · 5 lines
Nick Loeve -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html