From patchwork Mon May 18 09:34:25 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yoshihiro Shimoda X-Patchwork-Id: 6427291 X-Patchwork-Delegate: geert@linux-m68k.org 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 787F5C0432 for ; Mon, 18 May 2015 09:34:49 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 8319220611 for ; Mon, 18 May 2015 09:34:48 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 8345C2037C for ; Mon, 18 May 2015 09:34:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753186AbbERJeq (ORCPT ); Mon, 18 May 2015 05:34:46 -0400 Received: from relmlor4.renesas.com ([210.160.252.174]:55438 "EHLO relmlie3.idc.renesas.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1753021AbbERJep (ORCPT ); Mon, 18 May 2015 05:34:45 -0400 Received: from unknown (HELO relmlir4.idc.renesas.com) ([10.200.68.154]) by relmlie3.idc.renesas.com with ESMTP; 18 May 2015 18:34:44 +0900 Received: from relmlac2.idc.renesas.com (relmlac2.idc.renesas.com [10.200.69.22]) by relmlir4.idc.renesas.com (Postfix) with ESMTP id A00B845FAE; Mon, 18 May 2015 18:34:44 +0900 (JST) Received: by relmlac2.idc.renesas.com (Postfix, from userid 0) id 908862806E; Mon, 18 May 2015 18:34:44 +0900 (JST) Received: from relmlac2.idc.renesas.com (localhost [127.0.0.1]) by relmlac2.idc.renesas.com (Postfix) with ESMTP id 8BBF42806D; Mon, 18 May 2015 18:34:44 +0900 (JST) Received: from relmlii1.idc.renesas.com [10.200.68.65] by relmlac2.idc.renesas.com with ESMTP id UAF27286; Mon, 18 May 2015 18:34:44 +0900 X-IronPort-AV: E=Sophos;i="5.13,452,1427727600"; d="scan'208";a="186431145" Received: from mail-hk1lp0118.outbound.protection.outlook.com (HELO APAC01-HK1-obe.outbound.protection.outlook.com) ([207.46.51.118]) by relmlii1.idc.renesas.com with ESMTP/TLS/AES256-SHA; 18 May 2015 18:34:43 +0900 Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=<>; Received: from localhost (211.11.155.147) by HK2PR06MB0914.apcprd06.prod.outlook.com (25.162.246.29) with Microsoft SMTP Server (TLS) id 15.1.166.22; Mon, 18 May 2015 09:34:42 +0000 From: Yoshihiro Shimoda To: , , , , , , CC: , , , Yoshihiro Shimoda Subject: [PATCH 2/2] usb: renesas_usbhs: Add support for R-Car E2 Date: Mon, 18 May 2015 18:34:25 +0900 Message-ID: <1431941665-3768-3-git-send-email-yoshihiro.shimoda.uh@renesas.com> X-Mailer: git-send-email 1.9.4.msysgit.1 In-Reply-To: <1431941665-3768-1-git-send-email-yoshihiro.shimoda.uh@renesas.com> References: <1431941665-3768-1-git-send-email-yoshihiro.shimoda.uh@renesas.com> MIME-Version: 1.0 X-Originating-IP: [211.11.155.147] X-ClientProxiedBy: OS1PR01CA0009.jpnprd01.prod.outlook.com (25.161.225.147) To HK2PR06MB0914.apcprd06.prod.outlook.com (25.162.246.29) X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:HK2PR06MB0914; X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(5005006)(3002001); SRVR:HK2PR06MB0914; BCL:0; PCL:0; RULEID:; SRVR:HK2PR06MB0914; X-Forefront-PRVS: 058043A388 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(6009001)(6069001)(199003)(189002)(101416001)(19580405001)(19580395003)(105586002)(92566002)(48376002)(40100003)(42382002)(76506005)(50466002)(78352002)(42186005)(87976001)(2950100001)(33646002)(36756003)(107886002)(5001960100002)(81156007)(97736004)(5001830100001)(4001540100001)(5001860100001)(5001770100001)(50226001)(122386002)(189998001)(47776003)(46102003)(77156002)(229853001)(66066001)(76176999)(62966003)(64706001)(68736005)(50986999)(106356001)(4001430100001); DIR:OUT; SFP:1102; SCL:1; SRVR:HK2PR06MB0914; H:localhost; FPR:; SPF:None; PTR:InfoNoRecords; A:0; MX:0; LANG:en; X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 May 2015 09:34:42.2667 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: HK2PR06MB0914 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.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, 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 This patch adds a compatible string to support for R-Car E2. Signed-off-by: Yoshihiro Shimoda Acked-by: Geert Uytterhoeven --- Documentation/devicetree/bindings/usb/renesas_usbhs.txt | 1 + drivers/usb/renesas_usbhs/common.c | 6 ++++++ include/linux/usb/renesas_usbhs.h | 1 + 3 files changed, 8 insertions(+) diff --git a/Documentation/devicetree/bindings/usb/renesas_usbhs.txt b/Documentation/devicetree/bindings/usb/renesas_usbhs.txt index ddbe304..64a4ca6 100644 --- a/Documentation/devicetree/bindings/usb/renesas_usbhs.txt +++ b/Documentation/devicetree/bindings/usb/renesas_usbhs.txt @@ -4,6 +4,7 @@ Required properties: - compatible: Must contain one of the following: - "renesas,usbhs-r8a7790" - "renesas,usbhs-r8a7791" + - "renesas,usbhs-r8a7794" - reg: Base address and length of the register for the USBHS - interrupts: Interrupt specifier for the USBHS - clocks: A list of phandle + clock specifier pairs diff --git a/drivers/usb/renesas_usbhs/common.c b/drivers/usb/renesas_usbhs/common.c index 0f7e850..954357f 100644 --- a/drivers/usb/renesas_usbhs/common.c +++ b/drivers/usb/renesas_usbhs/common.c @@ -472,6 +472,10 @@ static const struct of_device_id usbhs_of_match[] = { .compatible = "renesas,usbhs-r8a7791", .data = (void *)USBHS_TYPE_R8A7791, }, + { + .compatible = "renesas,usbhs-r8a7794", + .data = (void *)USBHS_TYPE_R8A7794, + }, { }, }; MODULE_DEVICE_TABLE(of, usbhs_of_match); @@ -500,6 +504,7 @@ static struct renesas_usbhs_platform_info *usbhs_parse_dt(struct device *dev) switch (dparam->type) { case USBHS_TYPE_R8A7790: case USBHS_TYPE_R8A7791: + case USBHS_TYPE_R8A7794: dparam->has_usb_dmac = 1; break; default: @@ -561,6 +566,7 @@ static int usbhs_probe(struct platform_device *pdev) switch (priv->dparam.type) { case USBHS_TYPE_R8A7790: case USBHS_TYPE_R8A7791: + case USBHS_TYPE_R8A7794: priv->pfunc = usbhs_rcar2_ops; if (!priv->dparam.pipe_type) { priv->dparam.pipe_type = usbhsc_new_pipe_type; diff --git a/include/linux/usb/renesas_usbhs.h b/include/linux/usb/renesas_usbhs.h index e438e72..08c62ba 100644 --- a/include/linux/usb/renesas_usbhs.h +++ b/include/linux/usb/renesas_usbhs.h @@ -172,6 +172,7 @@ struct renesas_usbhs_driver_param { enum { USBHS_TYPE_R8A7790 = 1, USBHS_TYPE_R8A7791, + USBHS_TYPE_R8A7794, }; /*