From patchwork Wed Oct 26 18:26:54 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Cercueil X-Patchwork-Id: 11347 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp424012wru; Wed, 26 Oct 2022 11:29:24 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7KtaTT+IwH5hLQI2xo2J18WY9Sb19FedSersrvxcHJgPGvZGy0lgrw6fIUVJnAll4fW9+I X-Received: by 2002:a17:903:1c9:b0:186:91fa:59ad with SMTP id e9-20020a17090301c900b0018691fa59admr23016169plh.35.1666808964009; Wed, 26 Oct 2022 11:29:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666808964; cv=none; d=google.com; s=arc-20160816; b=LzOGj1Buey3V+vFQGOefcQJrATuMcc7Pi0vpcNshPRDeoArA3kya69/X1lIb1p5mc/ OAomZL378SWzdUNYuO++ULQRmTLWqPGweJZpXzfUP/lfw2ntTHHm2GZlLRZU94ceyXPI XnPpO9Ae2KyAWQOF42YThmmYRa1Lt447OXY7GN2W7ub0uLEATRNkw+HMuGBf/qUS4ehF QG9G32vIgq5RR048O2ohRJp4I+Krazn+rKdYZVbFRsimnt71O+8SVUeiuUUXUfJYTKGm 8othRwha/Ios8UXltyhhEWmXN1NVdPA7l7ewEnCxUFtXDpHfq93jgai//vqij8TzEGpd xhXQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=QOVVrSW/npzEAOc9hlI/DwXmmJ9MpDgUUfZkFKj4+dA=; b=fNXNzgq1rq1ObFH8yQBf49nh32DyNtJGwt3E+v7IzJIGsb1evaPwut/B+elcB6tPHH 4zr70y+CnUF3OJGRznGO/JS293c1qd2upxUViPGLVXij7vn/VVUYwO9ELbfmyRmWab0u dVppzw2UcQl0I8UFMYU3kC8c+1r+NxdBVSAuWX8ttHhctTIYuEkQ93v3LTc+HXzRzb8I Bu/7y0C7Klm79Km8NRh2g6X4wm1NR9q4oEb4evyLM7z4ROu1F6Db51tfjQyuUwaVvdkZ K90+E1GSc8wv43J9JXCA7YVpYpCbJ/7slpqF4HZVOGNGZWv9kxc/xy8MOeI3PCRM7Fk6 W3wQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@crapouillou.net header.s=mail header.b=lpkky17S; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=crapouillou.net Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id iz15-20020a170902ef8f00b001787e843b71si6631133plb.122.2022.10.26.11.29.09; Wed, 26 Oct 2022 11:29:23 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@crapouillou.net header.s=mail header.b=lpkky17S; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=crapouillou.net Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234328AbiJZS1y (ORCPT + 99 others); Wed, 26 Oct 2022 14:27:54 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55392 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234230AbiJZS1o (ORCPT ); Wed, 26 Oct 2022 14:27:44 -0400 Received: from aposti.net (aposti.net [89.234.176.197]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3ABF382D34; Wed, 26 Oct 2022 11:27:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=crapouillou.net; s=mail; t=1666808827; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=QOVVrSW/npzEAOc9hlI/DwXmmJ9MpDgUUfZkFKj4+dA=; b=lpkky17SVhLZCcTnEHZTdCGuwaziUESpWLf5k7/4e2CoVvZ0aCBSad4ivJ3hUATEKKJNyW By4+DsKFVvl9iZb9AH+gB0l6QRTIALtYy5Lrb4yg71TUnJzQL6B6tpKw/9No910txXXmoH ibtFJO2d3KQjljyzIu7S0Y/nXUmUQtk= From: Paul Cercueil To: Bin Liu , Greg Kroah-Hartman , Felipe Balbi Cc: linux-kernel@vger.kernel.org, linux-usb@vger.kernel.org, linux-mips@vger.kernel.org, od@opendingux.net, Paul Cercueil Subject: [PATCH v2 4/7] usb: musb: Support setting OTG mode using generic PHY Date: Wed, 26 Oct 2022 19:26:54 +0100 Message-Id: <20221026182657.146630-5-paul@crapouillou.net> In-Reply-To: <20221026182657.146630-1-paul@crapouillou.net> References: <20221026182657.146630-1-paul@crapouillou.net> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_PASS,SPF_PASS, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1747775875876694550?= X-GMAIL-MSGID: =?utf-8?q?1747775875876694550?= When musb->xceiv is not provided but musb->phy is, support setting the OTG mode (host, peripheral) using the generic PHY framework. Signed-off-by: Paul Cercueil --- drivers/usb/musb/musb_gadget.c | 4 ++++ drivers/usb/musb/musb_host.c | 2 ++ 2 files changed, 6 insertions(+) diff --git a/drivers/usb/musb/musb_gadget.c b/drivers/usb/musb/musb_gadget.c index 66c8b32b16bb..6cb9514ef340 100644 --- a/drivers/usb/musb/musb_gadget.c +++ b/drivers/usb/musb/musb_gadget.c @@ -1854,6 +1854,8 @@ static int musb_gadget_start(struct usb_gadget *g, if (musb->xceiv) otg_set_peripheral(musb->xceiv->otg, &musb->g); + else + phy_set_mode(musb->phy, PHY_MODE_USB_DEVICE); musb_set_state(musb, OTG_STATE_B_IDLE); spin_unlock_irqrestore(&musb->lock, flags); @@ -1905,6 +1907,8 @@ static int musb_gadget_stop(struct usb_gadget *g) if (musb->xceiv) otg_set_peripheral(musb->xceiv->otg, NULL); + else + phy_set_mode(musb->phy, PHY_MODE_INVALID); musb->is_active = 0; musb->gadget_driver = NULL; diff --git a/drivers/usb/musb/musb_host.c b/drivers/usb/musb/musb_host.c index 8ad39ecd3b6f..a02c29216955 100644 --- a/drivers/usb/musb/musb_host.c +++ b/drivers/usb/musb/musb_host.c @@ -2726,6 +2726,8 @@ int musb_host_setup(struct musb *musb, int power_budget) if (musb->xceiv) { otg_set_host(musb->xceiv->otg, &hcd->self); musb->xceiv->otg->host = &hcd->self; + } else { + phy_set_mode(musb->phy, PHY_MODE_USB_HOST); } /* don't support otg protocols */