diff options
Diffstat (limited to 'arch/arm/mach-omap1/board-osk.c')
-rw-r--r-- | arch/arm/mach-omap1/board-osk.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/arch/arm/mach-omap1/board-osk.c b/arch/arm/mach-omap1/board-osk.c index 84333440008c..e1f813d4417d 100644 --- a/arch/arm/mach-omap1/board-osk.c +++ b/arch/arm/mach-omap1/board-osk.c | |||
@@ -160,12 +160,12 @@ static struct omap_mcbsp_reg_cfg mcbsp_regs = { | |||
160 | static struct omap_alsa_codec_config alsa_config = { | 160 | static struct omap_alsa_codec_config alsa_config = { |
161 | .name = "OSK AIC23", | 161 | .name = "OSK AIC23", |
162 | .mcbsp_regs_alsa = &mcbsp_regs, | 162 | .mcbsp_regs_alsa = &mcbsp_regs, |
163 | .codec_configure_dev = NULL, // aic23_configure, | 163 | .codec_configure_dev = NULL, /* aic23_configure, */ |
164 | .codec_set_samplerate = NULL, // aic23_set_samplerate, | 164 | .codec_set_samplerate = NULL, /* aic23_set_samplerate, */ |
165 | .codec_clock_setup = NULL, // aic23_clock_setup, | 165 | .codec_clock_setup = NULL, /* aic23_clock_setup, */ |
166 | .codec_clock_on = NULL, // aic23_clock_on, | 166 | .codec_clock_on = NULL, /* aic23_clock_on, */ |
167 | .codec_clock_off = NULL, // aic23_clock_off, | 167 | .codec_clock_off = NULL, /* aic23_clock_off, */ |
168 | .get_default_samplerate = NULL, // aic23_get_default_samplerate, | 168 | .get_default_samplerate = NULL, /* aic23_get_default_samplerate, */ |
169 | }; | 169 | }; |
170 | 170 | ||
171 | static struct platform_device osk5912_mcbsp1_device = { | 171 | static struct platform_device osk5912_mcbsp1_device = { |
@@ -392,7 +392,7 @@ static void __init osk_mistral_init(void) | |||
392 | omap_cfg_reg(W13_1610_CCP_CLKM); | 392 | omap_cfg_reg(W13_1610_CCP_CLKM); |
393 | omap_cfg_reg(Y12_1610_CCP_CLKP); | 393 | omap_cfg_reg(Y12_1610_CCP_CLKP); |
394 | /* CCP_DATAM CONFLICTS WITH UART1.TX (and serial console) */ | 394 | /* CCP_DATAM CONFLICTS WITH UART1.TX (and serial console) */ |
395 | // omap_cfg_reg(Y14_1610_CCP_DATAM); | 395 | /* omap_cfg_reg(Y14_1610_CCP_DATAM); */ |
396 | omap_cfg_reg(W14_1610_CCP_DATAP); | 396 | omap_cfg_reg(W14_1610_CCP_DATAP); |
397 | 397 | ||
398 | /* CAM_PWDN */ | 398 | /* CAM_PWDN */ |
@@ -404,8 +404,8 @@ static void __init osk_mistral_init(void) | |||
404 | pr_debug("OSK+Mistral: CAM_PWDN is awol\n"); | 404 | pr_debug("OSK+Mistral: CAM_PWDN is awol\n"); |
405 | 405 | ||
406 | 406 | ||
407 | // omap_cfg_reg(P19_1610_GPIO6); // BUSY | 407 | /* omap_cfg_reg(P19_1610_GPIO6); */ /* BUSY */ |
408 | omap_cfg_reg(P20_1610_GPIO4); // PENIRQ | 408 | omap_cfg_reg(P20_1610_GPIO4); /* PENIRQ */ |
409 | set_irq_type(OMAP_GPIO_IRQ(4), IRQT_FALLING); | 409 | set_irq_type(OMAP_GPIO_IRQ(4), IRQT_FALLING); |
410 | spi_register_board_info(mistral_boardinfo, | 410 | spi_register_board_info(mistral_boardinfo, |
411 | ARRAY_SIZE(mistral_boardinfo)); | 411 | ARRAY_SIZE(mistral_boardinfo)); |