From patchwork Wed Dec 13 06:27:37 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yoshihiro Shimoda X-Patchwork-Id: 10109287 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 776C360352 for ; Wed, 13 Dec 2017 06:32:59 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 73B8226E55 for ; Wed, 13 Dec 2017 06:32:59 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 672DB28AFF; Wed, 13 Dec 2017 06:32:59 +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=unavailable 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 E060C26E55 for ; Wed, 13 Dec 2017 06:32:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751477AbdLMGcE (ORCPT ); Wed, 13 Dec 2017 01:32:04 -0500 Received: from relmlor4.renesas.com ([210.160.252.174]:61654 "EHLO relmlie3.idc.renesas.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751090AbdLMGb7 (ORCPT ); Wed, 13 Dec 2017 01:31:59 -0500 Received: from unknown (HELO relmlir3.idc.renesas.com) ([10.200.68.153]) by relmlie3.idc.renesas.com with ESMTP; 13 Dec 2017 15:31:56 +0900 Received: from relmlii1.idc.renesas.com (relmlii1.idc.renesas.com [10.200.68.65]) by relmlir3.idc.renesas.com (Postfix) with ESMTP id 864937FBC0; Wed, 13 Dec 2017 15:31:57 +0900 (JST) X-IronPort-AV: E=Sophos;i="5.45,397,1508770800"; d="scan'208";a="264978437" Received: from mail-os2jpn01lp0150.outbound.protection.outlook.com (HELO JPN01-OS2-obe.outbound.protection.outlook.com) ([23.103.139.150]) by relmlii1.idc.renesas.com with ESMTP/TLS/AES256-SHA256; 13 Dec 2017 15:31:57 +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=vDKHREELenOi6/4gOS+SXYkDJn7QeDTiLU50mk3TNBw=; b=RQUM1hj5JsETOkgTbEm2PJQbhnffDTz9jQ51bgeivxnTLGcnH5hd0qa9fayk4ePL4jiAWJ5pSOs+gY9Pwjs15Y4Y7IOM5YrznBENnA49C7CMzo5jh221iCrU0MJ7zDgXdr2LJkHr1FiV4VXUktT2VGJnXYOu60/0kyZ9CFE1iPY= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=<>; Received: from localhost.localdomain (211.11.155.138) by TY1PR06MB0992.apcprd06.prod.outlook.com (10.164.99.26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.302.9; Wed, 13 Dec 2017 06:31:54 +0000 From: Yoshihiro Shimoda To: kishon@ti.com, robh+dt@kernel.org, mark.rutland@arm.com Cc: linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, linux-renesas-soc@vger.kernel.org, Yoshihiro Shimoda Subject: [PATCH 2/5] phy: renesas: rcar-gen3-usb2: unify OBINTEN handling Date: Wed, 13 Dec 2017 15:27:37 +0900 Message-Id: <1513146460-20326-3-git-send-email-yoshihiro.shimoda.uh@renesas.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1513146460-20326-1-git-send-email-yoshihiro.shimoda.uh@renesas.com> References: <1513146460-20326-1-git-send-email-yoshihiro.shimoda.uh@renesas.com> MIME-Version: 1.0 X-Originating-IP: [211.11.155.138] X-ClientProxiedBy: OS2PR01CA0090.jpnprd01.prod.outlook.com (10.165.51.178) To TY1PR06MB0992.apcprd06.prod.outlook.com (10.164.99.26) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 6e11d691-d17e-426f-9c61-08d541f3341e X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(4534020)(4602075)(4627115)(201703031133081)(48565401081)(5600026)(4604075)(2017052603307); SRVR:TY1PR06MB0992; X-Microsoft-Exchange-Diagnostics: 1; TY1PR06MB0992; 3:XoImMa8Ua/do7h8qQj3rCWZe+U1n34ufn5irSBby9qxDZr7DE0Ng6citpjNNt76sfr1y5eodj5/v/YuNAUiXC6VhucDbvrTTrBjQ4HqU91WkI31lsTxLB0TlAn+uhdPt8evDj+s88iiOGnmChZe5aj38/ceakXQk9wR0vc82E6leVvAUDyQqLFJDwdfavDjuAlQmNd71INC/WU1ExL08dT7o9WC84GDuOSak5tGvhu77Op62P/MoHwNpnRwmuFP+; 25:7fi2n7fwwhRu2vEaGTLXQ/5/qTfU7kDDtCERvlXW/+cKd0fwWtiYhZuewdCiZHhYl/NFQAAFEbZ3u6n/bnTC7qH3dAN+W+d+kHPDSX490M7O/SyV9yZgMjaT1RxqI+k8mKnWHV2/oQ31A5Yzgn3fduAYcrLUOvTti1imKfXXHIdafHmECi5UoVMHjsSodybowBRjV3/o3FIsVQBSwElIjEKtmlABLNC/rsfbrEppAy1zA+ONWiDRaW5aGHwcnAmI2R63ZH/E4ZEYKD1H7G/z4iLlcyfTuqVqy2YRo9aKcspdx47TH3uyI21KJ88vpSwTxc4W4bbYUEJSdL/0U0p8lQ==; 31:T0XflEu0aKbz3aIbEoikNxh8Krtnnl9vY9J9O+Xv5DtdA0S6LqD0X9eybk1vkIYUHXrN4/x1AktWBRYcX5hwrSPqXc7nC13aIcY/QALtHXL+HwvSYUuDH0r+Vd1OwWkJph2fVrkqDfqPglM0wWdyrymsPzAAvthaoCCuWnHQLufIW6UnoCHXpp4ldGgNEdY+OK3BOadz36gQaTMCbsgpAn3O8EkN99L86a3rHtOrFtY= X-MS-TrafficTypeDiagnostic: TY1PR06MB0992: X-Microsoft-Exchange-Diagnostics: 1; TY1PR06MB0992; 20:/uL9LDfnIJMEWGw4KZW0/t/YExiSFb6ur3W9IaoXX6aiSmD9wfafV+re4HWaVSSndrqtFoeK06M2ospoCpiQrFlPE0WFccVKjU8FgDZiXg1QIGPdyOLdd9RfFX9PRpMlCd/f0kSfG74bICKk3agl/PFdGOn6UEAR146ipcHTnEWHP17CPM8YMiUI33FrhjzJFd0kY4ED+59vEqFxo6PkQ/LKznwzu8H3spekQjPVhnPgwjtCGmxur+YMsQ5FuziSsmO/1jTo+LYPmIW4x8Rf4/WhGlY6XBscQ8IGKwMIZldc6Wj7eKGo7hjP8scC50/0Zl8RQTlG9XHoasdI3Lz1B2AINUSakClFrWhfp1kOOG5zhc5vx1dA6Kt3b1nnZHfNw9lI7fSzLCBzBIO2pzqzTrKCqk/hOuW8W5oQjHj0B3bFCvO2vvchCnBauIouNQmiPB9DeudNzhHxX3XklhloYAsahBjHWWc9tP57ULKUKi09p4syz4LbzJaXvTKIqKuo; 4:Q+uySw54YpE+no8lkiGG77HLD95asGm4knGh7uPp7MfYcblqd9GnosGTX2PWN1arGTwPRf4Ir8mVrjgoCoR7s6kGQ1mb6u1LNybd0AJa8Ht7vbSvFJTik4n3VEdi3HCt/k0tlL7Tkvb3TNb0q2bNEXCXC9czWCJkZTk+VOlEVRMhwap8v3K4hhiQ5whiGoAFvWt5HVPrAQ+ifWgRuw5fms5xs+qXjywzFcHyAZlznvLTrRPqqm8k/R0X6Qp4AiG1WQsRhcy44oVM6IhDVghbqw== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040450)(2401047)(5005006)(8121501046)(10201501046)(3231023)(93006095)(3002001)(6055026)(6041248)(20161123558100)(201703131423075)(201702281528075)(201703061421075)(201703061750153)(20161123560025)(20161123564025)(20161123562025)(20161123555025)(6072148)(201708071742011); SRVR:TY1PR06MB0992; BCL:0; PCL:0; RULEID:(100000803101)(100110400095); SRVR:TY1PR06MB0992; X-Forefront-PRVS: 052017CAF1 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(6069001)(366004)(376002)(346002)(39860400002)(199004)(189003)(81166006)(48376002)(2906002)(76176011)(66066001)(230783001)(97736004)(5660300001)(6666003)(47776003)(51416003)(52116002)(50466002)(6486002)(3846002)(2950100002)(6116002)(6512007)(42882006)(107886003)(25786009)(8676002)(78352004)(4326008)(53936002)(36756003)(106356001)(68736007)(105586002)(8936002)(81156014)(16526018)(316002)(50226002)(305945005)(7736002)(16586007)(498600001)(6506007)(386003)(3720700003); DIR:OUT; SFP:1102; SCL:1; SRVR:TY1PR06MB0992; H:localhost.localdomain; FPR:; SPF:None; PTR:InfoNoRecords; A:0; MX: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; TY1PR06MB0992; 23:D5DcO6XfnCzPaqGayv6kZ/sh/QgtFwhCHKXzjkx0d?= =?us-ascii?Q?NQEdVptZi7lMlSm3u/GgAnSk+TENEb/1klpDOzBpw547TWK9K8cJzgOB/wwj?= =?us-ascii?Q?NbpZBQySG6tA2l1yKXgmhuh1KmHM+0QRgzJkJJ+CNcK31kmUi/D9nxytF6uz?= =?us-ascii?Q?0jSgDEMgavW8H2ss8nkUCTz0CPApI7RflxB4YiV6dzCb8MxQ+MryQx5KkfLP?= =?us-ascii?Q?Xq5rhc6synOVlxVtHwUSayzHc0qCdaToxlmLX3pGMlxXgPrlaPVsTob1GDrW?= =?us-ascii?Q?/4hkPpeADTUQB+DwvWSCGyvgsz9F2V8+Ujsd8hB0g3OX4cVz8wDJAXMHhJKc?= =?us-ascii?Q?sq23LLr+TnvuOOTVl7GpgJE/c2CcxyTtnqNAURjD2t1ahUaX8DmaBCQmZKFU?= =?us-ascii?Q?q8ubpPOkOsRBI2rvgsQUKHFko4OloB6Xbj6G7dlbbKbTrUVTfjOvi3tgf9uE?= =?us-ascii?Q?6b/lIv4s9VtoJg5fuR/lG9lBFpVDsK7cDfigLtxs29NXdAB2C53Y2EiDkiwv?= =?us-ascii?Q?SJBKtsaVwJVLUx5QZ8dkJgSeQP1Tp2VtBUaGM05/w9cRA/Rc+na8CfLdTvbb?= =?us-ascii?Q?z8H0xhVx/benthe7qNws4p9HEtIjGQ3GdNG4BJZ8RtgVTvRsowzMnu9i2mWm?= =?us-ascii?Q?QGXJSh7Mbfho83H+a2pSD4Fdx3Kja1qtuASot01Fiqy/DpNFJ9GelEg8wQjz?= =?us-ascii?Q?D6VBpSjOMDQQwIPR5Jcz5z5BG9BLNna56jw26gZt94cabf+MFKzwpVPq965c?= =?us-ascii?Q?WTq5z8QztOcgGKkhWRsJpdCdm8PNxRagdKuAD2jJ5OUB099zrHNBwlkKdAEp?= =?us-ascii?Q?OzFeqrVr9Lkqbbynsh+ovnj1bBKL+ACapWKgII6uj5iRT0SUZQNGjoj0EJvC?= =?us-ascii?Q?WRfMwV+uKobA4PkTiW3g2jQGObSWvjWO4RIYEiRdv1zXeEfHhSxdGLI78NQI?= =?us-ascii?Q?n8CLrQ94sTvM1S14i8EERw3BcbryH0HJ47XiW5hrFDMbDTA/R6U7mY9qNJij?= =?us-ascii?Q?Q/Uw9K61ORl6A1eqc9kgylhOYRNZvoqf3C2kSCZxuFFkrQJXsE8qVKqpV2pQ?= =?us-ascii?Q?8Ac/w6z5HjhvvItYI1EeV/NqTMaELsdkDztXNkW8gVIkat2P+WuyAF3pjclc?= =?us-ascii?Q?WCTMt//PEM=3D?= X-Microsoft-Exchange-Diagnostics: 1; TY1PR06MB0992; 6:+rQRQKFOhC1RGp4IeMi2+S+sf+Rw2eSdO947HaQOPp7mSLHyLZ6HXmNgmAk7mPhV2LSabpYYpxNV4/FUKNUsCSkFnyu+hEI7CBPCGcu7OqAkUYnyLv5AXtu89t/fJcQzt1AhIVTLPMebbCzdlfdE3O2fdNM0IueuQ6QQ//laMelIq0VlV8JrERN/rgXstZxRR+qEdQYY9e2znLTupq/qGKOLck1ZQO4euim1F4ATgdDkjDJ89hqB1L7IkQcGWiLSd46YeUaqQAOJSoI2NLxRtY2SLQWVcJByr1CNQrHJ2tmXcMFZyoKuw47NOyRNtgLPalhx89GqvM0wU21EcyQo/ow6qSCdjsEeQ+l8rVTHcxw=; 5:fIOvIZtSvfvLJpjEfATzyOfzLllKI24f+FUXTXwzOAgJlbo9hQ6/bEVBr4DwgcCDAcWZVcqrt7UEQ9OuJwsY4BJrqfZVuA4u7hNzQHZVJBAgGlnG7KqLA1cRfjvqU0DrTy/gDoG0igQIsTupN3sICL1D8qZcq81zGNA+pGWJERM=; 24:YAy0plo+eOaUYiAvoSYefTkUhb4d1V45WFef/yIRerKV7NMt+GbKZsYXOteByOyN4+cqt3j2UIyD5adtFYn33GUiGflZkx2sET4RmNwAPAk=; 7:KkSsqd3agnEY8SOTtDZ5vnsdoc3unPAJbQk7hTDI5eKPsPwrHX98KZWJ3DDQWLrTieGpjdJJz/47JnTLxy0FOoF6zjvmEXg+ge91j1ABmVc+pzyaDRLMUbulgYld4tK7THLD1w4RpY+x93S2JQgwWGEBYABYgyJXncPdG+I5YKTPky2cVVQDYDpxdsC+thiEf8Ofu56QiyGSMir9Epl760uXFtjkAk/71ZhfFVtkjp7gjXf3TfhQFL/XC0ffRb2W SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; TY1PR06MB0992; 20:bUT4B7BvdUcqQGS+GZTP4yvh7nwgrFJpxzDNDi2cQDLyU2qyl8pGWsoe8/ur3Fisgr9Dkt8FB+schxlxYNgU2MN1dv40twuz+K2hOdk1Mo4Y5eN8yIGX6+o9uCKpTvsWgKhkbwtPrS21+V3r6tg3PC35LYQXkDCMfFeOv9ezV4k= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Dec 2017 06:31:54.7572 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 6e11d691-d17e-426f-9c61-08d541f3341e X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 53d82571-da19-47e4-9cb4-625a166a4a2a X-MS-Exchange-Transport-CrossTenantHeadersStamped: TY1PR06MB0992 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 unifies the OBINTEN handling to clean-up the code. Signed-off-by: Yoshihiro Shimoda --- drivers/phy/renesas/phy-rcar-gen3-usb2.c | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/drivers/phy/renesas/phy-rcar-gen3-usb2.c b/drivers/phy/renesas/phy-rcar-gen3-usb2.c index c22d65a..beeaa30 100644 --- a/drivers/phy/renesas/phy-rcar-gen3-usb2.c +++ b/drivers/phy/renesas/phy-rcar-gen3-usb2.c @@ -147,6 +147,18 @@ static void rcar_gen3_enable_vbus_ctrl(struct rcar_gen3_chan *ch, int vbus) writel(val, usb2_base + USB2_ADPCTRL); } +static void rcar_gen3_enable_otg_irq(struct rcar_gen3_chan *ch, int enable) +{ + void __iomem *usb2_base = ch->base; + u32 val = readl(usb2_base + USB2_OBINTEN); + + if (enable) + val |= USB2_OBINT_BITS; + else + val &= ~USB2_OBINT_BITS; + writel(val, usb2_base + USB2_OBINTEN); +} + static void rcar_gen3_init_for_host(struct rcar_gen3_chan *ch) { rcar_gen3_set_linectrl(ch, 1, 1); @@ -192,16 +204,12 @@ static void rcar_gen3_init_for_a_peri(struct rcar_gen3_chan *ch) static void rcar_gen3_init_from_a_peri_to_a_host(struct rcar_gen3_chan *ch) { - void __iomem *usb2_base = ch->base; - u32 val; - - val = readl(usb2_base + USB2_OBINTEN); - writel(val & ~USB2_OBINT_BITS, usb2_base + USB2_OBINTEN); + rcar_gen3_enable_otg_irq(ch, 0); rcar_gen3_enable_vbus_ctrl(ch, 0); rcar_gen3_init_for_host(ch); - writel(val | USB2_OBINT_BITS, usb2_base + USB2_OBINTEN); + rcar_gen3_enable_otg_irq(ch, 1); } static bool rcar_gen3_check_id(struct rcar_gen3_chan *ch) @@ -291,8 +299,7 @@ static void rcar_gen3_init_otg(struct rcar_gen3_chan *ch) val = readl(usb2_base + USB2_VBCTRL); writel(val | USB2_VBCTRL_DRVVBUSSEL, usb2_base + USB2_VBCTRL); writel(USB2_OBINT_BITS, usb2_base + USB2_OBINTSTA); - val = readl(usb2_base + USB2_OBINTEN); - writel(val | USB2_OBINT_BITS, usb2_base + USB2_OBINTEN); + rcar_gen3_enable_otg_irq(ch, 1); val = readl(usb2_base + USB2_ADPCTRL); writel(val | USB2_ADPCTRL_IDPULLUP, usb2_base + USB2_ADPCTRL); val = readl(usb2_base + USB2_LINECTRL1);