From patchwork Tue Oct 3 11:09:14 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yoshihiro Shimoda X-Patchwork-Id: 9982267 X-Patchwork-Delegate: geert@linux-m68k.org Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id A99036029B for ; Tue, 3 Oct 2017 11:13:23 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 92E8F28899 for ; Tue, 3 Oct 2017 11:13:23 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 87A862889F; Tue, 3 Oct 2017 11:13:23 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A54F12889B for ; Tue, 3 Oct 2017 11:13:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751768AbdJCLNQ (ORCPT ); Tue, 3 Oct 2017 07:13:16 -0400 Received: from relmlor3.renesas.com ([210.160.252.173]:35071 "EHLO relmlie2.idc.renesas.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751639AbdJCLNM (ORCPT ); Tue, 3 Oct 2017 07:13:12 -0400 Received: from unknown (HELO relmlir3.idc.renesas.com) ([10.200.68.153]) by relmlie2.idc.renesas.com with ESMTP; 03 Oct 2017 20:13:09 +0900 Received: from relmlii1.idc.renesas.com (relmlii1.idc.renesas.com [10.200.68.65]) by relmlir3.idc.renesas.com (Postfix) with ESMTP id C73817DF4E; Tue, 3 Oct 2017 20:13:09 +0900 (JST) X-IronPort-AV: E=Sophos;i="5.42,474,1500908400"; d="scan'208";a="258403334" Received: from mail-sg2apc01lp0248.outbound.protection.outlook.com (HELO APC01-SG2-obe.outbound.protection.outlook.com) ([65.55.88.248]) by relmlii1.idc.renesas.com with ESMTP/TLS/AES256-SHA256; 03 Oct 2017 20:13:08 +0900 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=renesasgroup.onmicrosoft.com; s=selector1-renesas-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=GAJvwBFjr7/QPwAhJVAHoDErRBkMlQdyha/98O3ZWME=; b=N37KIDq96skpqwvA1wf+4mG12mbRR2BF5BNIQciuZ0BG2689EXSKWHJnPppnH1AOyXvuhdjOrHWJMu2SDYBPxaOEFs4ZCYXvjeiSgTLPhGi5Z9rDhcwfo8O3Gfk3kTEvf/+rP5PEGwtFwuuZNlM9aU2OXXdYUvRLXY+oWG4mezU= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=<>; Received: from localhost.localdomain (211.11.155.138) by SIXPR06MB0985.apcprd06.prod.outlook.com (2a01:111:e400:51e9::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.77.7; Tue, 3 Oct 2017 11:13:05 +0000 From: Yoshihiro Shimoda To: balbi@kernel.org, robh+dt@kernel.org, mark.rutland@arm.com Cc: gregkh@linuxfoundation.org, linux-usb@vger.kernel.org, linux-renesas-soc@vger.kernel.org, devicetree@vger.kernel.org, Yoshihiro Shimoda Subject: [PATCH 2/2] usb: renesas_usbhs: add support for R-Car D3 Date: Tue, 3 Oct 2017 20:09:14 +0900 Message-Id: <1507028954-15738-3-git-send-email-yoshihiro.shimoda.uh@renesas.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1507028954-15738-1-git-send-email-yoshihiro.shimoda.uh@renesas.com> References: <1507028954-15738-1-git-send-email-yoshihiro.shimoda.uh@renesas.com> MIME-Version: 1.0 X-Originating-IP: [211.11.155.138] X-ClientProxiedBy: KAXPR01CA0011.jpnprd01.prod.outlook.com (2603:1096:402:19::21) To SIXPR06MB0985.apcprd06.prod.outlook.com (2a01:111:e400:51e9::26) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 944b6365-5ac2-4bb7-ddda-08d50a4fb8ad X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(2017030254152)(48565401081)(2017052603199)(201703131423075)(201703031133081); SRVR:SIXPR06MB0985; X-Microsoft-Exchange-Diagnostics: 1; SIXPR06MB0985; 3:ihtMJ47EDPhUnY2k90aFBgECXsO4Uke9WJCYtD1plEovKPqRsvMQQgFX6E2/rMeIh7vpoydZihsBcNr1TERhSmgrhjhf7S4vewDGl8FeSrGeqFMu91BeOdU5g4lk1awp82mvLsQNjabRG6wFoO2HAPfMvi4/Fe1Gsj3W9IG7Sb2lW4nYFGn0V07C05lFH5hKLcgR3PZW0OivVx4yH7a0fCmHkmWjnbKUHc1ojYHUtc5UmelzixZcK63c74/su/uN; 25:KPYBUU7LUcsDLRCxi+JeDvnOANm2P3dkc0sX/u2mp+fWXsXhwQdxz29horTvMj5JawwnfwunrQQvQ2vBwMq/0awM+H7I4zL1O12q93PWTnsc4kFmUBbyxNocQNXDygFacamzS/PoRUzMuBer0inm9t+tg/Hg417QFDC+nAhRkbaxLsPTrnsctAW3MtC6I+qXKBkfN9KGqV5Bfa9H289hKrlktVZyuFtCXhwwrPqRAZoboQRp158gxv2FSJH+QZ/KuKwtW39knPRqqIsLkGDj3WYvWvolZ1y4roS5jT4EsLbZQs+2SkpJNUD6i+s3q6craGNNAPnFz+fUXKAFg4bONg==; 31:MphSJ2MWiQy/+Ldv5OI9EN4xnKAL1pcgmu98ovbVselm6IL2EyqhmWFkdOcZYNdIRRX/iHE7rwEq5voz9z67iortNK8XpXAjftfoQWcrNVtSrd7cUk+nrbqb3rKhD4TcdmjX3vpusT5E5oPq2RtpzK4yEM3G0b6VEzRt0+WJQ7BvaO508X+sO+EEhngLSuUIrQ/MZV2TQjLD/ozr9esuk8qW7ypdP+PfL0sRh3pJdEQ= X-MS-TrafficTypeDiagnostic: SIXPR06MB0985: X-Microsoft-Exchange-Diagnostics: 1; SIXPR06MB0985; 20:0qzTmQjrsEJa+BewQZJwiksYd6ZU5bhYjQT7Ny8SgnmIuQJuQ4ew9wn7LQ5Gn8LoYWgP773/XleI8Fysajv9zsqIVjUglz/LlhFMis4nPppNmfakia8h5HUkTx+BNc9x+9k6sOYQspUG+A3FDVMaV5awZ53TLqy5zF5ZUwHrQBqlcJLSeAfuyC01sRXfT3g28xRdjzWQ/vuisgblAtQ+QCKyOfyxYgceK0gqA1l6Ex+38DT2Njer8DXEuXJUEz+pk8Azy1Apst6RdJiKfbrvwqx1/sGDH1VRafOO21DYjUMIW2/ce4Z2aM+EUv2LDBdt0OtBV8bvdDCRzpWyomR7LeRQkb4aH+Gi5jb2KS0qASYiqWMllRkpL1gvsAR+XRSQ1Qdub5A7U436R6UbkeTPbRn4Xn5b52n0sOx63r1GkNYLSeZD4DL5WfHiaVLmJD/Gf+tUdRsakBzDO+GNSrDkHKBA4zCxc6roeajt1YtCnwYdG/VjDMxXRdIv4CoLmh/n; 4:+AlH00vBUDQQyuKtBaTMasc5dd3274S5mI2HTkf0oIJFpdkJHF9D68s8plUzz6NXwIsPhB2q52Shc2zs18PER8OahJVGwj84QT9BzQcP8E3aQGtu6fEPBO6+CGZqthwOFgiNzKFSEk8q8iKAAYSHAEeP4LZBNbDQpKSh5Kmynz64ULPUvmj+pIefuKIClRNXAFE++7nH72P66F/uqWSBVS6Nxjyf8PDrJdoiWcSTFsl0lHIDjwCRY8/D7TzGMtHA X-Exchange-Antispam-Report-Test: UriScan:; X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6040450)(2401047)(5005006)(8121501046)(100000703101)(100105400095)(3002001)(10201501046)(93006095)(6055026)(6041248)(201703131423075)(201702281528075)(201703061421075)(201703061750153)(20161123555025)(20161123562025)(20161123560025)(20161123564025)(20161123558100)(6072148)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:SIXPR06MB0985; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:SIXPR06MB0985; X-Forefront-PRVS: 044968D9E1 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(6009001)(6069001)(346002)(39860400002)(376002)(189002)(199003)(42882006)(6666003)(2950100002)(25786009)(101416001)(33646002)(3846002)(6116002)(2906002)(50226002)(575784001)(107886003)(50986999)(5003940100001)(76176999)(66066001)(36756003)(4326008)(6512007)(7736002)(305945005)(78352004)(106356001)(47776003)(105586002)(189998001)(97736004)(498600001)(8936002)(48376002)(50466002)(6506006)(6486002)(53936002)(316002)(81156014)(68736007)(16526017)(16586007)(81166006)(5660300001)(8676002)(3720700003); DIR:OUT; SFP:1102; SCL:1; SRVR:SIXPR06MB0985; H:localhost.localdomain; FPR:; SPF:None; PTR:InfoNoRecords; MX:0; A:0; LANG:en; Received-SPF: None (protection.outlook.com: localhost.localdomain does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; SIXPR06MB0985; 23:6MUY3J3wW//SZ64L8DBmQeXEAQuTlHKf+FHvPC912?= =?us-ascii?Q?wh9oqVlcTZs9yawatp0FzHe1EaGM9kLOG608SHQYeGj6l58LWU2+1R+hotNV?= =?us-ascii?Q?rIMXyFnBECMosA17Y5WAN6CyZu0enscD5c422LvMgm8XzGvZ3hTg0tO1nE89?= =?us-ascii?Q?Q7/tOffLbHJU2EvtdAzW27sca0IrzA8woV7wxSPCSXgdY1wHUT85FRYDFNoY?= =?us-ascii?Q?Nw4x1ilRx1WdCmAge74hgZIn1eXyJPdtGIRs0OcfqFng5uTbbZ5+wIRtWd1e?= =?us-ascii?Q?jRahkakpF8J/kTlcCInWfmVioPwiwMLH/juVx8wCTXHYCMEpg2/esn915iLz?= =?us-ascii?Q?AsX8gqfnuqHDFnrm+Yb8QYmpS8+L9BGGBFt3VPGmQITfjcrlWI3xvTX3IwZ+?= =?us-ascii?Q?ihGerlf0QqWVX4QY7ARSgsQOScf0yfwjOHiiuQMCdHcFQn4VgdfYZS0+PgFh?= =?us-ascii?Q?bZsDCiMqXx9zbVbyqmSzo6DhUZP7iRbClfRIWaFmKxNixrGecB8zW5pbQ1ef?= =?us-ascii?Q?WpoStzgL//EqgxBx6fzNc3L2uzzVAo04fThKYfpLfKkMyWdPI1ua95BeEZTw?= =?us-ascii?Q?VjLgN1Sh77hSdZv17zk1Kqt0z/6vJGtYiLKj8bnyvR+RDUsxkE5yr4KI9c6P?= =?us-ascii?Q?675aOK8kjhZfRavKJIR0lz98DDheVc8xq/7eC64616myU37uIV6340MKnr0B?= =?us-ascii?Q?rK1992iIY7Se3Ax4R5jNZ/kqYNdSc0KUvctMpyO5zw4hSeXYwXWk0W4S0SRu?= =?us-ascii?Q?8OR1p0C/QWliuzQd+b+UTM176OGgpKRaxxW+EEOBp5q+1aTnMEz7haAjBPFb?= =?us-ascii?Q?TLyWuFWMk1U1Sjj+pfrtd7PcIDv4Ittst7Bb9tCiPUhAJgiDSbZniXKg1mHv?= =?us-ascii?Q?O1GK4X6PKd5NCC1rpQhPNkN8mo2u6mUSMBkmNfNBYmJp3+BLJlPVz7Mb2I1L?= =?us-ascii?Q?Pq/5jPRAU1Px6+6kyMCcY6MHqFIKaKUj171srGrKSotvp9PqhYveL58Zyddj?= =?us-ascii?Q?GSbI1GARJwltjHnOX1h3tpRXyE8c4d8z+3QScGxFfOIoD2sn96eLuJq5Ty6o?= =?us-ascii?Q?9DP19inKbI57duM2WWNy6jTRpHmTknVh0Zvbr2sUFAJYfZAtFD3DkvrKgEgS?= =?us-ascii?Q?2PP/EMmFjAhwz2TBxcW26NLXvlRO2t31P9LpZ4Wiv0N+dQtswIYiF/ta5Mxi?= =?us-ascii?Q?x2lnx+qJ6VjSPM=3D?= X-Microsoft-Exchange-Diagnostics: 1; SIXPR06MB0985; 6:D1hjIQWSVtnV2YRsIoV4/bb5y5fyOpW5sr/P1QEefwHyAEth4p86LU6bN8ymHNJxE1+eu4ImjVMdBukpoIIuEDwkRpKQJ8wXpWYS2Sc98mX4pdxd+Bcz5SWMQzzHq+f74ExFqOaKGaVR9fQjl4eqXB7iVil0Tdd+jrLQKsNprX9JfCYXwCfiXMt1WtpIJCai4ArAMmzVezQwrpkImsefEpCkYQj+OqfohzLHZK/Rl3P4RlhtB5Y+0ZNLTsrYE7NzvVb9raHnYbq16DC59FTv8SXzxD3m4F8BXRajh8fuDPV+ORswjPo725UHVFJ1PFdLSEKtT9NB2DBIze0e/uVBgg==; 5:splc+xzVezVeX7UwnfLEHBWI+zi1PoxIcvG0SsFX0t44A5uYc0ocon3ijSw5e9CkHV5SXNs+pM/OXqaVuyrCI5fp3sL0RbC5NfxALoGmlhss3ffFbSJFCJG/rPihpxpoY7lMrrx2y9oJ7dQpZJK1VA9+UStM5ocB2lAKL7Z/beA=; 24:W9QYaX3nnfqyEWN8BCcSTZzZzQm7RDWSmWSRCqwziZdkQS5CtMAaKUH73u2sUuovgofRFCuoLq01yxm+9L7NSJxOOMH95eSRVQaCssHoq0Y=; 7:N8MEv6rghlr42pOiYx5UhKIyORYj3hATgIf5Y3A1JgICYccOuCvJZXpIGT4Z9s8iUG6HUnfrbuCCV3bgUj+ZNDA2Ek5v09m9hI92EZueqv2sE+SLMfXUhtdu7ZwnU6TzC0d7HO71o0BI6JFI7EtoKCVJWKASY2WLgTJtDxkLooq9Y3GAOEWHPyE2hexMbP+lVhm9Nuljij7uw9FXjyeHmweFuQCe0q/GFspDLMuz/pI= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; SIXPR06MB0985; 20:xKDUVon/hfMH8RySWXe1BqxugoQQsnc7S5rKdnrBa9qJ11JrL2iptGZbzpvOt0Bg4lpgBi7E2MsQ4zG4A6BRgyUGSRpDUaxTU+6YjLZxhOFzGUiG2Dn7YDuTWaJ0diyH8vF7VlHyP83l9LkgxG28/PRYDf0e21KVli8r8m6ONec= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Oct 2017 11:13:05.0983 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 53d82571-da19-47e4-9cb4-625a166a4a2a X-MS-Exchange-Transport-CrossTenantHeadersStamped: SIXPR06MB0985 Sender: linux-renesas-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-renesas-soc@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This patch adds support for R-Car D3. This SoC needs to release the PLL reset by the UGCTRL register. So, since this is not the same as other R-Car Gen3 SoCs, this patch adds a new type as "USBHS_TYPE_RCAR_GEN3_WITH_PLL". Signed-off-by: Yoshihiro Shimoda Acked-by: Rob Herring --- .../devicetree/bindings/usb/renesas_usbhs.txt | 1 + drivers/usb/renesas_usbhs/common.c | 10 ++++- drivers/usb/renesas_usbhs/rcar3.c | 48 ++++++++++++++++++++++ drivers/usb/renesas_usbhs/rcar3.h | 1 + include/linux/usb/renesas_usbhs.h | 5 ++- 5 files changed, 62 insertions(+), 3 deletions(-) diff --git a/Documentation/devicetree/bindings/usb/renesas_usbhs.txt b/Documentation/devicetree/bindings/usb/renesas_usbhs.txt index 9e18e00..e79f6e4 100644 --- a/Documentation/devicetree/bindings/usb/renesas_usbhs.txt +++ b/Documentation/devicetree/bindings/usb/renesas_usbhs.txt @@ -10,6 +10,7 @@ Required properties: - "renesas,usbhs-r8a7794" for r8a7794 (R-Car E2) compatible device - "renesas,usbhs-r8a7795" for r8a7795 (R-Car H3) compatible device - "renesas,usbhs-r8a7796" for r8a7796 (R-Car M3-W) compatible device + - "renesas,usbhs-r8a77995" for r8a77995 (R-Car D3) compatible device - "renesas,rcar-gen2-usbhs" for R-Car Gen2 compatible device - "renesas,rcar-gen3-usbhs" for R-Car Gen3 compatible device diff --git a/drivers/usb/renesas_usbhs/common.c b/drivers/usb/renesas_usbhs/common.c index 2a860e4..3e92a78 100644 --- a/drivers/usb/renesas_usbhs/common.c +++ b/drivers/usb/renesas_usbhs/common.c @@ -486,6 +486,10 @@ static int usbhsc_drvcllbck_notify_hotplug(struct platform_device *pdev) .data = (void *)USBHS_TYPE_RCAR_GEN3, }, { + .compatible = "renesas,usbhs-r8a77995", + .data = (void *)USBHS_TYPE_RCAR_GEN3_WITH_PLL, + }, + { .compatible = "renesas,rcar-gen2-usbhs", .data = (void *)USBHS_TYPE_RCAR_GEN2, }, @@ -519,7 +523,8 @@ static struct renesas_usbhs_platform_info *usbhs_parse_dt(struct device *dev) dparam->enable_gpio = gpio; if (dparam->type == USBHS_TYPE_RCAR_GEN2 || - dparam->type == USBHS_TYPE_RCAR_GEN3) { + dparam->type == USBHS_TYPE_RCAR_GEN3 || + dparam->type == USBHS_TYPE_RCAR_GEN3_WITH_PLL) { dparam->has_usb_dmac = 1; dparam->pipe_configs = usbhsc_new_pipe; dparam->pipe_size = ARRAY_SIZE(usbhsc_new_pipe); @@ -584,6 +589,9 @@ static int usbhs_probe(struct platform_device *pdev) case USBHS_TYPE_RCAR_GEN3: priv->pfunc = usbhs_rcar3_ops; break; + case USBHS_TYPE_RCAR_GEN3_WITH_PLL: + priv->pfunc = usbhs_rcar3_with_pll_ops; + break; default: if (!info->platform_callback.get_id) { dev_err(&pdev->dev, "no platform callbacks"); diff --git a/drivers/usb/renesas_usbhs/rcar3.c b/drivers/usb/renesas_usbhs/rcar3.c index 02b67ab..f436e9d 100644 --- a/drivers/usb/renesas_usbhs/rcar3.c +++ b/drivers/usb/renesas_usbhs/rcar3.c @@ -15,24 +15,39 @@ #include "rcar3.h" #define LPSTS 0x102 +#define UGCTRL 0x180 /* 32-bit register */ #define UGCTRL2 0x184 /* 32-bit register */ +#define UGSTS 0x188 /* 32-bit register */ /* Low Power Status register (LPSTS) */ #define LPSTS_SUSPM 0x4000 +/* R-Car D3 only: USB General control register (UGCTRL) */ +#define UGCTRL_PLLRESET 0x00000001 +#define UGCTRL_CONNECT 0x00000004 + /* * USB General control register 2 (UGCTRL2) * Remarks: bit[31:11] and bit[9:6] should be 0 */ #define UGCTRL2_RESERVED_3 0x00000001 /* bit[3:0] should be B'0001 */ +#define UGCTRL2_USB0SEL_HSUSB 0x00000020 #define UGCTRL2_USB0SEL_OTG 0x00000030 #define UGCTRL2_VBUSSEL 0x00000400 +/* R-Car D3 only: USB General status register (UGSTS) */ +#define UGSTS_LOCK 0x00000100 + static void usbhs_write32(struct usbhs_priv *priv, u32 reg, u32 data) { iowrite32(data, priv->base + reg); } +static u32 usbhs_read32(struct usbhs_priv *priv, u32 reg) +{ + return ioread32(priv->base + reg); +} + static int usbhs_rcar3_power_ctrl(struct platform_device *pdev, void __iomem *base, int enable) { @@ -52,6 +67,34 @@ static int usbhs_rcar3_power_ctrl(struct platform_device *pdev, return 0; } +/* R-Car D3 needs to release UGCTRL.PLLRESET */ +static int usbhs_rcar3_power_and_pll_ctrl(struct platform_device *pdev, + void __iomem *base, int enable) +{ + struct usbhs_priv *priv = usbhs_pdev_to_priv(pdev); + u32 val; + int timeout = 1000; + + if (enable) { + usbhs_write32(priv, UGCTRL, 0); /* release PLLRESET */ + usbhs_write32(priv, UGCTRL2, UGCTRL2_RESERVED_3 | + UGCTRL2_USB0SEL_HSUSB); + + usbhs_bset(priv, LPSTS, LPSTS_SUSPM, LPSTS_SUSPM); + do { + val = usbhs_read32(priv, UGSTS); + udelay(1); + } while (!(val & UGSTS_LOCK) && timeout--); + usbhs_write32(priv, UGCTRL, UGCTRL_CONNECT); + } else { + usbhs_write32(priv, UGCTRL, 0); + usbhs_bset(priv, LPSTS, LPSTS_SUSPM, 0); + usbhs_write32(priv, UGCTRL, UGCTRL_PLLRESET); + } + + return 0; +} + static int usbhs_rcar3_get_id(struct platform_device *pdev) { return USBHS_GADGET; @@ -61,3 +104,8 @@ static int usbhs_rcar3_get_id(struct platform_device *pdev) .power_ctrl = usbhs_rcar3_power_ctrl, .get_id = usbhs_rcar3_get_id, }; + +const struct renesas_usbhs_platform_callback usbhs_rcar3_with_pll_ops = { + .power_ctrl = usbhs_rcar3_power_and_pll_ctrl, + .get_id = usbhs_rcar3_get_id, +}; diff --git a/drivers/usb/renesas_usbhs/rcar3.h b/drivers/usb/renesas_usbhs/rcar3.h index 5f850b2..7fe9817 100644 --- a/drivers/usb/renesas_usbhs/rcar3.h +++ b/drivers/usb/renesas_usbhs/rcar3.h @@ -1,3 +1,4 @@ #include "common.h" extern const struct renesas_usbhs_platform_callback usbhs_rcar3_ops; +extern const struct renesas_usbhs_platform_callback usbhs_rcar3_with_pll_ops; diff --git a/include/linux/usb/renesas_usbhs.h b/include/linux/usb/renesas_usbhs.h index 00a47d0..d2f41e4 100644 --- a/include/linux/usb/renesas_usbhs.h +++ b/include/linux/usb/renesas_usbhs.h @@ -183,8 +183,9 @@ struct renesas_usbhs_driver_param { #define USBHS_USB_DMAC_XFER_SIZE 32 /* hardcode the xfer size */ }; -#define USBHS_TYPE_RCAR_GEN2 1 -#define USBHS_TYPE_RCAR_GEN3 2 +#define USBHS_TYPE_RCAR_GEN2 1 +#define USBHS_TYPE_RCAR_GEN3 2 +#define USBHS_TYPE_RCAR_GEN3_WITH_PLL 3 /* * option: