From patchwork Tue Dec 1 07:43:02 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Horman X-Patchwork-Id: 7733551 X-Patchwork-Delegate: horms@verge.net.au Return-Path: X-Original-To: patchwork-linux-sh@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 3D4D2BEEE1 for ; Tue, 1 Dec 2015 07:43:32 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 69869203B8 for ; Tue, 1 Dec 2015 07:43:31 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 7D7C020397 for ; Tue, 1 Dec 2015 07:43:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755186AbbLAHnY (ORCPT ); Tue, 1 Dec 2015 02:43:24 -0500 Received: from kirsty.vergenet.net ([202.4.237.240]:43196 "EHLO kirsty.vergenet.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755120AbbLAHnX (ORCPT ); Tue, 1 Dec 2015 02:43:23 -0500 Received: from reginn.isobedori.kobe.vergenet.net (p5254-ipbfp1403kobeminato.hyogo.ocn.ne.jp [114.152.48.254]) by kirsty.vergenet.net (Postfix) with ESMTPA id 6D14825BE52; Tue, 1 Dec 2015 18:43:19 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=verge.net.au; s=mail; t=1448955799; bh=FpoafNXNJd/RyD7YjZVdh4LjLyNEf8loIwBP6JJyXpg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=YsrDIrYXDubXlTfA+WU+hrGZQkQ/NwwkRupWnkGsq0DDI9+8Mwx5FCU+saqGaDT8I ux0tMvrm5Sbflp9pbTjJAxmMAmm/bormZtuCTq1qUZYe4WcE9K1ovVlUsZ0QHhB+3k 6y5kMZUxGho8oiMRhDATswBvKzA4Bw6ZqBerXPEA= Received: by reginn.isobedori.kobe.vergenet.net (Postfix, from userid 7100) id 6D76D9406B9; Tue, 1 Dec 2015 16:43:18 +0900 (JST) From: Simon Horman To: netdev@vger.kernel.org, linux-sh@vger.kernel.org Cc: Magnus Damm , Sergei Shtylyov , devicetree@vger.kernel.org Subject: [PATCH 1/2 net-next] ravb: Add fallback compatibility strings Date: Tue, 1 Dec 2015 16:43:02 +0900 Message-Id: <1448955783-22806-2-git-send-email-horms+renesas@verge.net.au> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1448955783-22806-1-git-send-email-horms+renesas@verge.net.au> References: <1448955783-22806-1-git-send-email-horms+renesas@verge.net.au> Sender: linux-sh-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sh@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID,T_RP_MATCHES_RCVD,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 strings for R-Car Gen 2 & 3 SoC Families. This is in keeping with the fallback scheme being adopted wherever appropriate for drivers for Renesas SoCs. Also correct typo. Signed-off-by: Simon Horman --- Documentation/devicetree/bindings/net/renesas,ravb.txt | 11 +++++++++-- drivers/net/ethernet/renesas/ravb_main.c | 2 ++ 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/Documentation/devicetree/bindings/net/renesas,ravb.txt b/Documentation/devicetree/bindings/net/renesas,ravb.txt index b486f3f5f6a3..115006325bff 100644 --- a/Documentation/devicetree/bindings/net/renesas,ravb.txt +++ b/Documentation/devicetree/bindings/net/renesas,ravb.txt @@ -1,12 +1,19 @@ * Renesas Electronics Ethernet AVB This file provides information on what the device node for the Ethernet AVB -interface contains. +interface. Required properties: - compatible: "renesas,etheravb-r8a7790" if the device is a part of R8A7790 SoC. "renesas,etheravb-r8a7794" if the device is a part of R8A7794 SoC. "renesas,etheravb-r8a7795" if the device is a part of R8A7795 SoC. + "renesas,etheravb-gen2" for generic R-Car Gen 2 compatible interface. + "renesas,etheravb-gen3" for generic R-Car Gen 3 compatible interface. + + When compatible with the generic version, nodes must list the + SoC-specific version corresponding to the platform first + followed by the generic version. + - reg: offset and length of (1) the register block and (2) the stream buffer. - interrupts: A list of interrupt-specifiers, one for each entry in interrupt-names. @@ -37,7 +44,7 @@ Optional properties: Example: ethernet@e6800000 { - compatible = "renesas,etheravb-r8a7795"; + compatible = "renesas,etheravb-r8a7795", "renesas,etheravb-gen3"; reg = <0 0xe6800000 0 0x800>, <0 0xe6a00000 0 0x10000>; interrupt-parent = <&gic>; interrupts = , diff --git a/drivers/net/ethernet/renesas/ravb_main.c b/drivers/net/ethernet/renesas/ravb_main.c index 990dc55cdada..d3b4f574d346 100644 --- a/drivers/net/ethernet/renesas/ravb_main.c +++ b/drivers/net/ethernet/renesas/ravb_main.c @@ -1656,7 +1656,9 @@ static int ravb_mdio_release(struct ravb_private *priv) static const struct of_device_id ravb_match_table[] = { { .compatible = "renesas,etheravb-r8a7790", .data = (void *)RCAR_GEN2 }, { .compatible = "renesas,etheravb-r8a7794", .data = (void *)RCAR_GEN2 }, + { .compatible = "renesas,etheravb-gen2", .data = (void *)RCAR_GEN2 }, { .compatible = "renesas,etheravb-r8a7795", .data = (void *)RCAR_GEN3 }, + { .compatible = "renesas,etheravb-gen3", .data = (void *)RCAR_GEN3 }, { } }; MODULE_DEVICE_TABLE(of, ravb_match_table);