Merge tag 'v3.4-rc2' into perf/core

Merge Linux 3.4-rc2: we were on v3.3, update the base.

Signed-off-by: Ingo Molnar <mingo@kernel.org>

5 files changed, 114 insertions, 49 deletions

diff --git a/drivers/input/serio/ams_delta_serio.c b/drivers/input/serio/ams_delta_serio.c
index d4d08bd9205b..f5fbdf94de3b 100644
--- a/drivers/input/serio/ams_delta_serio.c
+++ b/drivers/input/serio/ams_delta_serio.c
@@ -92,8 +92,7 @@ static irqreturn_t ams_delta_serio_interrupt(int irq, void *dev_id)
 static int ams_delta_serio_open(struct serio *serio)
 {
         /* enable keyboard */
-        ams_delta_latch2_write(AMD_DELTA_LATCH2_KEYBRD_PWR,
-                        AMD_DELTA_LATCH2_KEYBRD_PWR);
+        gpio_set_value(AMS_DELTA_GPIO_PIN_KEYBRD_PWR, 1);
 
         return 0;
 }
@@ -101,9 +100,32 @@ static int ams_delta_serio_open(struct serio *serio)
 static void ams_delta_serio_close(struct serio *serio)
 {
         /* disable keyboard */
-        ams_delta_latch2_write(AMD_DELTA_LATCH2_KEYBRD_PWR, 0);
+        gpio_set_value(AMS_DELTA_GPIO_PIN_KEYBRD_PWR, 0);
 }
 
+static const struct gpio ams_delta_gpios[] __initconst_or_module = {
+        {
+                .gpio   = AMS_DELTA_GPIO_PIN_KEYBRD_DATA,
+                .flags  = GPIOF_DIR_IN,
+                .label  = "serio-data",
+        },
+        {
+                .gpio   = AMS_DELTA_GPIO_PIN_KEYBRD_CLK,
+                .flags  = GPIOF_DIR_IN,
+                .label  = "serio-clock",
+        },
+        {
+                .gpio   = AMS_DELTA_GPIO_PIN_KEYBRD_PWR,
+                .flags  = GPIOF_OUT_INIT_LOW,
+                .label  = "serio-power",
+        },
+        {
+                .gpio   = AMS_DELTA_GPIO_PIN_KEYBRD_DATAOUT,
+                .flags  = GPIOF_OUT_INIT_LOW,
+                .label  = "serio-dataout",
+        },
+};
+
 static int __init ams_delta_serio_init(void)
 {
         int err;
@@ -123,19 +145,12 @@ static int __init ams_delta_serio_init(void)
         strlcpy(ams_delta_serio->phys, "GPIO/serio0",
                         sizeof(ams_delta_serio->phys));
 
-        err = gpio_request(AMS_DELTA_GPIO_PIN_KEYBRD_DATA, "serio-data");
+        err = gpio_request_array(ams_delta_gpios,
+                                ARRAY_SIZE(ams_delta_gpios));
         if (err) {
-                pr_err("ams_delta_serio: Couldn't request gpio pin for data\n");
+                pr_err("ams_delta_serio: Couldn't request gpio pins\n");
                 goto serio;
         }
-        gpio_direction_input(AMS_DELTA_GPIO_PIN_KEYBRD_DATA);
-
-        err = gpio_request(AMS_DELTA_GPIO_PIN_KEYBRD_CLK, "serio-clock");
-        if (err) {
-                pr_err("ams_delta_serio: couldn't request gpio pin for clock\n");
-                goto gpio_data;
-        }
-        gpio_direction_input(AMS_DELTA_GPIO_PIN_KEYBRD_CLK);
 
         err = request_irq(gpio_to_irq(AMS_DELTA_GPIO_PIN_KEYBRD_CLK),
                         ams_delta_serio_interrupt, IRQ_TYPE_EDGE_RISING,
@@ -143,7 +158,7 @@ static int __init ams_delta_serio_init(void)
         if (err < 0) {
                 pr_err("ams_delta_serio: couldn't request gpio interrupt %d\n",
                                 gpio_to_irq(AMS_DELTA_GPIO_PIN_KEYBRD_CLK));
-                goto gpio_clk;
+                goto gpio;
         }
         /*
          * Since GPIO register handling for keyboard clock pin is performed
@@ -157,10 +172,9 @@ static int __init ams_delta_serio_init(void)
         dev_info(&ams_delta_serio->dev, "%s\n", ams_delta_serio->name);
 
         return 0;
-gpio_clk:
-        gpio_free(AMS_DELTA_GPIO_PIN_KEYBRD_CLK);
-gpio_data:
-        gpio_free(AMS_DELTA_GPIO_PIN_KEYBRD_DATA);
+gpio:
+        gpio_free_array(ams_delta_gpios,
+                        ARRAY_SIZE(ams_delta_gpios));
 serio:
         kfree(ams_delta_serio);
         return err;
@@ -170,8 +184,8 @@ module_init(ams_delta_serio_init);
 static void __exit ams_delta_serio_exit(void)
 {
         serio_unregister_port(ams_delta_serio);
-        free_irq(OMAP_GPIO_IRQ(AMS_DELTA_GPIO_PIN_KEYBRD_CLK), 0);
-        gpio_free(AMS_DELTA_GPIO_PIN_KEYBRD_CLK);
-        gpio_free(AMS_DELTA_GPIO_PIN_KEYBRD_DATA);
+        free_irq(gpio_to_irq(AMS_DELTA_GPIO_PIN_KEYBRD_CLK), 0);
+        gpio_free_array(ams_delta_gpios,
+                        ARRAY_SIZE(ams_delta_gpios));
 }
 module_exit(ams_delta_serio_exit);
diff --git a/drivers/input/serio/hp_sdc.c b/drivers/input/serio/hp_sdc.c
index be3316073ae7..09a089996ded 100644
--- a/drivers/input/serio/hp_sdc.c
+++ b/drivers/input/serio/hp_sdc.c
@@ -71,7 +71,6 @@
 #include <linux/slab.h>
 #include <linux/hil.h>
 #include <asm/io.h>
-#include <asm/system.h>
 
 /* Machine-specific abstraction */
 
diff --git a/drivers/input/serio/maceps2.c b/drivers/input/serio/maceps2.c
index 558200e96d0f..61da763b1209 100644
--- a/drivers/input/serio/maceps2.c
+++ b/drivers/input/serio/maceps2.c
@@ -21,7 +21,6 @@
 
 #include <asm/io.h>
 #include <asm/irq.h>
-#include <asm/system.h>
 #include <asm/ip32/mace.h>
 #include <asm/ip32/ip32_ints.h>
 
diff --git a/drivers/input/serio/rpckbd.c b/drivers/input/serio/rpckbd.c
index 8b44ddc8041c..2af5df6a8fba 100644
--- a/drivers/input/serio/rpckbd.c
+++ b/drivers/input/serio/rpckbd.c
@@ -36,16 +36,19 @@
 #include <linux/io.h>
 #include <linux/slab.h>
 
-#include <asm/irq.h>
 #include <mach/hardware.h>
 #include <asm/hardware/iomd.h>
-#include <asm/system.h>
 
 MODULE_AUTHOR("Vojtech Pavlik, Russell King");
 MODULE_DESCRIPTION("Acorn RiscPC PS/2 keyboard controller driver");
 MODULE_LICENSE("GPL");
 MODULE_ALIAS("platform:kart");
 
+struct rpckbd_data {
+        int tx_irq;
+        int rx_irq;
+};
+
 static int rpckbd_write(struct serio *port, unsigned char val)
 {
         while (!(iomd_readb(IOMD_KCTRL) & (1 << 7)))
@@ -78,19 +81,21 @@ static irqreturn_t rpckbd_tx(int irq, void *dev_id)
 
 static int rpckbd_open(struct serio *port)
 {
+        struct rpckbd_data *rpckbd = port->port_data;
+
         /* Reset the keyboard state machine. */
         iomd_writeb(0, IOMD_KCTRL);
         iomd_writeb(8, IOMD_KCTRL);
         iomd_readb(IOMD_KARTRX);
 
-        if (request_irq(IRQ_KEYBOARDRX, rpckbd_rx, 0, "rpckbd", port) != 0) {
+        if (request_irq(rpckbd->rx_irq, rpckbd_rx, 0, "rpckbd", port) != 0) {
                 printk(KERN_ERR "rpckbd.c: Could not allocate keyboard receive IRQ\n");
                 return -EBUSY;
         }
 
-        if (request_irq(IRQ_KEYBOARDTX, rpckbd_tx, 0, "rpckbd", port) != 0) {
+        if (request_irq(rpckbd->tx_irq, rpckbd_tx, 0, "rpckbd", port) != 0) {
                 printk(KERN_ERR "rpckbd.c: Could not allocate keyboard transmit IRQ\n");
-                free_irq(IRQ_KEYBOARDRX, port);
+                free_irq(rpckbd->rx_irq, port);
                 return -EBUSY;
         }
 
@@ -99,8 +104,10 @@ static int rpckbd_open(struct serio *port)
 
 static void rpckbd_close(struct serio *port)
 {
-        free_irq(IRQ_KEYBOARDRX, port);
-        free_irq(IRQ_KEYBOARDTX, port);
+        struct rpckbd_data *rpckbd = port->port_data;
+
+        free_irq(rpckbd->rx_irq, port);
+        free_irq(rpckbd->tx_irq, port);
 }
 
 /*
@@ -109,17 +116,35 @@ static void rpckbd_close(struct serio *port)
  */
 static int __devinit rpckbd_probe(struct platform_device *dev)
 {
+        struct rpckbd_data *rpckbd;
         struct serio *serio;
+        int tx_irq, rx_irq;
+
+        rx_irq = platform_get_irq(dev, 0);
+        if (rx_irq <= 0)
+                return rx_irq < 0 ? rx_irq : -ENXIO;
+
+        tx_irq = platform_get_irq(dev, 1);
+        if (tx_irq <= 0)
+                return tx_irq < 0 ? tx_irq : -ENXIO;
 
         serio = kzalloc(sizeof(struct serio), GFP_KERNEL);
-        if (!serio)
+        rpckbd = kzalloc(sizeof(*rpckbd), GFP_KERNEL);
+        if (!serio || !rpckbd) {
+                kfree(rpckbd);
+                kfree(serio);
                 return -ENOMEM;
+        }
+
+        rpckbd->rx_irq = rx_irq;
+        rpckbd->tx_irq = tx_irq;
 
         serio->id.type          = SERIO_8042;
         serio->write            = rpckbd_write;
         serio->open             = rpckbd_open;
         serio->close            = rpckbd_close;
         serio->dev.parent       = &dev->dev;
+        serio->port_data        = rpckbd;
         strlcpy(serio->name, "RiscPC PS/2 kbd port", sizeof(serio->name));
         strlcpy(serio->phys, "rpckbd/serio0", sizeof(serio->phys));
 
@@ -131,7 +156,11 @@ static int __devinit rpckbd_probe(struct platform_device *dev)
 static int __devexit rpckbd_remove(struct platform_device *dev)
 {
         struct serio *serio = platform_get_drvdata(dev);
+        struct rpckbd_data *rpckbd = serio->port_data;
+
         serio_unregister_port(serio);
+        kfree(rpckbd);
+
         return 0;
 }
 
diff --git a/drivers/input/serio/sa1111ps2.c b/drivers/input/serio/sa1111ps2.c
index 44fc8b4bcd81..389766707534 100644
--- a/drivers/input/serio/sa1111ps2.c
+++ b/drivers/input/serio/sa1111ps2.c
@@ -20,10 +20,29 @@
 #include <linux/spinlock.h>
 
 #include <asm/io.h>
-#include <asm/system.h>
 
 #include <asm/hardware/sa1111.h>
 
+#define PS2CR           0x0000
+#define PS2STAT         0x0004
+#define PS2DATA         0x0008
+#define PS2CLKDIV       0x000c
+#define PS2PRECNT       0x0010
+
+#define PS2CR_ENA       0x08
+#define PS2CR_FKD       0x02
+#define PS2CR_FKC       0x01
+
+#define PS2STAT_STP     0x0100
+#define PS2STAT_TXE     0x0080
+#define PS2STAT_TXB     0x0040
+#define PS2STAT_RXF     0x0020
+#define PS2STAT_RXB     0x0010
+#define PS2STAT_ENA     0x0008
+#define PS2STAT_RXP     0x0004
+#define PS2STAT_KBD     0x0002
+#define PS2STAT_KBC     0x0001
+
 struct ps2if {
         struct serio            *io;
         struct sa1111_dev       *dev;
@@ -45,22 +64,22 @@ static irqreturn_t ps2_rxint(int irq, void *dev_id)
         struct ps2if *ps2if = dev_id;
         unsigned int scancode, flag, status;
 
-        status = sa1111_readl(ps2if->base + SA1111_PS2STAT);
+        status = sa1111_readl(ps2if->base + PS2STAT);
         while (status & PS2STAT_RXF) {
                 if (status & PS2STAT_STP)
-                        sa1111_writel(PS2STAT_STP, ps2if->base + SA1111_PS2STAT);
+                        sa1111_writel(PS2STAT_STP, ps2if->base + PS2STAT);
 
                 flag = (status & PS2STAT_STP ? SERIO_FRAME : 0) |
                        (status & PS2STAT_RXP ? 0 : SERIO_PARITY);
 
-                scancode = sa1111_readl(ps2if->base + SA1111_PS2DATA) & 0xff;
+                scancode = sa1111_readl(ps2if->base + PS2DATA) & 0xff;
 
                 if (hweight8(scancode) & 1)
                         flag ^= SERIO_PARITY;
 
                 serio_interrupt(ps2if->io, scancode, flag);
 
-                status = sa1111_readl(ps2if->base + SA1111_PS2STAT);
+                status = sa1111_readl(ps2if->base + PS2STAT);
         }
 
         return IRQ_HANDLED;
@@ -75,12 +94,12 @@ static irqreturn_t ps2_txint(int irq, void *dev_id)
         unsigned int status;
 
         spin_lock(&ps2if->lock);
-        status = sa1111_readl(ps2if->base + SA1111_PS2STAT);
+        status = sa1111_readl(ps2if->base + PS2STAT);
         if (ps2if->head == ps2if->tail) {
                 disable_irq_nosync(irq);
                 /* done */
         } else if (status & PS2STAT_TXE) {
-                sa1111_writel(ps2if->buf[ps2if->tail], ps2if->base + SA1111_PS2DATA);
+                sa1111_writel(ps2if->buf[ps2if->tail], ps2if->base + PS2DATA);
                 ps2if->tail = (ps2if->tail + 1) & (sizeof(ps2if->buf) - 1);
         }
         spin_unlock(&ps2if->lock);
@@ -103,8 +122,8 @@ static int ps2_write(struct serio *io, unsigned char val)
         /*
          * If the TX register is empty, we can go straight out.
          */
-        if (sa1111_readl(ps2if->base + SA1111_PS2STAT) & PS2STAT_TXE) {
-                sa1111_writel(val, ps2if->base + SA1111_PS2DATA);
+        if (sa1111_readl(ps2if->base + PS2STAT) & PS2STAT_TXE) {
+                sa1111_writel(val, ps2if->base + PS2DATA);
         } else {
                 if (ps2if->head == ps2if->tail)
                         enable_irq(ps2if->dev->irq[1]);
@@ -124,13 +143,16 @@ static int ps2_open(struct serio *io)
         struct ps2if *ps2if = io->port_data;
         int ret;
 
-        sa1111_enable_device(ps2if->dev);
+        ret = sa1111_enable_device(ps2if->dev);
+        if (ret)
+                return ret;
 
         ret = request_irq(ps2if->dev->irq[0], ps2_rxint, 0,
                           SA1111_DRIVER_NAME(ps2if->dev), ps2if);
         if (ret) {
                 printk(KERN_ERR "sa1111ps2: could not allocate IRQ%d: %d\n",
                         ps2if->dev->irq[0], ret);
+                sa1111_disable_device(ps2if->dev);
                 return ret;
         }
 
@@ -140,6 +162,7 @@ static int ps2_open(struct serio *io)
                 printk(KERN_ERR "sa1111ps2: could not allocate IRQ%d: %d\n",
                         ps2if->dev->irq[1], ret);
                 free_irq(ps2if->dev->irq[0], ps2if);
+                sa1111_disable_device(ps2if->dev);
                 return ret;
         }
 
@@ -147,7 +170,7 @@ static int ps2_open(struct serio *io)
 
         enable_irq_wake(ps2if->dev->irq[0]);
 
-        sa1111_writel(PS2CR_ENA, ps2if->base + SA1111_PS2CR);
+        sa1111_writel(PS2CR_ENA, ps2if->base + PS2CR);
         return 0;
 }
 
@@ -155,7 +178,7 @@ static void ps2_close(struct serio *io)
 {
         struct ps2if *ps2if = io->port_data;
 
-        sa1111_writel(0, ps2if->base + SA1111_PS2CR);
+        sa1111_writel(0, ps2if->base + PS2CR);
 
         disable_irq_wake(ps2if->dev->irq[0]);
 
@@ -175,7 +198,7 @@ static void __devinit ps2_clear_input(struct ps2if *ps2if)
         int maxread = 100;
 
         while (maxread--) {
-                if ((sa1111_readl(ps2if->base + SA1111_PS2DATA) & 0xff) == 0xff)
+                if ((sa1111_readl(ps2if->base + PS2DATA) & 0xff) == 0xff)
                         break;
         }
 }
@@ -185,11 +208,11 @@ static unsigned int __devinit ps2_test_one(struct ps2if *ps2if,
 {
         unsigned int val;
 
-        sa1111_writel(PS2CR_ENA | mask, ps2if->base + SA1111_PS2CR);
+        sa1111_writel(PS2CR_ENA | mask, ps2if->base + PS2CR);
 
         udelay(2);
 
-        val = sa1111_readl(ps2if->base + SA1111_PS2STAT);
+        val = sa1111_readl(ps2if->base + PS2STAT);
         return val & (PS2STAT_KBC | PS2STAT_KBD);
 }
 
@@ -220,7 +243,7 @@ static int __devinit ps2_test(struct ps2if *ps2if)
                 ret = -ENODEV;
         }
 
-        sa1111_writel(0, ps2if->base + SA1111_PS2CR);
+        sa1111_writel(0, ps2if->base + PS2CR);
 
         return ret;
 }
@@ -274,8 +297,8 @@ static int __devinit ps2_probe(struct sa1111_dev *dev)
         sa1111_enable_device(ps2if->dev);
 
         /* Incoming clock is 8MHz */
-        sa1111_writel(0, ps2if->base + SA1111_PS2CLKDIV);
-        sa1111_writel(127, ps2if->base + SA1111_PS2PRECNT);
+        sa1111_writel(0, ps2if->base + PS2CLKDIV);
+        sa1111_writel(127, ps2if->base + PS2PRECNT);
 
         /*
          * Flush any pending input.
@@ -330,6 +353,7 @@ static int __devexit ps2_remove(struct sa1111_dev *dev)
 static struct sa1111_driver ps2_driver = {
         .drv = {
                 .name   = "sa1111-ps2",
+                .owner  = THIS_MODULE,
         },
         .devid          = SA1111_DEVID_PS2,
         .probe          = ps2_probe,