From patchwork Mon Jan 21 10:25:00 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yinbo Zhu X-Patchwork-Id: 10773515 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 CBADD13B4 for ; Mon, 21 Jan 2019 10:25:12 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B66B329CF4 for ; Mon, 21 Jan 2019 10:25:12 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A3E7529D27; Mon, 21 Jan 2019 10:25:12 +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 8E21029CF4 for ; Mon, 21 Jan 2019 10:25:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726702AbfAUKZG (ORCPT ); Mon, 21 Jan 2019 05:25:06 -0500 Received: from mail-eopbgr20086.outbound.protection.outlook.com ([40.107.2.86]:64147 "EHLO EUR02-VE1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726231AbfAUKZG (ORCPT ); Mon, 21 Jan 2019 05:25:06 -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=nhKsbqWj79Ubee88jWim4G6U4muyRG4bNDB2cI3gVdg=; b=iOGDIOG1G3F8Xp/oCT22AdysrAXUg9xmBVl7IQne3j+JNvfeeMdDayerC0PwvLniNBED1ei7MV0YMUgs0JuBhDxCZgJTtmoQcr3dr0gJt8Gy+sNQ00MtI23iSGxoe1bPxHNkeFxZnJM3fyzDyZM7eGoxXF0AvPmsyig0S/DlyBs= Received: from VI1PR04MB4158.eurprd04.prod.outlook.com (52.133.15.33) by VI1PR04MB4111.eurprd04.prod.outlook.com (52.133.14.152) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1537.27; Mon, 21 Jan 2019 10:25:01 +0000 Received: from VI1PR04MB4158.eurprd04.prod.outlook.com ([fe80::257e:f28a:1a8c:c9c4]) by VI1PR04MB4158.eurprd04.prod.outlook.com ([fe80::257e:f28a:1a8c:c9c4%2]) with mapi id 15.20.1537.031; Mon, 21 Jan 2019 10:25:01 +0000 From: Yinbo Zhu To: Alan Stern CC: Yinbo Zhu , Xiaobo Xie , Jerry Huang , Ran Wang , Greg Kroah-Hartman , Ramneek Mehresh , Nikhil Badola , Suresh Gupta , "linux-usb@vger.kernel.org" , "linux-kernel@vger.kernel.org" Subject: [PATCH v2 1/6] usb: fsl: Set USB_EN bit to select ULPI phy Thread-Topic: [PATCH v2 1/6] usb: fsl: Set USB_EN bit to select ULPI phy Thread-Index: AQHUsXOQuCNR1eimmkSvf2OsvNDAKA== Date: Mon, 21 Jan 2019 10:25:00 +0000 Message-ID: <20190121102601.4735-1-yinbo.zhu@nxp.com> Accept-Language: zh-CN, en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: HK2PR06CA0003.apcprd06.prod.outlook.com (2603:1096:202:2e::15) To VI1PR04MB4158.eurprd04.prod.outlook.com (2603:10a6:803:46::33) authentication-results: spf=none (sender IP is ) smtp.mailfrom=yinbo.zhu@nxp.com; x-ms-exchange-messagesentrepresentingtype: 1 x-mailer: git-send-email 2.17.1 x-originating-ip: [119.31.174.73] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1;VI1PR04MB4111;6:ACRA+xaksBABWkGcmOMgfjf7zb+2WBuGsWZECa8md1CtqFisR1rvfTf8frgleVQRegsmv5dCnUmNBnffxuXuv8wcrXJ36RFl86RydYfQ5hVXGNyrmcPbJd3WU9+TGltfVPmQ/lDvqMNl2X+DIoEI4GeCHQ7xjlv3jh3/7MGRF4V64vbVOpRhtdNxFjd4XFHui2F+/Par7yiVoJiNA074eqP98AGiaMYdyOyzxuY+aKou+4VRxpT9LxKRyWxoesu/UjW0HsYe7fSd7SeKDj+qEZQKwJFtSJfvgXa2BDjaxcNpLFgWTqxPVjlcm/vJifFBjld6ByCX0LV+tt/8gY/xG6wIsn8Egt8r8GkMhVPUKbdKR4IXkMisXtOtsIIYns3LBXYBwBA2Rfu4Pvxd7eLP/5eK4o10DmMMm6lN8ENtey4iyDYMrPxkz07Edpt2FQFbvZYbbGT1NvsXdFZOemVxfA==;5:upCN/RLwqpl34IkQlU/YlemWSsOcIJYwm6FbMuvqmlLDNgt+PfbBAJTclB5JUZ0V5XFLIJlVEoeI1bYMuuwXFACiqDtZArYwp2RRkxl6CUVUzl8suUtbwfvhPUVlDTKy4gvTElsallFp7YXPsM+bkRRfBfv2B1EMepvxD+TkZfhFoWTQwygl7CsUHAJdQgtMj7E5HNpGiKqmIyPv9BOK3w==;7:tkXjn0WsYwly3Cqoc8yB1WWUm/Pbhll2eN5E1Cnhot2TkVGHupSXOeiVdE2qFHOiZp+jBN+JVA/xO8sCDlE3hho3VACfViptAnmtBihgUv55kiNXMxpho8A+fcic7O0mjCrmB+rFVKvAexnam48uZg== x-ms-office365-filtering-correlation-id: df8494a1-b423-4289-6f1e-08d67f8ab2ee x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0;PCL:0;RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600109)(711020)(4618075)(2017052603328)(7153060)(7193020);SRVR:VI1PR04MB4111; x-ms-traffictypediagnostic: VI1PR04MB4111: x-microsoft-antispam-prvs: x-forefront-prvs: 0924C6A0D5 x-forefront-antispam-report: SFV:NSPM;SFS:(10009020)(366004)(136003)(346002)(376002)(39860400002)(396003)(189003)(199004)(97736004)(106356001)(14454004)(25786009)(6436002)(2171002)(476003)(4326008)(486006)(53936002)(6486002)(44832011)(105586002)(2616005)(478600001)(66066001)(68736007)(36756003)(6512007)(6916009)(3846002)(6116002)(26005)(102836004)(81166006)(186003)(86362001)(8936002)(50226002)(8676002)(71200400001)(71190400001)(81156014)(6506007)(99286004)(316002)(52116002)(386003)(305945005)(4744005)(1076003)(256004)(7736002)(2906002)(54906003);DIR:OUT;SFP:1101;SCL:1;SRVR:VI1PR04MB4111;H:VI1PR04MB4158.eurprd04.prod.outlook.com;FPR:;SPF:None;LANG:en;PTR:InfoNoRecords;MX:1;A:1; received-spf: None (protection.outlook.com: nxp.com does not designate permitted sender hosts) x-ms-exchange-senderadcheck: 1 x-microsoft-antispam-message-info: rbOe6MCEkKalLNY4xfie3EEQJDY4FKRcGdioQI+g2RBqIYBAFk9mvN5ZhT8N4oasD4S7C4BXV49h8GUDJIWesJsG/fpTe3LxmRpJInEfLH5LOoPP5DUYMmVHxt4UvruAmIUb3Ajw5uZMH9EvfQwSn8UVJCkA7MO0i8X66naPqGUmRN/9XRubWpeUZepgz2FWPzm6MP7pBVG7n86is4XbGR61cSd5fXQ8iF/+wzxjPnRvov45wNuS+fmozqYL/5ozJAoHuzl8ureEYllRNRvj6R0wanwbJyqLXRHVh7ctCwuvb3qghO/KdENPwegwMOswzE2iainUgR2G6L0xSb4o2CGCAMsLRuRBWC986AErRLKNcSsB/r7VgZq8x+0Z1EoQZQZTouePBjpFywELc4r/Xj/xtX+s69jy5Se4O4pfuew= spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: df8494a1-b423-4289-6f1e-08d67f8ab2ee X-MS-Exchange-CrossTenant-originalarrivaltime: 21 Jan 2019 10:24:55.7125 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB4111 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 From: Nikhil Badola Set USB_EN bit to select ULPI phy for USB controller version 2.5 Signed-off-by: Nikhil Badola Signed-off-by: Yinbo Zhu --- Change in v2: replace Yinbo.Zhu with Yinbo Zhu drivers/usb/host/ehci-fsl.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/drivers/usb/host/ehci-fsl.c b/drivers/usb/host/ehci-fsl.c index 0a9fd20..71c4661 100644 --- a/drivers/usb/host/ehci-fsl.c +++ b/drivers/usb/host/ehci-fsl.c @@ -118,6 +118,12 @@ static int fsl_ehci_drv_probe(struct platform_device *pdev) clrsetbits_be32(hcd->regs + FSL_SOC_USB_CTRL, CONTROL_REGISTER_W1C_MASK, 0x4); + /* Set USB_EN bit to select ULPI phy for USB controller version 2.5 */ + if (pdata->controller_ver == FSL_USB_VER_2_5 && + pdata->phy_mode == FSL_USB2_PHY_ULPI) + iowrite32be(USB_CTRL_USB_EN, hcd->regs + FSL_SOC_USB_CTRL); + + /* * Enable UTMI phy and program PTS field in UTMI mode before asserting * controller reset for USB Controller version 2.5 From patchwork Mon Jan 21 10:25:06 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yinbo Zhu X-Patchwork-Id: 10773517 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 8D42913B4 for ; Mon, 21 Jan 2019 10:25:13 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7B8EF29CF4 for ; Mon, 21 Jan 2019 10:25:13 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6F68F29D27; Mon, 21 Jan 2019 10:25:13 +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 EBF3429CF4 for ; Mon, 21 Jan 2019 10:25:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726530AbfAUKZM (ORCPT ); Mon, 21 Jan 2019 05:25:12 -0500 Received: from mail-eopbgr20056.outbound.protection.outlook.com ([40.107.2.56]:11429 "EHLO EUR02-VE1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726191AbfAUKZL (ORCPT ); Mon, 21 Jan 2019 05:25:11 -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=kY9O2+bEuEHpKzzY/RzsErRorf1+4Qbj7g9oiRjOCI8=; b=ID8CembuOjBdwxU5yiN9EQxl8AJ8RS8BfId4Sr8OeWcfaQnPT3YOj0qqN/4zG4uQMZMwnFDraphU6AKEGcRIDsWC9176TczKK+qN7ivvcf72DgK/kmtBSxtMO2ibtUYcKgmP3qJa5jW7huSBVAjNa2emmc7c7LNAPaWShGpv8B0= Received: from VI1PR04MB4158.eurprd04.prod.outlook.com (52.133.15.33) by VI1PR04MB6110.eurprd04.prod.outlook.com (20.179.26.18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1537.27; Mon, 21 Jan 2019 10:25:06 +0000 Received: from VI1PR04MB4158.eurprd04.prod.outlook.com ([fe80::257e:f28a:1a8c:c9c4]) by VI1PR04MB4158.eurprd04.prod.outlook.com ([fe80::257e:f28a:1a8c:c9c4%2]) with mapi id 15.20.1537.031; Mon, 21 Jan 2019 10:25:06 +0000 From: Yinbo Zhu To: Alan Stern CC: Yinbo Zhu , Xiaobo Xie , Jerry Huang , Ran Wang , Greg Kroah-Hartman , Ramneek Mehresh , Nikhil Badola , Suresh Gupta , "linux-usb@vger.kernel.org" , "linux-kernel@vger.kernel.org" , Suresh Gupta Subject: [PATCH v2 2/6] usb: phy: Workaround for USB erratum-A005728 Thread-Topic: [PATCH v2 2/6] usb: phy: Workaround for USB erratum-A005728 Thread-Index: AQHUsXOTxtawB/GUl029QzXbRLQa/g== Date: Mon, 21 Jan 2019 10:25:06 +0000 Message-ID: <20190121102601.4735-2-yinbo.zhu@nxp.com> References: <20190121102601.4735-1-yinbo.zhu@nxp.com> In-Reply-To: <20190121102601.4735-1-yinbo.zhu@nxp.com> Accept-Language: zh-CN, en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: HK2PR06CA0003.apcprd06.prod.outlook.com (2603:1096:202:2e::15) To VI1PR04MB4158.eurprd04.prod.outlook.com (2603:10a6:803:46::33) authentication-results: spf=none (sender IP is ) smtp.mailfrom=yinbo.zhu@nxp.com; x-ms-exchange-messagesentrepresentingtype: 1 x-mailer: git-send-email 2.17.1 x-originating-ip: [119.31.174.73] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1;VI1PR04MB6110;6:z6/z59IuB3eZs+iIoyAF6cVrFk4SImUwG856mp+4WRLORQqrn1N5sN8olF+1qxQ90qH0RYu6VEIzqXApeKI7itU4N23j1VsnSI351Qqp4obONlaFyca32d4OWwFw5wxI9/gLYPVj0B/EKEvjxtgjAPPt2l9l8eW0gmQutqEXVyQDi13KfeK+J8Rr8tjM4yrrx3UUXaksbDTMOV79CnkUpsa4IZqKF4qRrcMfIUYFTBml2KAWNdO5q4VQleFQ8/nVTBssZa/HhzQtt8eC1ANrTa5dcbxfCyNdPUqX2ELvPq1jDkVCXqNSnjeA7SdiPBduoHep2cI3pnKTrCynEzw4jQvl9AHZpfUo/OQGUbRe80UmALohxTVkdVzATs/dxjGmlM6vrVzJyrUkTcXeXlI+dlB7+Z62cAi+NnmYKR6ZMJSRlYhlwwDKZ+exqkX6Ven5VqyxlW/+PBn1xBctMntJsg==;5:veLs8IUauhpLIImYlRT//C+d4tODf98HRiyrl92SjBAt9ESlCQzWgVSAqNURJK+nCTYktwRvftCnesKF/8qoDH31v/6jgsFxeGD8H7R3RKZw3CHF6j9ZJbq4ChbL2Rq40L2pQ4KGZRPmW41M9SRTEDGteVDEHRNeBs2HCdP1M/58vRQn0q00tkWcwLzM5285iq5Q34OEzav+AbVw+54i5A==;7:/nz96PjIZ+vom3ayvJ8VG7opefcCLd6WjI/4y7mVt6mnkeF9OvyG7m2b3Bx+pKS0gqfAmAg92eZWvrf5mdbuC6PCwlZglIW2nn1IUbE16cv/ZcUljcsaKtu5OzQWw4FSYE1LYCn/8Z52lxaxqGNC6Q== x-ms-office365-filtering-correlation-id: 6cc94379-5d56-44e8-8567-08d67f8ab62e x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0;PCL:0;RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600109)(711020)(4618075)(2017052603328)(7153060)(7193020);SRVR:VI1PR04MB6110; x-ms-traffictypediagnostic: VI1PR04MB6110: x-microsoft-antispam-prvs: x-forefront-prvs: 0924C6A0D5 x-forefront-antispam-report: SFV:NSPM;SFS:(10009020)(136003)(376002)(366004)(346002)(396003)(39860400002)(199004)(189003)(476003)(2616005)(446003)(11346002)(6486002)(2906002)(1076003)(4326008)(316002)(6916009)(68736007)(7736002)(54906003)(86362001)(71190400001)(305945005)(71200400001)(478600001)(66066001)(6116002)(3846002)(25786009)(8676002)(6506007)(386003)(52116002)(81156014)(81166006)(26005)(76176011)(99286004)(186003)(102836004)(50226002)(256004)(14454004)(8936002)(36756003)(486006)(6436002)(105586002)(106356001)(2171002)(6512007)(97736004)(107886003)(44832011)(53936002);DIR:OUT;SFP:1101;SCL:1;SRVR:VI1PR04MB6110;H:VI1PR04MB4158.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-ms-exchange-senderadcheck: 1 x-microsoft-antispam-message-info: YuQ5hMEWx63qDgFvWYnRD7ifQsYbbNUAdX8GhEKbASTM42AD8pWrnsfZj08kbciNMViOk+R3bxOKKyTJ4Ij4uKzlR7DeewObbBqWzA7eeqdpykLo4/WG522G/gKdU1d/QWasPPP3tdLmzshyFyjO/SYHbKUNHOKuurhRQ+RfL7KmyD3i5q2MGkmfbZPWFf4P+m1RFMxFMl0v0wSAGmH8yFQfa17wgqml3pd6ALrVa4iKUo59+EjD1EokO52EpM3ilax9cYWs/DR/OvQYxU8bRJnPqGITNeyTaiUr7UcT1o0Y4NGOt3Pss2v6cOU9qznkAR+k1WADGs8M27LKr7mZVAEjzr/ANtvwuioJGBCvTVzAmsFWwnMYlGw2cksrgmKv/aIIq6zl3UJRGOReaaKcbCC+Tr3CMKtyWC+HTrek4bY= spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 6cc94379-5d56-44e8-8567-08d67f8ab62e X-MS-Exchange-CrossTenant-originalarrivaltime: 21 Jan 2019 10:25:01.2907 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB6110 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 From: Suresh Gupta PHY_CLK_VALID bit for UTMI PHY in USBDR does not set even if PHY is providing valid clock. Workaround for this involves resetting of PHY and check PHY_CLK_VALID bit multiple times. If PHY_CLK_VALID bit is still not set even after 5 retries, it would be safe to deaclare that PHY clock is not available. This erratum is applicable for USBDR less then ver 2.4. Signed-off-by: Suresh Gupta Signed-off-by: Yinbo Zhu --- Change in v2: replace Yinbo.Zhu with Yinbo Zhu drivers/usb/host/ehci-fsl.c | 37 ++++++++++++++++++++++++++----------- drivers/usb/host/ehci-fsl.h | 3 +++ 2 files changed, 29 insertions(+), 11 deletions(-) diff --git a/drivers/usb/host/ehci-fsl.c b/drivers/usb/host/ehci-fsl.c index 71c4661..a28ec1e 100644 --- a/drivers/usb/host/ehci-fsl.c +++ b/drivers/usb/host/ehci-fsl.c @@ -176,6 +176,17 @@ static int fsl_ehci_drv_probe(struct platform_device *pdev) return retval; } +static bool usb_phy_clk_valid(struct usb_hcd *hcd) +{ + void __iomem *non_ehci = hcd->regs; + bool ret = true; + + if (!(in_be32(non_ehci + FSL_SOC_USB_CTRL) & PHY_CLK_VALID)) + ret = false; + + return ret; +} + static int ehci_fsl_setup_phy(struct usb_hcd *hcd, enum fsl_usb2_phy_modes phy_mode, unsigned int port_offset) @@ -214,6 +225,16 @@ static int ehci_fsl_setup_phy(struct usb_hcd *hcd, /* fall through */ case FSL_USB2_PHY_UTMI: case FSL_USB2_PHY_UTMI_DUAL: + /* PHY_CLK_VALID bit is de-featured from all controller + * versions below 2.4 and is to be checked only for + * internal UTMI phy + */ + if (pdata->controller_ver > FSL_USB_VER_2_4 && + pdata->have_sysif_regs && !usb_phy_clk_valid(hcd)) { + pr_err("fsl-ehci: USB PHY clock invalid\n"); + return -EINVAL; + } + if (pdata->have_sysif_regs && pdata->controller_ver) { /* controller version 1.6 or above */ clrsetbits_be32(non_ehci + FSL_SOC_USB_CTRL, @@ -232,17 +253,11 @@ static int ehci_fsl_setup_phy(struct usb_hcd *hcd, break; } - /* - * check PHY_CLK_VALID to determine phy clock presence before writing - * to portsc - */ - if (pdata->check_phy_clk_valid) { - if (!(ioread32be(non_ehci + FSL_SOC_USB_CTRL) & - PHY_CLK_VALID)) { - dev_warn(hcd->self.controller, - "USB PHY clock invalid\n"); - return -EINVAL; - } + if (pdata->have_sysif_regs && + pdata->controller_ver > FSL_USB_VER_1_6 && + !usb_phy_clk_valid(hcd)) { + dev_warn(hcd->self.controller, "USB PHY clock invalid\n"); + return -EINVAL; } ehci_writel(ehci, portsc, &ehci->regs->port_status[port_offset]); diff --git a/drivers/usb/host/ehci-fsl.h b/drivers/usb/host/ehci-fsl.h index cbc4220..9d18c6e 100644 --- a/drivers/usb/host/ehci-fsl.h +++ b/drivers/usb/host/ehci-fsl.h @@ -50,4 +50,7 @@ #define UTMI_PHY_EN (1<<9) #define ULPI_PHY_CLK_SEL (1<<10) #define PHY_CLK_VALID (1<<17) + +/* Retry count for checking UTMI PHY CLK validity */ +#define UTMI_PHY_CLK_VALID_CHK_RETRY 5 #endif /* _EHCI_FSL_H */ From patchwork Mon Jan 21 10:25:10 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yinbo Zhu X-Patchwork-Id: 10773523 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 A875491E for ; Mon, 21 Jan 2019 10:25:41 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 981B629D02 for ; Mon, 21 Jan 2019 10:25:41 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8BF5729D2A; Mon, 21 Jan 2019 10:25:41 +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 12EF029D02 for ; Mon, 21 Jan 2019 10:25:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727554AbfAUKZR (ORCPT ); Mon, 21 Jan 2019 05:25:17 -0500 Received: from mail-eopbgr150084.outbound.protection.outlook.com ([40.107.15.84]:46872 "EHLO EUR01-DB5-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726191AbfAUKZQ (ORCPT ); Mon, 21 Jan 2019 05:25:16 -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=5kss/Ad4eOgvtbc+kDo3JYGw7YpFBOJxlZn1ClRqhEc=; b=BxOWQZQltZQOrqVIs/Wo9b1c28/h8WU4nuysZgFTTsDY/lqOpPFsVVafI4U4QlBoRXJEqlfQZjDx7r/wwCSE8Kzql5SHQCA+fYXIsBS884n9vRUxkD9ijp5BfZ+JojwvSYBff+ZGOWNgUXtJh9AkivVPw6B+QNZTZxuftuArRpU= Received: from VI1PR04MB4158.eurprd04.prod.outlook.com (52.133.15.33) by VI1PR04MB6110.eurprd04.prod.outlook.com (20.179.26.18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1537.27; Mon, 21 Jan 2019 10:25:11 +0000 Received: from VI1PR04MB4158.eurprd04.prod.outlook.com ([fe80::257e:f28a:1a8c:c9c4]) by VI1PR04MB4158.eurprd04.prod.outlook.com ([fe80::257e:f28a:1a8c:c9c4%2]) with mapi id 15.20.1537.031; Mon, 21 Jan 2019 10:25:11 +0000 From: Yinbo Zhu To: Alan Stern CC: Yinbo Zhu , Xiaobo Xie , Jerry Huang , Ran Wang , Greg Kroah-Hartman , Ramneek Mehresh , Nikhil Badola , Suresh Gupta , "linux-usb@vger.kernel.org" , "linux-kernel@vger.kernel.org" Subject: [PATCH v2 3/6] usb: host: Stops USB controller init if PLL fails to lock Thread-Topic: [PATCH v2 3/6] usb: host: Stops USB controller init if PLL fails to lock Thread-Index: AQHUsXOWYWo9SkwNBE2vWQj5pSmfbw== Date: Mon, 21 Jan 2019 10:25:10 +0000 Message-ID: <20190121102601.4735-3-yinbo.zhu@nxp.com> References: <20190121102601.4735-1-yinbo.zhu@nxp.com> In-Reply-To: <20190121102601.4735-1-yinbo.zhu@nxp.com> Accept-Language: zh-CN, en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: HK2PR06CA0003.apcprd06.prod.outlook.com (2603:1096:202:2e::15) To VI1PR04MB4158.eurprd04.prod.outlook.com (2603:10a6:803:46::33) authentication-results: spf=none (sender IP is ) smtp.mailfrom=yinbo.zhu@nxp.com; x-ms-exchange-messagesentrepresentingtype: 1 x-mailer: git-send-email 2.17.1 x-originating-ip: [119.31.174.73] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1;VI1PR04MB6110;6:VTyk2kVag+qECxwhSeqlscwweqF6Bv+jqRyMxG7G0RffF42P0CfU1eLakS2/pGC3+ANTZZtzTtOcvkIcY+nUJHlwXDPFG3i1K8dyoRU1/UOUEVV7yEagGQupGzJwAtXEK6e4vAFgkaxsovvZYEnsqrkKaxjfGN03A0xM1VBdYc0c8vx3DHF4MfHo46SHJ7OXd5Uw5qcn3r5OuO+j+/JN7CwUkqQLAmeKjAVSwxICLc5iNsJXkuXYMeGHveZ6/Q0Ei/TqoN683GmxrxhY3fBKtdZxCVZXJn5gjSNCHS3hDsFLiPukjkPQIBVo+/aKgeszr/vZCR2ircuCYx0sCQPQbZXs2yhkNGdaxCr2yxCXfpSXLWyj2mTbu5b7Qz1e3m7vqzoXhWT9uBgP8UrG/XJtxKE+DXdgRPE8UcxEOdZLNy6mxsR2MeXrAVuevOuPbvUjokOJEbapuEusT9DW4q2jYA==;5:Ho87y+3LtA2lrsRJxnAUdEEmOsbWTFSVTGrn4dqRxLzi+au+c8IOji4uyNXteqEqCfTq+6+5EWlQlsXwrRURmNHjqo82LmoZNSN1mIkJVtx15Ea+ip3XHr3mW5RBYdIh8OGDl0eslD+V2/M2hS2zQbc3sQtZrcksZy9KQWhFRv7bk0OLcxUQoihs9nV7lfo+JmFcusY/zjqfDWO5L01uxQ==;7:tJWRCyL+JNRekIUEHzHvVCBXMH4Th+VrOLIu3rveM7YPYVCvM6IKgYuwhXBiSeSGqZjJXECxJpWSkLkgzy3difPwd5JdqAFqX9oastMmQlF2+4zikL01IOBZ856KO093QCx2G/zhPCWSAyMO+ErI2A== x-ms-office365-filtering-correlation-id: ac197d14-f1a8-4e6a-9f81-08d67f8ab911 x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0;PCL:0;RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600109)(711020)(4618075)(2017052603328)(7153060)(7193020);SRVR:VI1PR04MB6110; x-ms-traffictypediagnostic: VI1PR04MB6110: x-microsoft-antispam-prvs: x-forefront-prvs: 0924C6A0D5 x-forefront-antispam-report: SFV:NSPM;SFS:(10009020)(136003)(376002)(366004)(346002)(396003)(39860400002)(199004)(189003)(476003)(2616005)(446003)(11346002)(6486002)(2906002)(1076003)(4326008)(316002)(6916009)(68736007)(7736002)(54906003)(86362001)(71190400001)(305945005)(71200400001)(478600001)(66066001)(6116002)(3846002)(25786009)(8676002)(6506007)(386003)(52116002)(81156014)(81166006)(26005)(76176011)(99286004)(186003)(102836004)(50226002)(14444005)(256004)(14454004)(8936002)(36756003)(486006)(6436002)(105586002)(106356001)(2171002)(6512007)(97736004)(44832011)(53936002);DIR:OUT;SFP:1101;SCL:1;SRVR:VI1PR04MB6110;H:VI1PR04MB4158.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-ms-exchange-senderadcheck: 1 x-microsoft-antispam-message-info: 3qWBrMcO+vu00Qzz5olLZVOjuTyP9R5ouYwpraBwE43tojR17IVBCzW9Ept4BfT2iobl5pydFFU6qV9yy+5Rq/X8aFH8gcJGDWSTDZeiHld/wxMbIanJHjUihfL4WdORB85yH3KaiUk7g+CuwUYK/u653hJAD/FzKuxUWI3SqPCD/Rw52eF2IEK9/rEWn3tXyqq8JmitSXOoU5iBq1fA6+kRxWRlgvRPsZUJSbrnqlf4UcO2DWI7WilT9V6YbWypo5jm4qjGdOlt2uOlMNOTcLhChSSQvULST4paPr+Z3k82KjHHkKHkGRgEEtCilS+eNO8PRmiYqD0jtVN3iwqIhKxFJGCmFKZFo9WOXgpnGFbay4doVC+XM1oE5uWgjL5Ht37mF75TtHO7EM3y/QG04pXM8jb9pirkyomEFnC4/0A= spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: ac197d14-f1a8-4e6a-9f81-08d67f8ab911 X-MS-Exchange-CrossTenant-originalarrivaltime: 21 Jan 2019 10:25:06.4626 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB6110 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 From: yinbo.zhu USB erratum-A006918 workaround tries to start internal PHY inside uboot (when PLL fails to lock). However, if the workaround also fails, then USB initialization is also stopped inside Linux. Erratum-A006918 workaround failure creates "fsl,erratum_a006918" node in device-tree. Presence of this node in device-tree is used to stop USB controller initialization in Linux Signed-off-by: Ramneek Mehresh Signed-off-by: Suresh Gupta Signed-off-by: Yinbo Zhu --- Change in v2: replace Yinbo.Zhu with Yinbo Zhu drivers/usb/host/ehci-fsl.c | 5 +++++ drivers/usb/host/fsl-mph-dr-of.c | 5 +++++ 2 files changed, 10 insertions(+), 0 deletions(-) diff --git a/drivers/usb/host/ehci-fsl.c b/drivers/usb/host/ehci-fsl.c index a28ec1e..6884130 100644 --- a/drivers/usb/host/ehci-fsl.c +++ b/drivers/usb/host/ehci-fsl.c @@ -224,6 +224,11 @@ static int ehci_fsl_setup_phy(struct usb_hcd *hcd, portsc |= PORT_PTS_PTW; /* fall through */ case FSL_USB2_PHY_UTMI: + if (pdata->has_fsl_erratum_a006918) { + pr_warn("fsl-ehci: USB PHY clock invalid\n"); + return -EINVAL; + } + case FSL_USB2_PHY_UTMI_DUAL: /* PHY_CLK_VALID bit is de-featured from all controller * versions below 2.4 and is to be checked only for diff --git a/drivers/usb/host/fsl-mph-dr-of.c b/drivers/usb/host/fsl-mph-dr-of.c index 677f9d5..7e07701 100644 --- a/drivers/usb/host/fsl-mph-dr-of.c +++ b/drivers/usb/host/fsl-mph-dr-of.c @@ -225,6 +225,11 @@ static int fsl_usb2_mph_dr_of_probe(struct platform_device *ofdev) pdata->has_fsl_erratum_a005697 = of_property_read_bool(np, "fsl,usb_erratum-a005697"); + if (of_get_property(np, "fsl,erratum_a006918", NULL)) + pdata->has_fsl_erratum_a006918 = 1; + else + pdata->has_fsl_erratum_a006918 = 0; + /* * Determine whether phy_clk_valid needs to be checked * by reading property in device tree From patchwork Mon Jan 21 10:25:15 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yinbo Zhu X-Patchwork-Id: 10773519 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 098DE13B4 for ; Mon, 21 Jan 2019 10:25:27 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id ED91B29CF4 for ; Mon, 21 Jan 2019 10:25:26 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E17A029D27; Mon, 21 Jan 2019 10:25:26 +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 734E329CF4 for ; Mon, 21 Jan 2019 10:25:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727600AbfAUKZV (ORCPT ); Mon, 21 Jan 2019 05:25:21 -0500 Received: from mail-eopbgr10083.outbound.protection.outlook.com ([40.107.1.83]:45568 "EHLO EUR02-HE1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726191AbfAUKZV (ORCPT ); Mon, 21 Jan 2019 05:25:21 -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=LwZbwsEDU3J/GAQ7lcOOK8y5Ns8DrXZecVIVKr+xb8A=; b=M5JDfr0GQR4Ebt8uXNLWOksTqpDPUHjUEaWLvnd4hGBQIX2o3APqtKB95hnJi6AY8/ODI20em6Vcdrd21+sFMw7qQTZHO1IuAGgyRdKLoxO0oDLeBg2ZIUp+iinAhmZ9MdcewIbvkvIvRiwzk/1E9XHF0mDTYdD7KW7w1qAfPk0= Received: from VI1PR04MB4158.eurprd04.prod.outlook.com (52.133.15.33) by VI1PR04MB6048.eurprd04.prod.outlook.com (20.179.24.148) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1537.24; Mon, 21 Jan 2019 10:25:16 +0000 Received: from VI1PR04MB4158.eurprd04.prod.outlook.com ([fe80::257e:f28a:1a8c:c9c4]) by VI1PR04MB4158.eurprd04.prod.outlook.com ([fe80::257e:f28a:1a8c:c9c4%2]) with mapi id 15.20.1537.031; Mon, 21 Jan 2019 10:25:16 +0000 From: Yinbo Zhu To: Alan Stern CC: Yinbo Zhu , Xiaobo Xie , Jerry Huang , Ran Wang , Greg Kroah-Hartman , Ramneek Mehresh , Nikhil Badola , Suresh Gupta , "linux-usb@vger.kernel.org" , "linux-kernel@vger.kernel.org" Subject: [PATCH v2 4/6] usb: linux/fsl_device: Add platform member has_fsl_erratum_a006918 Thread-Topic: [PATCH v2 4/6] usb: linux/fsl_device: Add platform member has_fsl_erratum_a006918 Thread-Index: AQHUsXOZxMMeIXYUFUa7J7VHKAaqcw== Date: Mon, 21 Jan 2019 10:25:15 +0000 Message-ID: <20190121102601.4735-4-yinbo.zhu@nxp.com> References: <20190121102601.4735-1-yinbo.zhu@nxp.com> In-Reply-To: <20190121102601.4735-1-yinbo.zhu@nxp.com> Accept-Language: zh-CN, en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: HK2PR06CA0003.apcprd06.prod.outlook.com (2603:1096:202:2e::15) To VI1PR04MB4158.eurprd04.prod.outlook.com (2603:10a6:803:46::33) authentication-results: spf=none (sender IP is ) smtp.mailfrom=yinbo.zhu@nxp.com; x-ms-exchange-messagesentrepresentingtype: 1 x-mailer: git-send-email 2.17.1 x-originating-ip: [119.31.174.73] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1;VI1PR04MB6048;6:f/SYdXY7GCFKbgoTn8HRit2ks9tLKYDL2zgXP+DPO7K6rC/ID20y2n8eHrdN1ny3uQ3NuLlDpndO8HhoTUH6pMH7WlFHlXrlSVbzkpd5RgHPRbVGDbervJeOcJophPh5jNhO3Z/Sntz0mc8qQa2adYfsuA6QRfiPn9kXFxoEbrzzXfMudsacDUc4Bc5jSTJr1/ZYHpr4gutouBnHwb8bZjIkVWYKPiREHvCboLYvXLxGerWi9IpbXhnZJrvGtnPq6zKswErdaNEwrZZKwQyVsetAURjhIKCA86KtZUWGy3NcIZjkLjwo1JX4/W9vcbHN4jlfVoRSI6aGaWKo/IO2gc4nXq85rgK7kZXewWdazy1LyKHGcGJGcgblMZAUlKNOTm2dnXEihSySlb56zrEVxPi0I9uq5CAF5u/Kij5KeHea2P7/R1O9p0Q28i+aRetvcc64a/V+HDVLgNNQEIyhiw==;5:Fpj81qbN2XGj6bzVZd+OcG20Uwcex9TlkaOQgkOPVQzJ2d9YRmudbGr1PJBUbn3spbGUF/RX+ed5hGmRWyMB9V3k2hiReq3Aun5J9pXXy49jr4LlzEkeFF4kDdA1j3IhdVfECczAkWgQG2SGiB3PK+OOL+YzsTAEKt2j2MQ2NkRMJOif0gHTvcI0g1G1uzcXxomjHW+qE2KSy18xtB1GiA==;7:s8l/9Z6nA2TBhYgcZSDm04aVt0+jYkCvVW1FZwtZQX4OWNxjMAuIx4GtxZ/KA3weaGO3e/Am1bHNCTdVKXW2t45s9ecdR4Ubz9lquqBXiX3qaiXsEB6xsz37nZ8bNlWm6iuxPBijyqcoyM6Vsacjcw== x-ms-office365-filtering-correlation-id: 11834e83-b5e3-4b58-929f-08d67f8abbed x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0;PCL:0;RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600109)(711020)(4618075)(2017052603328)(7153060)(7193020);SRVR:VI1PR04MB6048; x-ms-traffictypediagnostic: VI1PR04MB6048: x-microsoft-antispam-prvs: x-forefront-prvs: 0924C6A0D5 x-forefront-antispam-report: SFV:NSPM;SFS:(10009020)(366004)(136003)(346002)(396003)(39860400002)(376002)(189003)(199004)(3846002)(1076003)(86362001)(386003)(6506007)(102836004)(71190400001)(316002)(6486002)(26005)(71200400001)(2906002)(6436002)(52116002)(6916009)(99286004)(186003)(76176011)(54906003)(81166006)(81156014)(68736007)(6116002)(8676002)(4744005)(2171002)(66066001)(53936002)(97736004)(478600001)(305945005)(14444005)(36756003)(4326008)(7736002)(256004)(476003)(44832011)(50226002)(105586002)(106356001)(11346002)(486006)(25786009)(2616005)(446003)(8936002)(6512007)(14454004);DIR:OUT;SFP:1101;SCL:1;SRVR:VI1PR04MB6048;H:VI1PR04MB4158.eurprd04.prod.outlook.com;FPR:;SPF:None;LANG:en;PTR:InfoNoRecords;MX:1;A:1; received-spf: None (protection.outlook.com: nxp.com does not designate permitted sender hosts) x-ms-exchange-senderadcheck: 1 x-microsoft-antispam-message-info: 2kRogi7vb8fmPS7vb2KByCT7FIp8AJKNYq6GFWeNVod8PNpo5DO0API2cdGEQRgAg5C5sQBjP+C3fe5Y0Lp73wAEvFyypVsC28DjGnXJAyiy1DJpXbBYv6cRRoHeIDqQpwkX6s28/q1M5QtYqoB8h6+13nDRdyOP0j0QL5qXkD7a0hcnDVjLqmMbOTc7KJ2eKBzRlFvYyvBcu+kPsLCttDViHqMC/PDKik4/NwDaBGeZ74rp5TS5Iiql2Yic5NXy4g9tyGePOB/Ou4RpAb0Kct8WcUr5gkqDqhuZe9Mty/YnmrDS+7FEXFWIlgPJxBSz2ptYFmm4tfc22cWomFBg3EAVJqMhELq8xbNxBtIGv4/mf88zIfwxJkxNvzN+Og/EUcIzhDVYHaFL0aUThH+D9wT1CELG1EMVQR0AEsfWaks= spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 11834e83-b5e3-4b58-929f-08d67f8abbed X-MS-Exchange-CrossTenant-originalarrivaltime: 21 Jan 2019 10:25:11.2595 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB6048 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 From: Yinbo Zhu This patch is to add member has_fsl_erratum_a006918 in platform data Signed-off-by: Yinbo Zhu --- include/linux/fsl_devices.h | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/include/linux/fsl_devices.h b/include/linux/fsl_devices.h index 60cef82..7ea53c8 100644 --- a/include/linux/fsl_devices.h +++ b/include/linux/fsl_devices.h @@ -101,6 +101,7 @@ struct fsl_usb2_platform_data { unsigned has_fsl_erratum_a007792:1; unsigned has_fsl_erratum_a005275:1; unsigned has_fsl_erratum_a005697:1; + unsigned has_fsl_erratum_a006918:1; unsigned check_phy_clk_valid:1; /* register save area for suspend/resume */ From patchwork Mon Jan 21 10:25:20 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yinbo Zhu X-Patchwork-Id: 10773525 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 5BB6A13B4 for ; Mon, 21 Jan 2019 10:25:44 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4C70129CF4 for ; Mon, 21 Jan 2019 10:25:44 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 408C029D27; Mon, 21 Jan 2019 10:25:44 +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 8300F29CF4 for ; Mon, 21 Jan 2019 10:25:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727655AbfAUKZ0 (ORCPT ); Mon, 21 Jan 2019 05:25:26 -0500 Received: from mail-eopbgr10041.outbound.protection.outlook.com ([40.107.1.41]:55872 "EHLO EUR02-HE1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726857AbfAUKZZ (ORCPT ); Mon, 21 Jan 2019 05:25:25 -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=JSgYunpgKZchCJdSL5LuweHzn3IEUVZcWtvHO5dhjm8=; b=aOYTqGAmjKQxd2tzRFMcvl8o0RHGym6KrXD3JrlyGdbyqCjKsrRJkaUD5iJGjhtofNZwAEEtzjMxwB8IhnfiGqrn+iY/2/2Ww3Wfpci3Nl8sFBsyMKvusP6jUGhaxW4w47N4f2Y2mwqXi0t5UPHREGp6ctJbw5W0xrwZEbvswWw= Received: from VI1PR04MB4158.eurprd04.prod.outlook.com (52.133.15.33) by VI1PR04MB6048.eurprd04.prod.outlook.com (20.179.24.148) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1537.24; Mon, 21 Jan 2019 10:25:21 +0000 Received: from VI1PR04MB4158.eurprd04.prod.outlook.com ([fe80::257e:f28a:1a8c:c9c4]) by VI1PR04MB4158.eurprd04.prod.outlook.com ([fe80::257e:f28a:1a8c:c9c4%2]) with mapi id 15.20.1537.031; Mon, 21 Jan 2019 10:25:21 +0000 From: Yinbo Zhu To: Alan Stern CC: Yinbo Zhu , Xiaobo Xie , Jerry Huang , Ran Wang , Greg Kroah-Hartman , Ramneek Mehresh , Nikhil Badola , Suresh Gupta , "linux-usb@vger.kernel.org" , "linux-kernel@vger.kernel.org" Subject: [PATCH v2 5/6] usb: linux/fsl_device: Add platform member has_fsl_erratum_14 Thread-Topic: [PATCH v2 5/6] usb: linux/fsl_device: Add platform member has_fsl_erratum_14 Thread-Index: AQHUsXOcZao9MRKiB0609jwBmJw81g== Date: Mon, 21 Jan 2019 10:25:20 +0000 Message-ID: <20190121102601.4735-5-yinbo.zhu@nxp.com> References: <20190121102601.4735-1-yinbo.zhu@nxp.com> In-Reply-To: <20190121102601.4735-1-yinbo.zhu@nxp.com> Accept-Language: zh-CN, en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: HK2PR06CA0003.apcprd06.prod.outlook.com (2603:1096:202:2e::15) To VI1PR04MB4158.eurprd04.prod.outlook.com (2603:10a6:803:46::33) authentication-results: spf=none (sender IP is ) smtp.mailfrom=yinbo.zhu@nxp.com; x-ms-exchange-messagesentrepresentingtype: 1 x-mailer: git-send-email 2.17.1 x-originating-ip: [119.31.174.73] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1;VI1PR04MB6048;6:rVUuaM6+CXavrzVwtxar3maSbTmcxeND35rzZMs+jZOZ7/Oxe2jR8s6yAgH7Fu1U7gOlTy/ICVic6KDEWBMMM1hWFPlxt8YSvcMQ/1/iW3qzk5VLdmqXircXoRH2YfDeQv4JW8JcC2FXLjhqK3HvlRiY/A0shtRzs2Fr0nENSE1K0ji74hRxUE6TcaaWz4nDktsioIHHP7Fe2o9EXhUAofMauxfu9y9/g7gGjKk0huo0ov6SYHKHS3fs3VgSJNEDATHZDVpDZaMF6vJ7UXZxhhXS7TvmsPPWRHz/GHgQjKdxddd8mad2VsdNWubKHm0VInUh4sKf6J/0ayjaFf0CgNBGpZie3c1zTkxxdKu08kiRIOinWVLVSFDIujOvzZG7GrmyINhTesmeuPcWy73qDFE0lpLShVNY0SadYTRTRKbWJMVbrT3qzf87HgIkd2mD5GXPej+t+/w2OXY1mRUAAg==;5:+F9NjS4NtMFat4PPMalDYkpY9c4lyJtlfdPt8RtHOGEjiCluOWcG0yl+Irx715pvXFFPOU71/LioZ4vJSCjXfrgfT8PsnMXJ1cchhXnDeXgTPqRw22hqtJ4Aazg3lEC4diRwy2n1rd+7mg1edTOvJ7Qn6Tv5nNwjyuBIxQJYFKdxcUqVJmbBaXeqZkxOev1ktno2hYpbAs4nf4y6rI8tmA==;7:qZCkr92UXpGAgtUgCO1hdZGkmOily37Wts0z+IVjPO1rZWLoKg7lWaJIja3OltXQtO5KG/FQNi1FGh1MI9IyzSOe4hWcs2ZaXSorWxVoADBdj6Ri37o5oHRRG9Rw+y1vFX7NswtLXwDUCav87grlwg== x-ms-office365-filtering-correlation-id: 1ff00c86-5635-47b7-e6b4-08d67f8abeea x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0;PCL:0;RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600109)(711020)(4618075)(2017052603328)(7153060)(7193020);SRVR:VI1PR04MB6048; x-ms-traffictypediagnostic: VI1PR04MB6048: x-microsoft-antispam-prvs: x-forefront-prvs: 0924C6A0D5 x-forefront-antispam-report: SFV:NSPM;SFS:(10009020)(366004)(136003)(346002)(396003)(39860400002)(376002)(189003)(199004)(3846002)(1076003)(86362001)(386003)(6506007)(102836004)(71190400001)(316002)(6486002)(26005)(71200400001)(2906002)(6436002)(52116002)(6916009)(99286004)(186003)(76176011)(54906003)(81166006)(81156014)(68736007)(6116002)(8676002)(4744005)(2171002)(66066001)(53936002)(97736004)(478600001)(305945005)(14444005)(36756003)(4326008)(7736002)(256004)(476003)(44832011)(50226002)(105586002)(106356001)(11346002)(486006)(25786009)(2616005)(446003)(8936002)(6512007)(14454004);DIR:OUT;SFP:1101;SCL:1;SRVR:VI1PR04MB6048;H:VI1PR04MB4158.eurprd04.prod.outlook.com;FPR:;SPF:None;LANG:en;PTR:InfoNoRecords;MX:1;A:1; received-spf: None (protection.outlook.com: nxp.com does not designate permitted sender hosts) x-ms-exchange-senderadcheck: 1 x-microsoft-antispam-message-info: Ujch1lu8yd8lIX3DZvrfqV6buZovIj65G7CWf0phWxtz8jVvHyawmokFeSJHoy8tnYoNGk0AEKVf227ISdts3lIA6iSPhsXiivPQaXgK8XjM+QiuD39hCP+liLss7EGCzXA6Q5HQfhW18XfnPqVQJG3ThF7vgMl0ERX3WD+dvcPnCanrpwb1E7GanONG4KcAfWVb1fxdyytzmVkIFnjkwG8S4/e4MwMoDY49jA2jmg1S335SbipoKDqGNNlV4x9C3gzl3Dp7yw0Q1m9FjWov0UdgS5Ug00PkVK4OHwsn8r6uJtnRHqQFBK4MuhFaNASQ9wCzo1YYwO37E8YAYv/BDQAA3CGfFaY7dF9s5/L4SgO7DKWOmW+a97sWsV3bYQjQ2vWXrZmNml2VK4ndJG10dbAXAXpuLSz9YscKpuCnEJ0= spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 1ff00c86-5635-47b7-e6b4-08d67f8abeea X-MS-Exchange-CrossTenant-originalarrivaltime: 21 Jan 2019 10:25:16.2752 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB6048 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 From: Yinbo Zhu This patch is to add member has_fsl_erratum_14 in platform data Signed-off-by: Yinbo Zhu --- include/linux/fsl_devices.h | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/include/linux/fsl_devices.h b/include/linux/fsl_devices.h index 7ea53c8..5c21a3a 100644 --- a/include/linux/fsl_devices.h +++ b/include/linux/fsl_devices.h @@ -102,6 +102,7 @@ struct fsl_usb2_platform_data { unsigned has_fsl_erratum_a005275:1; unsigned has_fsl_erratum_a005697:1; unsigned has_fsl_erratum_a006918:1; + unsigned has_fsl_erratum_14:1; unsigned check_phy_clk_valid:1; /* register save area for suspend/resume */ From patchwork Mon Jan 21 10:25:25 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yinbo Zhu X-Patchwork-Id: 10773521 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 5162F13B4 for ; Mon, 21 Jan 2019 10:25:37 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 403A429CF4 for ; Mon, 21 Jan 2019 10:25:37 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3419B29D27; Mon, 21 Jan 2019 10:25:37 +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 B5ABB29D02 for ; Mon, 21 Jan 2019 10:25:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727713AbfAUKZb (ORCPT ); Mon, 21 Jan 2019 05:25:31 -0500 Received: from mail-eopbgr10049.outbound.protection.outlook.com ([40.107.1.49]:61312 "EHLO EUR02-HE1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726773AbfAUKZa (ORCPT ); Mon, 21 Jan 2019 05:25:30 -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=M8j4CiHHK0IWaN6WFSaCa/1k983I9QtcbMIFQEgWW00=; b=O6zTqWg+vy200E0Z+5tCGevX/11E6o+dYuMpCxEOnM8idISTh2M49uGW04ecXpan72gRHg+5CdHI+6CyhXClvdlx2yIE9Mx+QkbIgyCVN27nZB9gnsBx4R9b/9RYqvjWi/3Cy72ZS785kRlfet+e+gy7Cto0U35ex6jXsRQXO7A= Received: from VI1PR04MB4158.eurprd04.prod.outlook.com (52.133.15.33) by VI1PR04MB6048.eurprd04.prod.outlook.com (20.179.24.148) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1537.24; Mon, 21 Jan 2019 10:25:25 +0000 Received: from VI1PR04MB4158.eurprd04.prod.outlook.com ([fe80::257e:f28a:1a8c:c9c4]) by VI1PR04MB4158.eurprd04.prod.outlook.com ([fe80::257e:f28a:1a8c:c9c4%2]) with mapi id 15.20.1537.031; Mon, 21 Jan 2019 10:25:25 +0000 From: Yinbo Zhu To: Alan Stern CC: Yinbo Zhu , Xiaobo Xie , Jerry Huang , Ran Wang , Greg Kroah-Hartman , Ramneek Mehresh , Nikhil Badola , Suresh Gupta , "linux-usb@vger.kernel.org" , "linux-kernel@vger.kernel.org" Subject: [PATCH v2 6/6] usb :fsl: Change string format for errata property Thread-Topic: [PATCH v2 6/6] usb :fsl: Change string format for errata property Thread-Index: AQHUsXOfbjL2T1lCNUuHKjRpLt03xA== Date: Mon, 21 Jan 2019 10:25:25 +0000 Message-ID: <20190121102601.4735-6-yinbo.zhu@nxp.com> References: <20190121102601.4735-1-yinbo.zhu@nxp.com> In-Reply-To: <20190121102601.4735-1-yinbo.zhu@nxp.com> Accept-Language: zh-CN, en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: HK2PR06CA0003.apcprd06.prod.outlook.com (2603:1096:202:2e::15) To VI1PR04MB4158.eurprd04.prod.outlook.com (2603:10a6:803:46::33) authentication-results: spf=none (sender IP is ) smtp.mailfrom=yinbo.zhu@nxp.com; x-ms-exchange-messagesentrepresentingtype: 1 x-mailer: git-send-email 2.17.1 x-originating-ip: [119.31.174.73] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1;VI1PR04MB6048;6:cGBRdc1g4BiSoz26ruDW7E9tOpoHlvx3IhjKfJNqU3ftHYTGlZwsqnIV8ckMW7DKLWgJHFQzlFzV65vF1ry2YptgNnN89yQQMMQEwz6ypw7dNB1S+juG7LD8ogcFgaTGjkQs642mOp87PeKLaLMTo8TujOEG181aXQs23Dyfc0Fptos+TyDl8qg8LuIfxyfqhlYQfiPXRt3MJHTzynYzT6XsIEsLr+smK6QBkfRBI3BQLlnDvPd23NiqAxkcjDwu7cvBFw7OPdoUblqk7eRUt5Wac574CIfNwXloZTZ1LiQqYbLSqXDal1loIoV3RrLUsiuB5ia53Tkh6/dOuXJZVcoSBp6CBFja6IFdXhvdcY73C4iMtjQ5qGIDAgBX0BPPzFnp0X6HJhWdm6lgQY1kentjpOCciuEebT4bTn9rGwQR/GhJ2p1HVu57lkQJw3YQ/QOpi/+nXPdIYxpk8UYybQ==;5:BErJ0cvSClpi/G0KWxmOeqbytPTXfj/YnsxIVHPRUtCt8B1UjGYR5ydnpkqF0Eq29PEemP/+CmWhq12rhhT+LiBi4WLt2bh91mlr6UmKXB+N0/N6xkn4gI1RTGBy9xkwAMHpN1RrSecKHWBH9JrGaApGb16XG3stzRDpGEtbpwVBA48MlnVjXWsNaudUcTXM0g6NzHYXvRiSgq6L8U6I1w==;7:njqomSqycavtd3NwbSbkfRQUf/56EH7V2XS5cRP2OHyt1Tl5Nd9UtrdNbjMp7MFMfQshNegGBFK/On0PyZbrLwtv6noSD1w+cjkMNH8Ia1vjCCmliMqYW4FNTf690fy4fcyGO5yv3druwV7lIxN/Qg== x-ms-office365-filtering-correlation-id: be36c8cb-ea06-43e5-080e-08d67f8ac1ed x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0;PCL:0;RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600109)(711020)(4618075)(2017052603328)(7153060)(7193020);SRVR:VI1PR04MB6048; x-ms-traffictypediagnostic: VI1PR04MB6048: x-microsoft-antispam-prvs: x-forefront-prvs: 0924C6A0D5 x-forefront-antispam-report: SFV:NSPM;SFS:(10009020)(366004)(136003)(346002)(396003)(39860400002)(376002)(189003)(199004)(3846002)(1076003)(86362001)(386003)(6506007)(102836004)(71190400001)(316002)(6486002)(26005)(71200400001)(2906002)(6436002)(52116002)(6916009)(99286004)(186003)(76176011)(54906003)(81166006)(81156014)(68736007)(6116002)(8676002)(2171002)(66066001)(53936002)(97736004)(478600001)(305945005)(36756003)(4326008)(7736002)(256004)(476003)(44832011)(50226002)(105586002)(106356001)(11346002)(486006)(25786009)(2616005)(446003)(8936002)(6512007)(14454004);DIR:OUT;SFP:1101;SCL:1;SRVR:VI1PR04MB6048;H:VI1PR04MB4158.eurprd04.prod.outlook.com;FPR:;SPF:None;LANG:en;PTR:InfoNoRecords;MX:1;A:1; received-spf: None (protection.outlook.com: nxp.com does not designate permitted sender hosts) x-ms-exchange-senderadcheck: 1 x-microsoft-antispam-message-info: jAkm9getwiL1UF4zCIClwFQhm17G5bO0B4qRd8ucRvsS0NMwWpZoR2bPZCNK9dkQMhMmUDC0OtouUGIhh8zeFNA+n86Oo2/rLqYuryGZ60ZB8DnzKaz9Q2KX4iNePpkvl8DkQczrxbRXjDM1JNXtlxHsxYvfQZ3PwD9bt6HqWm5OUa0cHCi2UIfaG+PEl+imUcaq99tmiJOGjwwTbFaCRmZ5/MY6jP7KS8S/aRDQG8ws5WguwMmMnOgdlhB+hVzYbkqCKJZXs6SDhMM6SE7B99crJZGlhYLmc7vMf5iDpri4L7dH732o2m3EsUVhnIqsfQTcBGkMzPHZ6Z43ZlBaos0bXzI4YpgA5MCAYhbGnbVtXI4CtRTnJNdfzfPSi7V8Fbt5tFoEswwJfd4QNpxzhXDjIkkIMaWl1LmeGnX5gNM= spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: be36c8cb-ea06-43e5-080e-08d67f8ac1ed X-MS-Exchange-CrossTenant-originalarrivaltime: 21 Jan 2019 10:25:21.3377 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB6048 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 From: Nikhil Badola Remove USB errata checking code from driver. Applicability of erratum is retrieved by reading corresponding property in device tree. This property is written during device tree fixup. Signed-off-by: Ramneek Mehresh Signed-off-by: Nikhil Badola Signed-off-by: Yinbo Zhu --- drivers/usb/host/ehci-fsl.c | 7 +------ drivers/usb/host/fsl-mph-dr-of.c | 9 ++++----- 2 files changed, 5 insertions(+), 11 deletions(-) diff --git a/drivers/usb/host/ehci-fsl.c b/drivers/usb/host/ehci-fsl.c index 6884130..c71680e 100644 --- a/drivers/usb/host/ehci-fsl.c +++ b/drivers/usb/host/ehci-fsl.c @@ -310,14 +310,9 @@ static int ehci_fsl_usb_setup(struct ehci_hcd *ehci) return -EINVAL; if (pdata->operating_mode == FSL_USB2_MPH_HOST) { - unsigned int chip, rev, svr; - - svr = mfspr(SPRN_SVR); - chip = svr >> 16; - rev = (svr >> 4) & 0xf; /* Deal with USB Erratum #14 on MPC834x Rev 1.0 & 1.1 chips */ - if ((rev == 1) && (chip >= 0x8050) && (chip <= 0x8055)) + if (pdata->has_fsl_erratum_14 == 1) ehci->has_fsl_port_bug = 1; if (pdata->port_enables & FSL_USB2_PORT0_ENABLED) diff --git a/drivers/usb/host/fsl-mph-dr-of.c b/drivers/usb/host/fsl-mph-dr-of.c index 7e07701..ae8f60f 100644 --- a/drivers/usb/host/fsl-mph-dr-of.c +++ b/drivers/usb/host/fsl-mph-dr-of.c @@ -224,11 +224,10 @@ static int fsl_usb2_mph_dr_of_probe(struct platform_device *ofdev) of_property_read_bool(np, "fsl,usb-erratum-a005275"); pdata->has_fsl_erratum_a005697 = of_property_read_bool(np, "fsl,usb_erratum-a005697"); - - if (of_get_property(np, "fsl,erratum_a006918", NULL)) - pdata->has_fsl_erratum_a006918 = 1; - else - pdata->has_fsl_erratum_a006918 = 0; + pdata->has_fsl_erratum_a006918 = + of_property_read_bool(np, "fsl,usb_erratum-a006918"); + pdata->has_fsl_erratum_14 = + of_property_read_bool(np, "fsl,usb_erratum-14"); /* * Determine whether phy_clk_valid needs to be checked