diff options
Diffstat (limited to 'arch/arm/mach-omap1/board-sx1.c')
| -rw-r--r-- | arch/arm/mach-omap1/board-sx1.c | 33 |
1 files changed, 1 insertions, 32 deletions
diff --git a/arch/arm/mach-omap1/board-sx1.c b/arch/arm/mach-omap1/board-sx1.c index 09a242261a3d..28c76a1e71c0 100644 --- a/arch/arm/mach-omap1/board-sx1.c +++ b/arch/arm/mach-omap1/board-sx1.c | |||
| @@ -34,13 +34,12 @@ | |||
| 34 | 34 | ||
| 35 | #include <mach/gpio.h> | 35 | #include <mach/gpio.h> |
| 36 | #include <mach/mux.h> | 36 | #include <mach/mux.h> |
| 37 | #include <mach/dma.h> | ||
| 37 | #include <mach/irda.h> | 38 | #include <mach/irda.h> |
| 38 | #include <mach/usb.h> | 39 | #include <mach/usb.h> |
| 39 | #include <mach/tc.h> | 40 | #include <mach/tc.h> |
| 40 | #include <mach/board.h> | 41 | #include <mach/board.h> |
| 41 | #include <mach/common.h> | 42 | #include <mach/common.h> |
| 42 | #include <mach/mcbsp.h> | ||
| 43 | #include <mach/omap-alsa.h> | ||
| 44 | #include <mach/keypad.h> | 43 | #include <mach/keypad.h> |
| 45 | 44 | ||
| 46 | /* Write to I2C device */ | 45 | /* Write to I2C device */ |
| @@ -254,35 +253,6 @@ static struct platform_device sx1_irda_device = { | |||
| 254 | .resource = sx1_irda_resources, | 253 | .resource = sx1_irda_resources, |
| 255 | }; | 254 | }; |
| 256 | 255 | ||
| 257 | /*----------- McBSP & Sound -------------------------*/ | ||
| 258 | |||
| 259 | /* Playback interface - McBSP1 */ | ||
| 260 | static struct omap_mcbsp_reg_cfg mcbsp1_regs = { | ||
| 261 | .spcr2 = XINTM(3), /* SPCR2=30 */ | ||
| 262 | .spcr1 = RINTM(3), /* SPCR1=30 */ | ||
| 263 | .rcr2 = 0, /* RCR2 =00 */ | ||
| 264 | .rcr1 = RFRLEN1(1) | RWDLEN1(OMAP_MCBSP_WORD_16), /* RCR1=140 */ | ||
| 265 | .xcr2 = 0, /* XCR2 = 0 */ | ||
| 266 | .xcr1 = XFRLEN1(1) | XWDLEN1(OMAP_MCBSP_WORD_16), /* XCR1 = 140 */ | ||
| 267 | .srgr1 = FWID(15) | CLKGDV(12), /* SRGR1=0f0c */ | ||
| 268 | .srgr2 = FSGM | FPER(31), /* SRGR2=101f */ | ||
| 269 | .pcr0 = FSXM | FSRM | CLKXM | CLKRM | FSXP | FSRP | CLKXP | CLKRP, | ||
| 270 | /* PCR0 =0f0f */ | ||
| 271 | }; | ||
| 272 | |||
| 273 | static struct omap_alsa_codec_config sx1_alsa_config = { | ||
| 274 | .name = "SX1 EGold", | ||
| 275 | .mcbsp_regs_alsa = &mcbsp1_regs, | ||
| 276 | }; | ||
| 277 | |||
| 278 | static struct platform_device sx1_mcbsp1_device = { | ||
| 279 | .name = "omap_alsa_mcbsp", | ||
| 280 | .id = 1, | ||
| 281 | .dev = { | ||
| 282 | .platform_data = &sx1_alsa_config, | ||
| 283 | }, | ||
| 284 | }; | ||
| 285 | |||
| 286 | /*----------- MTD -------------------------*/ | 256 | /*----------- MTD -------------------------*/ |
| 287 | 257 | ||
| 288 | static struct mtd_partition sx1_partitions[] = { | 258 | static struct mtd_partition sx1_partitions[] = { |
| @@ -394,7 +364,6 @@ static struct platform_device *sx1_devices[] __initdata = { | |||
| 394 | &sx1_flash_device, | 364 | &sx1_flash_device, |
| 395 | &sx1_kp_device, | 365 | &sx1_kp_device, |
| 396 | &sx1_lcd_device, | 366 | &sx1_lcd_device, |
| 397 | &sx1_mcbsp1_device, | ||
| 398 | &sx1_irda_device, | 367 | &sx1_irda_device, |
| 399 | }; | 368 | }; |
| 400 | /*-----------------------------------------*/ | 369 | /*-----------------------------------------*/ |
