diff options
Diffstat (limited to 'drivers/pcmcia/pxa2xx_palmtx.c')
-rw-r--r-- | drivers/pcmcia/pxa2xx_palmtx.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/drivers/pcmcia/pxa2xx_palmtx.c b/drivers/pcmcia/pxa2xx_palmtx.c index 80645a688ee3..069b6bbcf319 100644 --- a/drivers/pcmcia/pxa2xx_palmtx.c +++ b/drivers/pcmcia/pxa2xx_palmtx.c | |||
@@ -23,7 +23,6 @@ static struct gpio palmtx_pcmcia_gpios[] = { | |||
23 | { GPIO_NR_PALMTX_PCMCIA_POWER1, GPIOF_INIT_LOW, "PCMCIA Power 1" }, | 23 | { GPIO_NR_PALMTX_PCMCIA_POWER1, GPIOF_INIT_LOW, "PCMCIA Power 1" }, |
24 | { GPIO_NR_PALMTX_PCMCIA_POWER2, GPIOF_INIT_LOW, "PCMCIA Power 2" }, | 24 | { GPIO_NR_PALMTX_PCMCIA_POWER2, GPIOF_INIT_LOW, "PCMCIA Power 2" }, |
25 | { GPIO_NR_PALMTX_PCMCIA_RESET, GPIOF_INIT_HIGH,"PCMCIA Reset" }, | 25 | { GPIO_NR_PALMTX_PCMCIA_RESET, GPIOF_INIT_HIGH,"PCMCIA Reset" }, |
26 | { GPIO_NR_PALMTX_PCMCIA_READY, GPIOF_IN, "PCMCIA Ready" }, | ||
27 | }; | 26 | }; |
28 | 27 | ||
29 | static int palmtx_pcmcia_hw_init(struct soc_pcmcia_socket *skt) | 28 | static int palmtx_pcmcia_hw_init(struct soc_pcmcia_socket *skt) |
@@ -33,7 +32,8 @@ static int palmtx_pcmcia_hw_init(struct soc_pcmcia_socket *skt) | |||
33 | ret = gpio_request_array(palmtx_pcmcia_gpios, | 32 | ret = gpio_request_array(palmtx_pcmcia_gpios, |
34 | ARRAY_SIZE(palmtx_pcmcia_gpios)); | 33 | ARRAY_SIZE(palmtx_pcmcia_gpios)); |
35 | 34 | ||
36 | skt->socket.pci_irq = gpio_to_irq(GPIO_NR_PALMTX_PCMCIA_READY); | 35 | skt->stat[SOC_STAT_RDY].gpio = GPIO_NR_PALMTX_PCMCIA_READY; |
36 | skt->stat[SOC_STAT_RDY].name = "PCMCIA Ready"; | ||
37 | 37 | ||
38 | return ret; | 38 | return ret; |
39 | } | 39 | } |
@@ -47,10 +47,6 @@ static void palmtx_pcmcia_socket_state(struct soc_pcmcia_socket *skt, | |||
47 | struct pcmcia_state *state) | 47 | struct pcmcia_state *state) |
48 | { | 48 | { |
49 | state->detect = 1; /* always inserted */ | 49 | state->detect = 1; /* always inserted */ |
50 | state->ready = !!gpio_get_value(GPIO_NR_PALMTX_PCMCIA_READY); | ||
51 | state->bvd1 = 1; | ||
52 | state->bvd2 = 1; | ||
53 | state->wrprot = 0; | ||
54 | state->vs_3v = 1; | 50 | state->vs_3v = 1; |
55 | state->vs_Xv = 0; | 51 | state->vs_Xv = 0; |
56 | } | 52 | } |