From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 481DAC48BDF for ; Sun, 20 Jun 2021 15:01:20 +0000 (UTC) Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id CBDAB6108E for ; Sun, 20 Jun 2021 15:01:18 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org CBDAB6108E Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=denx.de Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 37EAF828D0; Sun, 20 Jun 2021 17:01:07 +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=1624201267; bh=wvIS7ZoFUiBEfgfJuHePElfnMtgKF2yE8AucHvRAB2A=; h=From:To:Cc:Subject:Date:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:List-Subscribe:From; b=uNKOyRQlvr3Ik7Tz/0zdL1eEuy22bvdn8alzi5TNs90OaRYwhpt89xxUI04/fVlYq fPKPvnHX1EZ6Yasv4JQLDxmEP+/WGM0zqNZgtDEXvr03zgAn+/SM9leIRuZv8t079u P/WHPuYkLHYffsO7b7gQWgAmTzaMvtIrQjQLKcvBE9g2UZp2lSUjFpjhQUq90ugMfR 1ZAUkC4H2Fzr+H1F4mmu1du1gQZqcvRg/PdvaSPtBK09F8d7a2Hzf/O7PkR6MKULL/ P1JM1rwltvxefaix2q65x5J4Q9aA5FXP35FprQuVG1cboFAPxcfAL+7nAdDPtBkykz ZNHVtF6nQ03fQ== Received: from localhost.localdomain (unknown [IPv6:2804:14c:485:504a:df0b:982f:3f3b:d24b]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) (Authenticated sender: festevam@denx.de) by phobos.denx.de (Postfix) with ESMTPSA id C724D801FD; Sun, 20 Jun 2021 17:01:01 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=denx.de; s=phobos-20191101; t=1624201263; bh=wvIS7ZoFUiBEfgfJuHePElfnMtgKF2yE8AucHvRAB2A=; h=From:To:Cc:Subject:Date:From; b=TMSmelpfw5kNmyYSoEkb/o0ONEcMuEjqd1VIVVljnjsQbeQMED1Qr1WyhbVEZbdN8 Jch8z+8f7SCAPb1Xaq83DmTC53I6zrKd/HXS5oiJ4M2cY4uonfHcdqPK/y5jM60SCt TFuOX+wUJw0/FWeGVjITEs+CSNGH6L8nib8Qbgsxe2mI1rvBMesoNzkNagATY7YWiz fXX/Ykf1pGuwdIsc1B022jLCqr9ORBz3FBcjvxctrpidIJmVtlYYp4flSMs1QsNI70 CqcA+KsQLK140piHdIpCrVFSBbT5ld0o17DIXcFHg5dFSK6XjO0HjbosCg0ds88E/w FOex1Q4i1knpQ== From: Fabio Estevam To: marex@denx.de Cc: u-boot@lists.denx.de, sbabic@denx.de, ye.li@nxp.com, peng.fan@nxp.com, Fabio Estevam Subject: [PATCH 1/2] usb: ehci-mx6: Move fdtdec_get_alias_seq() inside the CONFIG_MX6 Date: Sun, 20 Jun 2021 12:00:51 -0300 Message-Id: <20210620150052.1628256-1-festevam@denx.de> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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.103.2 at phobos.denx.de X-Virus-Status: Clean On a imx7s-warp board the fdtdec_get_alias_seq() function always fails. As priv->portnr is only used on i.MX6, move fdtdec_get_alias_seq() inside the CONFIG_MX6 block. Signed-off-by: Fabio Estevam --- drivers/usb/host/ehci-mx6.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/drivers/usb/host/ehci-mx6.c b/drivers/usb/host/ehci-mx6.c index 238c93183b05..48b5c8b0c53c 100644 --- a/drivers/usb/host/ehci-mx6.c +++ b/drivers/usb/host/ehci-mx6.c @@ -569,7 +569,6 @@ static int mx6_parse_dt_addrs(struct udevice *dev) const void *blob = gd->fdt_blob; int offset = dev_of_offset(dev); void *__iomem addr; - int ret, devnump; phy_off = fdtdec_lookup_phandle(blob, offset, "fsl,usbphy"); if (phy_off < 0) { @@ -578,11 +577,6 @@ static int mx6_parse_dt_addrs(struct udevice *dev) return -EINVAL; } - ret = fdtdec_get_alias_seq(blob, dev->uclass->uc_drv->name, - phy_off, &devnump); - if (ret < 0) - return ret; - misc_off = fdtdec_lookup_phandle(blob, offset, "fsl,usbmisc"); if (misc_off < 0) return -EINVAL; @@ -592,7 +586,6 @@ static int mx6_parse_dt_addrs(struct udevice *dev) return -EINVAL; priv->phy_addr = addr; - priv->portnr = devnump; addr = (void __iomem *)fdtdec_get_addr(blob, misc_off, "reg"); if ((fdt_addr_t)addr == FDT_ADDR_T_NONE) @@ -601,7 +594,13 @@ static int mx6_parse_dt_addrs(struct udevice *dev) priv->misc_addr = addr; #if defined(CONFIG_MX6) - int anatop_off; + int anatop_off, ret, devnump; + + ret = fdtdec_get_alias_seq(blob, dev->uclass->uc_drv->name, + phy_off, &devnump); + if (ret < 0) + return ret; + priv->portnr = devnump; /* Resolve ANATOP offset through USB PHY node */ anatop_off = fdtdec_lookup_phandle(blob, phy_off, "fsl,anatop"); -- 2.25.1