From patchwork Sun Jun 26 07:28:30 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Boyd X-Patchwork-Id: 9199227 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 959A860754 for ; Sun, 26 Jun 2016 07:34:39 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 88DF42849E for ; Sun, 26 Jun 2016 07:34:39 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7DB4328542; Sun, 26 Jun 2016 07:34:39 +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=-4.1 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED, T_DKIM_INVALID autolearn=unavailable version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 371492849E for ; Sun, 26 Jun 2016 07:34:39 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.85_2 #1 (Red Hat Linux)) id 1bH4XW-0004dy-NX; Sun, 26 Jun 2016 07:31:34 +0000 Received: from mail-pf0-x22c.google.com ([2607:f8b0:400e:c00::22c]) by bombadil.infradead.org with esmtps (Exim 4.85_2 #1 (Red Hat Linux)) id 1bH4VL-00017Y-AA for linux-arm-kernel@lists.infradead.org; Sun, 26 Jun 2016 07:29:20 +0000 Received: by mail-pf0-x22c.google.com with SMTP id h14so51896479pfe.1 for ; Sun, 26 Jun 2016 00:28:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=7UyoTgRDambHtgks/sqaIR+qGNStUHdXpV1PDyPgr68=; b=YiXXrUFHge+O8rFbgyHh0bDlKaXi6rPld8+iaUHYtMh/5k1wETgcrtjxoaQ1bxblR3 cNT7oI7trW7D6+VLDYJOIvi6+x6U9mPSrWPrYfXvopfCJ9lVU9OTIUhtyqr9nSCwoDAY q/RkMvoQTZkb/1rtvBTnAXdOklutFJj34pKGc= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=7UyoTgRDambHtgks/sqaIR+qGNStUHdXpV1PDyPgr68=; b=hDfmj4m1/oYXg26ITOUIa1JjngHbJGhKLbhIPjNnMgO35NBPaqGf8AiHIV7WeEM0Ka UP2PphZGYOmSaR/m9qSJXgUheDwBXx3JajKw/a2JbGvQIgtJhAYdWeeeCDO6RHcpOo3F spooGnWQ4pmflkmkGYCdV8wOfxx8wVlyg9/NEk5GxKRmXAZZfVyk4vGEBDGVZ+YRzGNw SYcTNwjy72BgAKo+gE3igcmqZnVnhSvFepauzfZF6u7ibykcSxRJs3ty0zrl53kxYooC 57PvNeWbmqXrXfZnN1BEDyRrKeshusVilpWmaABP8GVRSXSQUwEE4I6SD0pZ78pgz7IJ Rk8A== X-Gm-Message-State: ALyK8tL8ocRQDAxlzv4mcI97jUFEUau/J7y5Firw5GCZAyg6LqTlozljzfNlTsaltpoLpitm X-Received: by 10.98.196.18 with SMTP id y18mr22487090pff.163.1466926138497; Sun, 26 Jun 2016 00:28:58 -0700 (PDT) Received: from localhost.localdomain (ip68-101-172-78.sd.sd.cox.net. [68.101.172.78]) by smtp.gmail.com with ESMTPSA id f138sm3790495pfa.17.2016.06.26.00.28.57 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 26 Jun 2016 00:28:58 -0700 (PDT) From: Stephen Boyd To: linux-usb@vger.kernel.org Subject: [PATCH 13/21] usb: chipidea: msm: Allow core to get usb phy Date: Sun, 26 Jun 2016 00:28:30 -0700 Message-Id: <20160626072838.28082-14-stephen.boyd@linaro.org> X-Mailer: git-send-email 2.9.0.rc2.8.ga28705d In-Reply-To: <20160626072838.28082-1-stephen.boyd@linaro.org> References: <20160626072838.28082-1-stephen.boyd@linaro.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160626_002919_519019_7B9C6BDF X-CRM114-Status: GOOD ( 11.37 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Felipe Balbi , Arnd Bergmann , Neil Armstrong , linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, Bjorn Andersson , Peter Chen , Greg Kroah-Hartman , Andy Gross , linux-arm-kernel@lists.infradead.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP The chipidea core gets the usb phy and initializes the phy at the right point now so we don't need to get the phy in this driver. Cc: Peter Chen Cc: Greg Kroah-Hartman Signed-off-by: Stephen Boyd Acked-by: Peter Chen --- drivers/usb/chipidea/ci_hdrc_msm.c | 21 --------------------- 1 file changed, 21 deletions(-) diff --git a/drivers/usb/chipidea/ci_hdrc_msm.c b/drivers/usb/chipidea/ci_hdrc_msm.c index 430856ef1be3..07cccd24a87f 100644 --- a/drivers/usb/chipidea/ci_hdrc_msm.c +++ b/drivers/usb/chipidea/ci_hdrc_msm.c @@ -24,15 +24,6 @@ static void ci_hdrc_msm_notify_event(struct ci_hdrc *ci, unsigned event) dev_dbg(dev, "CI_HDRC_CONTROLLER_RESET_EVENT received\n"); /* use AHB transactor, allow posted data writes */ hw_write_id_reg(ci, HS_PHY_AHB_MODE, 0xffffffff, 0x8); - usb_phy_init(ci->usb_phy); - break; - case CI_HDRC_CONTROLLER_STOPPED_EVENT: - dev_dbg(dev, "CI_HDRC_CONTROLLER_STOPPED_EVENT received\n"); - /* - * Put the phy in non-driving mode. Otherwise host - * may not detect soft-disconnection. - */ - usb_phy_notify_disconnect(ci->usb_phy, USB_SPEED_UNKNOWN); break; default: dev_dbg(dev, "unknown ci_hdrc event\n"); @@ -53,21 +44,9 @@ static struct ci_hdrc_platform_data ci_hdrc_msm_platdata = { static int ci_hdrc_msm_probe(struct platform_device *pdev) { struct platform_device *plat_ci; - struct usb_phy *phy; dev_dbg(&pdev->dev, "ci_hdrc_msm_probe\n"); - /* - * OTG(PHY) driver takes care of PHY initialization, clock management, - * powering up VBUS, mapping of registers address space and power - * management. - */ - phy = devm_usb_get_phy_by_phandle(&pdev->dev, "usb-phy", 0); - if (IS_ERR(phy)) - return PTR_ERR(phy); - - ci_hdrc_msm_platdata.usb_phy = phy; - plat_ci = ci_hdrc_add_device(&pdev->dev, pdev->resource, pdev->num_resources, &ci_hdrc_msm_platdata);