[patch 2.6.28-rc2-omap] H4: fix i2c registration

[patch 2.6.28-rc2-omap] H4: fix i2c registration

[David Brownell]

From: David Brownell <dbrownell@users.sourceforge.net>

Registering the I2C devices on H4 boards once is enough;
remove the extra call.

Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
---
Mainline doesn't have the call to register the I2C adapter
along with its devices ... this has that call *plus* the call
to register just the board_info.  Seems to be the only OMAP2/3
board with this bug.

 arch/arm/mach-omap2/board-h4.c |    3 ---
 1 file changed, 3 deletions(-)

--- a/arch/arm/mach-omap2/board-h4.c
+++ b/arch/arm/mach-omap2/board-h4.c
@@ -746,9 +746,6 @@ static void __init omap_h4_init(void)
 	/* Menelaus interrupt */
 	omap_cfg_reg(W19_24XX_SYS_NIRQ);
 
-	i2c_register_board_info(1, h4_i2c_board_info,
-			ARRAY_SIZE(h4_i2c_board_info));
-
 	platform_add_devices(h4_devices, ARRAY_SIZE(h4_devices));
 	omap_board_config = h4_config;
 	omap_board_config_size = ARRAY_SIZE(h4_config);

Re: [patch 2.6.28-rc2-omap] H4: fix i2c registration

[Tony Lindgren]

* David Brownell <david-b@pacbell.net> [081101 00:38]:
> From: David Brownell <dbrownell@users.sourceforge.net>
> 
> Registering the I2C devices on H4 boards once is enough;
> remove the extra call.
> 
> Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
> ---
> Mainline doesn't have the call to register the I2C adapter
> along with its devices ... this has that call *plus* the call
> to register just the board_info.  Seems to be the only OMAP2/3
> board with this bug.

Pushing to l-o, not adding to upstream queue.

Tony

> 
>  arch/arm/mach-omap2/board-h4.c |    3 ---
>  1 file changed, 3 deletions(-)
> 
> --- a/arch/arm/mach-omap2/board-h4.c
> +++ b/arch/arm/mach-omap2/board-h4.c
> @@ -746,9 +746,6 @@ static void __init omap_h4_init(void)
>  	/* Menelaus interrupt */
>  	omap_cfg_reg(W19_24XX_SYS_NIRQ);
>  
> -	i2c_register_board_info(1, h4_i2c_board_info,
> -			ARRAY_SIZE(h4_i2c_board_info));
> -
>  	platform_add_devices(h4_devices, ARRAY_SIZE(h4_devices));
>  	omap_board_config = h4_config;
>  	omap_board_config_size = ARRAY_SIZE(h4_config);
> --
> 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