diff options
Diffstat (limited to 'arch/arm/mach-omap1/board-innovator.c')
-rw-r--r-- | arch/arm/mach-omap1/board-innovator.c | 39 |
1 files changed, 0 insertions, 39 deletions
diff --git a/arch/arm/mach-omap1/board-innovator.c b/arch/arm/mach-omap1/board-innovator.c index af2fb9070083..071cd02a734e 100644 --- a/arch/arm/mach-omap1/board-innovator.c +++ b/arch/arm/mach-omap1/board-innovator.c | |||
@@ -37,8 +37,6 @@ | |||
37 | #include <mach/usb.h> | 37 | #include <mach/usb.h> |
38 | #include <mach/keypad.h> | 38 | #include <mach/keypad.h> |
39 | #include <mach/common.h> | 39 | #include <mach/common.h> |
40 | #include <mach/mcbsp.h> | ||
41 | #include <mach/omap-alsa.h> | ||
42 | #include <mach/mmc.h> | 40 | #include <mach/mmc.h> |
43 | 41 | ||
44 | static int innovator_keymap[] = { | 42 | static int innovator_keymap[] = { |
@@ -115,42 +113,6 @@ static struct platform_device innovator_flash_device = { | |||
115 | .resource = &innovator_flash_resource, | 113 | .resource = &innovator_flash_resource, |
116 | }; | 114 | }; |
117 | 115 | ||
118 | #define DEFAULT_BITPERSAMPLE 16 | ||
119 | |||
120 | static struct omap_mcbsp_reg_cfg mcbsp_regs = { | ||
121 | .spcr2 = FREE | FRST | GRST | XRST | XINTM(3), | ||
122 | .spcr1 = RINTM(3) | RRST, | ||
123 | .rcr2 = RPHASE | RFRLEN2(OMAP_MCBSP_WORD_8) | | ||
124 | RWDLEN2(OMAP_MCBSP_WORD_16) | RDATDLY(0), | ||
125 | .rcr1 = RFRLEN1(OMAP_MCBSP_WORD_8) | RWDLEN1(OMAP_MCBSP_WORD_16), | ||
126 | .xcr2 = XPHASE | XFRLEN2(OMAP_MCBSP_WORD_8) | | ||
127 | XWDLEN2(OMAP_MCBSP_WORD_16) | XDATDLY(0) | XFIG, | ||
128 | .xcr1 = XFRLEN1(OMAP_MCBSP_WORD_8) | XWDLEN1(OMAP_MCBSP_WORD_16), | ||
129 | .srgr1 = FWID(DEFAULT_BITPERSAMPLE - 1), | ||
130 | .srgr2 = GSYNC | CLKSP | FSGM | FPER(DEFAULT_BITPERSAMPLE * 2 - 1), | ||
131 | /*.pcr0 = FSXM | FSRM | CLKXM | CLKRM | CLKXP | CLKRP,*/ /* mcbsp: master */ | ||
132 | .pcr0 = CLKXP | CLKRP, /* mcbsp: slave */ | ||
133 | }; | ||
134 | |||
135 | static struct omap_alsa_codec_config alsa_config = { | ||
136 | .name = "OMAP Innovator AIC23", | ||
137 | .mcbsp_regs_alsa = &mcbsp_regs, | ||
138 | .codec_configure_dev = NULL, /* aic23_configure, */ | ||
139 | .codec_set_samplerate = NULL, /* aic23_set_samplerate, */ | ||
140 | .codec_clock_setup = NULL, /* aic23_clock_setup, */ | ||
141 | .codec_clock_on = NULL, /* aic23_clock_on, */ | ||
142 | .codec_clock_off = NULL, /* aic23_clock_off, */ | ||
143 | .get_default_samplerate = NULL, /* aic23_get_default_samplerate, */ | ||
144 | }; | ||
145 | |||
146 | static struct platform_device innovator_mcbsp1_device = { | ||
147 | .name = "omap_alsa_mcbsp", | ||
148 | .id = 1, | ||
149 | .dev = { | ||
150 | .platform_data = &alsa_config, | ||
151 | }, | ||
152 | }; | ||
153 | |||
154 | static struct resource innovator_kp_resources[] = { | 116 | static struct resource innovator_kp_resources[] = { |
155 | [0] = { | 117 | [0] = { |
156 | .start = INT_KEYBOARD, | 118 | .start = INT_KEYBOARD, |
@@ -227,7 +189,6 @@ static struct platform_device innovator1510_spi_device = { | |||
227 | static struct platform_device *innovator1510_devices[] __initdata = { | 189 | static struct platform_device *innovator1510_devices[] __initdata = { |
228 | &innovator_flash_device, | 190 | &innovator_flash_device, |
229 | &innovator1510_smc91x_device, | 191 | &innovator1510_smc91x_device, |
230 | &innovator_mcbsp1_device, | ||
231 | &innovator_kp_device, | 192 | &innovator_kp_device, |
232 | &innovator1510_lcd_device, | 193 | &innovator1510_lcd_device, |
233 | &innovator1510_spi_device, | 194 | &innovator1510_spi_device, |