aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-omap2/board-4430sdp.c
diff options
context:
space:
mode:
Diffstat (limited to 'arch/arm/mach-omap2/board-4430sdp.c')
-rw-r--r--arch/arm/mach-omap2/board-4430sdp.c24
1 files changed, 14 insertions, 10 deletions
diff --git a/arch/arm/mach-omap2/board-4430sdp.c b/arch/arm/mach-omap2/board-4430sdp.c
index 44cf1893829a..a39fc4bbd2b8 100644
--- a/arch/arm/mach-omap2/board-4430sdp.c
+++ b/arch/arm/mach-omap2/board-4430sdp.c
@@ -324,7 +324,10 @@ static struct spi_board_info sdp4430_spi_board_info[] __initdata = {
324 .bus_num = 1, 324 .bus_num = 1,
325 .chip_select = 0, 325 .chip_select = 0,
326 .max_speed_hz = 24000000, 326 .max_speed_hz = 24000000,
327 .irq = ETH_KS8851_IRQ, 327 /*
328 * .irq is set to gpio_to_irq(ETH_KS8851_IRQ)
329 * in omap_4430sdp_init
330 */
328 }, 331 },
329}; 332};
330 333
@@ -487,21 +490,22 @@ static struct platform_device omap_vwlan_device = {
487 490
488static int omap4_twl6030_hsmmc_late_init(struct device *dev) 491static int omap4_twl6030_hsmmc_late_init(struct device *dev)
489{ 492{
490 int ret = 0; 493 int irq = 0;
491 struct platform_device *pdev = container_of(dev, 494 struct platform_device *pdev = container_of(dev,
492 struct platform_device, dev); 495 struct platform_device, dev);
493 struct omap_mmc_platform_data *pdata = dev->platform_data; 496 struct omap_mmc_platform_data *pdata = dev->platform_data;
494 497
495 /* Setting MMC1 Card detect Irq */ 498 /* Setting MMC1 Card detect Irq */
496 if (pdev->id == 0) { 499 if (pdev->id == 0) {
497 ret = twl6030_mmc_card_detect_config(); 500 irq = twl6030_mmc_card_detect_config();
498 if (ret) 501 if (irq < 0) {
499 pr_err("Failed configuring MMC1 card detect\n"); 502 pr_err("Failed configuring MMC1 card detect\n");
500 pdata->slots[0].card_detect_irq = TWL6030_IRQ_BASE + 503 return irq;
501 MMCDETECT_INTR_OFFSET; 504 }
505 pdata->slots[0].card_detect_irq = irq;
502 pdata->slots[0].card_detect = twl6030_mmc_card_detect; 506 pdata->slots[0].card_detect = twl6030_mmc_card_detect;
503 } 507 }
504 return ret; 508 return 0;
505} 509}
506 510
507static __init void omap4_twl6030_hsmmc_set_late_init(struct device *dev) 511static __init void omap4_twl6030_hsmmc_set_late_init(struct device *dev)
@@ -521,9 +525,9 @@ static int __init omap4_twl6030_hsmmc_init(struct omap2_hsmmc_info *controllers)
521{ 525{
522 struct omap2_hsmmc_info *c; 526 struct omap2_hsmmc_info *c;
523 527
524 omap2_hsmmc_init(controllers); 528 omap_hsmmc_init(controllers);
525 for (c = controllers; c->mmc; c++) 529 for (c = controllers; c->mmc; c++)
526 omap4_twl6030_hsmmc_set_late_init(c->dev); 530 omap4_twl6030_hsmmc_set_late_init(&c->pdev->dev);
527 531
528 return 0; 532 return 0;
529} 533}
@@ -903,7 +907,6 @@ static void __init omap4_sdp4430_wifi_mux_init(void)
903} 907}
904 908
905static struct wl12xx_platform_data omap4_sdp4430_wlan_data __initdata = { 909static struct wl12xx_platform_data omap4_sdp4430_wlan_data __initdata = {
906 .irq = OMAP_GPIO_IRQ(GPIO_WIFI_IRQ),
907 .board_ref_clock = WL12XX_REFCLOCK_26, 910 .board_ref_clock = WL12XX_REFCLOCK_26,
908 .board_tcxo_clock = WL12XX_TCXOCLOCK_26, 911 .board_tcxo_clock = WL12XX_TCXOCLOCK_26,
909}; 912};
@@ -913,6 +916,7 @@ static void __init omap4_sdp4430_wifi_init(void)
913 int ret; 916 int ret;
914 917
915 omap4_sdp4430_wifi_mux_init(); 918 omap4_sdp4430_wifi_mux_init();
919 omap4_sdp4430_wlan_data.irq = gpio_to_irq(GPIO_WIFI_IRQ);
916 ret = wl12xx_set_platform_data(&omap4_sdp4430_wlan_data); 920 ret = wl12xx_set_platform_data(&omap4_sdp4430_wlan_data);
917 if (ret) 921 if (ret)
918 pr_err("Error setting wl12xx data: %d\n", ret); 922 pr_err("Error setting wl12xx data: %d\n", ret);