diff options
| author | Russell King <rmk+kernel@armlinux.org.uk> | 2016-08-31 08:49:45 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@armlinux.org.uk> | 2016-09-22 09:38:59 +0100 |
| commit | 535e0abc0534b139b067d496bb93663acffb72ce (patch) | |
| tree | cdb492a540551ed00b7c601074dd01f751e91dee /drivers/pcmcia | |
| parent | 7bfe49785b28931297d9e6e811f88732914f8ff3 (diff) | |
| download | linux-stable-535e0abc0534b139b067d496bb93663acffb72ce.tar.gz linux-stable-535e0abc0534b139b067d496bb93663acffb72ce.tar.bz2 linux-stable-535e0abc0534b139b067d496bb93663acffb72ce.zip | |
pcmcia: soc_common: add support for reset and bus enable GPIOs
Add support to soc_common for controlling reset and bus enable GPIOs
from within the generic soc_common layer, rather than having
individual drivers having to perform this themselves.
Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
Diffstat (limited to 'drivers/pcmcia')
| -rw-r--r-- | drivers/pcmcia/soc_common.c | 16 | ||||
| -rw-r--r-- | drivers/pcmcia/soc_common.h | 3 |
2 files changed, 19 insertions, 0 deletions
diff --git a/drivers/pcmcia/soc_common.c b/drivers/pcmcia/soc_common.c index 4036454b2785..f7721274cfba 100644 --- a/drivers/pcmcia/soc_common.c +++ b/drivers/pcmcia/soc_common.c @@ -119,6 +119,7 @@ static void __soc_pcmcia_hw_shutdown(struct soc_pcmcia_socket *skt, if (skt->ops->hw_shutdown) skt->ops->hw_shutdown(skt); + clk_disable_unprepare(skt->clk); } @@ -286,6 +287,21 @@ static int soc_common_pcmcia_config_skt( ret = skt->ops->configure_socket(skt, state); if (ret == 0) { + struct gpio_desc *descs[2]; + int values[2], n = 0; + + if (skt->gpio_reset) { + descs[n] = skt->gpio_reset; + values[n++] = !!(state->flags & SS_RESET); + } + if (skt->gpio_bus_enable) { + descs[n] = skt->gpio_bus_enable; + values[n++] = !!(state->flags & SS_OUTPUT_ENA); + } + + if (n) + gpiod_set_array_value_cansleep(n, descs, values); + /* * This really needs a better solution. The IRQ * may or may not be claimed by the driver. diff --git a/drivers/pcmcia/soc_common.h b/drivers/pcmcia/soc_common.h index ee40db16dc40..686ba3238c76 100644 --- a/drivers/pcmcia/soc_common.h +++ b/drivers/pcmcia/soc_common.h @@ -62,6 +62,9 @@ struct soc_pcmcia_socket { #define SOC_STAT_BVD2 2 /* BATWARN / IOSPKR */ #define SOC_STAT_RDY 3 /* Ready / Interrupt */ + struct gpio_desc *gpio_reset; + struct gpio_desc *gpio_bus_enable; + unsigned int irq_state; struct timer_list poll_timer; |