Adds I2C board info for tlvaic23

[linux-2.6-omap-h63xx.git] / arch / arm / mach-omap1 / board-osk.c

diff --git a/arch/arm/mach-omap1/board-osk.c b/arch/arm/mach-omap1/board-osk.c
index 41f94f6fc15c4c7119536accffbb3a540b41558c..e506aef77c040e3fbb630c42725f77ea4fcb1158 100644 (file)
--- a/arch/arm/mach-omap1/board-osk.c
+++ b/arch/arm/mach-omap1/board-osk.c
@@ -39,7 +39,7 @@
 
 #include <linux/i2c/tps65010.h>
 
-#include <asm/hardware.h>
+#include <mach/hardware.h>
 #include <asm/gpio.h>
 
 #include <asm/mach-types.h>
@@ -47,12 +47,12 @@
 #include <asm/mach/map.h>
 #include <asm/mach/flash.h>
 
-#include <asm/arch/usb.h>
-#include <asm/arch/mux.h>
-#include <asm/arch/tc.h>
-#include <asm/arch/common.h>
-#include <asm/arch/mcbsp.h>
-#include <asm/arch/omap-alsa.h>
+#include <mach/usb.h>
+#include <mach/mux.h>
+#include <mach/tc.h>
+#include <mach/common.h>
+#include <mach/mcbsp.h>
+#include <mach/omap-alsa.h>
 
 static struct mtd_partition osk_partitions[] = {
        /* bootloader (U-Boot, etc) in first sector */
@@ -258,8 +258,10 @@ static struct i2c_board_info __initdata osk_i2c_board_info[] = {
                .platform_data  = &tps_board,
 
        },
+       {
+               I2C_BOARD_INFO("tlv320aic23", 0x1B),
+       },
        /* TODO when driver support is ready:
-        *  - aic23 audio chip at 0x1a
         *  - on Mistral, 24c04 eeprom at 0x50
         *  - optionally on Mistral, ov9640 camera sensor at 0x30
         */
@@ -340,7 +342,7 @@ static struct omap_board_config_kernel osk_config[] __initdata = {
 #include <linux/spi/spi.h>
 #include <linux/spi/ads7846.h>
 
-#include <asm/arch/keypad.h>
+#include <mach/keypad.h>
 
 static const int osk_keymap[] = {
        /* KEY(col, row, code) */