From patchwork Tue May 28 02:20:50 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Derald D. Woods" X-Patchwork-Id: 1106018 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="a3taT94k"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 45Ccyj2gP9z9s3l for ; Tue, 28 May 2019 12:21:01 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id E0524C220A7; Tue, 28 May 2019 02:20:57 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=FREEMAIL_FROM, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 6C2BEC21C4A; Tue, 28 May 2019 02:20:56 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 4B792C22006; Tue, 28 May 2019 02:20:55 +0000 (UTC) Received: from mail-io1-f67.google.com (mail-io1-f67.google.com [209.85.166.67]) by lists.denx.de (Postfix) with ESMTPS id AFCD3C21C3F for ; Tue, 28 May 2019 02:20:54 +0000 (UTC) Received: by mail-io1-f67.google.com with SMTP id u13so5801280iop.0 for ; Mon, 27 May 2019 19:20:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=date:from:to:cc:subject:message-id:mime-version:content-disposition :user-agent; bh=Spg6WJTgsP10mOhT8j6iZLRK2Mq3zaCERCCG31eZFvE=; b=a3taT94kFo4pyHnGQNjMtStYHFAXktQI3LpDvLo2Sx3FN+3onb9yLSmVuy4JQcdzps WGR8QItXmRcfX6tZ6zXfra7vQFVvXtiiYBCAPqMLKY4NuZDdCWrBO3tNVs1N3Viq+iq+ luL/907gqIyCueVOLafUCYrxHkPdj2e72DF3aJ4xIz9hnkGTzEWxWrBMUVW4SCYnkxGH 8Wv3YQ4PTSwIk0gOftJM3V4CdMiA7VTOIEFISHIMW8fOUgeRmsdyqYk1lxtdfkqLPtfT zLseKpXi6DXM3p3UxQdApHpCcLtyEaXWizqYgyAozzLoDfULNnh8ciB1fz9x2aW1i0gM bOZg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:mime-version :content-disposition:user-agent; bh=Spg6WJTgsP10mOhT8j6iZLRK2Mq3zaCERCCG31eZFvE=; b=r90dwIAOsjK0Uqln7GpDlLtnZ+MsG0Dtlm0dZYeHCO8alAa/lnz8Ka4po90WeFrQrR xmw1qFMLmlj7dm11VvoWKjSNzzG9QFgImIuB0cz/og4WXRQ+eAkD+1h5iL/ymvwbfKdw DRk0v7nWO/1uhKq8Vkx0EDjTRSJwzRA6iwxAmutw/l9joPOlbRFCsx2W6pGtaFI4L5ba JY6bcBbx5TGdOLQAfJIqZuV88VCgEJ/xy58tzf6IRwddOOAhfQqQAzHGp2uE1TEw1NQO L8UZaq9dVVvRTqIlv4c0b6x9wQbdBbwlCK8qv4MqscQQbk5UDSnJ3mzDFWFDt1tEGBMo j/nQ== X-Gm-Message-State: APjAAAVjLtCfQ/YDwaFD+mqaBL+OwQ7jVJNhI5erYPcZoGNqbxoRH1s/ hUrR2GnF+bS2znsob05LlzgIxcUk X-Google-Smtp-Source: APXvYqx3HzQ9lnH6wgEc0cn6OqiPzYagLUbp6wrzn/s3wGLVz6YnPQNt6DRjtTtgD/K5NWm/VQofhA== X-Received: by 2002:a6b:8f82:: with SMTP id r124mr3248256iod.270.1559010053182; Mon, 27 May 2019 19:20:53 -0700 (PDT) Received: from ethiopia (c-73-176-50-185.hsd1.il.comcast.net. [73.176.50.185]) by smtp.gmail.com with ESMTPSA id b196sm648965itb.30.2019.05.27.19.20.52 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Mon, 27 May 2019 19:20:52 -0700 (PDT) Date: Mon, 27 May 2019 21:20:50 -0500 From: "Derald D. Woods" To: u-boot@lists.denx.de Message-ID: <20190528022050.GA14745@ethiopia> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.12.0 (2019-05-25) Cc: trini@konsulko.com Subject: [U-Boot] [PATCH 2/3] ARM: omap3: evm: Enable DM_USB in defconfig X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 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" This addresses the following warning message: ===================== WARNING ====================== This board does not use CONFIG_DM_USB. Please update the board to use CONFIG_DM_USB before the v2019.07 release. Failure to update by the deadline may result in board removal. See doc/driver-model/MIGRATION.txt for more info. ==================================================== As USB support for older OMAP3 SoC's improves, OMAP3 EVM can be readily adapted. There is some additional 'gpio-hog' support needed to fully setup USB in a similar manner to Linux. Signed-off-by: Derald D. Woods --- board/ti/evm/evm.c | 31 ------------------------------- configs/omap3_evm_defconfig | 3 +++ include/configs/omap3_evm.h | 2 -- 3 files changed, 3 insertions(+), 33 deletions(-) diff --git a/board/ti/evm/evm.c b/board/ti/evm/evm.c index daecb4af3e..93408047b2 100644 --- a/board/ti/evm/evm.c +++ b/board/ti/evm/evm.c @@ -30,11 +30,6 @@ #include #include "evm.h" -#ifdef CONFIG_USB_EHCI_HCD -#include -#include -#endif - #define OMAP3EVM_GPIO_ETH_RST_GEN1 64 #define OMAP3EVM_GPIO_ETH_RST_GEN2 7 @@ -307,32 +302,6 @@ void board_mmc_power_init(void) } #endif /* CONFIG_MMC */ -#if defined(CONFIG_USB_EHCI_HCD) && !defined(CONFIG_SPL_BUILD) -/* Call usb_stop() before starting the kernel */ -void show_boot_progress(int val) -{ - if (val == BOOTSTAGE_ID_RUN_OS) - usb_stop(); -} - -static struct omap_usbhs_board_data usbhs_bdata = { - .port_mode[0] = OMAP_USBHS_PORT_MODE_UNUSED, - .port_mode[1] = OMAP_EHCI_PORT_MODE_PHY, - .port_mode[2] = OMAP_USBHS_PORT_MODE_UNUSED -}; - -int ehci_hcd_init(int index, enum usb_init_type init, - struct ehci_hccr **hccr, struct ehci_hcor **hcor) -{ - return omap_ehci_hcd_init(index, &usbhs_bdata, hccr, hcor); -} - -int ehci_hcd_stop(int index) -{ - return omap_ehci_hcd_stop(); -} -#endif /* CONFIG_USB_EHCI_HCD */ - #if defined(CONFIG_USB_ETHER) && defined(CONFIG_USB_MUSB_GADGET) && !defined(CONFIG_CMD_NET) int board_eth_init(bd_t *bis) { diff --git a/configs/omap3_evm_defconfig b/configs/omap3_evm_defconfig index a3b662db2b..26d0e65589 100644 --- a/configs/omap3_evm_defconfig +++ b/configs/omap3_evm_defconfig @@ -66,7 +66,10 @@ CONFIG_SPI=y CONFIG_DM_SPI=y CONFIG_OMAP3_SPI=y CONFIG_USB=y +CONFIG_DM_USB=y +# CONFIG_SPL_DM_USB is not set CONFIG_USB_EHCI_HCD=y +CONFIG_USB_OMAP3=y CONFIG_USB_MUSB_GADGET=y CONFIG_USB_MUSB_OMAP2PLUS=y CONFIG_USB_GADGET=y diff --git a/include/configs/omap3_evm.h b/include/configs/omap3_evm.h index 5b9d8a57e3..082a4edb2b 100644 --- a/include/configs/omap3_evm.h +++ b/include/configs/omap3_evm.h @@ -56,8 +56,6 @@ /* Environment */ #define CONFIG_ENV_SIZE SZ_128K -#define CONFIG_PREBOOT "usb start" - #define MEM_LAYOUT_ENV_SETTINGS \ DEFAULT_LINUX_BOOT_ENV