Commit c89ca70243376593516dfeb5e553c331d086096e
1 parent
e3deaebb1b
Exists in
v3.2_SMARCT335xPSP_04.06.00.11
and in
2 other branches
Add patch (0001-am3358-sk-modified-WLAN-enable-and-irq-to-match-boar.patch) to a…
…llow wireless to work properly on EVM-SK 1.2.
Showing 1 changed file with 7 additions and 4 deletions Side-by-side Diff
arch/arm/mach-omap2/board-am335xevm.c
| ... | ... | @@ -918,7 +918,7 @@ |
| 918 | 918 | |
| 919 | 919 | #define AM335XEVM_WLAN_PMENA_GPIO GPIO_TO_PIN(1, 30) |
| 920 | 920 | #define AM335XEVM_WLAN_IRQ_GPIO GPIO_TO_PIN(3, 17) |
| 921 | -#define AM335XEVM_SK_WLAN_IRQ_GPIO GPIO_TO_PIN(1, 29) | |
| 921 | +#define AM335XEVM_SK_WLAN_IRQ_GPIO GPIO_TO_PIN(0, 31) | |
| 922 | 922 | |
| 923 | 923 | struct wl12xx_platform_data am335xevm_wlan_data = { |
| 924 | 924 | .irq = OMAP_GPIO_IRQ(AM335XEVM_WLAN_IRQ_GPIO), |
| ... | ... | @@ -954,8 +954,8 @@ |
| 954 | 954 | }; |
| 955 | 955 | |
| 956 | 956 | static struct pinmux_config wl12xx_pin_mux_sk[] = { |
| 957 | - {"gpmc_wpn.gpio0_31", OMAP_MUX_MODE7 | AM33XX_PIN_OUTPUT}, | |
| 958 | - {"gpmc_csn0.gpio1_29", OMAP_MUX_MODE7 | AM33XX_PIN_INPUT}, | |
| 957 | + {"gpmc_wpn.gpio0_31", OMAP_MUX_MODE7 | AM33XX_PIN_INPUT}, | |
| 958 | + {"gpmc_csn0.gpio1_29", OMAP_MUX_MODE7 | AM33XX_PIN_OUTPUT_PULLUP}, | |
| 959 | 959 | {"mcasp0_ahclkx.gpio3_21", OMAP_MUX_MODE7 | AM33XX_PIN_OUTPUT}, |
| 960 | 960 | {NULL, 0}, |
| 961 | 961 | }; |
| ... | ... | @@ -1648,6 +1648,7 @@ |
| 1648 | 1648 | am335x_mmc[1].name = "wl1271"; |
| 1649 | 1649 | am335x_mmc[1].caps = MMC_CAP_4_BIT_DATA | MMC_CAP_POWER_OFF_CARD; |
| 1650 | 1650 | am335x_mmc[1].nonremovable = true; |
| 1651 | + am335x_mmc[1].pm_caps = MMC_PM_KEEP_POWER; | |
| 1651 | 1652 | am335x_mmc[1].gpio_cd = -EINVAL; |
| 1652 | 1653 | am335x_mmc[1].gpio_wp = -EINVAL; |
| 1653 | 1654 | am335x_mmc[1].ocr_mask = MMC_VDD_32_33 | MMC_VDD_33_34; /* 3V3 */ |
| 1654 | 1655 | |
| ... | ... | @@ -1704,10 +1705,12 @@ |
| 1704 | 1705 | int ret; |
| 1705 | 1706 | |
| 1706 | 1707 | if (evm_id == EVM_SK) { |
| 1707 | - am335xevm_wlan_data.wlan_enable_gpio = GPIO_TO_PIN(0, 31); | |
| 1708 | + am335xevm_wlan_data.wlan_enable_gpio = GPIO_TO_PIN(1, 29); | |
| 1708 | 1709 | am335xevm_wlan_data.bt_enable_gpio = GPIO_TO_PIN(3, 21); |
| 1709 | 1710 | am335xevm_wlan_data.irq = |
| 1710 | 1711 | OMAP_GPIO_IRQ(AM335XEVM_SK_WLAN_IRQ_GPIO); |
| 1712 | + am335xevm_wlan_data.platform_quirks = | |
| 1713 | + WL12XX_PLATFORM_QUIRK_EDGE_IRQ; | |
| 1711 | 1714 | setup_pin_mux(wl12xx_pin_mux_sk); |
| 1712 | 1715 | } else { |
| 1713 | 1716 | setup_pin_mux(wl12xx_pin_mux); |