diff options
| author | Shawn Guo | 2012-05-12 07:32:09 +0200 |
|---|---|---|
| committer | Shawn Guo | 2012-05-12 07:32:09 +0200 |
| commit | 844d0b5a0b42d6c73114a1dc229db751120d226f (patch) | |
| tree | faf9f83e78ae24f6730d64999a89c35144da3b8a /drivers/net/can/flexcan.c | |
| parent | ARM: mxs: remove now unused timer_clk argument from mxs_timer_init (diff) | |
| parent | ARM: mxs: enable pinctrl support (diff) | |
| download | kernel-qcow2-linux-844d0b5a0b42d6c73114a1dc229db751120d226f.tar.gz kernel-qcow2-linux-844d0b5a0b42d6c73114a1dc229db751120d226f.tar.xz kernel-qcow2-linux-844d0b5a0b42d6c73114a1dc229db751120d226f.zip | |
Merge branches 'clk/mxs' and 'imx/pinctrl/for-3.5' into mxs/dt/for-3.5
Diffstat (limited to 'drivers/net/can/flexcan.c')
| -rw-r--r-- | drivers/net/can/flexcan.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/net/can/flexcan.c b/drivers/net/can/flexcan.c index 1efb08386c61..38c0690df5c8 100644 --- a/drivers/net/can/flexcan.c +++ b/drivers/net/can/flexcan.c @@ -35,6 +35,7 @@ #include <linux/module.h> #include <linux/of.h> #include <linux/platform_device.h> +#include <linux/pinctrl/consumer.h> #define DRV_NAME "flexcan" @@ -927,11 +928,16 @@ static int __devinit flexcan_probe(struct platform_device *pdev) struct flexcan_priv *priv; struct resource *mem; struct clk *clk = NULL; + struct pinctrl *pinctrl; void __iomem *base; resource_size_t mem_size; int err, irq; u32 clock_freq = 0; + pinctrl = devm_pinctrl_get_select_default(&pdev->dev); + if (IS_ERR(pinctrl)) + return PTR_ERR(pinctrl); + if (pdev->dev.of_node) { const u32 *clock_freq_p; |