am335x-evm: beta evm bringup changes for wlan and bt
authorEyal Reizer <eyalr@ti.com>
Tue, 22 Nov 2011 16:23:01 +0000 (18:23 +0200)
committerVaibhav Hiremath <hvaibhav@ti.com>
Mon, 23 Jan 2012 19:14:38 +0000 (00:44 +0530)
* Fix a wrong gpio pin used for bluetooth enable on the beta evm.
  was using gpio0_17 while it should be gpio3_21

* Add a 70 msec delay after turning wlan on to allow for all voltages
  to settle down before starting sdio activity

Signed-off-by: Eyal Reizer <eyalr@ti.com>
Signed-off-by: Vaibhav Hiremath <hvaibhav@ti.com>
arch/arm/mach-omap2/board-am335xevm.c
arch/arm/mach-omap2/mux33xx.c

index a490a1d79ca58323d138317399b1bf1ef11f3ba1..2f53106a7f983d4a21f027c1d30d003139665f1f 100644 (file)
@@ -815,7 +815,7 @@ static struct pinmux_config uart1_wl12xx_pin_mux[] = {
 static struct pinmux_config wl12xx_pin_mux_evm_rev1_1a[] = {
        {"gpmc_a0.gpio1_16", OMAP_MUX_MODE7 | AM33XX_PIN_OUTPUT},
        {"mcasp0_ahclkr.gpio3_17", OMAP_MUX_MODE7 | AM33XX_PIN_INPUT},
-       {"mcasp0_ahclkx.gpio0_17", OMAP_MUX_MODE7 | AM33XX_PIN_OUTPUT},
+       {"mcasp0_ahclkx.gpio3_21", OMAP_MUX_MODE7 | AM33XX_PIN_OUTPUT},
        {NULL, 0},
  };
 
@@ -1129,8 +1129,10 @@ static void wl12xx_bluetooth_enable(void)
 
 static int wl12xx_set_power(struct device *dev, int slot, int on, int vdd)
 {
-       if (on)
+       if (on) {
                gpio_set_value(am335xevm_wlan_data.wlan_enable_gpio, 1);
+               mdelay(70);
+       }
        else
                gpio_set_value(am335xevm_wlan_data.wlan_enable_gpio, 0);
 
@@ -1146,7 +1148,7 @@ static void wl12xx_init(int evm_id, int profile)
        /* Register WLAN and BT enable pins based on the evm board revision */
        if (gp_evm_revision == GP_EVM_REV_IS_1_1A) {
                am335xevm_wlan_data.wlan_enable_gpio = GPIO_TO_PIN(1, 16);
-               am335xevm_wlan_data.bt_enable_gpio = GPIO_TO_PIN(0, 17);
+               am335xevm_wlan_data.bt_enable_gpio = GPIO_TO_PIN(3, 21);
        }
        else {
                am335xevm_wlan_data.wlan_enable_gpio = GPIO_TO_PIN(1, 30);
index 8e9180f5861b7922732d6dbec1ae63305e32cde4..a7e120f902f254f4a5aa6ce1aea0f4628882b12b 100644 (file)
@@ -355,7 +355,7 @@ static struct omap_mux __initdata am33xx_muxmodes[] = {
                NULL, NULL, NULL, NULL),
        _AM33XX_MUXENTRY(MCASP0_AHCLKX, 0,
                "mcasp0_ahclkx", "mcasp0_axr3", NULL, "mcasp1_axr1",
-               NULL, NULL, NULL, "gpio0_17"),
+               NULL, NULL, NULL, "gpio3_21"),
        _AM33XX_MUXENTRY(XDMA_EVENT_INTR0, 0,
                "xdma_event_intr0", NULL, NULL, NULL,
                "spi1_cs1", NULL, NULL, NULL),