From patchwork Tue Apr 27 16:06:37 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marek Vasut X-Patchwork-Id: 1470790 X-Patchwork-Delegate: marek.vasut@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=denx.de header.i=@denx.de header.a=rsa-sha256 header.s=phobos-20191101 header.b=p62RqIUI; dkim=pass (2048-bit key) header.d=denx.de header.i=@denx.de header.a=rsa-sha256 header.s=phobos-20191101 header.b=y5PCtOyi; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4FV68X08qxz9sjD for ; Wed, 28 Apr 2021 02:06:51 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id DE5B582BCB; Tue, 27 Apr 2021 18:06:45 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=denx.de Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=denx.de; s=phobos-20191101; t=1619539606; bh=wkTCCWfpT12dt+CQTPPHq8jvZaVXxRiJY2Aw5KHQDVw=; h=From:To:Cc:Subject:Date:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:List-Subscribe:From; b=p62RqIUIudXRz9mKHF6QEj3NSbztUPVeqD7elp6Lo+3LObCRsxBOkpkDYisPLQTlA zcKsAiXwEPK0dt2DdGFuxiNXGP8hv4gciIH+gWzZkOXd2Jy7dALFSUFtOouTQ4kD8r pVZDDyV08jD74i/fnDLkQAaVIpGwgodzdvQ5S1blDKSZsu+2dLMMayY8rHTACgqKet +4fop/soWXtNghDT4B9onwFQ5Llh+qtL7Q2PGZbL5QKIEv11UieIGZ7ZuAgqkCl6ZW 2MUu6BJJt0RV0skeXlPGDuYWu3BFZv5H8aJp945QmABTgzBIsQJY5+IhGY+LvLFcwG LsMaSE9LhKOlw== Received: from tr.lan (ip-89-176-112-137.net.upcbroadband.cz [89.176.112.137]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) (Authenticated sender: marex@denx.de) by phobos.denx.de (Postfix) with ESMTPSA id A1BE181F8C; Tue, 27 Apr 2021 18:06:43 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=denx.de; s=phobos-20191101; t=1619539603; bh=wkTCCWfpT12dt+CQTPPHq8jvZaVXxRiJY2Aw5KHQDVw=; h=From:To:Cc:Subject:Date:From; b=y5PCtOyi9PYak5UMzCtNHAY1nn+ryPeiC1X1UE3A+w4Lbr8HVzuhyV4Mq20Eand+5 7b1hS+81AkJWkR2KLc9t6bGe+0+vmvcOmvKhuO62FZp1l9TdrnL3xuAzp8sfgn7UTL LoK3pm5gWdxx6L84B+jmenASqa+8godIwoqcJhzMXErGC2Gv/rgVTW767wvi+QaKfW ugtmZz4TEl0Sah5HmYSJhMBepn8d4bZSC07CeyIr3CWeUTiLtCo8tY8XiN34OwYDIK 7n0Vf4fWdPQE6NBL1JXVz0/0rqoc+qdxyMu9OzlUcfuq2UOcwl8iq2naeYokKaVJXg 2LH4yjwuQTT7Q== From: Marek Vasut To: u-boot@lists.denx.de Cc: Marek Vasut , Fabio Estevam , Peng Fan , Stefano Babic , Tim Harvey , Ye Li , uboot-imx Subject: [PATCH] usb: ehci-mx6: Limit PHY address parsing to !CONFIG_PHY Date: Tue, 27 Apr 2021 18:06:37 +0200 Message-Id: <20210427160637.37817-1-marex@denx.de> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.102.4 at phobos.denx.de X-Virus-Status: Clean For systems which use generic PHY support and implement USB PHY driver, the parsing of PHY properties is unnecessary, disable it. Signed-off-by: Marek Vasut Cc: Fabio Estevam Cc: Peng Fan Cc: Stefano Babic Cc: Tim Harvey Cc: Ye Li Cc: uboot-imx Tested-by: Tim Harvey Tested-by: Ying-Chun Liu (PaulLiu) --- drivers/usb/host/ehci-mx6.c | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/drivers/usb/host/ehci-mx6.c b/drivers/usb/host/ehci-mx6.c index 7642a31b655..06be9deaaae 100644 --- a/drivers/usb/host/ehci-mx6.c +++ b/drivers/usb/host/ehci-mx6.c @@ -265,6 +265,8 @@ int usb_phy_mode(int port) } #endif +#if !defined(CONFIG_PHY) +/* Should be done in the MXS PHY driver */ static void usb_oc_config(struct usbnc_regs *usbnc, int index) { void __iomem *ctrl = (void __iomem *)(&usbnc->ctrl[index]); @@ -285,6 +287,7 @@ static void usb_oc_config(struct usbnc_regs *usbnc, int index) clrbits_le32(ctrl, UCTRL_PWR_POL); #endif } +#endif #if !CONFIG_IS_ENABLED(DM_USB) /** @@ -432,10 +435,12 @@ struct ehci_mx6_priv_data { struct clk clk; struct phy phy; enum usb_init_type init_type; +#if !defined(CONFIG_PHY) int portnr; void __iomem *phy_addr; void __iomem *misc_addr; void __iomem *anatop_addr; +#endif }; static int mx6_init_after_reset(struct ehci_ctrl *dev) @@ -448,14 +453,14 @@ static int mx6_init_after_reset(struct ehci_ctrl *dev) usb_power_config_mx6(priv->anatop_addr, priv->portnr); usb_power_config_mx7(priv->misc_addr); usb_power_config_mx7ulp(priv->phy_addr); -#endif usb_oc_config(priv->misc_addr, priv->portnr); -#if !defined(CONFIG_PHY) && (defined(CONFIG_MX6) || defined(CONFIG_MX7ULP)) +#if defined(CONFIG_MX6) || defined(CONFIG_MX7ULP) usb_internal_phy_clock_gate(priv->phy_addr, 1); usb_phy_enable(ehci, priv->phy_addr); #endif +#endif #if CONFIG_IS_ENABLED(DM_REGULATOR) if (priv->vbus_supply) { @@ -558,6 +563,7 @@ static int ehci_usb_of_to_plat(struct udevice *dev) static int mx6_parse_dt_addrs(struct udevice *dev) { +#if !defined(CONFIG_PHY) struct ehci_mx6_priv_data *priv = dev_get_priv(dev); int phy_off, misc_off; const void *blob = gd->fdt_blob; @@ -594,7 +600,7 @@ static int mx6_parse_dt_addrs(struct udevice *dev) priv->misc_addr = addr; -#if !defined(CONFIG_PHY) && defined(CONFIG_MX6) +#if defined(CONFIG_MX6) int anatop_off; /* Resolve ANATOP offset through USB PHY node */ @@ -607,6 +613,7 @@ static int mx6_parse_dt_addrs(struct udevice *dev) return -EINVAL; priv->anatop_addr = addr; +#endif #endif return 0; } @@ -661,14 +668,14 @@ static int ehci_usb_probe(struct udevice *dev) usb_power_config_mx6(priv->anatop_addr, priv->portnr); usb_power_config_mx7(priv->misc_addr); usb_power_config_mx7ulp(priv->phy_addr); -#endif usb_oc_config(priv->misc_addr, priv->portnr); -#if !defined(CONFIG_PHY) && (defined(CONFIG_MX6) || defined(CONFIG_MX7ULP)) +#if defined(CONFIG_MX6) || defined(CONFIG_MX7ULP) usb_internal_phy_clock_gate(priv->phy_addr, 1); usb_phy_enable(ehci, priv->phy_addr); #endif +#endif #if CONFIG_IS_ENABLED(DM_REGULATOR) if (priv->vbus_supply) {