From patchwork Mon Jan 11 04:07:24 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Horman X-Patchwork-Id: 7999091 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 84A50BEEED for ; Mon, 11 Jan 2016 04:08:33 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 4A33D20117 for ; Mon, 11 Jan 2016 04:08:31 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 6711120263 for ; Mon, 11 Jan 2016 04:08:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758202AbcAKEIR (ORCPT ); Sun, 10 Jan 2016 23:08:17 -0500 Received: from kirsty.vergenet.net ([202.4.237.240]:34769 "EHLO kirsty.vergenet.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758169AbcAKEHq (ORCPT ); Sun, 10 Jan 2016 23:07:46 -0500 Received: from penelope.kanocho.kobe.vergenet.net (121-84-114-231f1.hyg1.eonet.ne.jp [121.84.114.231]) by kirsty.vergenet.net (Postfix) with ESMTPSA id D680425B82F; Mon, 11 Jan 2016 15:07:42 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=verge.net.au; s=mail; t=1452485263; bh=PbWFyzmVPzOnBDMX3NtvErQcgQp1eK6hYNhEm7kPDHs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=hQ5aEwHkfQC5RYT65hh/HMjgc0t7+bvmLXwvdt6pHA2U4EqfVrJHuKIj6PXMO1XUJ 6oT/GK4RlfKhL2Y0qUuqfyxgf0WIQpNgeRUBIgKhNzdvhEmRd/O8RUhwhh7KPvbu+H L9KqOlzF2Z0yDp/mgOf8hGPKVc3HQUbFTP9y/kOE= Received: by penelope.kanocho.kobe.vergenet.net (Postfix, from userid 7100) id 3F70560261; Mon, 11 Jan 2016 15:07:41 +1100 (AEDT) From: Simon Horman To: Mathias Nyman Cc: linux-usb@vger.kernel.org, linux-sh@vger.kernel.org, Yoshihiro Shimoda , Magnus Damm , Simon Horman Subject: [PATCH v2 1/2] usb: host: xhci-plat: add R-Car Gen2 and Gen3 fallback compatibility strings Date: Mon, 11 Jan 2016 13:07:24 +0900 Message-Id: <1452485245-9001-2-git-send-email-horms+renesas@verge.net.au> X-Mailer: git-send-email 2.7.0.rc3.207.g0ac5344 In-Reply-To: <1452485245-9001-1-git-send-email-horms+renesas@verge.net.au> References: <1452485245-9001-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,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 strings for R-Car Gen2 and Gen3. This is in keeping with the fallback scheme being adopted wherever appropriate for drivers for Renesas SoCs. Signed-off-by: Simon Horman Acked-by: Geert Uytterhoeven --- v2 * Use consistent line ending in documentation * Group compat strings at the bottom of usb_xhci_of_match[] --- Documentation/devicetree/bindings/usb/usb-xhci.txt | 21 +++++++++++++++++---- drivers/usb/host/xhci-plat.c | 5 +++++ 2 files changed, 22 insertions(+), 4 deletions(-) diff --git a/Documentation/devicetree/bindings/usb/usb-xhci.txt b/Documentation/devicetree/bindings/usb/usb-xhci.txt index 082573289f1e..34e1d7b6a829 100644 --- a/Documentation/devicetree/bindings/usb/usb-xhci.txt +++ b/Documentation/devicetree/bindings/usb/usb-xhci.txt @@ -1,10 +1,23 @@ USB xHCI controllers Required properties: - - compatible: should be one of "generic-xhci", - "marvell,armada-375-xhci", "marvell,armada-380-xhci", - "renesas,xhci-r8a7790", "renesas,xhci-r8a7791", "renesas,xhci-r8a7793", - "renesas,xhci-r8a7795" (deprecated: "xhci-platform"). + - compatible: should be one or more of + + - "generic-xhci" for generic XHCI device + - "marvell,armada-375-xhci" for Armada 375 SoCs + - "marvell,armada-380-xhci" for Armada 380 SoCs + - "renesas,xhci-r8a7790" for r8a7790 SoC + - "renesas,xhci-r8a7791" for r8a7791 SoC + - "renesas,xhci-r8a7793" for r8a7793 SoC + - "renesas,xhci-r8a7795" for r8a7795 SoC + - "renesas,rcar-gen2-xhci" for a generic R-Car Gen2 compatible device + - "renesas,rcar-gen3-xhci" for a generic R-Car Gen3 compatible device + - "xhci-platform" (deprecated) + + When compatible with the generic version, nodes must list the + SoC-specific version corresponding to the platform first + followed by the generic version. + - reg: should contain address and length of the standard XHCI register set for the device. - interrupts: one XHCI interrupt should be described here. diff --git a/drivers/usb/host/xhci-plat.c b/drivers/usb/host/xhci-plat.c index 770b6b088797..05d09d7547ea 100644 --- a/drivers/usb/host/xhci-plat.c +++ b/drivers/usb/host/xhci-plat.c @@ -110,6 +110,11 @@ static const struct of_device_id usb_xhci_of_match[] = { .compatible = "renesas,xhci-r8a7795", .data = &xhci_plat_renesas_rcar_gen3, }, { + .compatible = "renesas,rcar-gen2-xhci", + .data = &xhci_plat_renesas_rcar_gen2, + }, { + .compatible = "renesas,rcar-gen3-xhci", + .data = &xhci_plat_renesas_rcar_gen3, }, }; MODULE_DEVICE_TABLE(of, usb_xhci_of_match);