From patchwork Sun Dec 9 05:40:15 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Chen X-Patchwork-Id: 10719839 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 15BAA3E9D for ; Sun, 9 Dec 2018 05:40:25 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0790D2A8D4 for ; Sun, 9 Dec 2018 05:40:25 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id EFDDB2A8D5; Sun, 9 Dec 2018 05:40:24 +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=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,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 3CEA82A8D8 for ; Sun, 9 Dec 2018 05:40:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726190AbeLIFkV (ORCPT ); Sun, 9 Dec 2018 00:40:21 -0500 Received: from mail-eopbgr80051.outbound.protection.outlook.com ([40.107.8.51]:16469 "EHLO EUR04-VI1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726097AbeLIFkU (ORCPT ); Sun, 9 Dec 2018 00:40:20 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=CuXhReK6X8uKCQpHOWfuUNle6LtrvH0HTdJm3AljDoc=; b=Ds99ZhQ6bM8NIv4ZeIMRAKfEKeMqzu7J1r1hGLHb/uPYPW8RI3eSqy952MqxbxxMkPj9EkvyNS3M0fFsIz7EQg4ibwnHCHWPdKm8Oalwf0rnnkiutuCMfeT9uBufREveORAj3eUTngpAJvpWo1WM57JKOwHVe06D7jRopRvF0zk= Received: from VI1PR04MB5327.eurprd04.prod.outlook.com (20.177.52.16) by VI1PR04MB5613.eurprd04.prod.outlook.com (20.178.125.138) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1404.21; Sun, 9 Dec 2018 05:40:15 +0000 Received: from VI1PR04MB5327.eurprd04.prod.outlook.com ([fe80::811d:1992:9a6a:bb3f]) by VI1PR04MB5327.eurprd04.prod.outlook.com ([fe80::811d:1992:9a6a:bb3f%5]) with mapi id 15.20.1404.025; Sun, 9 Dec 2018 05:40:15 +0000 From: Peter Chen To: "linux-usb@vger.kernel.org" CC: dl-linux-imx , "robh+dt@kernel.org" , "devicetree@vger.kernel.org" , "frieder.schrempf@exceet.de" , "festevam@gmail.com" , Peter Chen Subject: [PATCH v4 1/4] usb: chipidea: add flag for imx hsic implementation Thread-Topic: [PATCH v4 1/4] usb: chipidea: add flag for imx hsic implementation Thread-Index: AQHUj4GpLplhuyWh502E8qSY9Aqglg== Date: Sun, 9 Dec 2018 05:40:15 +0000 Message-ID: <20181209053746.24967-2-peter.chen@nxp.com> References: <20181209053746.24967-1-peter.chen@nxp.com> In-Reply-To: <20181209053746.24967-1-peter.chen@nxp.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-mailer: git-send-email 2.14.1 x-clientproxiedby: HK2PR06CA0023.apcprd06.prod.outlook.com (2603:1096:202:2e::35) To VI1PR04MB5327.eurprd04.prod.outlook.com (2603:10a6:803:60::16) authentication-results: spf=none (sender IP is ) smtp.mailfrom=peter.chen@nxp.com; x-ms-exchange-messagesentrepresentingtype: 1 x-originating-ip: [119.31.174.66] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1;VI1PR04MB5613;6:pHrh88AJuIoc5lHSPTUEvbcQIWwdRY2meSNt/26C3aELaGEulKgfReIwZ5EIHEWhelAqU01rhvY1wpD+WD+HMuU0Tue1ELTvOuiUtuw2meci5O1SyW26Pt4W+Z+YFoGxUO/NNjefNHcVULa6KKfxNReuOSymN4bqIyr3SbpiUZqnVzVo76RXqrL5qkBs/2yRBinsJCcbXxmJhd4ycyHDT/DWp7WyGo3fml46c0LvWNWC7WHwYgCYs7Y/PJ8h/LW5+JuvZKB9E9Q9vWYG+PSd5Ezcsc4H/gEwMlRsKq1Q8O8WJTy4XbtHNJ/2MGkbmnNb9JhND+edEfHh5JG4VAuQvckmCNtOLCqmBRy0Lo/rde62ozP+Oy9e2aZ9/kiaOtUyjvQ16dJuuaxPdL815gUp9w52G0CjIFC8+0HgNloPDBjv+PknFKFVQxbbzCQqWVvfzNyDr3fpsfcBXkdh7qsB7Q==;5:jLfDvsCogE1HQKkHjPOOWPgcRqMdemn4zdd2r2k8J9u2mghvU4TEj2KzrDEgIGKQthm6pw7A3teYjtJq/cNA34aaUrpR/hzSLCc6O4IGOwsdOdcg25J5vOpD9uuY3Is3Bdcck5Hbapy1RukDcNUUvmKH59nvsIbJQIq/n1hkEzQ=;7:JujSTq9/SjMnRgVurZf+CaMXgpuBaRogbcKsh/VqNmWdXgv5P6umU9auyryaGaHCC28UGel4padpQV9nWiza0C1SbhtzLQr14aFqwOMJ05GHOGUwqSzT+MBj/REf3Z1Fr9VTifaVZH/IQVPAevAsfQ== x-ms-office365-filtering-correlation-id: 6a3dd2f7-16ee-40bd-cdaa-08d65d98cb44 x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0;PCL:0;RULEID:(2390098)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600074)(711020)(4618075)(2017052603328)(7153060)(7193020);SRVR:VI1PR04MB5613; x-ms-traffictypediagnostic: VI1PR04MB5613: x-microsoft-antispam-prvs: x-ms-exchange-senderadcheck: 1 x-exchange-antispam-report-cfa-test: BCL:0;PCL:0;RULEID:(8211001083)(6040522)(2401047)(5005006)(8121501046)(10201501046)(3002001)(3231455)(999002)(944501520)(52105112)(93006095)(93001095)(6055026)(148016)(149066)(150057)(6041310)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123558120)(20161123560045)(20161123562045)(20161123564045)(201708071742011)(7699051)(76991095);SRVR:VI1PR04MB5613;BCL:0;PCL:0;RULEID:;SRVR:VI1PR04MB5613; x-forefront-prvs: 0881A7A935 x-forefront-antispam-report: SFV:NSPM;SFS:(10009020)(396003)(346002)(376002)(136003)(366004)(39860400002)(199004)(189003)(53936002)(39060400002)(44832011)(3846002)(11346002)(2616005)(316002)(446003)(486006)(6512007)(186003)(476003)(8936002)(52116002)(5640700003)(6116002)(4326008)(8676002)(81156014)(66066001)(1076002)(26005)(81166006)(97736004)(478600001)(68736007)(36756003)(54906003)(99286004)(106356001)(71190400001)(6486002)(6436002)(71200400001)(76176011)(5660300001)(50226002)(256004)(25786009)(102836004)(14444005)(2501003)(305945005)(14454004)(6506007)(386003)(6916009)(7736002)(2906002)(2351001)(86362001)(105586002);DIR:OUT;SFP:1101;SCL:1;SRVR:VI1PR04MB5613;H:VI1PR04MB5327.eurprd04.prod.outlook.com;FPR:;SPF:None;LANG:en;PTR:InfoNoRecords;A:1;MX:1; received-spf: None (protection.outlook.com: nxp.com does not designate permitted sender hosts) x-microsoft-antispam-message-info: BGsi6mvLR62LT+u7L6UKamhB5E0KMbPoE4K5G2OZapHItinPjZ55yIOgHVellVVawFg93OF7D8IHjnGqYbmIA5iRTP0JET1M9+7cdhyF7MSC/gk5MH/r3dzaN45KVt1YCCDZo6CG1fedvEagLnI+2Q6UihI34B4ERqZasM+1Cp5454jqZcLoWu5KsGnxcM4NTv7mcPcir0shXWrGDfeE4wQjNVx4q1Ck22Yjdx72uBbpEII+xGt4XIi8B3OMwlLUQfcFGleDvFeHYNgO7cdILQnaM9xDFEAlWiSJxPLRSwOCJ8Fk/429UDIINPuGEznGZW2wJDuDcpDfLJOOmWBbVaMMmO/efaGq7oyYlS36aaw= spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 6a3dd2f7-16ee-40bd-cdaa-08d65d98cb44 X-MS-Exchange-CrossTenant-originalarrivaltime: 09 Dec 2018 05:40:15.0603 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB5613 Sender: linux-usb-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-usb@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP NXP (Freecale) imx HSIC design has some special requirements, add some flags at host code to handle them. Reviewed-by: Frieder Schrempf Tested-by: Frieder Schrempf Signed-off-by: Peter Chen --- drivers/usb/chipidea/host.c | 17 +++++++++++++++++ include/linux/usb/chipidea.h | 3 +++ 2 files changed, 20 insertions(+) diff --git a/drivers/usb/chipidea/host.c b/drivers/usb/chipidea/host.c index d858a82c4f44..028a3574266a 100644 --- a/drivers/usb/chipidea/host.c +++ b/drivers/usb/chipidea/host.c @@ -170,6 +170,11 @@ static int host_start(struct ci_hdrc *ci) otg->host = &hcd->self; hcd->self.otg_port = 1; } + + if (ci->platdata->notify_event && + (ci->platdata->flags & CI_HDRC_IMX_IS_HSIC)) + ci->platdata->notify_event + (ci, CI_HDRC_IMX_HSIC_ACTIVE_EVENT); } return ret; @@ -218,6 +223,8 @@ void ci_hdrc_host_destroy(struct ci_hdrc *ci) static int ci_ehci_bus_suspend(struct usb_hcd *hcd) { struct ehci_hcd *ehci = hcd_to_ehci(hcd); + struct device *dev = hcd->self.controller; + struct ci_hdrc *ci = dev_get_drvdata(dev); int port; u32 tmp; @@ -249,6 +256,16 @@ static int ci_ehci_bus_suspend(struct usb_hcd *hcd) * It needs a short delay between set RS bit and PHCD. */ usleep_range(150, 200); + /* + * Need to clear WKCN and WKOC for imx HSIC, + * otherwise, there will be wakeup event. + */ + if (ci->platdata->flags & CI_HDRC_IMX_IS_HSIC) { + tmp = ehci_readl(ehci, reg); + tmp &= ~(PORT_WKDISC_E | PORT_WKCONN_E); + ehci_writel(ehci, tmp, reg); + } + break; } } diff --git a/include/linux/usb/chipidea.h b/include/linux/usb/chipidea.h index 63758c399e4e..911e05af671e 100644 --- a/include/linux/usb/chipidea.h +++ b/include/linux/usb/chipidea.h @@ -60,9 +60,12 @@ struct ci_hdrc_platform_data { #define CI_HDRC_OVERRIDE_RX_BURST BIT(11) #define CI_HDRC_OVERRIDE_PHY_CONTROL BIT(12) /* Glue layer manages phy */ #define CI_HDRC_REQUIRES_ALIGNED_DMA BIT(13) +#define CI_HDRC_IMX_IS_HSIC BIT(14) enum usb_dr_mode dr_mode; #define CI_HDRC_CONTROLLER_RESET_EVENT 0 #define CI_HDRC_CONTROLLER_STOPPED_EVENT 1 +#define CI_HDRC_IMX_HSIC_ACTIVE_EVENT 2 +#define CI_HDRC_IMX_HSIC_SUSPEND_EVENT 3 int (*notify_event) (struct ci_hdrc *ci, unsigned event); struct regulator *reg_vbus; struct usb_otg_caps ci_otg_caps;