3 files changed, 36 insertions, 13 deletions

diff --git a/drivers/input/touchscreen/jornada720_ts.c b/drivers/input/touchscreen/jornada720_ts.c
index 742242111bf1..1aca108b1031 100644
--- a/drivers/input/touchscreen/jornada720_ts.c
+++ b/drivers/input/touchscreen/jornada720_ts.c
@@ -24,7 +24,7 @@
 
 MODULE_AUTHOR("Kristoffer Ericson <kristoffer.ericson@gmail.com>");
 MODULE_DESCRIPTION("HP Jornada 710/720/728 touchscreen driver");
-MODULE_LICENSE("GPLv2");
+MODULE_LICENSE("GPL v2");
 
 struct jornada_ts {
         struct input_dev *dev;
diff --git a/drivers/input/touchscreen/wm9713.c b/drivers/input/touchscreen/wm9713.c
index 01278bd7e65c..838458792ea0 100644
--- a/drivers/input/touchscreen/wm9713.c
+++ b/drivers/input/touchscreen/wm9713.c
@@ -85,6 +85,15 @@ module_param(delay, int, 0);
 MODULE_PARM_DESC(delay, "Set adc sample delay.");
 
 /*
+ * Set five_wire = 1 to use a 5 wire touchscreen.
+ *
+ * NOTE: Five wire mode does not allow for readback of pressure.
+ */
+static int five_wire;
+module_param(five_wire, int, 0);
+MODULE_PARM_DESC(five_wire, "Set to '1' to use 5-wire touchscreen.");
+
+/*
  * Set adc mask function.
  *
  * Sources of glitch noise, such as signals driving an LCD display, may feed
@@ -162,6 +171,19 @@ static void wm9713_phy_init(struct wm97xx *wm)
                          64000 / rpu);
         }
 
+        /* Five wire panel? */
+        if (five_wire) {
+                dig3 |= WM9713_45W;
+                dev_info(wm->dev, "setting 5-wire touchscreen mode.");
+
+                if (pil) {
+                        dev_warn(wm->dev,
+                                 "Pressure measurement not supported in 5 "
+                                 "wire mode, disabling\n");
+                        pil = 0;
+                }
+        }
+
         /* touchpanel pressure */
         if (pil == 2) {
                 dig3 |= WM9712_PIL;
diff --git a/drivers/input/touchscreen/wm97xx-core.c b/drivers/input/touchscreen/wm97xx-core.c
index e9c7ea46b6e3..cdc24ad314e0 100644
--- a/drivers/input/touchscreen/wm97xx-core.c
+++ b/drivers/input/touchscreen/wm97xx-core.c
@@ -608,6 +608,17 @@ static int wm97xx_probe(struct device *dev)
                 goto alloc_err;
         }
 
+        /* set up physical characteristics */
+        wm->codec->phy_init(wm);
+
+        /* load gpio cache */
+        wm->gpio[0] = wm97xx_reg_read(wm, AC97_GPIO_CFG);
+        wm->gpio[1] = wm97xx_reg_read(wm, AC97_GPIO_POLARITY);
+        wm->gpio[2] = wm97xx_reg_read(wm, AC97_GPIO_STICKY);
+        wm->gpio[3] = wm97xx_reg_read(wm, AC97_GPIO_WAKEUP);
+        wm->gpio[4] = wm97xx_reg_read(wm, AC97_GPIO_STATUS);
+        wm->gpio[5] = wm97xx_reg_read(wm, AC97_MISC_AFE);
+
         wm->input_dev = input_allocate_device();
         if (wm->input_dev == NULL) {
                 ret = -ENOMEM;
@@ -616,6 +627,7 @@ static int wm97xx_probe(struct device *dev)
 
         /* set up touch configuration */
         wm->input_dev->name = "wm97xx touchscreen";
+        wm->input_dev->phys = "wm97xx";
         wm->input_dev->open = wm97xx_ts_input_open;
         wm->input_dev->close = wm97xx_ts_input_close;
         set_bit(EV_ABS, wm->input_dev->evbit);
@@ -634,17 +646,6 @@ static int wm97xx_probe(struct device *dev)
         if (ret < 0)
                 goto dev_alloc_err;
 
-        /* set up physical characteristics */
-        wm->codec->phy_init(wm);
-
-        /* load gpio cache */
-        wm->gpio[0] = wm97xx_reg_read(wm, AC97_GPIO_CFG);
-        wm->gpio[1] = wm97xx_reg_read(wm, AC97_GPIO_POLARITY);
-        wm->gpio[2] = wm97xx_reg_read(wm, AC97_GPIO_STICKY);
-        wm->gpio[3] = wm97xx_reg_read(wm, AC97_GPIO_WAKEUP);
-        wm->gpio[4] = wm97xx_reg_read(wm, AC97_GPIO_STATUS);
-        wm->gpio[5] = wm97xx_reg_read(wm, AC97_MISC_AFE);
-
         /* register our battery device */
         wm->battery_dev = platform_device_alloc("wm97xx-battery", -1);
         if (!wm->battery_dev) {
@@ -801,7 +802,7 @@ void wm97xx_unregister_mach_ops(struct wm97xx *wm)
 EXPORT_SYMBOL_GPL(wm97xx_unregister_mach_ops);
 
 static struct device_driver wm97xx_driver = {
-        .name =         "ac97",
+        .name =         "wm97xx-ts",
         .bus =          &ac97_bus_type,
         .owner =        THIS_MODULE,
         .probe =        wm97xx_probe,