From patchwork Mon Feb 22 02:15:49 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Horman X-Patchwork-Id: 8370281 X-Patchwork-Delegate: geert@linux-m68k.org Return-Path: X-Original-To: patchwork-linux-renesas-soc@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id F3F589F88A for ; Mon, 22 Feb 2016 02:16:39 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 5767420225 for ; Mon, 22 Feb 2016 02:16:39 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 2CE38203B4 for ; Mon, 22 Feb 2016 02:16:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752787AbcBVCQO (ORCPT ); Sun, 21 Feb 2016 21:16:14 -0500 Received: from kirsty.vergenet.net ([202.4.237.240]:42367 "EHLO kirsty.vergenet.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752300AbcBVCQL (ORCPT ); Sun, 21 Feb 2016 21:16:11 -0500 Received: from reginn.isobedori.kobe.vergenet.net (p5023-ipbfp803kobeminato.hyogo.ocn.ne.jp [123.221.39.23]) by kirsty.vergenet.net (Postfix) with ESMTPA id 3BCB525B7F8; Mon, 22 Feb 2016 13:16:05 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=verge.net.au; s=mail; t=1456107365; bh=o0/MudUfF+4NZIPm7XLcaWVRguBiMjwjUUkhBh00fdw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=rhouuln7QYngu9jiyFd3J45I6xWB/RMAcEK0VKHrlmfmUxaAAcbIVUVrFwp7qfQ4p uK8BuBaErUhNWz/jhQ70t8JEuEXoe5y1w9v6td2E6D8PD3v9CreyAQHUCOI3hIkZwZ ZaR4WX14gVykOJSd1eJgI73XzJpPR/5JPQpytqL4= Received: by reginn.isobedori.kobe.vergenet.net (Postfix, from userid 7100) id 1917E94028E; Mon, 22 Feb 2016 11:15:59 +0900 (JST) From: Simon Horman To: Wolfgang Grandegger , Marc Kleine-Budde Cc: Magnus Damm , linux-can@vger.kernel.org, netdev@vger.kernel.org, linux-renesas-soc@vger.kernel.org, devicetree@vger.kernel.org, Simon Horman Subject: [PATCH can-next 1/2] CAN: rcar: add gen[12] fallback compatibility strings Date: Mon, 22 Feb 2016 11:15:49 +0900 Message-Id: <1456107350-12100-2-git-send-email-horms+renesas@verge.net.au> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1456107350-12100-1-git-send-email-horms+renesas@verge.net.au> References: <1456107350-12100-1-git-send-email-horms+renesas@verge.net.au> Sender: linux-renesas-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-renesas-soc@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Add fallback compatibility string for R-Car Gen 1 and Gen2 families. This is in keeping with the fallback scheme being adopted wherever appropriate for drivers for Renesas SoCs. Signed-off-by: Simon Horman Acked-by: Rob Herring --- Documentation/devicetree/bindings/net/can/rcar_can.txt | 4 +++- drivers/net/can/rcar_can.c | 2 ++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/Documentation/devicetree/bindings/net/can/rcar_can.txt b/Documentation/devicetree/bindings/net/can/rcar_can.txt index 002d8440bf66..036786e1f70d 100644 --- a/Documentation/devicetree/bindings/net/can/rcar_can.txt +++ b/Documentation/devicetree/bindings/net/can/rcar_can.txt @@ -6,6 +6,8 @@ Required properties: "renesas,can-r8a7779" if CAN controller is a part of R8A7779 SoC. "renesas,can-r8a7790" if CAN controller is a part of R8A7790 SoC. "renesas,can-r8a7791" if CAN controller is a part of R8A7791 SoC. + "renesas,can-gen1" for a generic R-Car Gen1 compatible device. + "renesas,can-gen2" for a generic R-Car Gen2 compatible device. - reg: physical base address and size of the R-Car CAN register map. - interrupts: interrupt specifier for the sole interrupt. - clocks: phandles and clock specifiers for 3 CAN clock inputs. @@ -25,7 +27,7 @@ Example SoC common .dtsi file: can0: can@e6e80000 { - compatible = "renesas,can-r8a7791"; + compatible = "renesas,can-r8a7791", "renesas,can-gen2"; reg = <0 0xe6e80000 0 0x1000>; interrupts = <0 186 IRQ_TYPE_LEVEL_HIGH>; clocks = <&mstp9_clks R8A7791_CLK_RCAN0>, diff --git a/drivers/net/can/rcar_can.c b/drivers/net/can/rcar_can.c index bc46be39549d..c70a1f795933 100644 --- a/drivers/net/can/rcar_can.c +++ b/drivers/net/can/rcar_can.c @@ -904,6 +904,8 @@ static const struct of_device_id rcar_can_of_table[] __maybe_unused = { { .compatible = "renesas,can-r8a7779" }, { .compatible = "renesas,can-r8a7790" }, { .compatible = "renesas,can-r8a7791" }, + { .compatible = "renesas,can-gen1" }, + { .compatible = "renesas,can-gen2" }, { } }; MODULE_DEVICE_TABLE(of, rcar_can_of_table);