From patchwork Mon Oct 5 12:06:28 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yoshihiro Shimoda X-Patchwork-Id: 7326991 X-Patchwork-Delegate: geert@linux-m68k.org Return-Path: X-Original-To: patchwork-linux-sh@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 0CF339F2F7 for ; Mon, 5 Oct 2015 12:06:59 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 1318620680 for ; Mon, 5 Oct 2015 12:06:58 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 63AD120684 for ; Mon, 5 Oct 2015 12:06:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751770AbbJEMGw (ORCPT ); Mon, 5 Oct 2015 08:06:52 -0400 Received: from relmlor2.renesas.com ([210.160.252.172]:21021 "EHLO relmlie1.idc.renesas.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751054AbbJEMGv (ORCPT ); Mon, 5 Oct 2015 08:06:51 -0400 Received: from unknown (HELO relmlir3.idc.renesas.com) ([10.200.68.153]) by relmlie1.idc.renesas.com with ESMTP; 05 Oct 2015 21:06:50 +0900 Received: from relmlac4.idc.renesas.com (relmlac4.idc.renesas.com [10.200.69.24]) by relmlir3.idc.renesas.com (Postfix) with ESMTP id 697664BEDA; Mon, 5 Oct 2015 21:06:50 +0900 (JST) Received: by relmlac4.idc.renesas.com (Postfix, from userid 0) id 4DFF1480A4; Mon, 5 Oct 2015 21:06:50 +0900 (JST) Received: from relmlac4.idc.renesas.com (localhost [127.0.0.1]) by relmlac4.idc.renesas.com (Postfix) with ESMTP id 44139480A3; Mon, 5 Oct 2015 21:06:50 +0900 (JST) Received: from relmlii2.idc.renesas.com [10.200.68.66] by relmlac4.idc.renesas.com with ESMTP id XAH13024; Mon, 5 Oct 2015 21:06:50 +0900 X-IronPort-AV: E=Sophos;i="5.17,638,1437404400"; d="scan'";a="196977997" Received: from mail-pu1apc01lp0017.outbound.protection.outlook.com (HELO APC01-PU1-obe.outbound.protection.outlook.com) ([65.55.88.17]) by relmlii2.idc.renesas.com with ESMTP/TLS/AES256-SHA; 05 Oct 2015 21:06:49 +0900 Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=<>; Received: from localhost (211.11.155.144) by SIXPR06MB0921.apcprd06.prod.outlook.com (10.162.173.13) with Microsoft SMTP Server (TLS) id 15.1.286.20; Mon, 5 Oct 2015 12:06:48 +0000 From: Yoshihiro Shimoda To: , CC: , , Yoshihiro Shimoda Subject: [PATCH 2/4] usb: host: xhci-plat: add support for the R-Car M2-N xHCI controller Date: Mon, 5 Oct 2015 21:06:28 +0900 Message-ID: <1444046790-5804-3-git-send-email-yoshihiro.shimoda.uh@renesas.com> X-Mailer: git-send-email 1.9.4.msysgit.1 In-Reply-To: <1444046790-5804-1-git-send-email-yoshihiro.shimoda.uh@renesas.com> References: <1444046790-5804-1-git-send-email-yoshihiro.shimoda.uh@renesas.com> MIME-Version: 1.0 X-Originating-IP: [211.11.155.144] X-ClientProxiedBy: TY1PR0201CA0034.apcprd02.prod.outlook.com (25.164.90.172) To SIXPR06MB0921.apcprd06.prod.outlook.com (25.162.173.13) X-Microsoft-Exchange-Diagnostics: 1; SIXPR06MB0921; 2:95eru4XRjvf5o6DZOSBKEVKqXXuSO6qI9e+DrWzyg3hQ0TcAkxrOHWkCiF7jETQH6Rb0edb0OMz4bUcNvPovA+FJLwXESN5PImmFcZAQPVWu+XCy2nKKErqc12GKru0vUYUXGv2np3MjPTjY+cqlm8cTCdrEpgjrKv3RA/3EiCc=; 3:qZHshOVr4M2kBipRNzWFqENh/WGSedcmQFeazOQKZHV5hjh3WlE+3AgZppjqyDneVs95tXh9KLLPzh8RcaMhC0hj6wXDfBv5q2cTzhrPR1PXrdAxRDGtmCO6x9DYrMa1mepecUnzjfsf+8n6dTfpmA==; 25:5hOEKXysaHRThvfPFNw4wcQSmUqtHN9hQFCGwIcgLuPr4nJOJKC2nDEw0GNFLV51uVfxeRB8DxYJHTdlhVwNfeM09A25V9RGKN3rB1P2ouwm60M3xi0Zb5qCodExebeV0jAWUXUYTDRRbgwc6j2yFPWEzVhGmey2oagdKIRDBoVSpylMq+jGmLcU/GaLAmZEI9EfMFyldVypAa1kYnWMSgvACKFQTASo+Y5S04TluV/4zqvJ0IjZocHw4KEyVAkVvmvLjic0xfCRxptw+P1xBQ== X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:SIXPR06MB0921; X-Microsoft-Exchange-Diagnostics: 1; SIXPR06MB0921; 20:Stdw0B/iBfRMqND3BTbJPtv3C6KnJdZZjbD4DtMm47duxdvmpzw/b9Fqk5RVMHrZsKk/80TXym33OaBw3sfvKTj8UpMR1QB2WnJa9sidn0wF7UmhX9KrHwElOc3qBlw4q8oZt8QwO9kso0GMl/HeBcDrGoe/3AqkoxLtiA3Jc5Ghyixwmq+Hp4KzY3BckIL/YT/g7CviZ2QS/1ksX6wOoonIjPE44LHXwsBNn2n1nx9Cqv843w+fYA/4QQLm7Um++Qrx9URJlxyWAs+4NeEY0nJH6IwJvVw1bb5tMEanXWB1kjObzPyjH8a495tirErs7JBKLeAyIvkJrL1p0Ztghmzac7Cq4STA+EG98wT6GiZc2eMGmKQ+rRgELjydLlkK4pAG7qG/pQRbfcYJN9iEeX+JZyoj+Tbjdxmd0BFGCvjXOKs6Sj/bPqDuH0t/WxAKFV1puDTdyKsdJIG9bZks6yV3dOHN5yAXM72w6uIxtvd4/vYqhMITXF5K840uurCO; 4:3ZEayMSDmSDaWNPKrP3Z+2B+/YG6Rqc/rFYsRa9bzbDwcOYNpQ5rsJ9ArdYvvOcu5j8NUbaiJLdODzwVhXB+fyoditXIhuKvZsWZ7AJW7FS08v7MGznEK9aik86zuOHuJb6W+IENiQ6lu+P4XHnTkPIk/g45iSq/12/1ghWxLbZCB82W8XiKnF1Hoq6dgeYGYQrNdKw1ZkThz44T8OXG6biODPY7ISh6PbBO9O5WaOSabMTrjy8R8xJc18Rk9nVO3Ci4fz1IOe+fJKas7a8S39O9aN0tdFrw7HQp+C9NrGbtbySl9f0qKk00OPnCKQRLsnMQTaMIbAS96N5TwBz/9DISdOBATP5vGRCWEchfP8c= X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(2401047)(5005006)(520078)(8121501046)(3002001); SRVR:SIXPR06MB0921; BCL:0; PCL:0; RULEID:; SRVR:SIXPR06MB0921; X-Forefront-PRVS: 07200C0526 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(6069001)(6009001)(189002)(199003)(50226001)(101416001)(5008740100001)(5001860100001)(77156002)(62966003)(92566002)(5001830100001)(97736004)(5001770100001)(48376002)(2950100001)(33646002)(36756003)(81156007)(42382002)(4001540100001)(40100003)(122386002)(229853001)(5004730100002)(50466002)(19580405001)(105586002)(106356001)(19580395003)(78352002)(68736005)(77096005)(46102003)(5001960100002)(5003940100001)(107886002)(189998001)(64706001)(66066001)(50986999)(76176999)(76506005)(87976001)(42186005)(5007970100001)(47776003)(4001430100001); DIR:OUT; SFP:1102; SCL:1; SRVR:SIXPR06MB0921; H:localhost; FPR:; SPF:None; PTR:InfoNoRecords; MX:0; A:0; LANG:en; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; SIXPR06MB0921; 23:XyrHR+PdfR1sUpXfa+eHNr2h/XEzQui8lj44slzYB?= =?us-ascii?Q?PETdzKCiSr1El15HihAzozGYShVUCbriqGJcVC+q9ojOK7AKRVX5uyhkEixx?= =?us-ascii?Q?3UTfVGxW+JpS7gQljxvvnVon1RM8mqdsh3saUocXkEXRZB3fFW6s9Ld453Pc?= =?us-ascii?Q?LK9UFhuvLhaV9kX0sxRKlOu8bPiNFATNRIAbiNDg3A/4F8WPBBqLoooIj+vf?= =?us-ascii?Q?L6u3v4ZuywVtWjZU6JDkS9WYA7aLfYeN7hv3XjZLVj3es7o+fOE7q5xDuHRj?= =?us-ascii?Q?dAMHdIDnx1sO0ul1bzE/QpFhQXWKyD1cX52vpdn+BmH+hleA/KvikrcrP26V?= =?us-ascii?Q?hv50WhdDmt+OyNmdtoIy8A9CnTavG2vnSE2eHrezbn/Fdv1v7GTtRj/LVYK0?= =?us-ascii?Q?6eniBygz7oOL/ilcL7LlXV7w6Ezm/X2gNgSVlZPK9nSLUE3Vyq8QN251LnuZ?= =?us-ascii?Q?96aUCv/XddT/fIKIaRnh+lXvROruPmXOvhWqwAM3ThWcDfAfAWiQFNTkA7dC?= =?us-ascii?Q?O0VxINFZsLkqYoW0lbs8Y4fESGlgr26+img5aKXOibpz1d152F5gcljAuU9v?= =?us-ascii?Q?1kwYUJTfJy6qIKoKRtTlmlelPB3InbL8KkP/R8qst7f7ohVav/oViTTqfzwe?= =?us-ascii?Q?rBVI0PNWXKWRB+xetZCo0GhjjE8btZ9ONG++hqtaHUDl2pbmqsQ5D8O7EPcJ?= =?us-ascii?Q?4M+WjklLS/iu5kMH3HhOqI3dVQAk6YycAg/SHXq/BBXE+pb1GZe4azP0g6qJ?= =?us-ascii?Q?RTrEjgTEqFNGGDu0jF705nmKf8Kfjp/cBRDugw9ryUt2tdy0KN6xQppKmaaL?= =?us-ascii?Q?rONneB0OkcZOiTctr77E63jmCnZH436wVUZL/bagIzkKTMA1t3vKIuewYc/t?= =?us-ascii?Q?WVz31NFrzzEedbKy4mkKVz4qUbd6tBkDsAzN7vCHQSNaMnqLFyb60jbMHjUQ?= =?us-ascii?Q?7Nnuue82pHmzq1xBUAbJ21HKLp1nge/57kPh8DZQjeKGxY82x2hFpMuvN2vn?= =?us-ascii?Q?mOeqkHe4k1Ht4fwkYhDIgxvRbor3lc+Kqa091XzBfuTA9v7w3JqBeHhRsT7A?= =?us-ascii?Q?G88W2XHaOZco3c6FF9nEzgB54A4s2wZuVvoKvn3TJnEuK68dz0h8HHVCszXt?= =?us-ascii?Q?SHWtVUBPOTvpBZ4XjbLE0ICQHQXit+iGv1uUyJ3ukVjbeEHjnzaCwttUcSkD?= =?us-ascii?Q?G4/htAHSY3Uh7TO19ED1FV8mV7Ky7wr1sn82rZtKn3l/I+v+Cn7rG10N5LVB?= =?us-ascii?Q?8HzNGeyV2ypTD+Y1j5wvUdb8oVbEWqHKAdl0J20zQgKp/ekKAmjD83K37x8V?= =?us-ascii?Q?tW69uD1slNoUCHGs7jqD3A=3D?= X-Microsoft-Exchange-Diagnostics: 1; SIXPR06MB0921; 5:izLadhk1Wytmedqs071/cFs0mUsTU2fdh9lCw8D34CleJmthKhUf2xWHKPLmFARTiVo6ThlioG8xrb+IEZu04TDoOF0bCg4UL1XPVrZtO5y1SuIiqvXdMCFaJtw7AX6XqlJujVl1DbVgAWJbGudIWA==; 24:0b5j1VKoPIqstxTv5kcoiBSRL1T8+1xsbVg62yLKERtf+5hIvgPxuSKTRnv0puguQpfMSJqPVo/vu7c3rpa8n2n5d5NOyPempFDeM5/jcoM=; 20:9BF5i80S5+2kMPW/lcNCR+R+FJv9DrL3OBpEHOrAL1Z8/+6YWbIhZUXEgOhzGGsWaIP42pv4tyGczAQ/LcXx0pa6WLWAoI9SBYfPvfeGw4u7KQYk+DwIggzTHNEVpvEZz+4yfXMuvhO8lQNWs4BvvD24WLq5xqIhadmyJX2p/HY= SpamDiagnosticOutput: 1:23 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Oct 2015 12:06:48.0687 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: SIXPR06MB0921 Sender: linux-sh-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sh@vger.kernel.org X-Spam-Status: No, score=-4.2 required=5.0 tests=AXB_X_OUTLOOKPROT_ENVSDR, BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham 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 This patch adds support for R-Car M2-N (r8a7793) xHCI controller. This SoC is compatible with R-Car H2 (r8a7790) and R-Car M2-W (r8a7791). Signed-off-by: Yoshihiro Shimoda --- Documentation/devicetree/bindings/usb/usb-xhci.txt | 4 ++-- drivers/usb/host/xhci-plat.c | 1 + drivers/usb/host/xhci-rcar.c | 3 ++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Documentation/devicetree/bindings/usb/usb-xhci.txt b/Documentation/devicetree/bindings/usb/usb-xhci.txt index 86f67f0..106299a 100644 --- a/Documentation/devicetree/bindings/usb/usb-xhci.txt +++ b/Documentation/devicetree/bindings/usb/usb-xhci.txt @@ -3,8 +3,8 @@ 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" (deprecated: - "xhci-platform"). + "renesas,xhci-r8a7790", "renesas,xhci-r8a7791", "renesas,xhci-r8a7793" + (deprecated: "xhci-platform"). - 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 26acece..401110f 100644 --- a/drivers/usb/host/xhci-plat.c +++ b/drivers/usb/host/xhci-plat.c @@ -252,6 +252,7 @@ static const struct of_device_id usb_xhci_of_match[] = { { .compatible = "marvell,armada-380-xhci"}, { .compatible = "renesas,xhci-r8a7790"}, { .compatible = "renesas,xhci-r8a7791"}, + { .compatible = "renesas,xhci-r8a7793"}, { }, }; MODULE_DEVICE_TABLE(of, usb_xhci_of_match); diff --git a/drivers/usb/host/xhci-rcar.c b/drivers/usb/host/xhci-rcar.c index 642fe55..b4b110e 100644 --- a/drivers/usb/host/xhci-rcar.c +++ b/drivers/usb/host/xhci-rcar.c @@ -62,7 +62,8 @@ bool xhci_rcar_is_compatible(struct usb_hcd *hcd) struct device_node *of_node = hcd->self.controller->of_node; if (of_device_is_compatible(of_node, "renesas,xhci-r8a7790") || - of_device_is_compatible(of_node, "renesas,xhci-r8a7791")) + of_device_is_compatible(of_node, "renesas,xhci-r8a7791") || + of_device_is_compatible(of_node, "renesas,xhci-r8a7793")) return true; return false;