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 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 smtp.lore.kernel.org (Postfix) with ESMTPS id 29B19C433EF for ; Sat, 19 Feb 2022 23:09:26 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 0EE1A83C5B; Sun, 20 Feb 2022 00:09:18 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="bMFj/PhL"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id BB88283C5B; Sun, 20 Feb 2022 00:09:12 +0100 (CET) Received: from mail-io1-xd32.google.com (mail-io1-xd32.google.com [IPv6:2607:f8b0:4864:20::d32]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id BF9CA83C65 for ; Sun, 20 Feb 2022 00:09:04 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=aford173@gmail.com Received: by mail-io1-xd32.google.com with SMTP id c14so8108314ioa.12 for ; Sat, 19 Feb 2022 15:09:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=xLIyR/drQOjnlrieX0HElv0iyGwb8pku2FxmFbVXw6M=; b=bMFj/PhLsR/CRT87APTkSw6bn5sMas/d9hyPQQkfZ9mtRr+AfuOKgD5jm7VViORCbU q/lAdfuho/1azGHxO2XQiYTf1oLcioBFhoyEd27bJzNFr1DqbyNxX0LIHZYqCS4xkGhX ZzwSA2y14eKvkCF9lMHSuhBCPEqWmjjN7tCOPynWmIclfRGWKLL4bvE8w7to9XCVlOOg QgIgkJuWwjd5nGe6wKccpG9WAkSFvbdFYotKW+VYukIsY/ElOzJd1H/TaauIiyILJOje 2vsVDwvdwklbFd06hoFtOoLETZnAEDZ2OFwntGdrJCU7r8hvSjw7lEalmg72vT2c215Q 8VUQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=xLIyR/drQOjnlrieX0HElv0iyGwb8pku2FxmFbVXw6M=; b=Q728G/ClaMT4EcFp5b0V2itqBdQsGTfipbX69+K3cJIKgn7yRnAqrrSTRhXry8n8mS Sy4veIvFt7rrX9egwgEnur7f9ksrOyC6sEhbRW4IyIpdSCpx5OqPpiXm1dZvB272Y6Qq p/PZS+jr6I/X6KGib3S5qVrovWBS7P/2HIDL75T5A0YN5ymWsUmL9kUr7Ugdpr/IIMaU huF6YHwBS3tRD5ZH8YvqRIaoqafocA2d0WYpKwbfuSuufRJaPgP8VAWOSjVSj5UTbv1i uedwOKJpJ97Kw9SuQQmk1Ybf+QcgzYY/gQjk5FWc7W+w60a+WPRbDhnWyxoovSuW4txR 9wJw== X-Gm-Message-State: AOAM531JYhqAoJ6qG3g8mNza3VAXI7v6SwoSPhqt8LiyngMEsswTiKhm 5cXEOklACEMg2f/kQSgcYjQA+zKfWtm14A== X-Google-Smtp-Source: ABdhPJyyXwUepy60GfBQMQ7xbvWkSAXyfRXzcMUzmfvxLgCMhDv5gawp1Y/FhSA9aKtRLGtHZq/GJw== X-Received: by 2002:a05:6638:b1a:b0:311:4aa1:6c36 with SMTP id a26-20020a0566380b1a00b003114aa16c36mr10562596jab.281.1645312142971; Sat, 19 Feb 2022 15:09:02 -0800 (PST) Received: from aford-IdeaCentre-A730.lan ([2601:448:8400:9e8:4655:df85:f9da:7170]) by smtp.gmail.com with ESMTPSA id u12sm5642173ilg.51.2022.02.19.15.09.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 19 Feb 2022 15:09:02 -0800 (PST) From: Adam Ford To: u-boot@lists.denx.de Cc: marex@denx.de, trini@konsulko.com, woods.technical@gmail.com, Adam Ford Subject: [PATCH 2/7] usb: ehci-omap: Move omap_ehci_hcd_init to omap_ehci_probe Date: Sat, 19 Feb 2022 17:08:42 -0600 Message-Id: <20220219230847.798484-3-aford173@gmail.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20220219230847.798484-1-aford173@gmail.com> References: <20220219230847.798484-1-aford173@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 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.5 at phobos.denx.de X-Virus-Status: Clean The OMAP3 hierarchy has the ehci node as a sub-node of the usbhshost. The usbhshost node contains an ohci and an ehci subnode. The configuration of the ehci belongs in the EHCI node and not its parent. Move it to the proper probe. usb start starting USB... Bus ehci@48064800: USB EHCI 1.00 Bus usb_otg_hs@480ab000: Port not available. scanning bus ehci@48064800 for devices... 3 USB Device(s) found scanning usb for storage devices... 1 Storage Device(s) found Signed-off-by: Adam Ford --- drivers/usb/host/ehci-omap.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/drivers/usb/host/ehci-omap.c b/drivers/usb/host/ehci-omap.c index d34c0add4a..5f79279fe2 100644 --- a/drivers/usb/host/ehci-omap.c +++ b/drivers/usb/host/ehci-omap.c @@ -312,7 +312,7 @@ static int omap_usbhs_probe(struct udevice *dev) omap_usbhs_set_mode(i, mode); } - return omap_ehci_hcd_init(0, &usbhs_bdata); + return 0; } static const struct udevice_id omap_usbhs_dt_ids[] = { @@ -355,6 +355,7 @@ static int omap_ehci_probe(struct udevice *dev) struct ehci_omap_priv_data *priv = dev_get_priv(dev); struct ehci_hccr *hccr; struct ehci_hcor *hcor; + int ret; priv->ehci = dev_read_addr_ptr(dev); priv->portnr = dev_seq(dev); @@ -363,6 +364,10 @@ static int omap_ehci_probe(struct udevice *dev) hccr = (struct ehci_hccr *)&priv->ehci->hccapbase; hcor = (struct ehci_hcor *)&priv->ehci->usbcmd; + ret = omap_ehci_hcd_init(0, &usbhs_bdata); + if (ret) + return ret; + return ehci_register(dev, hccr, hcor, NULL, 0, USB_INIT_HOST); } -- 2.32.0