From patchwork Thu Jul 31 21:25:53 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergei Shtylyov X-Patchwork-Id: 375442 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 53F801400FA for ; Fri, 1 Aug 2014 07:26:02 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753228AbaGaVZ4 (ORCPT ); Thu, 31 Jul 2014 17:25:56 -0400 Received: from mail-lb0-f171.google.com ([209.85.217.171]:59314 "EHLO mail-lb0-f171.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753168AbaGaVZy (ORCPT ); Thu, 31 Jul 2014 17:25:54 -0400 Received: by mail-lb0-f171.google.com with SMTP id l4so2547131lbv.30 for ; Thu, 31 Jul 2014 14:25:52 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:to:subject:cc:from:organization:date :mime-version:content-type:content-transfer-encoding:message-id; bh=bkKr62hibTdZEUKefRP9F9ULQM8ObuBorgeDXlvVvs8=; b=HGaCF+TfZtaJLu6FXsD9+pSX8Zniaiu8fHEPDPMJp3LNE03ImuTXxJslgIsoFmdm0T yEY5UPzkNHIQZUbzJLQ2rg9nzocsw+wXKTAvCZDyS408a4H/B6iPnuGyfJ2OUEslSelC 7QYbU2fKDniZ1vq9lwYP9RsWLxvyOHAfGGR3bRmmME8OALTr4eewdj3qb+umuK4q+pse p9waX273Fe1T62fWOV+/rVkKqzj+4vEc5/+MP9kLtzD41YRHqJ91tFbpvkpOPe5JHYS1 kMRFHyi1D805acVCH5J49UWORV35DYUDCpsBSFblV4iO4t+wkS93hTDzYp7EucL3ypn+ t+Sg== X-Gm-Message-State: ALoCoQloxVKOIyoBNLBWXF9IA58Y/w1mVSBrIBuqHj/ESdsirzgPRLUAZO+5jC9MANTl+0lN7xow X-Received: by 10.152.27.197 with SMTP id v5mr935316lag.84.1406841952921; Thu, 31 Jul 2014 14:25:52 -0700 (PDT) Received: from wasted.cogentembedded.com (ppp19-216.pppoe.mtu-net.ru. [81.195.19.216]) by mx.google.com with ESMTPSA id kz1sm2681795lab.11.2014.07.31.14.25.51 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Thu, 31 Jul 2014 14:25:52 -0700 (PDT) To: netdev@vger.kernel.org, wg@grandegger.com, mkl@pengutronix.de, linux-can@vger.kernel.org, robh+dt@kernel.org, grant.likely@linaro.org, devicetree@vger.kernel.org Subject: [PATCH v3 2/2] rcar_can: add device tree support Cc: linux-sh@vger.kernel.org, vksavl@gmail.com From: Sergei Shtylyov Organization: Cogent Embedded Date: Fri, 1 Aug 2014 01:25:53 +0400 MIME-Version: 1.0 Message-Id: <201408010125.54723.sergei.shtylyov@cogentembedded.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Add support of the device tree probing for the Renesas R-Car CAN controllers. Signed-off-by: Sergei Shtylyov --- The patch is against the 'linux-can-next.git' repo plus the CAN clock handling patch I've just posted. Changes in version 3: - resolved rejects due to the 'clock_select' variable declaration being moved to the CAN clock handling patch. Changes in version 2: - split the device tree bindings document into a separate patch; - replaced 0 with CLKR_CLKP1 in the 'clock_select' variable intializer - reversed the condition in the *if* stetement handling the reading of the CAN clock selector from the device tree or the paltfrom data; - renamed the "clock-select" property to "renesas,can-clock-select"; - rebased the patch on top of the CAN clock handling fix. drivers/net/can/rcar_can.c | 28 ++++++++++++++++++++++------ 1 file changed, 22 insertions(+), 6 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Index: linux-can-next/drivers/net/can/rcar_can.c =================================================================== --- linux-can-next.orig/drivers/net/can/rcar_can.c +++ linux-can-next/drivers/net/can/rcar_can.c @@ -20,6 +20,7 @@ #include #include #include +#include #define RCAR_CAN_DRV_NAME "rcar_can" @@ -738,16 +739,21 @@ static int rcar_can_probe(struct platfor struct net_device *ndev; struct resource *mem; void __iomem *addr; - u32 clock_select; + u32 clock_select = CLKR_CLKP1; int err = -ENODEV; int irq; - pdata = dev_get_platdata(&pdev->dev); - if (!pdata) { - dev_err(&pdev->dev, "No platform data provided!\n"); - goto fail; + if (pdev->dev.of_node) { + of_property_read_u32(pdev->dev.of_node, + "renesas,can-clock-select", &clock_select); + } 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); if (!irq) { @@ -888,10 +894,20 @@ static int __maybe_unused rcar_can_resum 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 = { .driver = { .name = RCAR_CAN_DRV_NAME, .owner = THIS_MODULE, + .of_match_table = of_match_ptr(rcar_can_of_table), .pm = &rcar_can_pm_ops, }, .probe = rcar_can_probe,