From patchwork Wed Oct 19 08:31:41 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 4853 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4ac7:0:0:0:0:0 with SMTP id y7csp223866wrs; Wed, 19 Oct 2022 02:38:43 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5+EtS/c6KUiDdg6Ud6/V8joYJSMDCaQIgsLcr3FWepi2BaU1x07G5FAgLr5BYhXHWloaKs X-Received: by 2002:a17:90b:3b45:b0:20c:2eae:e70 with SMTP id ot5-20020a17090b3b4500b0020c2eae0e70mr8772620pjb.240.1666172323596; Wed, 19 Oct 2022 02:38:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666172323; cv=none; d=google.com; s=arc-20160816; b=t7TEbvHzbHJzfcOrtpB6LaTSUuezvTig68jSIhXGeLqgbBhIxEd4X7rtSu0n9KPJad MqelFXAvaFvA3lOf7jkCajWXadWCINmOk/QrGHqTDkfkdxmm9YM8ZyFlPCwfjPS3TmRg WFvwxY4p51TMdf6FU7J55KQF7ZgvadU3J5RX/Lx0YHcNFuxgkllrHY2M+q44hL0O7A0a Rkif6rUSwkkHjWB4XRxskvw/gH+fu7YRVpOkXq48qHAgdyzItPA9xH3ahJ8FtNjeK1F+ RUb9id5Z3zdMlRB3Aj4AyU4oGHWFhs5x8s8ZKPqAmJXBbAL4crEdZw9mV/OpXxeQNWSQ C8ZA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=JWPVaK8yGc8zVy+Bg+4iLqTxcvkGObFxw8ebQk4wH3M=; b=Qhp4ma8XJYhRIUxwRGbjHSDBhLNdKliyYpPOLXaPe04vZQDNPoCg2e+o6rLtnDUNBT +JOIWMKRISxvp7y7L5SAmq2WgcjRF859/wDZlRQePogF8omz8Io9ym8lpe5H8JAueE8i E/PSWHVb6BnmfLWTGFKZ3sXKrZMJqK6YRvei7tO4P2doZCnJakBPFQAu/aVT7U1MU2rc b5N1d4f/Pyz+TDmokZAE3Wj3nUZeWsNYpnWSTSVfhV51QeMEYU8QJn6M4oSzhQyUot2C wx7Jt1iB2hdrs5ia/DOiGa/dbTSgbKFKLruTnBnU9gcNzxww9s3rjEOYvPft12MDjS1k /VJw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=zhE0g4re; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id cw15-20020a056a00450f00b00567719e34aesi1967167pfb.49.2022.10.19.02.38.31; Wed, 19 Oct 2022 02:38:43 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=zhE0g4re; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233412AbiJSJWO (ORCPT + 99 others); Wed, 19 Oct 2022 05:22:14 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57622 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233312AbiJSJUb (ORCPT ); Wed, 19 Oct 2022 05:20:31 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AACF01A39C; Wed, 19 Oct 2022 02:09:37 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 1A25A61840; Wed, 19 Oct 2022 09:05:28 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 3044BC433D7; Wed, 19 Oct 2022 09:05:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1666170327; bh=2SjkYBbMahUyEZ8l3HQc8s3wgTMQACh2AITrVhmAKIQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=zhE0g4rex5B121wUNxxczWI5aXtPfmIqGjbokglSXlmiLWLbRAJvmxreT9U1/7hff jHdmtCFfY3gGmKMyhZSxPxqpNSJZQipCjc3/M3pO8FH38V7MlhWyfydkRV0+0DC/q+ +If2mzJx5ynzB4kQf4rxDBvdKMSJyvm25hy6Zwjo= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, =?utf-8?q?Pali_Roh=C3=A1r?= , Michael Ellerman , Sasha Levin Subject: [PATCH 6.0 614/862] powerpc: dts: turris1x.dts: Fix labels in DSA cpu port nodes Date: Wed, 19 Oct 2022 10:31:41 +0200 Message-Id: <20221019083317.059255466@linuxfoundation.org> X-Mailer: git-send-email 2.38.0 In-Reply-To: <20221019083249.951566199@linuxfoundation.org> References: <20221019083249.951566199@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 X-Spam-Status: No, score=-7.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1747108310581783527?= X-GMAIL-MSGID: =?utf-8?q?1747108310581783527?= From: Pali Rohár [ Upstream commit 8bf056f57f1d16c561e43f9af37301f23990cd21 ] DSA cpu port node has to be marked with "cpu" label. So fix it for both cpu port nodes. Fixes: 54c15ec3b738 ("powerpc: dts: Add DTS file for CZ.NIC Turris 1.x routers") Signed-off-by: Pali Rohár Signed-off-by: Michael Ellerman Link: https://lore.kernel.org/r/20220827131538.14577-1-pali@kernel.org Signed-off-by: Sasha Levin --- arch/powerpc/boot/dts/turris1x.dts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/powerpc/boot/dts/turris1x.dts b/arch/powerpc/boot/dts/turris1x.dts index 47027b4cebb3..045af668e928 100644 --- a/arch/powerpc/boot/dts/turris1x.dts +++ b/arch/powerpc/boot/dts/turris1x.dts @@ -147,7 +147,7 @@ port@0 { reg = <0>; - label = "cpu1"; + label = "cpu"; ethernet = <&enet1>; phy-mode = "rgmii-id"; @@ -184,7 +184,7 @@ port@6 { reg = <6>; - label = "cpu0"; + label = "cpu"; ethernet = <&enet0>; phy-mode = "rgmii-id";