aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-omap1/board-osk.c
diff options
context:
space:
mode:
authorJarkko Nikula <jarkko.nikula@nokia.com>2007-11-07 06:54:32 +0200
committerTony Lindgren <tony@atomide.com>2008-02-08 10:38:01 -0800
commit1ed16a86b47fd7dd9125fc8f6df482cc6edc9b20 (patch)
treec9efdae7940f22b97ceb8f62d622ea24e6a57bde /arch/arm/mach-omap1/board-osk.c
parentARM: OMAP1: Remove omap_sram_idle() (diff)
downloadlinux-dev-1ed16a86b47fd7dd9125fc8f6df482cc6edc9b20.tar.xz
linux-dev-1ed16a86b47fd7dd9125fc8f6df482cc6edc9b20.zip
ARM: OMAP1: Use I2C bus registration helper for omap1
This patch starts using introduced I2C bus registration helper by cleaning up registration currently done in various places and by doing necessary board file modifications. Signed-off-by: Jarkko Nikula <jarkko.nikula@nokia.com> Acked-by: David Brownell <dbrownell@users.sourceforge.net> Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch/arm/mach-omap1/board-osk.c')
-rw-r--r--arch/arm/mach-omap1/board-osk.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/arm/mach-omap1/board-osk.c b/arch/arm/mach-omap1/board-osk.c
index e1f813d4417d..effa176be57b 100644
--- a/arch/arm/mach-omap1/board-osk.c
+++ b/arch/arm/mach-omap1/board-osk.c
@@ -473,10 +473,9 @@ static void __init osk_init(void)
if (gpio_request(OMAP_MPUIO(1), "tps65010") == 0)
gpio_direction_input(OMAP_MPUIO(1));
- i2c_register_board_info(1, osk_i2c_board_info,
- ARRAY_SIZE(osk_i2c_board_info));
-
omap_serial_init();
+ omap_register_i2c_bus(1, 400, osk_i2c_board_info,
+ ARRAY_SIZE(osk_i2c_board_info));
osk_mistral_init();
}