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: 70862 Delivered-To: patch@linaro.org Received: by 10.140.28.4 with SMTP id 4csp554754qgy; Sun, 26 Jun 2016 00:29:38 -0700 (PDT) X-Received: by 10.98.206.77 with SMTP id y74mr22615005pfg.55.1466926177716; Sun, 26 Jun 2016 00:29:37 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id a74si18094577pfa.164.2016.06.26.00.29.37; Sun, 26 Jun 2016 00:29:37 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752436AbcFZH3a (ORCPT + 30 others); Sun, 26 Jun 2016 03:29:30 -0400 Received: from mail-pf0-f182.google.com ([209.85.192.182]:34160 "EHLO mail-pf0-f182.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752128AbcFZH27 (ORCPT ); Sun, 26 Jun 2016 03:28:59 -0400 Received: by mail-pf0-f182.google.com with SMTP id h14so51896489pfe.1 for ; Sun, 26 Jun 2016 00:28:59 -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=Zi29WjLaIkUAGc9KNW0G7P3FauG/sXkm4vJYq3I/21/2tRGmm0OlChIkxee4dKNRRL hZqhka94SYwDg82gTUpErjgfMeBREZ7neKE1dtyJ6V/bxPxNaxnwxfj6J19KpHVNtlcb neB9W+rI/paoLnXf3lPLJZyjTacWGmDJjNknUOWAiDCJWL+Ug/vf93JgaIrry390/hxG gjvJEILlcOr4WiH0T+kORTrr297yg0/E7mg9eJI9JCnXYHg+KXK0MmWN9TcwTaEvuuW3 j7NWe5KmjQ3veazr/IiIn2LzHLfv0kY/h6O2DpBx9jbjo9Fek/96pphYBGYAZa5kO90v 2Lgg== X-Gm-Message-State: ALyK8tIHq9ZGboOkmJwP5FstzYLjJVt6B8VrmX4r/Bsw3nwChtbu1IVaV5OIw7hHSVRjK/nR 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 Cc: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org, Andy Gross , Bjorn Andersson , Neil Armstrong , Arnd Bergmann , Felipe Balbi , Peter Chen , Greg Kroah-Hartman 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> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 --- drivers/usb/chipidea/ci_hdrc_msm.c | 21 --------------------- 1 file changed, 21 deletions(-) -- 2.9.0.rc2.8.ga28705d 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);