diff options
| author | Russell King <rmk+kernel@armlinux.org.uk> | 2016-08-31 08:49:48 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@armlinux.org.uk> | 2018-04-06 15:53:22 +0100 |
| commit | 64b2f129c38713a059e1299662fc68fc6bf6f0a6 (patch) | |
| tree | 3c28653814a5d6154b30c8d522f5e6672bea60aa /drivers/pcmcia | |
| parent | b51af86559d4b5c831abbec545c76f721a8d8237 (diff) | |
| download | linux-64b2f129c38713a059e1299662fc68fc6bf6f0a6.tar.gz linux-64b2f129c38713a059e1299662fc68fc6bf6f0a6.tar.bz2 linux-64b2f129c38713a059e1299662fc68fc6bf6f0a6.zip | |
ARM: sa1100/simpad: switch simpad CF to use gpiod APIs
Switch simpad's CF implementation to use the gpiod APIs. The inverted
detection is handled using gpiolib's native inversion abilities.
Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
Diffstat (limited to 'drivers/pcmcia')
| -rw-r--r-- | drivers/pcmcia/sa1100_simpad.c | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/drivers/pcmcia/sa1100_simpad.c b/drivers/pcmcia/sa1100_simpad.c index 7ce65bb23a8e..e235ee14eaa6 100644 --- a/drivers/pcmcia/sa1100_simpad.c +++ b/drivers/pcmcia/sa1100_simpad.c @@ -12,7 +12,6 @@ #include <mach/hardware.h> #include <asm/mach-types.h> -#include <asm/irq.h> #include <mach/simpad.h> #include "sa1100_generic.h" @@ -21,12 +20,10 @@ static int simpad_pcmcia_hw_init(struct soc_pcmcia_socket *skt) simpad_clear_cs3_bit(VCC_3V_EN|VCC_5V_EN|EN0|EN1); - skt->stat[SOC_STAT_CD].gpio = GPIO_CF_CD; - skt->stat[SOC_STAT_CD].name = "CF_CD"; - skt->stat[SOC_STAT_RDY].gpio = GPIO_CF_IRQ; - skt->stat[SOC_STAT_RDY].name = "CF_RDY"; + skt->stat[SOC_STAT_CD].name = "cf-detect"; + skt->stat[SOC_STAT_RDY].name = "cf-ready"; - return 0; + return soc_pcmcia_request_gpiods(skt); } static void simpad_pcmcia_hw_shutdown(struct soc_pcmcia_socket *skt) @@ -42,9 +39,6 @@ simpad_pcmcia_socket_state(struct soc_pcmcia_socket *skt, { long cs3reg = simpad_get_cs3_ro(); - /* the detect signal is inverted - fix that up here */ - state->detect = !state->detect; - state->bvd1 = 1; /* Might be cs3reg & PCMCIA_BVD1 */ state->bvd2 = 1; /* Might be cs3reg & PCMCIA_BVD2 */ |