1 files changed, 3 insertions, 40 deletions

diff --git a/arch/arm/mach-omap1/board-osk.c b/arch/arm/mach-omap1/board-osk.c
index ff9e67baa5c9..1a16ecb2ccc8 100644
--- a/arch/arm/mach-omap1/board-osk.c
+++ b/arch/arm/mach-omap1/board-osk.c
@@ -51,8 +51,6 @@
 #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 */
@@ -141,47 +139,10 @@ static struct platform_device osk5912_cf_device = {
         .resource       = osk5912_cf_resources,
 };
 
-#define DEFAULT_BITPERSAMPLE 16
-
-static struct omap_mcbsp_reg_cfg mcbsp_regs = {
-        .spcr2 = FREE | FRST | GRST | XRST | XINTM(3),
-        .spcr1 = RINTM(3) | RRST,
-        .rcr2 = RPHASE | RFRLEN2(OMAP_MCBSP_WORD_8) |
-            RWDLEN2(OMAP_MCBSP_WORD_16) | RDATDLY(0),
-        .rcr1 = RFRLEN1(OMAP_MCBSP_WORD_8) | RWDLEN1(OMAP_MCBSP_WORD_16),
-        .xcr2 = XPHASE | XFRLEN2(OMAP_MCBSP_WORD_8) |
-            XWDLEN2(OMAP_MCBSP_WORD_16) | XDATDLY(0) | XFIG,
-        .xcr1 = XFRLEN1(OMAP_MCBSP_WORD_8) | XWDLEN1(OMAP_MCBSP_WORD_16),
-        .srgr1 = FWID(DEFAULT_BITPERSAMPLE - 1),
-        .srgr2 = GSYNC | CLKSP | FSGM | FPER(DEFAULT_BITPERSAMPLE * 2 - 1),
-        /*.pcr0 = FSXM | FSRM | CLKXM | CLKRM | CLKXP | CLKRP,*/ /* mcbsp: master */
-        .pcr0 = CLKXP | CLKRP,  /* mcbsp: slave */
-};
-
-static struct omap_alsa_codec_config alsa_config = {
-        .name                   = "OSK AIC23",
-        .mcbsp_regs_alsa        = &mcbsp_regs,
-        .codec_configure_dev    = NULL, /* aic23_configure, */
-        .codec_set_samplerate   = NULL, /* aic23_set_samplerate, */
-        .codec_clock_setup      = NULL, /* aic23_clock_setup, */
-        .codec_clock_on         = NULL, /* aic23_clock_on, */
-        .codec_clock_off        = NULL, /* aic23_clock_off, */
-        .get_default_samplerate = NULL, /* aic23_get_default_samplerate, */
-};
-
-static struct platform_device osk5912_mcbsp1_device = {
-        .name   = "omap_alsa_mcbsp",
-        .id     = 1,
-        .dev = {
-                .platform_data  = &alsa_config,
-        },
-};
-
 static struct platform_device *osk5912_devices[] __initdata = {
         &osk5912_flash_device,
         &osk5912_smc91x_device,
         &osk5912_cf_device,
-        &osk5912_mcbsp1_device,
 };
 
 static struct gpio_led tps_leds[] = {
@@ -259,8 +220,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
          *  - optionally on Mistral, ov9640 camera sensor at 0x30
          */
 };