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 74C96C6FA8E for ; Fri, 24 Feb 2023 18:15:13 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 6038085BB2; Fri, 24 Feb 2023 19:14:05 +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="pRVt3ITH"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 40E8485BB0; Fri, 24 Feb 2023 19:12:12 +0100 (CET) Received: from mail-pj1-x1030.google.com (mail-pj1-x1030.google.com [IPv6:2607:f8b0:4864:20::1030]) (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 23FCD85BAC for ; Fri, 24 Feb 2023 19:11:41 +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=troykiskyboundary@gmail.com Received: by mail-pj1-x1030.google.com with SMTP id m3-20020a17090ade0300b00229eec90a7fso7019786pjv.0 for ; Fri, 24 Feb 2023 10:11:41 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=VVtvyt4F1gPScOvTqF879eO8ThirT5t68TlX3uqq6d0=; b=pRVt3ITH4Vna/ZuPBHigo5W7ky1q50nROQuRd89fNPoFMsIBKDUcI7KbONA0wMfB3O 2QDdiz3nF+sOloaM/H1caYjq0fhJFDqwzDfecqJkje/i2jbp7UZBmTDr2MUMT21g8gzM U0l3STn8Keq1J8hPu0TVZXooCJbN3ftW92BTcflMs7usWcwRfsQe6ChJyxe98nbwtcR1 QaEpfgHkOY+VuqHQY7mxdqv5+JuefJfy6ZUC4/s0wEP7+/cbaOVZ+Vtz+z6gjF70RNmW 8wz0cuzaD/TM3VamX8qaM8ffJOufWQ3INfrbcjR2Pmgen7xCtiATInv9Ytl7GcgzXM6c irjw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=VVtvyt4F1gPScOvTqF879eO8ThirT5t68TlX3uqq6d0=; b=ohvMDwQ8ZKNnt9f9r+hSDOdZ8gRKDbo68BHtB5dp4Z5rzZPszNJNoyZotP6KGaPQi3 Ooaj8pzQvpq3HYQwbmirfv1w/8xVAMMKG8w7ojyYws/hNwtuCNGcEXlHkYrujamp+jT2 lkqShhBGX2/J73sVCVsnM4n8fivsFEZGyJRvtXQ53G4hV1kAX8wfgO92VOS68b8gtIlo LhPYyF00yIcFt4GGTZtDeBTl0avQUKqPqXt3uz6muf8QJ0IKNUpeuGnFQkhaSW+Oq+1W C+3Qd4bBZhB5cTjjwoiuSawh/uAWSa277Kp7vfrZHPRx7B3UHgDKND0qm3B89MT0yg8v FQfA== X-Gm-Message-State: AO0yUKWVmk6q8+fT4Umi3NwR6OBmdgHMXth6ZHbPV/zN1ZqfRWibosrB 7EsF7w1x6he7YAR7AOtvUMc= X-Google-Smtp-Source: AK7set+LbdLf75PFBTlsTWSBUjgpguWQ4uHjlO2O7n7CnYyDnm6/ww9AtYc24ELD2RjvrETFg/9QhA== X-Received: by 2002:a17:90b:1e0f:b0:234:656d:2366 with SMTP id pg15-20020a17090b1e0f00b00234656d2366mr16910381pjb.42.1677262290308; Fri, 24 Feb 2023 10:11:30 -0800 (PST) Received: from OS2.boundarydevices.com. (wsip-184-189-120-117.oc.oc.cox.net. [184.189.120.117]) by smtp.gmail.com with ESMTPSA id o1-20020a170902bcc100b0019c922911a2sm7513957pls.40.2023.02.24.10.11.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Feb 2023 10:11:30 -0800 (PST) From: Troy Kisky To: sjg@chromium.org, trini@konsulko.com, u-boot@lists.denx.de Cc: gary.bisson@lairdconnect.com, Troy Kisky Subject: [PATCH v2 25/26] arm: cpu: armv7: ls102xa: fdt: remove eth_device support Date: Fri, 24 Feb 2023 10:10:46 -0800 Message-Id: <20230224181047.2775829-26-troykiskyboundary@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230224181047.2775829-1-troykiskyboundary@gmail.com> References: <20230224181047.2775829-1-troykiskyboundary@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.6 at phobos.denx.de X-Virus-Status: Clean commit e524f3a449f5 ("net: Remove eth_legacy.c") removed struct eth_device This prevents errors in the conversion to CONFIG_IS_ENABLED(DM_ETH). Signed-off-by: Troy Kisky Reviewed-by: Simon Glass --- (no changes since v1) arch/arm/cpu/armv7/ls102xa/fdt.c | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/arch/arm/cpu/armv7/ls102xa/fdt.c b/arch/arm/cpu/armv7/ls102xa/fdt.c index 599b7e18ef3..a5c5c780ae8 100644 --- a/arch/arm/cpu/armv7/ls102xa/fdt.c +++ b/arch/arm/cpu/armv7/ls102xa/fdt.c @@ -25,11 +25,7 @@ DECLARE_GLOBAL_DATA_PTR; void ft_fixup_enet_phy_connect_type(void *fdt) { -#ifdef CONFIG_DM_ETH struct udevice *dev; -#else - struct eth_device *dev; -#endif struct tsec_private *priv; const char *enet_path, *phy_path; char enet[16]; @@ -37,12 +33,8 @@ void ft_fixup_enet_phy_connect_type(void *fdt) int phy_node; int i = 0; uint32_t ph; -#ifdef CONFIG_DM_ETH char *name[3] = { "ethernet@2d10000", "ethernet@2d50000", "ethernet@2d90000" }; -#else - char *name[3] = { "eTSEC1", "eTSEC2", "eTSEC3" }; -#endif for (; i < ARRAY_SIZE(name); i++) { dev = eth_get_dev_by_name(name[i]); @@ -53,11 +45,7 @@ void ft_fixup_enet_phy_connect_type(void *fdt) continue; } -#ifdef CONFIG_DM_ETH priv = dev_get_priv(dev); -#else - priv = dev->priv; -#endif if (priv->flags & TSEC_SGMII) continue; -- 2.34.1