Merge branch 'for-davem' of git://gitorious.org/linux-can/linux-can-next

Marc Kleine-Budde says:

====================
this is a pull-request for net-next/master. It consists of three
patches by Fabio Estevam and me, which convert the flexcan transceiver
switching to DT[1] and a patch by Sachin Kamat, which cleans up the
at91_can driver a bit.

[1] These patches touch arch/arm/mach-imx, so I collected Acked-bys
from Shawn Guo and Sascha Hauer.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>

2 files changed, 14 insertions, 15 deletions

diff --git a/drivers/net/can/at91_can.c b/drivers/net/can/at91_can.c
index ce8421ac453a..dbbe97ae121e 100644
--- a/drivers/net/can/at91_can.c
+++ b/drivers/net/can/at91_can.c
@@ -1264,8 +1264,6 @@ static const struct of_device_id at91_can_dt_ids[] = {
         }
 };
 MODULE_DEVICE_TABLE(of, at91_can_dt_ids);
-#else
-#define at91_can_dt_ids NULL
 #endif
 
 static const struct at91_devtype_data *at91_can_get_driver_data(struct platform_device *pdev)
@@ -1424,7 +1422,7 @@ static struct platform_driver at91_can_driver = {
         .driver = {
                 .name = KBUILD_MODNAME,
                 .owner = THIS_MODULE,
-                .of_match_table = at91_can_dt_ids,
+                .of_match_table = of_match_ptr(at91_can_dt_ids),
         },
         .id_table = at91_can_id_table,
 };
diff --git a/drivers/net/can/flexcan.c b/drivers/net/can/flexcan.c
index f873b9f8d4d4..7b0be0910f4b 100644
--- a/drivers/net/can/flexcan.c
+++ b/drivers/net/can/flexcan.c
@@ -24,7 +24,6 @@
 #include <linux/can/dev.h>
 #include <linux/can/error.h>
 #include <linux/can/led.h>
-#include <linux/can/platform/flexcan.h>
 #include <linux/clk.h>
 #include <linux/delay.h>
 #include <linux/if_arp.h>
@@ -37,6 +36,7 @@
 #include <linux/of.h>
 #include <linux/of_device.h>
 #include <linux/platform_device.h>
+#include <linux/regulator/consumer.h>
 
 #define DRV_NAME                        "flexcan"
 
@@ -211,6 +211,7 @@ struct flexcan_priv {
         struct clk *clk_per;
         struct flexcan_platform_data *pdata;
         const struct flexcan_devtype_data *devtype_data;
+        struct regulator *reg_xceiver;
 };
 
 static struct flexcan_devtype_data fsl_p1010_devtype_data = {
@@ -258,15 +259,6 @@ static inline void flexcan_write(u32 val, void __iomem *addr)
 }
 #endif
 
-/*
- * Swtich transceiver on or off
- */
-static void flexcan_transceiver_switch(const struct flexcan_priv *priv, int on)
-{
-        if (priv->pdata && priv->pdata->transceiver_switch)
-                priv->pdata->transceiver_switch(on);
-}
-
 static inline int flexcan_has_and_handle_berr(const struct flexcan_priv *priv,
                                               u32 reg_esr)
 {
@@ -799,7 +791,11 @@ static int flexcan_chip_start(struct net_device *dev)
         if (priv->devtype_data->features & FLEXCAN_HAS_V10_FEATURES)
                 flexcan_write(0x0, &regs->rxfgmask);
 
-        flexcan_transceiver_switch(priv, 1);
+        if (priv->reg_xceiver)  {
+                err = regulator_enable(priv->reg_xceiver);
+                if (err)
+                        goto out;
+        }
 
         /* synchronize with the can bus */
         reg_mcr = flexcan_read(&regs->mcr);
@@ -842,7 +838,8 @@ static void flexcan_chip_stop(struct net_device *dev)
         reg |= FLEXCAN_MCR_MDIS | FLEXCAN_MCR_HALT;
         flexcan_write(reg, &regs->mcr);
 
-        flexcan_transceiver_switch(priv, 0);
+        if (priv->reg_xceiver)
+                regulator_disable(priv->reg_xceiver);
         priv->can.state = CAN_STATE_STOPPED;
 
         return;
@@ -1084,6 +1081,10 @@ static int flexcan_probe(struct platform_device *pdev)
         priv->pdata = pdev->dev.platform_data;
         priv->devtype_data = devtype_data;
 
+        priv->reg_xceiver = devm_regulator_get(&pdev->dev, "xceiver");
+        if (IS_ERR(priv->reg_xceiver))
+                priv->reg_xceiver = NULL;
+
         netif_napi_add(dev, &priv->napi, flexcan_poll, FLEXCAN_NAPI_WEIGHT);
 
         dev_set_drvdata(&pdev->dev, dev);