From patchwork Wed Apr 11 15:08:01 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Neil Armstrong X-Patchwork-Id: 10335655 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 31F9A60134 for ; Wed, 11 Apr 2018 15:08:33 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2195425EA6 for ; Wed, 11 Apr 2018 15:08:33 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1630D285EC; Wed, 11 Apr 2018 15:08:33 +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=-2.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 622F727D4D for ; Wed, 11 Apr 2018 15:08:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=mK2hnG6LUniciKQWKNP0Q86F+JuoXVMIrzV4Dtps2GI=; b=fIIDlMpSw2mgGAqVm0gt+2qXEN 9SFhk6PImi9o2pwK7YtECFgZj3/2OdZ/ZKdRWmperBypFfldsKMz94Rx4LTy3mxSTWldL/KzJ3XZj acQ1u6WNPIGhgdQt3R5jMQRxFprhvqIwEVG5gQNSLoCqmnGMFXPan1cURMU9tm9s5cW+s19J4CV1t xgx/m164RGB8mUSKxVP5JasAi1LPp1+nSIRbHVqX/fSLRFUlEGxPsJQllK220WD93ljjZIkjDfSW4 gHvUeO1Ph+6hHa7tQBuUSMVH2nk5/XhdG3uBiCuDfZX1Rfz+t3DHy8Cv+oqXc6MBnYapT1QDeo8/0 aHsfCX0w==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1f6HMI-00033X-M6; Wed, 11 Apr 2018 15:08:26 +0000 Received: from mail-wr0-x244.google.com ([2a00:1450:400c:c0c::244]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1f6HMD-0002zS-Fv for linux-amlogic@lists.infradead.org; Wed, 11 Apr 2018 15:08:23 +0000 Received: by mail-wr0-x244.google.com with SMTP id l13so1084109wrb.5 for ; Wed, 11 Apr 2018 08:08:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=P6ivEyAQjJErcXJBUqP7Yq0Kgt1j20K9lm6Tx5/JbWA=; b=cQVdvlHJ2bB+qvIErlcbdxU7GLaKuIkwpmr5Uf7eNhKBIuJ5d/8WP90josiSVLuMaW OGvV/lcq5R6ltgxbjjt7L2/VIE1aRbFCAIjZ11yEvUYL1hv80Jd7tijmBapD/pGsT+D0 zKkLSAYXFKETUBePEUGaQX/XEXkRw87IlK71NWpjUwA/tfsNpJQcPapSE2ZWzActH0Gd qYwg2Hpc7M4xbIPmzgIy95XV+jRdUap2+9RpsMguLvgteZ9hNooayDQp2N4Zbj6CHq0X koP32uQzN70tEdMXVVg1Rcyow76eoIb56ZcR2HJ45NBTxOLMk/WpGpbtU9Zhp3VDKR2T Tm9g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=P6ivEyAQjJErcXJBUqP7Yq0Kgt1j20K9lm6Tx5/JbWA=; b=TIjGnZSk16q/gxqWVeLLjmBMT5gsiXkKbK0iREjpQkrBQiPIGIB4JC5zSfwdylPAAb 8zfYeQtYD2/0CFmfn/uhn9KuNUbEJc5bx3m95Hp9BqVuddUwkqR1DJJO2PXD4TZNls4Z ZbCh/ZQh5Iw5cnRzwkRrsp3SlfyNrvoQMOHaDyM0Ag4rBwSx02WNKgIQEHRT9hTO4Wch hrs9hNda/4DO4s7w6boqu5T1Z/YdweHR3Weu1G08muJavVB9WcsgKyKiWesvR/qrzeLW r5uBgh3NH7hr57fd5s2p53BGdEuJgXt3YIB+R1YMcIaPkqq6r3dfg+u8gHMf7vjBu5E4 VDow== X-Gm-Message-State: ALQs6tC/4M7vBzGAIUElq8drPIQbtYuwJKTEjm8cYJa+GzVdReOFwpX2 qvZ6BrP2t60kihbC5lWcnuI1Gg== X-Google-Smtp-Source: AIpwx48Cm67EY0nLtvcUyHfGTaw8JQZiYV/szsDtvWXkBAFCI5nRm+rCNNtGlA91P6fsd4Pci9/xVQ== X-Received: by 10.223.165.3 with SMTP id i3mr4020939wrb.283.1523459289626; Wed, 11 Apr 2018 08:08:09 -0700 (PDT) Received: from bender.baylibre.local ([90.63.244.31]) by smtp.gmail.com with ESMTPSA id e27sm2260382wre.86.2018.04.11.08.08.07 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 11 Apr 2018 08:08:08 -0700 (PDT) From: Neil Armstrong To: u-boot@lists.denx.de, marex@denx.de, bmeng.cn@gmail.com Subject: [PATCH v3 u-boot 2/3] usb: host: dwc3: Add support for multiple PHYs Date: Wed, 11 Apr 2018 17:08:01 +0200 Message-Id: <1523459282-12235-3-git-send-email-narmstrong@baylibre.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1523459282-12235-1-git-send-email-narmstrong@baylibre.com> References: <1523459282-12235-1-git-send-email-narmstrong@baylibre.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180411_080821_526812_7A687EF3 X-CRM114-Status: GOOD ( 16.49 ) X-BeenThere: linux-amlogic@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-amlogic@lists.infradead.org, sjg@chromium.org, hs@denx.de, Neil Armstrong MIME-Version: 1.0 Sender: "linux-amlogic" Errors-To: linux-amlogic-bounces+patchwork-linux-amlogic=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP DWC3 Ips can have more than 1 PHY for USB2 and 1 PHY for USB3, add support for a generic number of PHYs and adapt the code to handle a generic number of PHYs. Signed-off-by: Neil Armstrong --- drivers/usb/host/xhci-dwc3.c | 113 +++++++++++++++++++++++++------------------ 1 file changed, 66 insertions(+), 47 deletions(-) diff --git a/drivers/usb/host/xhci-dwc3.c b/drivers/usb/host/xhci-dwc3.c index 1022dd5..c100735 100644 --- a/drivers/usb/host/xhci-dwc3.c +++ b/drivers/usb/host/xhci-dwc3.c @@ -22,8 +22,8 @@ DECLARE_GLOBAL_DATA_PTR; struct xhci_dwc3_platdata { - struct phy usb_phy; - struct phy usb3_phy; + struct phy *usb_phys; + int num_phys; }; void dwc3_set_mode(struct dwc3 *dwc3_reg, u32 mode) @@ -113,45 +113,82 @@ void dwc3_set_fladj(struct dwc3 *dwc3_reg, u32 val) } #ifdef CONFIG_DM_USB -static int xhci_dwc3_setup_phy(struct udevice *dev, int index, struct phy *phy) +static int xhci_dwc3_setup_phy(struct udevice *dev, int count) { - int ret = 0; + struct xhci_dwc3_platdata *plat = dev_get_platdata(dev); + int i, ret; + + if (!count) + return 0; - ret = generic_phy_get_by_index(dev, index, phy); - if (ret) { - if (ret != -ENOENT) { - pr_err("Failed to get USB PHY for %s\n", dev->name); + plat->usb_phys = devm_kcalloc(dev, count, sizeof(struct phy), + GFP_KERNEL); + if (!plat->usb_phys) + return -ENOMEM; + + for (i = 0; i < count; i++) { + ret = generic_phy_get_by_index(dev, i, &plat->usb_phys[i]); + if (ret && ret != -ENOENT) { + pr_err("Failed to get USB PHY%d for %s\n", + i, dev->name); return ret; } - } else { - ret = generic_phy_init(phy); + + ++plat->num_phys; + } + + for (i = 0; i < plat->num_phys; i++) { + ret = generic_phy_init(&plat->usb_phys[i]); if (ret) { - pr_err("Can't init USB PHY for %s\n", dev->name); - return ret; + pr_err("Can't init USB PHY%d for %s\n", + i, dev->name); + goto phys_init_err; } - ret = generic_phy_power_on(phy); + } + + for (i = 0; i < plat->num_phys; i++) { + ret = generic_phy_power_on(&plat->usb_phys[i]); if (ret) { - pr_err("Can't power on USB PHY for %s\n", dev->name); - generic_phy_exit(phy); - return ret; + pr_err("Can't power USB PHY%d for %s\n", + i, dev->name); + goto phys_poweron_err; } } return 0; + + +phys_poweron_err: + for (; i >= 0; i--) + generic_phy_power_off(&plat->usb_phys[i]); + + for (i = 0; i < plat->num_phys; i++) + generic_phy_exit(&plat->usb_phys[i]); + + return ret; + +phys_init_err: + for (; i >= 0; i--) + generic_phy_exit(&plat->usb_phys[i]); + + return ret; } -static int xhci_dwc3_shutdown_phy(struct phy *phy) +static int xhci_dwc3_shutdown_phy(struct udevice *dev) { - int ret = 0; + struct xhci_dwc3_platdata *plat = dev_get_platdata(dev); + int i, ret; - if (generic_phy_valid(phy)) { - ret = generic_phy_power_off(phy); - if (ret) - return ret; + for (i = 0; i < plat->num_phys; i++) { + if (!generic_phy_valid(&plat->usb_phys[i])) + continue; - ret = generic_phy_exit(phy); - if (ret) - return ret; + ret = generic_phy_power_off(&plat->usb_phys[i]); + ret |= generic_phy_exit(&plat->usb_phys[i]); + if (ret) { + pr_err("Can't shutdown USB PHY%d for %s\n", + i, dev->name); + } } return 0; @@ -159,7 +196,6 @@ static int xhci_dwc3_shutdown_phy(struct phy *phy) static int xhci_dwc3_probe(struct udevice *dev) { - struct xhci_dwc3_platdata *plat = dev_get_platdata(dev); struct xhci_hcor *hcor; struct xhci_hccr *hccr; struct dwc3 *dwc3_reg; @@ -170,18 +206,10 @@ static int xhci_dwc3_probe(struct udevice *dev) hcor = (struct xhci_hcor *)((uintptr_t)hccr + HC_LENGTH(xhci_readl(&(hccr)->cr_capbase))); - ret = xhci_dwc3_setup_phy(dev, 0, &plat->usb_phy); - if (ret) { - pr_err("Failed to setup USB PHY for %s\n", dev->name); + ret = xhci_dwc3_setup_phy(dev, dev_count_phandle_with_args( + dev, "phys", "#phy-cells")); + if (ret) return ret; - } - - ret = xhci_dwc3_setup_phy(dev, 1, &plat->usb3_phy); - if (ret) { - pr_err("Failed to setup USB3 PHY for %s\n", dev->name); - xhci_dwc3_shutdown_phy(&plat->usb_phy); - return ret; - } dwc3_reg = (struct dwc3 *)((char *)(hccr) + DWC3_REG_OFFSET); @@ -199,16 +227,7 @@ static int xhci_dwc3_probe(struct udevice *dev) static int xhci_dwc3_remove(struct udevice *dev) { - struct xhci_dwc3_platdata *plat = dev_get_platdata(dev); - int ret; - - ret = xhci_dwc3_shutdown_phy(&plat->usb_phy); - if (ret) - pr_err("Can't shutdown USB PHY for %s\n", dev->name); - - ret = xhci_dwc3_shutdown_phy(&plat->usb3_phy); - if (ret) - pr_err("Can't shutdown USB3 PHY for %s\n", dev->name); + xhci_dwc3_shutdown_phy(dev); return xhci_deregister(dev); }