1
0
mirror of https://git.yoctoproject.org/meta-ti synced 2026-07-16 14:27:48 +00:00

linux-omap 2.6.37: sync with OE

Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
This commit is contained in:
Koen Kooi
2011-02-08 14:07:02 +01:00
parent 420df3be9e
commit 46f000fb0e
@@ -87,7 +87,7 @@ index 64a181e..59b26da 100644
/* gpio + 0 is "mmc0_cd" (input/IRQ) */ /* gpio + 0 is "mmc0_cd" (input/IRQ) */
mmc[0].gpio_cd = gpio + 0; mmc[0].gpio_cd = gpio + 0;
+#if defined(CONFIG_WL1271) || defined(CONFIG_WL1271_MODULE) +#if defined(CONFIG_WL1271) || defined(CONFIG_WL1271_MODULE)
+ if(!strcmp(expansionboard_name, "fixme-beagletoy")) { + if(!strcmp(expansionboard_name, "bbtoys-wifi")) {
+ omap2_hsmmc_init(mmcbbt); + omap2_hsmmc_init(mmcbbt);
+ /* link regulators to MMC adapters */ + /* link regulators to MMC adapters */
+ beagle_vmmc1_supply.dev = mmcbbt[0].dev; + beagle_vmmc1_supply.dev = mmcbbt[0].dev;
@@ -112,7 +112,7 @@ index 64a181e..59b26da 100644
gpio_export(162, 1); gpio_export(162, 1);
} }
+ if(!strcmp(expansionboard_name, "fixme-beagletoy")) + if(!strcmp(expansionboard_name, "bbtoys-wifi"))
+ { + {
+ if (wl12xx_set_platform_data(&omap_beagle_wlan_data)) + if (wl12xx_set_platform_data(&omap_beagle_wlan_data))
+ pr_err("error setting wl12xx data\n"); + pr_err("error setting wl12xx data\n");