On Mon, Jan 07, 2008 at 10:20:38AM +0200, Jarkko Nikula wrote: > On Thu, 3 Jan 2008 10:42:47 -0500 > "ext Felipe Balbi" <me@xxxxxxxxxxxxxxx> wrote: > > > On Wed, Jan 02, 2008 at 03:15:26PM -0400, Carlos Aguiar wrote: > > > From: Carlos Eduardo Aguiar <carlos.aguiar@xxxxxxxxxxx> > > > > > > This patch adds on arch/arm/mach-omap1/board-h2.c file, > > > the i2c_register_board_info() call at h2_init(void), > > > in order to fix kernel panic on I2C when booting TI H2 boards. > > > > > > Signed-off-by: Carlos Eduardo Aguiar <carlos.aguiar@xxxxxxxxxxx> > > Acked-by: Felipe Balbi <me@xxxxxxxxxxxxxxx> > > > > > --- > > > arch/arm/mach-omap1/board-h2.c | 5 +++-- > > > 1 files changed, 3 insertions(+), 2 deletions(-) > > > > > > diff --git a/arch/arm/mach-omap1/board-h2.c > > > b/arch/arm/mach-omap1/board-h2.c index 43f9627..007a00b 100644 > > > --- a/arch/arm/mach-omap1/board-h2.c > > > +++ b/arch/arm/mach-omap1/board-h2.c > > > @@ -447,8 +447,6 @@ static void __init h2_init_irq(void) > > > omap1_init_common_hw(); > > > omap_init_irq(); > > > omap_gpio_init(); > > > - i2c_register_board_info(1, h2_i2c_board_info, > > > - ARRAY_SIZE(h2_i2c_board_info)); > > > h2_init_smc91x(); > > > } > > > > > > @@ -545,6 +543,9 @@ static void __init h2_init(void) > > > } > > > #endif > > > > > > + i2c_register_board_info(1, h2_i2c_board_info, > > > + ARRAY_SIZE(h2_i2c_board_info)); > > > + > > > > Good catch. I just compile tested on H2 and H4 and let it pass. Sorry > > guys > > > How about passing h2_i2c_board_info via omap_register_i2c_bus? > > > Jarkko > > diff --git a/arch/arm/mach-omap1/board-h2.c > b/arch/arm/mach-omap1/board-h2.c index 43f9627..9b3a1d1 100644 > --- a/arch/arm/mach-omap1/board-h2.c > +++ b/arch/arm/mach-omap1/board-h2.c > @@ -447,8 +447,6 @@ static void __init h2_init_irq(void) > omap1_init_common_hw(); > omap_init_irq(); > omap_gpio_init(); > - i2c_register_board_info(1, h2_i2c_board_info, > - ARRAY_SIZE(h2_i2c_board_info)); > h2_init_smc91x(); > } > > @@ -551,7 +549,8 @@ static void __init h2_init(void) > omap_board_config = h2_config; > omap_board_config_size = ARRAY_SIZE(h2_config); > omap_serial_init(); > - omap_register_i2c_bus(1, 100, NULL, 0); > + omap_register_i2c_bus(1, 100, h2_i2c_board_info, > + ARRAY_SIZE(h2_i2c_board_info)); > h2_mmc_init(); > omap_register_gpio_switches(h2_gpio_switches, > ARRAY_SIZE(h2_gpio_switches)); i2c_register_bard_info() looks better to me since it's comming from i2c subsystem. Maybe we should, instead, get rid of omap_register_i2c_bus when we finish porting all omap i2c drivers to new style i2c. I'm Cc'ing David Brownell and Jean Delvare as they might have comments on this. Dave? Jean? What do you guys say? > > - > To unsubscribe from this list: send the line "unsubscribe linux-omap" in > the body of a message to majordomo@xxxxxxxxxxxxxxx > More majordomo info at http://vger.kernel.org/majordomo-info.html -- Best Regards, Felipe Balbi me@xxxxxxxxxxxxxxx http://blog.felipebalbi.com - To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
