From patchwork Wed Dec 2 22:51:37 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Horman X-Patchwork-Id: 551818 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id C26081402E2 for ; Thu, 3 Dec 2015 09:52:04 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=verge.net.au header.i=@verge.net.au header.b=n1udJukW; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757077AbbLBWwD (ORCPT ); Wed, 2 Dec 2015 17:52:03 -0500 Received: from kirsty.vergenet.net ([202.4.237.240]:41748 "EHLO kirsty.vergenet.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756762AbbLBWwC (ORCPT ); Wed, 2 Dec 2015 17:52:02 -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 7EBA225B813; Thu, 3 Dec 2015 09:51:54 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=verge.net.au; s=mail; t=1449096715; bh=AnB9zN0mMW1h5lZXPe/epmIpnYbMzuHobqqLRfgLjZs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=n1udJukWxkuKjsRdzwWMJI731EOti7Ftn7mRL9+AUvjnDA/MewRpQTmvFWBzQNVHe pF6t5dcrvjf9p2h6CyZj5x2I09GzXxABssJIVhBhONdNaZkEEa9czhzZT1dxh2uUVn lQoBKB+2aTlPlvHWq0mX6lYmn1NweMgaqN3JNMGE= Received: by reginn.isobedori.kobe.vergenet.net (Postfix, from userid 7100) id E3A7A940543; Thu, 3 Dec 2015 07:51:53 +0900 (JST) From: Simon Horman To: Bjorn Helgaas Cc: Magnus Damm , linux-pci@vger.kernel.org, linux-sh@vger.kernel.org, devicetree@vger.kernel.org, Simon Horman Subject: [PATCH v2 1/4] PCI: rcar-gen2: add gen2 fallback compatibility string Date: Thu, 3 Dec 2015 07:51:37 +0900 Message-Id: <1449096700-23304-2-git-send-email-horms+renesas@verge.net.au> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1449096700-23304-1-git-send-email-horms+renesas@verge.net.au> References: <1449096700-23304-1-git-send-email-horms+renesas@verge.net.au> Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org Add fallback compatibility string for R-Car Gen 2 family. 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 Acked-by: Bjorn Helgaas --- v2 * Include "rcar-" in new compatibility string --- Documentation/devicetree/bindings/pci/pci-rcar-gen2.txt | 11 +++++++++-- drivers/pci/host/pci-rcar-gen2.c | 1 + 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/Documentation/devicetree/bindings/pci/pci-rcar-gen2.txt b/Documentation/devicetree/bindings/pci/pci-rcar-gen2.txt index 891463cb09c2..089a99dcdf10 100644 --- a/Documentation/devicetree/bindings/pci/pci-rcar-gen2.txt +++ b/Documentation/devicetree/bindings/pci/pci-rcar-gen2.txt @@ -8,7 +8,14 @@ OHCI and EHCI controllers. Required properties: - compatible: "renesas,pci-r8a7790" for the R8A7790 SoC; "renesas,pci-r8a7791" for the R8A7791 SoC; - "renesas,pci-r8a7794" for the R8A7794 SoC. + "renesas,pci-r8a7794" for the R8A7794 SoC; + "renesas,pci-rcar-gen2" for a generic R-Car Gen2 compatible device. + + + When compatible with the generic version, nodes must list the + SoC-specific version corresponding to the platform first + followed by the generic version. + - reg: A list of physical regions to access the device: the first is the operational registers for the OHCI/EHCI controllers and the second is for the bridge configuration and control registers. @@ -32,7 +39,7 @@ Optional properties: Example SoC configuration: pci0: pci@ee090000 { - compatible = "renesas,pci-r8a7790"; + compatible = "renesas,pci-r8a7790", "renesas,pci-rcar-gen2"; clocks = <&mstp7_clks R8A7790_CLK_EHCI>; reg = <0x0 0xee090000 0x0 0xc00>, <0x0 0xee080000 0x0 0x1100>; diff --git a/drivers/pci/host/pci-rcar-gen2.c b/drivers/pci/host/pci-rcar-gen2.c index 62951165dcbb..9980a4bdae7e 100644 --- a/drivers/pci/host/pci-rcar-gen2.c +++ b/drivers/pci/host/pci-rcar-gen2.c @@ -430,6 +430,7 @@ static int rcar_pci_probe(struct platform_device *pdev) } static struct of_device_id rcar_pci_of_match[] = { + { .compatible = "renesas,pci-rcar-gen2", }, { .compatible = "renesas,pci-r8a7790", }, { .compatible = "renesas,pci-r8a7791", }, { .compatible = "renesas,pci-r8a7794", },