From patchwork Fri Apr 7 15:25:01 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Lunn X-Patchwork-Id: 13205010 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id B3E26C77B61 for ; Fri, 7 Apr 2023 15:25:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232437AbjDGPZl (ORCPT ); Fri, 7 Apr 2023 11:25:41 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39074 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233032AbjDGPZb (ORCPT ); Fri, 7 Apr 2023 11:25:31 -0400 Received: from vps0.lunn.ch (vps0.lunn.ch [156.67.10.101]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 74D749EE5 for ; Fri, 7 Apr 2023 08:25:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lunn.ch; s=20171124; h=Content-Transfer-Encoding:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:From:Sender:Reply-To:Subject:Date: Message-ID:To:Cc:MIME-Version:Content-Type:Content-Transfer-Encoding: Content-ID:Content-Description:Content-Disposition:In-Reply-To:References; bh=WM2tDHH9rXY0X0+Xk8mi6u7u0H/XcHl0OImH+M9gYQ8=; b=5MBVPgq/PW14mhfhOYwQOtxZ1h lsn6IZJGqHhJVkQUMT6A1ngy8MHZzY/SVE/bOU9TUgdlpyOURHkhSeZ+Pc5/nydKevYDlp9HOfcwS ckBCtYtxJFZ7L4Zc6eXTkIW1up+hT7bZ+00fscPXzhYTrrwVbR4WUp2zoqojfsaCMiig=; Received: from andrew by vps0.lunn.ch with local (Exim 4.94.2) (envelope-from ) id 1pknxp-009jjb-PB; Fri, 07 Apr 2023 17:25:21 +0200 From: Andrew Lunn To: shawnguo@kernel.org Cc: s.hauer@pengutronix.de, Russell King , Vladimir Oltean , arm-soc , netdev , Andrew Lunn Subject: [PATCH 1/3] ARM: dts: imx51: ZII: Add missing phy-mode Date: Fri, 7 Apr 2023 17:25:01 +0200 Message-Id: <20230407152503.2320741-2-andrew@lunn.ch> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20230407152503.2320741-1-andrew@lunn.ch> References: <20230407152503.2320741-1-andrew@lunn.ch> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org The DSA framework has got more picky about always having a phy-mode for the CPU port. The imx51 Ethernet supports MII, and RMII. Set the switch phy-mode based on how the SoC Ethernet port has been configured. Additionally, the cpu label has never actually been used in the binding, so remove it. Signed-off-by: Andrew Lunn --- arch/arm/boot/dts/imx51-zii-rdu1.dts | 2 +- arch/arm/boot/dts/imx51-zii-scu2-mezz.dts | 2 +- arch/arm/boot/dts/imx51-zii-scu3-esb.dts | 1 - 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/arch/arm/boot/dts/imx51-zii-rdu1.dts b/arch/arm/boot/dts/imx51-zii-rdu1.dts index e537e06e11d7..8621760af1af 100644 --- a/arch/arm/boot/dts/imx51-zii-rdu1.dts +++ b/arch/arm/boot/dts/imx51-zii-rdu1.dts @@ -181,7 +181,7 @@ ports { port@0 { reg = <0>; - label = "cpu"; + phy-mode = "mii"; ethernet = <&fec>; fixed-link { diff --git a/arch/arm/boot/dts/imx51-zii-scu2-mezz.dts b/arch/arm/boot/dts/imx51-zii-scu2-mezz.dts index 21dd3f7abd48..883e80d92ef0 100644 --- a/arch/arm/boot/dts/imx51-zii-scu2-mezz.dts +++ b/arch/arm/boot/dts/imx51-zii-scu2-mezz.dts @@ -82,7 +82,7 @@ port@3 { port@4 { reg = <4>; - label = "cpu"; + phy-mode = "mii"; ethernet = <&fec>; fixed-link { diff --git a/arch/arm/boot/dts/imx51-zii-scu3-esb.dts b/arch/arm/boot/dts/imx51-zii-scu3-esb.dts index 9f857eb44bf7..19a3b142c964 100644 --- a/arch/arm/boot/dts/imx51-zii-scu3-esb.dts +++ b/arch/arm/boot/dts/imx51-zii-scu3-esb.dts @@ -267,7 +267,6 @@ fixed-link { port@6 { reg = <6>; - label = "cpu"; phy-mode = "mii"; ethernet = <&fec>; From patchwork Fri Apr 7 15:25:02 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Lunn X-Patchwork-Id: 13205009 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id C3F4CC77B61 for ; Fri, 7 Apr 2023 15:25:40 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231812AbjDGPZh (ORCPT ); Fri, 7 Apr 2023 11:25:37 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38932 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232045AbjDGPZ3 (ORCPT ); Fri, 7 Apr 2023 11:25:29 -0400 Received: from vps0.lunn.ch (vps0.lunn.ch [156.67.10.101]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 750B45FEC for ; Fri, 7 Apr 2023 08:25:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lunn.ch; s=20171124; h=Content-Transfer-Encoding:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:From:Sender:Reply-To:Subject:Date: Message-ID:To:Cc:MIME-Version:Content-Type:Content-Transfer-Encoding: Content-ID:Content-Description:Content-Disposition:In-Reply-To:References; bh=Z5IQvTFcmGGpdy7wPN1jqAydJBSopgZpKUblUtUCQ9E=; b=FSOZs2sEmv7B2a+cG5aFjs9GaQ Rh8GyZhqQxlJ74Eu3RduuwmHODJToEnbH/9+/ogdbnSzi5yPudLXbWKnyo1jILZKJTTpzYbTpXmXM hIWEgQCpsQEr9vyMzGCNLFh+WQMuXPMhmZ0uZoGTdelVpIQGkw0RU8/zFd+jX8y9CqE0=; Received: from andrew by vps0.lunn.ch with local (Exim 4.94.2) (envelope-from ) id 1pknxp-009jjf-QB; Fri, 07 Apr 2023 17:25:21 +0200 From: Andrew Lunn To: shawnguo@kernel.org Cc: s.hauer@pengutronix.de, Russell King , Vladimir Oltean , arm-soc , netdev , Andrew Lunn Subject: [PATCH 2/3] ARM: dts: imx6qdl: Add missing phy-mode and fixed links Date: Fri, 7 Apr 2023 17:25:02 +0200 Message-Id: <20230407152503.2320741-3-andrew@lunn.ch> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20230407152503.2320741-1-andrew@lunn.ch> References: <20230407152503.2320741-1-andrew@lunn.ch> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org The DSA framework has got more picky about always having a phy-mode for the CPU port. Add a phy-mode based on what the SoC ethernet is using. For RGMII mode, have the switch add the delays. Additionally, the cpu label has never actually been used in the binding, so remove it. Lastly add a fixed-link node indicating the expected speed/duplex of the link to the SoC. Signed-off-by: Andrew Lunn --- arch/arm/boot/dts/imx6qdl-gw5904.dtsi | 7 ++++++- arch/arm/boot/dts/imx6qdl-zii-rdu2.dtsi | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/arch/arm/boot/dts/imx6qdl-gw5904.dtsi b/arch/arm/boot/dts/imx6qdl-gw5904.dtsi index 9fc79af2bc9a..9594bc5745ed 100644 --- a/arch/arm/boot/dts/imx6qdl-gw5904.dtsi +++ b/arch/arm/boot/dts/imx6qdl-gw5904.dtsi @@ -238,8 +238,13 @@ port@3 { port@5 { reg = <5>; - label = "cpu"; ethernet = <&fec>; + phy-mode = "rgmii-id"; + + fixed-link { + speed = <1000>; + full-duplex; + }; }; }; }; diff --git a/arch/arm/boot/dts/imx6qdl-zii-rdu2.dtsi b/arch/arm/boot/dts/imx6qdl-zii-rdu2.dtsi index 5bb47c79a4da..826a9d6cb4d8 100644 --- a/arch/arm/boot/dts/imx6qdl-zii-rdu2.dtsi +++ b/arch/arm/boot/dts/imx6qdl-zii-rdu2.dtsi @@ -757,7 +757,7 @@ port@1 { port@2 { reg = <2>; - label = "cpu"; + phy-mode = "rmii"; ethernet = <&fec>; fixed-link { From patchwork Fri Apr 7 15:25:03 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Lunn X-Patchwork-Id: 13205011 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 133FDC77B6C for ; Fri, 7 Apr 2023 15:25:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231152AbjDGPZp (ORCPT ); Fri, 7 Apr 2023 11:25:45 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38872 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230368AbjDGPZa (ORCPT ); Fri, 7 Apr 2023 11:25:30 -0400 Received: from vps0.lunn.ch (vps0.lunn.ch [156.67.10.101]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A759F61B3 for ; Fri, 7 Apr 2023 08:25:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lunn.ch; s=20171124; h=Content-Transfer-Encoding:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:From:Sender:Reply-To:Subject:Date: Message-ID:To:Cc:MIME-Version:Content-Type:Content-Transfer-Encoding: Content-ID:Content-Description:Content-Disposition:In-Reply-To:References; bh=X3K7h09C9j8Z0TntfCgb0xN5xS9R+BUD+vkeGUZCJJ4=; b=HDwqa/IB9VWJQSP4nx5Wm/D4aS 54hER2On/jYw4yoI7OVxy2vR84URB6q3nG8xFfQWcigtCsqhJ1W9gg6SlA+c8dlKZotGBeSLeqNKe SKiUoCh1gEp6RD6rEKrAIy6YiVSU2g5MM9vNyknk+4Xg1my7ubbxSnB3IcMCLhDH0g6E=; Received: from andrew by vps0.lunn.ch with local (Exim 4.94.2) (envelope-from ) id 1pknxp-009jjj-R8; Fri, 07 Apr 2023 17:25:21 +0200 From: Andrew Lunn To: shawnguo@kernel.org Cc: s.hauer@pengutronix.de, Russell King , Vladimir Oltean , arm-soc , netdev , Andrew Lunn Subject: [PATCH 3/3] ARM64: dts: freescale: ZII: Add missing phy-mode Date: Fri, 7 Apr 2023 17:25:03 +0200 Message-Id: <20230407152503.2320741-4-andrew@lunn.ch> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20230407152503.2320741-1-andrew@lunn.ch> References: <20230407152503.2320741-1-andrew@lunn.ch> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org The DSA framework has got more picky about always having a phy-mode for the CPU port. The imx8mq Ethernet is being configured to RMII. Set the switch phy-mode based on this. Additionally, the cpu label has never actually been used in the binding, so remove it. Signed-off-by: Andrew Lunn --- arch/arm64/boot/dts/freescale/imx8mq-zii-ultra.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm64/boot/dts/freescale/imx8mq-zii-ultra.dtsi b/arch/arm64/boot/dts/freescale/imx8mq-zii-ultra.dtsi index 3a52679ecd68..3bf7850fbe9c 100644 --- a/arch/arm64/boot/dts/freescale/imx8mq-zii-ultra.dtsi +++ b/arch/arm64/boot/dts/freescale/imx8mq-zii-ultra.dtsi @@ -177,7 +177,7 @@ port@1 { port@2 { reg = <2>; - label = "cpu"; + phy-mode = "rmii"; ethernet = <&fec1>; fixed-link {