aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Bornet <Olivier.Bornet@puck.ch>2009-08-18 15:05:57 -0400
committerGreg Kroah-Hartman <gregkh@suse.de>2009-09-23 09:46:36 -0400
commite55c6d06fead7e58b7c597fd9afc46a88ef740e6 (patch)
tree0c485e4ff930a5a7204a68447fc7bb0387b9d605
parent02b180665279df9de6b121ce0b4d42ce4f04c411 (diff)
USB: iuu_phoenix: add a way to select the default VCC
Using the module parameter vcc_default, you can choose the default VCC value. Signed-off-by: Olivier Bornet <Olivier.Bornet@puck.ch> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r--drivers/usb/serial/iuu_phoenix.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/drivers/usb/serial/iuu_phoenix.c b/drivers/usb/serial/iuu_phoenix.c
index 0b1a74e7be50..e6e02b178d2b 100644
--- a/drivers/usb/serial/iuu_phoenix.c
+++ b/drivers/usb/serial/iuu_phoenix.c
@@ -64,6 +64,7 @@ static int cdmode = 1;
64static int iuu_cardin; 64static int iuu_cardin;
65static int iuu_cardout; 65static int iuu_cardout;
66static int xmas; 66static int xmas;
67static int vcc_default = 5;
67 68
68static void read_rxcmd_callback(struct urb *urb); 69static void read_rxcmd_callback(struct urb *urb);
69 70
@@ -115,7 +116,7 @@ static int iuu_startup(struct usb_serial *serial)
115 kfree(priv); 116 kfree(priv);
116 return -ENOMEM; 117 return -ENOMEM;
117 } 118 }
118 priv->vcc = 5; /* 5 V for vcc by default */ 119 priv->vcc = vcc_default;
119 spin_lock_init(&priv->lock); 120 spin_lock_init(&priv->lock);
120 init_waitqueue_head(&priv->delta_msr_wait); 121 init_waitqueue_head(&priv->delta_msr_wait);
121 usb_set_serial_port_data(serial->port[0], priv); 122 usb_set_serial_port_data(serial->port[0], priv);
@@ -1339,3 +1340,7 @@ MODULE_PARM_DESC(clockmode, "Card clock mode (1=3.579 MHz, 2=3.680 MHz, "
1339module_param(cdmode, int, S_IRUGO | S_IWUSR); 1340module_param(cdmode, int, S_IRUGO | S_IWUSR);
1340MODULE_PARM_DESC(cdmode, "Card detect mode (0=none, 1=CD, 2=!CD, 3=DSR, " 1341MODULE_PARM_DESC(cdmode, "Card detect mode (0=none, 1=CD, 2=!CD, 3=DSR, "
1341 "4=!DSR, 5=CTS, 6=!CTS, 7=RING, 8=!RING)"); 1342 "4=!DSR, 5=CTS, 6=!CTS, 7=RING, 8=!RING)");
1343
1344module_param(vcc_default, int, S_IRUGO | S_IWUSR);
1345MODULE_PARM_DESC(vcc_default, "Set default VCC (either 3 for 3.3V or 5 "
1346 "for 5V). Default to 5.");