From patchwork Tue Sep 8 07:30:50 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Andre Heider X-Patchwork-Id: 11762715 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id BBC1B746 for ; Tue, 8 Sep 2020 07:32:17 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 52D1E218AC for ; Tue, 8 Sep 2020 07:32:15 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="ZjkxQ/aW"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="Xl35qbKV" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 52D1E218AC Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject:To:From: Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender :Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Owner; bh=yFvRzmp5WWgGeakzaeOyofr6+Xf+9C2nt6GSJaOHQL8=; b=ZjkxQ/aW6MQCJjCAjiwck2Kox6 HzNBeZfAoultF3TxyHpjdEFIZC6yokYARiKHiauglfjnWCJyVIIJ02kwcAQe1vUQcpHq6EWf6Q4L0 ukKJ4e9ELvhpbVXJEHehNLLryOecm2XRvMblhMbZI2wsL6iodOkQBr4fIi9auTtc/mYF+7METgQm0 M3O7JklCFjlsqn6HqUZP9+bIhG89epaqB76b7f39p7Mf5n9IvNnJ/FTElrcrmbydjU1KRiVZJWWFi RrC5rlO1so4OSbFNO+bSXdc8qWUwt5NO+n53sYx5LndgvFjC/uefm0Ubr/GCc4Dtp8qBqS4PloaPg fe92HaYw==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kFY5h-0002E3-1t; Tue, 08 Sep 2020 07:30:57 +0000 Received: from mail-wm1-x341.google.com ([2a00:1450:4864:20::341]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kFY5d-0002DS-Ln for linux-arm-kernel@lists.infradead.org; Tue, 08 Sep 2020 07:30:54 +0000 Received: by mail-wm1-x341.google.com with SMTP id x23so6303903wmi.3 for ; 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=KfrEq4tZigIwg+5l4k9HzIcdTNTjmZU4PtC19H1/Xkp8EE2MWhrm/rNE1MleygZpyi kPMicS/2N69piK8Qa5N4zZUf2WpGaH7MCq6Hy2umw5NDQMQOHoBQt8PKNjnAkT+Si5NX 8WakhZ7EcuOectWOV64sTay3i8BusRma1w71kuc3eaFOGoDHVR99qxcrFo2Mq00uWB7E M5NXfbatzSBMP+uwzvfRx/d35hNlJBjbk2FfVAoja7Ia+HqZ2Vharl7C4vfmnxUH0D1m FBFrABczNrk41nifCreIp5mKkQu5oDG6ErUNs43dSGTcHKO5vynnxGVDg7BkoC8kRygL jRVQ== X-Gm-Message-State: AOAM5319E3+tKQlI+1aet0AUXSWtnTjwj9civxPPcYLlMAptmS68BSJE NgygoyJ3XcOXO3AkcACkJrA= X-Google-Smtp-Source: ABdhPJzh2uEi1a9lEH05SEcFEEKjR5cujH7Cqau95bPA8Are5JFA2A660SUhx29/ShVmCPTgP40F7Q== 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_Roh=C3=A1r?= 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 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200908_033053_800398_751B15EB X-CRM114-Status: GOOD ( 12.99 ) X-Spam-Score: -0.2 (/) X-Spam-Report: SpamAssassin version 3.4.4 on merlin.infradead.org summary: Content analysis details: (-0.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2a00:1450:4864:20:0:0:0:341 listed in] [list.dnswl.org] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider [a.heider[at]gmail.com] -0.0 SPF_PASS SPF: sender matches SPF record 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.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 Reviewed-by: Pali Rohár Reviewed-by: Andrew Lunn --- 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"; };