|
@@ -32,6 +32,7 @@
|
|
#include <linux/clk.h>
|
|
#include <linux/clk.h>
|
|
#include <linux/of.h>
|
|
#include <linux/of.h>
|
|
#include <linux/of_device.h>
|
|
#include <linux/of_device.h>
|
|
|
|
+#include <linux/pinctrl/consumer.h>
|
|
|
|
|
|
#include <linux/can/dev.h>
|
|
#include <linux/can/dev.h>
|
|
|
|
|
|
@@ -97,6 +98,7 @@ static int __devinit c_can_plat_probe(struct platform_device *pdev)
|
|
struct c_can_priv *priv;
|
|
struct c_can_priv *priv;
|
|
const struct of_device_id *match;
|
|
const struct of_device_id *match;
|
|
const struct platform_device_id *id;
|
|
const struct platform_device_id *id;
|
|
|
|
+ struct pinctrl *pinctrl;
|
|
struct resource *mem;
|
|
struct resource *mem;
|
|
int irq;
|
|
int irq;
|
|
struct clk *clk;
|
|
struct clk *clk;
|
|
@@ -113,6 +115,11 @@ static int __devinit c_can_plat_probe(struct platform_device *pdev)
|
|
id = platform_get_device_id(pdev);
|
|
id = platform_get_device_id(pdev);
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+ pinctrl = devm_pinctrl_get_select_default(&pdev->dev);
|
|
|
|
+ if (IS_ERR(pinctrl))
|
|
|
|
+ dev_warn(&pdev->dev,
|
|
|
|
+ "failed to configure pins from driver\n");
|
|
|
|
+
|
|
/* get the appropriate clk */
|
|
/* get the appropriate clk */
|
|
clk = clk_get(&pdev->dev, NULL);
|
|
clk = clk_get(&pdev->dev, NULL);
|
|
if (IS_ERR(clk)) {
|
|
if (IS_ERR(clk)) {
|