From patchwork Tue Jan 14 10:02:19 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 233937 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id EE88AC33CB3 for ; Tue, 14 Jan 2020 10:13:34 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C51CB24676 for ; Tue, 14 Jan 2020 10:13:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1578996814; bh=DqdKq8k+ElV5a+yPjy3KKkiW09hq6K3B7z9btllzCrQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=lPp5jwrQr0C+nBs9AdZTnrd4Hpt95+GWV/qWtDwaB/Kk+rcZo4QSC9tCWuaHF8+U1 hzsiaZBOuQpfgu0zaIfgGxKT5iSLNkGChttYHwje1ERuWLL9edQ2fTTzm2mJOy4buo qAo+qYN4wclHpwIEi89GAW4hIotIi46yGYxUEnlM= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729406AbgANKNe (ORCPT ); Tue, 14 Jan 2020 05:13:34 -0500 Received: from mail.kernel.org ([198.145.29.99]:50976 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1733209AbgANKNc (ORCPT ); Tue, 14 Jan 2020 05:13:32 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 6C58E24676; Tue, 14 Jan 2020 10:13:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1578996812; bh=DqdKq8k+ElV5a+yPjy3KKkiW09hq6K3B7z9btllzCrQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=R+6ce4d+61TJWjuSfnzlRBg/Yghcz50pY3g0+JUyiOSQzdzM8nw+tW7BJKLfR2qye WHHIbbOLfmfuz0BEKBZc5wdxaRS+e6dFouU4TTzeEYou3P22KcjoEq0Yw2uKifqd3E oFiT/hRkcoOaksViD8xZ9EnaRcY0xmssJB2Mz7N8= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Paul Cercueil , Bin Liu Subject: [PATCH 4.4 17/28] usb: musb: Disable pullup at init Date: Tue, 14 Jan 2020 11:02:19 +0100 Message-Id: <20200114094343.011684611@linuxfoundation.org> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200114094336.845958665@linuxfoundation.org> References: <20200114094336.845958665@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Paul Cercueil commit 96a0c12843109e5c4d5eb1e09d915fdd0ce31d25 upstream. The pullup may be already enabled before the driver is initialized. This happens for instance on JZ4740. It has to be disabled at init time, as we cannot guarantee that a gadget driver will be bound to the UDC. Signed-off-by: Paul Cercueil Suggested-by: Bin Liu Cc: stable@vger.kernel.org Signed-off-by: Bin Liu Link: https://lore.kernel.org/r/20200107152625.857-3-b-liu@ti.com Signed-off-by: Greg Kroah-Hartman --- drivers/usb/musb/musb_core.c | 3 +++ 1 file changed, 3 insertions(+) --- a/drivers/usb/musb/musb_core.c +++ b/drivers/usb/musb/musb_core.c @@ -2132,6 +2132,9 @@ musb_init_controller(struct device *dev, musb_platform_disable(musb); musb_generic_disable(musb); + /* MUSB_POWER_SOFTCONN might be already set, JZ4740 does this. */ + musb_writeb(musb->mregs, MUSB_POWER, 0); + /* Init IRQ workqueue before request_irq */ INIT_WORK(&musb->irq_work, musb_irq_work); INIT_DELAYED_WORK(&musb->deassert_reset_work, musb_deassert_reset);