diff options
| author | Florian Fainelli <florian@openwrt.org> | 2009-06-04 10:03:03 +0000 |
|---|---|---|
| committer | Florian Fainelli <florian@openwrt.org> | 2009-06-04 10:03:03 +0000 |
| commit | 4049592268b8859aca4871375c42e2d67d7c2358 (patch) | |
| tree | 159e07058e535954a97f798bb41225b7e72df257 /target/linux/brcm63xx | |
| parent | 287a0efd683a0dfd10dd9048875e55a0fac64195 (diff) | |
| download | upstream-4049592268b8859aca4871375c42e2d67d7c2358.tar.gz upstream-4049592268b8859aca4871375c42e2d67d7c2358.tar.bz2 upstream-4049592268b8859aca4871375c42e2d67d7c2358.zip | |
request gpio pins and set direction correctly for pcmcia
SVN-Revision: 16332
Diffstat (limited to 'target/linux/brcm63xx')
| -rw-r--r-- | target/linux/brcm63xx/files/drivers/pcmcia/bcm63xx_pcmcia.c | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/target/linux/brcm63xx/files/drivers/pcmcia/bcm63xx_pcmcia.c b/target/linux/brcm63xx/files/drivers/pcmcia/bcm63xx_pcmcia.c index 94a776273d..19b05fce0c 100644 --- a/target/linux/brcm63xx/files/drivers/pcmcia/bcm63xx_pcmcia.c +++ b/target/linux/brcm63xx/files/drivers/pcmcia/bcm63xx_pcmcia.c @@ -409,9 +409,18 @@ static int bcm63xx_drv_pcmcia_probe(struct platform_device *pdev) val |= 3 << PCMCIA_C2_HOLD_SHIFT; pcmcia_writel(skt, val, PCMCIA_C2_REG); + /* request and setup ready gpio */ + ret = gpio_request(skt->pd->ready_gpio, "bcm63xx_pcmcia"); + if (ret < 0) + goto err; + + ret = gpio_direction_input(skt->pd->ready_gpio); + if (ret < 0) + goto err_gpio; + ret = pcmcia_register_socket(sock); if (ret) - goto err; + goto err_gpio; /* start polling socket */ mod_timer(&skt->timer, @@ -420,6 +429,9 @@ static int bcm63xx_drv_pcmcia_probe(struct platform_device *pdev) platform_set_drvdata(pdev, skt); return 0; +err_gpio: + gpio_free(skt->pd->ready_gpio); + err: if (skt->io_base) iounmap(skt->io_base); @@ -442,6 +454,7 @@ static int bcm63xx_drv_pcmcia_remove(struct platform_device *pdev) iounmap(skt->io_base); res = skt->reg_res; release_mem_region(res->start, res->end - res->start + 1); + gpio_free(skt->pd->ready_gpio); kfree(skt); return 0; } |