evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

can: rcar_can: add device tree support

Browse source 
Add support of the device tree probing for the Renesas R-Car CAN controllers.

Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
This commit is contained in:
Sergei Shtylyov 2014-08-01 01:25:53 +04:00 • committed by Marc Kleine-Budde
parent 632e25ca72
commit a268de6c68
1 changed files with 22 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
drivers/net/can/rcar_can.c
View file

@ -20,6 +20,7 @@
#include <linux/can/dev.h> #include <linux/can/dev.h>
#include <linux/clk.h> #include <linux/clk.h>
#include <linux/can/platform/rcar_can.h> #include <linux/can/platform/rcar_can.h>
#include <linux/of.h>
#define RCAR_CAN_DRV_NAME "rcar_can" #define RCAR_CAN_DRV_NAME "rcar_can"
@ -738,16 +739,21 @@ static int rcar_can_probe(struct platform_device *pdev)
struct net_device *ndev; struct net_device *ndev;
struct resource *mem; struct resource *mem;
void __iomem *addr; void __iomem *addr;
u32 clock_select; u32 clock_select = CLKR_CLKP1;
int err = -ENODEV; int err = -ENODEV;
int irq; int irq;
pdata = dev_get_platdata(&pdev->dev); if (pdev->dev.of_node) {
if (!pdata) { of_property_read_u32(pdev->dev.of_node,
dev_err(&pdev->dev, "No platform data provided!\n"); "renesas,can-clock-select", &clock_select);
goto fail; } else {
pdata = dev_get_platdata(&pdev->dev);
if (!pdata) {
dev_err(&pdev->dev, "No platform data provided!\n");
goto fail;
}
clock_select = pdata->clock_select;
} }
clock_select = pdata->clock_select;
irq = platform_get_irq(pdev, 0); irq = platform_get_irq(pdev, 0);
if (!irq) { if (!irq) {
@ -888,10 +894,20 @@ static int __maybe_unused rcar_can_resume(struct device *dev)
static SIMPLE_DEV_PM_OPS(rcar_can_pm_ops, rcar_can_suspend, rcar_can_resume); static SIMPLE_DEV_PM_OPS(rcar_can_pm_ops, rcar_can_suspend, rcar_can_resume);
static const struct of_device_id rcar_can_of_table[] __maybe_unused = {
{ .compatible = "renesas,can-r8a7778" },
{ .compatible = "renesas,can-r8a7779" },
{ .compatible = "renesas,can-r8a7790" },
{ .compatible = "renesas,can-r8a7791" },
{ }
};
MODULE_DEVICE_TABLE(of, rcar_can_of_table);
static struct platform_driver rcar_can_driver = { static struct platform_driver rcar_can_driver = {
.driver = { .driver = {
.name = RCAR_CAN_DRV_NAME, .name = RCAR_CAN_DRV_NAME,
.owner = THIS_MODULE, .owner = THIS_MODULE,
.of_match_table = of_match_ptr(rcar_can_of_table),
.pm = &rcar_can_pm_ops, .pm = &rcar_can_pm_ops,
}, },
.probe = rcar_can_probe, .probe = rcar_can_probe,