OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

pcmcia: cleanup/fixup patch for sa1100_jornada_pcmcia driver 

Clean up the /drivers/pcmcia/sa1100_jornada.c file with respect to
formatting.  It also changes a build warning into a code comment (since
its a pain to watch every build and havent seen any problems with driver
in 3.5years).

Signed-off-by: Kristoffer Ericson <kristoffer.ericson@gmail.com>
Cc: Dominik Brodowski <linux@dominikbrodowski.net>
Cc: Greg KH <greg@kroah.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Kristoffer Ericson 2009-09-21 17:03:56 -07:00 committed by Linus Torvalds
parent e6be4a8c26
commit 02e87d1a93
1 changed files with 73 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
drivers/pcmcia/sa1100_jornada720.c
View File

@ -16,22 +16,24 @@
#include "sa1111_generic.h" #include "sa1111_generic.h"
/* Does SOCKET1_3V actually do anything? */
#define SOCKET0_POWER GPIO_GPIO0 #define SOCKET0_POWER GPIO_GPIO0
#define SOCKET0_3V GPIO_GPIO2 #define SOCKET0_3V GPIO_GPIO2
#define SOCKET1_POWER (GPIO_GPIO1 | GPIO_GPIO3) #define SOCKET1_POWER (GPIO_GPIO1 | GPIO_GPIO3)
#warning *** Does SOCKET1_3V actually do anything?
#define SOCKET1_3V GPIO_GPIO3 #define SOCKET1_3V GPIO_GPIO3
static int jornada720_pcmcia_hw_init(struct soc_pcmcia_socket *skt) static int jornada720_pcmcia_hw_init(struct soc_pcmcia_socket *skt)
{ {
unsigned int pin = GPIO_A0 | GPIO_A1 | GPIO_A2 | GPIO_A3;
/* /*
* What is all this crap for? * What is all this crap for?
*/ */
GRER |= 0x00000002; GRER |= 0x00000002;
/* Set GPIO_A<3:1> to be outputs for PCMCIA/CF power controller: */ /* Set GPIO_A<3:1> to be outputs for PCMCIA/CF power controller: */
sa1111_set_io_dir(SA1111_DEV(skt->dev), GPIO_A0|GPIO_A1|GPIO_A2|GPIO_A3, 0, 0); sa1111_set_io_dir(SA1111_DEV(skt->dev), pin, 0, 0);
sa1111_set_io(SA1111_DEV(skt->dev), GPIO_A0|GPIO_A1|GPIO_A2|GPIO_A3, 0); sa1111_set_io(SA1111_DEV(skt->dev), pin, 0);
sa1111_set_sleep_io(SA1111_DEV(skt->dev), GPIO_A0|GPIO_A1|GPIO_A2|GPIO_A3, 0); sa1111_set_sleep_io(SA1111_DEV(skt->dev), pin, 0);
return sa1111_pcmcia_hw_init(skt); return sa1111_pcmcia_hw_init(skt);
} }
@ -42,7 +44,7 @@ jornada720_pcmcia_configure_socket(struct soc_pcmcia_socket *skt, const socket_s
unsigned int pa_dwr_mask, pa_dwr_set; unsigned int pa_dwr_mask, pa_dwr_set;
int ret; int ret;
printk("%s(): config socket %d vcc %d vpp %d\n", __func__, printk(KERN_INFO "%s(): config socket %d vcc %d vpp %d\n", __func__,
skt->nr, state->Vcc, state->Vpp); skt->nr, state->Vcc, state->Vpp);
switch (skt->nr) { switch (skt->nr) {
@ -51,9 +53,15 @@ printk("%s(): config socket %d vcc %d vpp %d\n", __func__,
switch (state->Vcc) { switch (state->Vcc) {
default: default:
case 0: pa_dwr_set = 0; break; case 0:
case 33: pa_dwr_set = SOCKET0_POWER | SOCKET0_3V; break; pa_dwr_set = 0;
case 50: pa_dwr_set = SOCKET0_POWER; break; break;
case 33:
pa_dwr_set = SOCKET0_POWER | SOCKET0_3V;
break;
case 50:
pa_dwr_set = SOCKET0_POWER;
break;
} }
break; break;
@ -62,9 +70,15 @@ printk("%s(): config socket %d vcc %d vpp %d\n", __func__,
switch (state->Vcc) { switch (state->Vcc) {
default: default:
case 0: pa_dwr_set = 0; break; case 0:
case 33: pa_dwr_set = SOCKET1_POWER; break; pa_dwr_set = 0;
case 50: pa_dwr_set = SOCKET1_POWER; break; break;
case 33:
pa_dwr_set = SOCKET1_POWER;
break;
case 50:
pa_dwr_set = SOCKET1_POWER;
break;
} }
break; break;
@ -75,7 +89,7 @@ printk("%s(): config socket %d vcc %d vpp %d\n", __func__,
if (state->Vpp != state->Vcc && state->Vpp != 0) { if (state->Vpp != state->Vcc && state->Vpp != 0) {
printk(KERN_ERR "%s(): slot cannot support VPP %u\n", printk(KERN_ERR "%s(): slot cannot support VPP %u\n",
__func__, state->Vpp); __func__, state->Vpp);
return -1; return -EPERM;
} }
ret = sa1111_pcmcia_configure_socket(skt, state); ret = sa1111_pcmcia_configure_socket(skt, state);