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 AC65AC677F1 for ; Wed, 22 Feb 2023 01:48:40 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id ADF4A80BA3; Wed, 22 Feb 2023 02:48:38 +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="FgF0w0M9"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 4FCF080BA3; Wed, 22 Feb 2023 02:48:36 +0100 (CET) Received: from mail-pj1-x102e.google.com (mail-pj1-x102e.google.com [IPv6:2607:f8b0:4864:20::102e]) (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 C6AA885A9F for ; Wed, 22 Feb 2023 02:39:17 +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-x102e.google.com with SMTP id d1-20020a17090a3b0100b00229ca6a4636so7213008pjc.0 for ; Tue, 21 Feb 2023 17:39:17 -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=rTgPqktqbDFEEFBeO+Ij+o3hT/0eNWM2B9ECTd3GkuU=; b=FgF0w0M9HMEHFkbg4FKORBuBa37Q9Zfuo8NwKotlhDJr/i6lAslH6E4iST0w40XS90 N4+3kXO1ZP6COJwuF/4OLokjMp4iRdo9O6mr1am6aeFR4NLz/3Kjy5B/WoJkzIYr9xSD riwc9UhbA25TYwLNkWNBhpNYKvNL0AkENoeJnhYckkh/KnXBS6IEMiWCptSyZqCdLOT4 zmHTB6THGwwoAUaOfs91yzvq5Ne37LBAU0qb+pcC0mwg5mJbdDK7/z6U9iBMav6Yw49r vxbtQrgHlHiC499ggFO2dFHCR1f2cemKQVwH9jGSJicwMmREaQujuk66V0WPriqffapO NReQ== 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=rTgPqktqbDFEEFBeO+Ij+o3hT/0eNWM2B9ECTd3GkuU=; b=6jCpE1jm73bOk7wW9De9R3Vxf6DbYcfCXT0/e0PTrJA+wZAfQ5cQvT+DbfD3bNFH1Y RSOYZSPC25lOk3l2vzN0ZYY78Hl+NXqKMOLzPUgK6DFJmsIlPYm++i+NyDoZfKOp0kO5 tg00lvz6ZALtXXt0xBGsK8svQvH/0WRPbyK0OSCtIN2qJL5sPP90cYYqvHcz+gJhiiGN zCZPV3NI1IGnALvlCIMKK7jC+wsXamaC3SDKQk8yRF/thu4Vq86Hlv0mV+DtxdvXaRtb 0XaPk7zczGEHTiYn2ualCoQHSd4jSkNEOzKiNglwZQfVXCLNeQQ9eKglV6a+XWTSYPRT ToAA== X-Gm-Message-State: AO0yUKUAkALiZDG/dlAP5Pko1EFjAgt648M95DNX3l5yzIhkIol9DWnk sIZO9AYmu27DQJI6ti73Ht8= X-Google-Smtp-Source: AK7set8GP1znATZ90HCk3xd2YgrAah469VuWhMwhhB0iBODlbptP6CNOLn1WrP7OvNHkIBQ+/RfVtA== X-Received: by 2002:a05:6a20:12c4:b0:be:d4be:50a2 with SMTP id v4-20020a056a2012c400b000bed4be50a2mr8677587pzg.32.1677029945181; Tue, 21 Feb 2023 17:39:05 -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 d6-20020aa78e46000000b005accb31201fsm4200976pfr.26.2023.02.21.17.39.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Feb 2023 17:39:04 -0800 (PST) From: Troy Kisky To: sjg@chromium.org, trini@konsulko.com, u-boot@lists.denx.de Cc: gary.bisson@lairdconnect.com, Troy Kisky , Alison Wang Subject: [PATCH v1 23/24] arm: cpu: armv7: ls102xa: fdt: remove eth_device support Date: Tue, 21 Feb 2023 17:38:20 -0800 Message-Id: <20230222013821.1144691-24-troykiskyboundary@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230222013821.1144691-1-troykiskyboundary@gmail.com> References: <20230222013821.1144691-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 --- 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