From mboxrd@z Thu Jan 1 00:00:00 1970 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 58CE8C33CB1 for ; Tue, 14 Jan 2020 10:07:56 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 2358A2467D for ; Tue, 14 Jan 2020 10:07:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1578996476; bh=233lHTpAXwJwCP194gW01K4F3DNqIeFJxperaV1GY2k=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=vpIe0cMqhO9nWYjAt3dEwXJgq0adoHfr8mXEKQDwts1OWDVCizMr3tVZ3NYT06voO 3wJZy+kLj6zw92MmxpHBssmyFnYMTBiACfwN9QC+3H0l098hSfA95/SfVap/2PnZS3 83saei0Ns7mL82nxxrHlTtMnXHboEQGvcLYNeyQc= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730185AbgANKHz (ORCPT ); Tue, 14 Jan 2020 05:07:55 -0500 Received: from mail.kernel.org ([198.145.29.99]:38726 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730158AbgANKHz (ORCPT ); Tue, 14 Jan 2020 05:07:55 -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 3A71F24677; Tue, 14 Jan 2020 10:07:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1578996474; bh=233lHTpAXwJwCP194gW01K4F3DNqIeFJxperaV1GY2k=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=0o7Qdjw7/cchupVbko/vBZ3XZP0FuDmInjrwU0UbeS+9MEYW4WK7RGQqYHbKi+p2F 0aO7Chmh0z9iAYeY/8CaIFOCfCXmGHXeOrNjgxoYlckvDtiaK6lA4kMr9u/YHxIVo7 Ngh6hlErC8JUpgBWaqwYHVTcCCW3ShrAsrTB8O2o= 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.19 28/46] usb: musb: Disable pullup at init Date: Tue, 14 Jan 2020 11:01:45 +0100 Message-Id: <20200114094346.102633539@linuxfoundation.org> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200114094339.608068818@linuxfoundation.org> References: <20200114094339.608068818@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 @@ -2324,6 +2324,9 @@ musb_init_controller(struct device *dev, musb_disable_interrupts(musb); musb_writeb(musb->mregs, MUSB_DEVCTL, 0); + /* MUSB_POWER_SOFTCONN might be already set, JZ4740 does this. */ + musb_writeb(musb->mregs, MUSB_POWER, 0); + /* Init IRQ workqueue before request_irq */ INIT_DELAYED_WORK(&musb->irq_work, musb_irq_work); INIT_DELAYED_WORK(&musb->deassert_reset_work, musb_deassert_reset);