Received: by 2002:a05:6a10:22f:0:0:0:0 with SMTP id 15csp3734274pxk; Tue, 8 Sep 2020 00:32:15 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxSNBq9Bv24C1osnimSSuLHQnbyyJg+et9rGF4Ek4JmEEWV6BMGv2+OQDC8hZBFJMNMnmeb X-Received: by 2002:a17:906:6d91:: with SMTP id h17mr23299258ejt.531.1599550334824; Tue, 08 Sep 2020 00:32:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1599550334; cv=none; d=google.com; s=arc-20160816; b=k7OuL/CdftwAuanpcjvopqBIonYBRg3/jqbMjvzYL+fY2oc+U9w9dzynwZgT9ZU3YF huU1u2ui4LkxA3/JFjHAOr4jIV+fk9opMURDzNKdZ/CouphluD+1WSV5iUxHSPc07hrB vZpiv1HJmdiaLpsVjXfPWfRmdCk3jKiXulCxG2VRtxkrZQRWo+DoQx0oAye0uErXMTK1 crHEH0V0a5MhPdN6RN451RyBxis54d2+Yq8OsBN4STuqNwTDcpCDlrjKuSGEY1UuW4/p wDqgsC46KXkeL24W1Xdd0QV4bj0KtxyxMR2oZrDgUBhUlnTtaCeEXPNmgv+nMXJ0q7er 6n7w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=AmA2lH7gtqxoy4mDbQrWCRwHZAf3YyIuPWiZh8AnqYQ=; b=PjafjexfOM0G5e1wJkQZ6E0Oy0irPxmMB/9gOnPXOiTq+gat90qO7niV9hEtZKRSGi xM2H5yUOhi0OTF3YbrpLhph8Wplza01QQIC1IlHQ9M6N2bq/3YmPbd9vWenIC+hm6d2m 9oECEvwh/GxRu6eTAByHZeSU9h5eCzM7/7KnI0w+fgU6pe7HOVptJso89gstMOqaClS1 hTBHZiIqpN9URJaHo1KqR55JJv1uB99befNpEIbX1NDaLjztNepCehNUppa2UnYJmaHy hB9bkP5xoPVOLpaQTxRv/TCRamGGklTi3M6aQhe6XgYQrXIRXYYGGIBN8op8OOht/5Bi S0ow== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=Xl35qbKV; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id m18si4150242eje.64.2020.09.08.00.31.52; Tue, 08 Sep 2020 00:32:14 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=Xl35qbKV; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729144AbgIHHa4 (ORCPT + 99 others); Tue, 8 Sep 2020 03:30:56 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60426 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728601AbgIHHaz (ORCPT ); Tue, 8 Sep 2020 03:30:55 -0400 Received: from mail-wm1-x343.google.com (mail-wm1-x343.google.com [IPv6:2a00:1450:4864:20::343]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B23F9C061573; Tue, 8 Sep 2020 00:30:53 -0700 (PDT) Received: by mail-wm1-x343.google.com with SMTP id w2so16229306wmi.1; Tue, 08 Sep 2020 00:30:53 -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:mime-version :content-transfer-encoding; bh=AmA2lH7gtqxoy4mDbQrWCRwHZAf3YyIuPWiZh8AnqYQ=; b=Xl35qbKVmDEE2krWlxOS4SSQHfc1+nT1fS34f3N8NHld+TH6w8YRP7rMSbMyxOkOY/ o6EQr1iRJ5fjKT938/V5rxpyD0OQOmE+57w8nAJb900n2KTKeZfYnJOYGiEGpcf6lArT 88GZZZQLKpwHYJNPrdM616uzoTPqNlgnWKswwSs1Cimi7zgFmvJCV/4WFT9pcxBhXXNY fpnlEd1Bil24AMUUMBQxfwgwi5l6ADc8elexQRZjYI4Jj5+HJE1Oc3ON+R3EDjQXhsNp qwZpfzJfpBJVaYB3rHNodTLWHB/GaIP9tp0sHRmLC2k7HI0hzM4ZjCIjFj3yg7etzu4f qswg== 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:mime-version :content-transfer-encoding; bh=AmA2lH7gtqxoy4mDbQrWCRwHZAf3YyIuPWiZh8AnqYQ=; b=GsGp6PGTETBdoZJh+tR+mcrDK+i8hKDI8KfYTzTBn7VuB24Xrq3bcscCqTv2ZENDNe s884fHtDGQH5rXCI1RBMPl18TJjvzklKio6TUNq3fzj/LbkrlGXRVrRA8wpamKx5y+Or PQ5fI2shl3qtySnx2C2iVaB6ZO+Vt4p1mthBBgBTc7S3AxWJ6SdL5FsL6HXKXLYMAaxC vLakOhbEoQ6bwFryfFFHLtLVvCgR99bqlGbid1LVvLABRtagk8QeiNHibSoLCbo+AX2Y xIbNiGRsmgXcoN2WorxjlHYskJwKggNNIaKsRfXQI6z6sJ0eXbf+tFfxK+36m1Hs57iY x8hQ== X-Gm-Message-State: AOAM532YLeApv0YKMch3gYPt5/fysdurT/RVx27ED/eOvdcoyEFISf9Z 7Lbq/MUSP+1wiLw0hbHAILw= X-Received: by 2002:a05:600c:230f:: with SMTP id 15mr2962523wmo.186.1599550252445; Tue, 08 Sep 2020 00:30:52 -0700 (PDT) Received: from mamamia.internal (a89-183-54-2.net-htp.de. [89.183.54.2]) by smtp.gmail.com with ESMTPSA id u66sm30949377wmg.44.2020.09.08.00.30.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 08 Sep 2020 00:30:51 -0700 (PDT) From: Andre Heider To: Jason Cooper , Andrew Lunn , Gregory Clement , Sebastian Hesselbarth , Rob Herring , Tomasz Maciej Nowak , =?UTF-8?q?Pali=20Roh=C3=A1r?= Cc: linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] arm64: dts: marvell: espressobin: Simplify v7 ethernet port labeling Date: Tue, 8 Sep 2020 09:30:50 +0200 Message-Id: <20200908073050.535919-1-a.heider@gmail.com> X-Mailer: git-send-email 2.28.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Now that the switch ports have a label in the .dtsi, simplify the whole "switch0" block for the v7 dts files. Signed-off-by: Andre Heider --- This goes on top of Pali's patch: "arm64: dts: marvell: espressobin: Add ethernet switch aliases" The resulting .dtb files are the same. .../armada-3720-espressobin-v7-emmc.dts | 18 +++++------------- .../dts/marvell/armada-3720-espressobin-v7.dts | 18 +++++------------- 2 files changed, 10 insertions(+), 26 deletions(-) diff --git a/arch/arm64/boot/dts/marvell/armada-3720-espressobin-v7-emmc.dts b/arch/arm64/boot/dts/marvell/armada-3720-espressobin-v7-emmc.dts index 215d2f702623..61d49d6a2a2a 100644 --- a/arch/arm64/boot/dts/marvell/armada-3720-espressobin-v7-emmc.dts +++ b/arch/arm64/boot/dts/marvell/armada-3720-espressobin-v7-emmc.dts @@ -28,20 +28,12 @@ aliases { }; }; -&switch0 { - ports { - switch0port1: port@1 { - reg = <1>; - label = "lan1"; - phy-handle = <&switch0phy0>; - }; +&switch0port1 { + label = "lan1"; +}; - switch0port3: port@3 { - reg = <3>; - label = "wan"; - phy-handle = <&switch0phy2>; - }; - }; +&switch0port3 { + label = "wan"; }; /* U11 */ diff --git a/arch/arm64/boot/dts/marvell/armada-3720-espressobin-v7.dts b/arch/arm64/boot/dts/marvell/armada-3720-espressobin-v7.dts index b6f4af8ebafb..44dbe9a21cc7 100644 --- a/arch/arm64/boot/dts/marvell/armada-3720-espressobin-v7.dts +++ b/arch/arm64/boot/dts/marvell/armada-3720-espressobin-v7.dts @@ -27,18 +27,10 @@ aliases { }; }; -&switch0 { - ports { - switch0port1: port@1 { - reg = <1>; - label = "lan1"; - phy-handle = <&switch0phy0>; - }; +&switch0port1 { + label = "lan1"; +}; - switch0port3: port@3 { - reg = <3>; - label = "wan"; - phy-handle = <&switch0phy2>; - }; - }; +&switch0port3 { + label = "wan"; }; -- 2.28.0