From patchwork Sun Jul 19 00:23:04 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Derald D. Woods" X-Patchwork-Id: 1331629 X-Patchwork-Delegate: lokeshvutla@ti.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=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=aTFos6pp; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (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 4B8QZ76wVPz9sQt for ; Sun, 19 Jul 2020 10:23:27 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id A39F381BCB; Sun, 19 Jul 2020 02:23:21 +0200 (CEST) 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="aTFos6pp"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 639198158B; Sun, 19 Jul 2020 02:23:20 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,SPF_HELO_NONE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-il1-x142.google.com (mail-il1-x142.google.com [IPv6:2607:f8b0:4864:20::142]) (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 78E8B8158B for ; Sun, 19 Jul 2020 02:23:16 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=woods.technical@gmail.com Received: by mail-il1-x142.google.com with SMTP id r12so10348721ilh.4 for ; Sat, 18 Jul 2020 17:23:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=GbzD4sarAoydP8YqYeKxOWs6BuVBrqdyTYRftuaELhA=; b=aTFos6ppNUNTw4te1we+6fl+lNd4t2+DFDXnbWKPx8xc9YWMnmWxeTn2NjeZ334Gkb 3cqk7JEpHyD8VF+gnfC2SKlXkuflMiF7fu9nqaN677GQc3NjDmLnoQ8R35RNhZTH1GId TiK0Xv20pyJk2zvn9nTYO/Jkht2RLlXSZKrIRwM1c0s4kzPygQg9EB521PiQPTXg6KtD oxF0M5ac1O34MtHfswkjhRANyfCGBNQ+v5wW2N3pMQNr9mPQRf0VQDY2yAD0Q6HSFlKQ wZe/+w8vUNEubdPLfRL4CICso7259CL3hstmPZ8O6wTdLAsRpdGGnmtKYN/552pe1dFm Vt7A== 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:mime-version:content-transfer-encoding; bh=GbzD4sarAoydP8YqYeKxOWs6BuVBrqdyTYRftuaELhA=; b=S2bDMCj3XNmVBt3kfrc/NpKEnbBiVV7wTTbD1U+f58+RlgmoiRxZylhVPD65qgl5mU JjCN6inQJAb2N0meiSMRbKFdsny5FZh2t19Xs7U/Wthwu6pj6P4VlFmahQIjC1cZCYeb m1z0Ix5MpPz0i0PZS39U+CQMLQY9XpTA/dwKNJn+uZBndCAy0KY2JdMFMJbi4aPwjHRJ cGDUZWjzMfk3X6ShvcBQChIokuCG4O+fC26p4441rRfSaQ6gnlVPsA+RYKEs1cqyxxDe Bzljdj09aEDrpsmhyFGAzHtf7llqKZk/WjmTZ4B28+headIurYRoimJHrfnBBM/Y8lpr GZlw== X-Gm-Message-State: AOAM532S0Wqj+WARw5Q9VW+PpQ0+XZCJvhMO8WwFhJLoJlZ0IMKoOt14 DcZAC5nU7THY6a27aAEqxPYWVenctJo= X-Google-Smtp-Source: ABdhPJw1c148UpXhHrZ7Iu8ZUzlMQzpCETwvkaASBTtwtnX1UFgIt/EvxM7k0ZJ3tcxA0s6trcQInw== X-Received: by 2002:a92:488f:: with SMTP id j15mr16739457ilg.269.1595118194867; Sat, 18 Jul 2020 17:23:14 -0700 (PDT) Received: from ethiopia.woodsts.org (c-73-176-50-185.hsd1.il.comcast.net. [73.176.50.185]) by smtp.gmail.com with ESMTPSA id c25sm6570978ioi.13.2020.07.18.17.23.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 18 Jul 2020 17:23:14 -0700 (PDT) From: "Derald D. Woods" To: u-boot@lists.denx.de Cc: "Derald D. Woods" , Tom Rini , Adam Ford Subject: [PATCH v3] ARM: omap3: evm: Complete DM_ETH and DM_USB migrations Date: Sat, 18 Jul 2020 19:23:04 -0500 Message-Id: <20200719002304.526176-1-woods.technical@gmail.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200719000701.517834-1-woods.technical@gmail.com> References: <20200719000701.517834-1-woods.technical@gmail.com> 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.3 at phobos.denx.de X-Virus-Status: Clean This commit completes the migrations for DM_ETH and DM_USB. The board is now consistent with omap3_beagle and other remaining OMAP3 boards. Cc: Tom Rini Cc: Adam Ford Signed-off-by: Derald D. Woods --- Changes for v3: - Also handle 37xx 'dtsi' variant - My testing is with the 3530 processor variant Changes for v2: - Add omitted ethernet node to omap3-evm-u-boot.dtsi * Based on similar changes found in logicpd-torpedo-35xx-devkit.dtsi --- arch/arm/dts/omap3-evm-37xx-u-boot.dtsi | 10 +++ arch/arm/dts/omap3-evm-u-boot.dtsi | 10 +++ arch/arm/mach-omap2/omap3/Kconfig | 3 + board/ti/evm/evm.c | 82 ++++--------------------- configs/omap3_evm_defconfig | 14 +++-- 5 files changed, 43 insertions(+), 76 deletions(-) diff --git a/arch/arm/dts/omap3-evm-37xx-u-boot.dtsi b/arch/arm/dts/omap3-evm-37xx-u-boot.dtsi index b9e433f873..97a8141c8a 100644 --- a/arch/arm/dts/omap3-evm-37xx-u-boot.dtsi +++ b/arch/arm/dts/omap3-evm-37xx-u-boot.dtsi @@ -11,4 +11,14 @@ chosen { stdout-path = &uart1; }; + + ethernet@2c000000 { + compatible = "smsc,lan9221","smsc,lan9115"; + reg = <0x2c000000 0xff>; + bank-width = <2>; + vddvario-supply = <&vddvario>; + vdd33a-supply = <&vdd33a>; + reg-io-width = <4>; + smsc,save-mac-address; + }; }; diff --git a/arch/arm/dts/omap3-evm-u-boot.dtsi b/arch/arm/dts/omap3-evm-u-boot.dtsi index b9e433f873..97a8141c8a 100644 --- a/arch/arm/dts/omap3-evm-u-boot.dtsi +++ b/arch/arm/dts/omap3-evm-u-boot.dtsi @@ -11,4 +11,14 @@ chosen { stdout-path = &uart1; }; + + ethernet@2c000000 { + compatible = "smsc,lan9221","smsc,lan9115"; + reg = <0x2c000000 0xff>; + bank-width = <2>; + vddvario-supply = <&vddvario>; + vdd33a-supply = <&vdd33a>; + reg-io-width = <4>; + smsc,save-mac-address; + }; }; diff --git a/arch/arm/mach-omap2/omap3/Kconfig b/arch/arm/mach-omap2/omap3/Kconfig index cf11e5707f..0a6eb4cb26 100644 --- a/arch/arm/mach-omap2/omap3/Kconfig +++ b/arch/arm/mach-omap2/omap3/Kconfig @@ -61,7 +61,10 @@ config TARGET_OMAP3_EVM select DM select DM_GPIO select DM_SERIAL + select OMAP3_GPIO_2 select OMAP3_GPIO_3 + select OMAP3_GPIO_5 + select OMAP3_GPIO_6 imply CMD_DM config TARGET_OMAP3_IGEP00X0 diff --git a/board/ti/evm/evm.c b/board/ti/evm/evm.c index 193b3eb576..ecbd843676 100644 --- a/board/ti/evm/evm.c +++ b/board/ti/evm/evm.c @@ -16,7 +16,6 @@ #include #include #include -#include #include #include #include @@ -24,20 +23,17 @@ #include #include #include -#include #include #include -#include #include #include -#include -#include -#include #include "evm.h" #define OMAP3EVM_GPIO_ETH_RST_GEN1 64 #define OMAP3EVM_GPIO_ETH_RST_GEN2 7 +#define CONFIG_SMC911X_BASE 0x2C000000 + DECLARE_GLOBAL_DATA_PTR; static u32 omap3_evm_version; @@ -49,7 +45,7 @@ u32 get_omap3_evm_rev(void) static void omap3_evm_get_revision(void) { -#if defined(CONFIG_CMD_NET) +#if defined(CONFIG_SMC911X) /* * Board revision can be ascertained only by identifying * the Ethernet chipset. @@ -70,7 +66,7 @@ static void omap3_evm_get_revision(void) default: omap3_evm_version = OMAP3EVM_BOARD_GEN_2; } -#else /* !CONFIG_CMD_NET */ +#else /* !CONFIG_SMC911X */ #if defined(CONFIG_STATIC_BOARD_REV) /* Look for static defintion of the board revision */ omap3_evm_version = CONFIG_STATIC_BOARD_REV; @@ -78,7 +74,7 @@ static void omap3_evm_get_revision(void) /* Fallback to the default above */ omap3_evm_version = OMAP3EVM_BOARD_GEN_2; #endif /* CONFIG_STATIC_BOARD_REV */ -#endif /* CONFIG_CMD_NET */ +#endif /* CONFIG_SMC911X */ } #if defined(CONFIG_USB_MUSB_GADGET) || defined(CONFIG_USB_MUSB_HOST) @@ -155,33 +151,6 @@ void get_board_mem_timings(struct board_sdrc_timings *timings) } #endif /* CONFIG_SPL_BUILD */ -#if defined(CONFIG_USB_MUSB_OMAP2PLUS) -static struct musb_hdrc_config musb_config = { - .multipoint = 1, - .dyn_fifo = 1, - .num_eps = 16, - .ram_bits = 12, -}; - -static struct omap_musb_board_data musb_board_data = { - .interface_type = MUSB_INTERFACE_ULPI, -}; - -static struct musb_hdrc_platform_data musb_plat = { -#if defined(CONFIG_USB_MUSB_HOST) - .mode = MUSB_HOST, -#elif defined(CONFIG_USB_MUSB_GADGET) - .mode = MUSB_PERIPHERAL, -#else -#error "Please define either CONFIG_USB_MUSB_HOST or CONFIG_USB_MUSB_GADGET" -#endif /* CONFIG_USB_MUSB_{GADGET,HOST} */ - .config = &musb_config, - .power = 100, - .platform_ops = &omap2430_ops, - .board_data = &musb_board_data, -}; -#endif /* CONFIG_USB_MUSB_OMAP2PLUS */ - /* * Routine: misc_init_r * Description: Init ethernet (done here so udelay works) @@ -190,25 +159,18 @@ int misc_init_r(void) { twl4030_power_init(); -#ifdef CONFIG_SYS_I2C_OMAP24XX - i2c_init(CONFIG_SYS_OMAP24_I2C_SPEED, CONFIG_SYS_OMAP24_I2C_SLAVE); -#endif - -#if defined(CONFIG_CMD_NET) +#if defined(CONFIG_SMC911X) setup_net_chip(); #endif omap3_evm_get_revision(); -#if defined(CONFIG_CMD_NET) +#if defined(CONFIG_SMC911X) reset_net_chip(); #endif omap_die_id_display(); -#if defined(CONFIG_USB_MUSB_OMAP2PLUS) - musb_register(&musb_plat, &musb_board_data, (void *)MUSB_BASE); -#endif - -#if defined(CONFIG_USB_ETHER) && defined(CONFIG_USB_MUSB_GADGET) +#if defined(CONFIG_USB_ETHER) && defined(CONFIG_USB_MUSB_GADGET) && \ + !defined(CONFIG_SMC911X) omap_die_id_usbethaddr(); #endif return 0; @@ -225,7 +187,7 @@ void set_muxconf_regs(void) MUX_EVM(); } -#if defined(CONFIG_CMD_NET) +#if defined(CONFIG_SMC911X) /* * Routine: setup_net_chip * Description: Setting up the configuration GPMC registers specific to the @@ -283,33 +245,11 @@ static void reset_net_chip(void) udelay(1); gpio_set_value(rst_gpio, 1); } - -int board_eth_init(struct bd_info *bis) -{ -#if defined(CONFIG_SMC911X) - env_set("ethaddr", NULL); - return smc911x_initialize(0, CONFIG_SMC911X_BASE); -#else - return 0; -#endif -} -#endif /* CONFIG_CMD_NET */ +#endif /* CONFIG_SMC911X */ #if defined(CONFIG_MMC) -int board_mmc_init(struct bd_info *bis) -{ - return omap_mmc_init(0, 0, 0, -1, -1); -} - void board_mmc_power_init(void) { twl4030_power_mmc_init(0); } #endif /* CONFIG_MMC */ - -#if defined(CONFIG_USB_ETHER) && defined(CONFIG_USB_MUSB_GADGET) && !defined(CONFIG_CMD_NET) -int board_eth_init(struct bd_info *bis) -{ - return usb_eth_initialize(bis); -} -#endif /* CONFIG_USB_ETHER */ diff --git a/configs/omap3_evm_defconfig b/configs/omap3_evm_defconfig index 1322707968..cf62c73cc3 100644 --- a/configs/omap3_evm_defconfig +++ b/configs/omap3_evm_defconfig @@ -10,6 +10,7 @@ CONFIG_NR_DRAM_BANKS=2 CONFIG_SPL=y CONFIG_DISTRO_DEFAULTS=y CONFIG_USE_PREBOOT=y +CONFIG_PREBOOT="usb start" CONFIG_SYS_CONSOLE_INFO_QUIET=y CONFIG_DEFAULT_FDT_FILE="omap3-evm.dtb" CONFIG_VERSION_VARIABLE=y @@ -38,7 +39,7 @@ CONFIG_MTDIDS_DEFAULT="nand0=omap2-nand.0" CONFIG_MTDPARTS_DEFAULT="mtdparts=omap2-nand.0:512k(spl),1920k(u-boot),128k(u-boot-env),128k(dtb),6m(kernel),-(rootfs)" CONFIG_CMD_UBI=y # CONFIG_ISO_PARTITION is not set -# CONFIG_EFI_PARTITION is not set +# CONFIG_SPL_EFI_PARTITION is not set CONFIG_SPL_PARTITION_UUIDS=y CONFIG_OF_CONTROL=y CONFIG_SPL_OF_CONTROL=y @@ -48,11 +49,10 @@ CONFIG_ENV_IS_IN_NAND=y CONFIG_SPL_DM=y CONFIG_SPL_DM_SEQ_ALIAS=y CONFIG_SPL_OF_TRANSLATE=y -# CONFIG_SPL_BLK is not set CONFIG_USB_FUNCTION_FASTBOOT=y CONFIG_FASTBOOT_BUF_ADDR=0x82000000 +CONFIG_GPIO_HOG=y CONFIG_DM_MMC=y -# CONFIG_SPL_DM_MMC is not set CONFIG_MMC_OMAP_HS=y CONFIG_MTD=y CONFIG_MTD_RAW_NAND=y @@ -60,8 +60,8 @@ CONFIG_SYS_NAND_BUSWIDTH_16BIT=y CONFIG_SYS_NAND_U_BOOT_LOCATIONS=y CONFIG_SYS_NAND_U_BOOT_OFFS=0x80000 CONFIG_SPL_NAND_SIMPLE=y +CONFIG_DM_ETH=y CONFIG_SMC911X=y -CONFIG_SMC911X_BASE=0x2C000000 CONFIG_SMC911X_32_BIT=y CONFIG_SPI=y CONFIG_DM_SPI=y @@ -78,6 +78,10 @@ CONFIG_USB_GADGET_MANUFACTURER="Texas Instruments" CONFIG_USB_GADGET_VENDOR_NUM=0x0451 CONFIG_USB_GADGET_PRODUCT_NUM=0x5678 CONFIG_USB_ETHER=y +CONFIG_USB_HOST_ETHER=y +CONFIG_USB_ETHER_ASIX=y +CONFIG_USB_ETHER_MCS7830=y +CONFIG_USB_ETHER_SMSC95XX=y +CONFIG_VIDEO_OMAP3=y CONFIG_FAT_WRITE=y CONFIG_BCH=y -# CONFIG_EFI_LOADER is not set