6 files changed, 42 insertions, 10 deletions

diff --git a/drivers/net/irda/kingsun-sir.c b/drivers/net/irda/kingsun-sir.c
index 2fc30b449eea..cb90d640007a 100644
--- a/drivers/net/irda/kingsun-sir.c
+++ b/drivers/net/irda/kingsun-sir.c
@@ -66,7 +66,6 @@
 #include <linux/errno.h>
 #include <linux/init.h>
 #include <linux/slab.h>
-#include <linux/kref.h>
 #include <linux/usb.h>
 #include <linux/device.h>
 #include <linux/crc32.h>
diff --git a/drivers/net/irda/ks959-sir.c b/drivers/net/irda/ks959-sir.c
index f4d13fc51cbc..b54d3b48045e 100644
--- a/drivers/net/irda/ks959-sir.c
+++ b/drivers/net/irda/ks959-sir.c
@@ -118,7 +118,6 @@
 #include <linux/errno.h>
 #include <linux/init.h>
 #include <linux/slab.h>
-#include <linux/kref.h>
 #include <linux/usb.h>
 #include <linux/device.h>
 #include <linux/crc32.h>
diff --git a/drivers/net/irda/ksdazzle-sir.c b/drivers/net/irda/ksdazzle-sir.c
index 5f9d73353972..8d713ebac15b 100644
--- a/drivers/net/irda/ksdazzle-sir.c
+++ b/drivers/net/irda/ksdazzle-sir.c
@@ -82,7 +82,6 @@
 #include <linux/errno.h>
 #include <linux/init.h>
 #include <linux/slab.h>
-#include <linux/kref.h>
 #include <linux/usb.h>
 #include <linux/device.h>
 #include <linux/crc32.h>
diff --git a/drivers/net/irda/mcs7780.c b/drivers/net/irda/mcs7780.c
index b3d30bcb88e7..c0e0bb9401d3 100644
--- a/drivers/net/irda/mcs7780.c
+++ b/drivers/net/irda/mcs7780.c
@@ -50,7 +50,6 @@
 #include <linux/errno.h>
 #include <linux/init.h>
 #include <linux/slab.h>
-#include <linux/kref.h>
 #include <linux/usb.h>
 #include <linux/device.h>
 #include <linux/crc32.h>
diff --git a/drivers/net/irda/pxaficp_ir.c b/drivers/net/irda/pxaficp_ir.c
index 1445e5865196..84db145d2b59 100644
--- a/drivers/net/irda/pxaficp_ir.c
+++ b/drivers/net/irda/pxaficp_ir.c
@@ -17,6 +17,7 @@
 #include <linux/etherdevice.h>
 #include <linux/platform_device.h>
 #include <linux/clk.h>
+#include <linux/gpio.h>
 
 #include <net/irda/irda.h>
 #include <net/irda/irmod.h>
@@ -163,6 +164,22 @@ inline static void pxa_irda_fir_dma_tx_start(struct pxa_irda *si)
 }
 
 /*
+ * Set the IrDA communications mode.
+ */
+static void pxa_irda_set_mode(struct pxa_irda *si, int mode)
+{
+        if (si->pdata->transceiver_mode)
+                si->pdata->transceiver_mode(si->dev, mode);
+        else {
+                if (gpio_is_valid(si->pdata->gpio_pwdown))
+                        gpio_set_value(si->pdata->gpio_pwdown,
+                                        !(mode & IR_OFF) ^
+                                        !si->pdata->gpio_pwdown_inverted);
+                pxa2xx_transceiver_mode(si->dev, mode);
+        }
+}
+
+/*
  * Set the IrDA communications speed.
  */
 static int pxa_irda_set_speed(struct pxa_irda *si, int speed)
@@ -188,7 +205,7 @@ static int pxa_irda_set_speed(struct pxa_irda *si, int speed)
                         pxa_irda_disable_clk(si);
 
                         /* set board transceiver to SIR mode */
-                        si->pdata->transceiver_mode(si->dev, IR_SIRMODE);
+                        pxa_irda_set_mode(si, IR_SIRMODE);
 
                         /* enable the STUART clock */
                         pxa_irda_enable_sirclk(si);
@@ -222,7 +239,7 @@ static int pxa_irda_set_speed(struct pxa_irda *si, int speed)
                 ICCR0 = 0;
 
                 /* set board transceiver to FIR mode */
-                si->pdata->transceiver_mode(si->dev, IR_FIRMODE);
+                pxa_irda_set_mode(si, IR_FIRMODE);
 
                 /* enable the FICP clock */
                 pxa_irda_enable_firclk(si);
@@ -641,7 +658,7 @@ static void pxa_irda_shutdown(struct pxa_irda *si)
         local_irq_restore(flags);
 
         /* power off board transceiver */
-        si->pdata->transceiver_mode(si->dev, IR_OFF);
+        pxa_irda_set_mode(si, IR_OFF);
 
         printk(KERN_DEBUG "pxa_ir: irda shutdown\n");
 }
@@ -849,10 +866,26 @@ static int pxa_irda_probe(struct platform_device *pdev)
         if (err)
                 goto err_mem_5;
 
-        if (si->pdata->startup)
+        if (gpio_is_valid(si->pdata->gpio_pwdown)) {
+                err = gpio_request(si->pdata->gpio_pwdown, "IrDA switch");
+                if (err)
+                        goto err_startup;
+                err = gpio_direction_output(si->pdata->gpio_pwdown,
+                                        !si->pdata->gpio_pwdown_inverted);
+                if (err) {
+                        gpio_free(si->pdata->gpio_pwdown);
+                        goto err_startup;
+                }
+        }
+
+        if (si->pdata->startup) {
                 err = si->pdata->startup(si->dev);
-        if (err)
-                goto err_startup;
+                if (err)
+                        goto err_startup;
+        }
+
+        if (gpio_is_valid(si->pdata->gpio_pwdown) && si->pdata->startup)
+                dev_warn(si->dev, "gpio_pwdown and startup() both defined!\n");
 
         dev->netdev_ops = &pxa_irda_netdev_ops;
 
@@ -903,6 +936,8 @@ static int pxa_irda_remove(struct platform_device *_dev)
         if (dev) {
                 struct pxa_irda *si = netdev_priv(dev);
                 unregister_netdev(dev);
+                if (gpio_is_valid(si->pdata->gpio_pwdown))
+                        gpio_free(si->pdata->gpio_pwdown);
                 if (si->pdata->shutdown)
                         si->pdata->shutdown(si->dev);
                 kfree(si->tx_buff.head);
diff --git a/drivers/net/irda/toim3232-sir.c b/drivers/net/irda/toim3232-sir.c
index fcf287b749db..99e1ec02a011 100644
--- a/drivers/net/irda/toim3232-sir.c
+++ b/drivers/net/irda/toim3232-sir.c
@@ -120,6 +120,7 @@
 #include <linux/module.h>
 #include <linux/delay.h>
 #include <linux/init.h>
+#include <linux/sched.h>
 
 #include <net/irda/irda.h>