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;
From:   Vladimir Oltean <vladimir.oltean@nxp.com>
To:     "David S . Miller" <davem@davemloft.net>,
        Jakub Kicinski <kuba@kernel.org>, netdev@vger.kernel.org
Cc:     devicetree@vger.kernel.org, linux-kernel@vger.kernel.org,
        linux-arm-kernel@lists.infradead.org,
        Rob Herring <robh+dt@kernel.org>,
        Shawn Guo <shawnguo@kernel.org>, Andrew Lunn <andrew@lunn.ch>,
        Heiner Kallweit <hkallweit1@gmail.com>,
        Russell King <linux@armlinux.org.uk>,
        Vivien Didelot <vivien.didelot@gmail.com>,
        Vladimir Oltean <olteanv@gmail.com>,
        Florian Fainelli <f.fainelli@gmail.com>,
        Prasanna Vengateshan <prasanna.vengateshan@microchip.com>,
        Ansuel Smith <ansuelsmth@gmail.com>,
        =?UTF-8?q?Alvin=20=C5=A0ipraga?= <alsi@bang-olufsen.dk>
Subject: [PATCH net-next 1/6] ARM: dts: imx6qp-prtwd3: update RGMII delays for sja1105 switch
Date:   Thu, 14 Oct 2021 01:23:08 +0300
Message-Id: <20211013222313.3767605-2-vladimir.oltean@nxp.com>
In-Reply-To: <20211013222313.3767605-1-vladimir.oltean@nxp.com>
References: <20211013222313.3767605-1-vladimir.oltean@nxp.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?jx94hoRRRwp/MTZPFHLWQGzKAffMlbsfNZD2EdjH0x+V7UJSzltocCPGHyBp?=
 =?us-ascii?Q?14YH21UECUBcZGeVZejn7q2yQVobEfjq84EbqhqTY+/gMsBNYvXoyVBFvqYX?=
 =?us-ascii?Q?4tD5EbKUfWVIqu3uUQ1HCMbgLr9BQ/rSUX0pf2MhH8NmpjmgJ+/6GfbonwvJ?=
 =?us-ascii?Q?/SWHRqIGOMOSaOc2jpzwJ0/nIO+BmsIQODcauKy+QcGkypE63bTKDl/ktKnH?=
 =?us-ascii?Q?QBvT3Y4Mwx+TqFgfz+rtuf92LQGCSA6eWMDnPKjCkrfXb9B731SY4y6eevzU?=
 =?us-ascii?Q?QW0CKyzV+bxBcxiwtU72PuPSTFlMeYlWz9pG6gJ63A5I/VAoVcNZ2zbBE1+z?=
 =?us-ascii?Q?qB57A0G0a9Kk2mHpUK85SpToMSWWaqWMyY/GCXtOM4j6SwQ2TUmCNT54gr1e?=
 =?us-ascii?Q?b0MKNBTttkahZnScLB3/lU3nFmcljS3jMFEH3RgVJfEKD1Bafsfwfp4WBV7J?=
 =?us-ascii?Q?sDHFhWEiPDPtuJhETlIkkVyta83aPXRIA+wBcgfTKrrVFqpAiTHOBANWbCej?=
 =?us-ascii?Q?WnYpT2f/RSNf2qT53VTeZSCedYOoZC9czSPEFziHFVVuXUpxPs8JvpW2/Pq4?=
 =?us-ascii?Q?vBEn8MRIar3RkLZnMKA/ZLwm3IngdWklIqu9nYeG47Z2LVyH8SuAPlyZuUOS?=
 =?us-ascii?Q?Qen+yBbXncnhPdaoFA1UZvqHFdahY3XI2LgVhLS/vC/2UeBWm57Y3Bbv8/3b?=
 =?us-ascii?Q?h/2uBeGt6XbxLIhCGal/hOO0vlufKBkqz9KfJVIqLD8EJa+dm3+EVj07ixI+?=
 =?us-ascii?Q?S9WLvknqnMvmUhVvmQIQRhcKjPPMiaHjJxMkCTwXnzaRsY5zoIa+hLLohKv0?=
 =?us-ascii?Q?/d1/zU8wkeQVFCpTwXuaN06jNg7XwVEkyQlLR6d6OPax7xrZQUtl/LpF2WOv?=
 =?us-ascii?Q?1JEw/I8PEGM6IAgVyz+F4MDJ1rFtyt2W78h8GMgUrnMCjM0kz2brqbMzqZv1?=
 =?us-ascii?Q?HrJWvJnzPGqKvTC1vNasBr4faFAnNcGXNg+cn+SNkOpM76ictwxalvlHmZgW?=
 =?us-ascii?Q?Aj0ewhn74wKZOfPB+7fOB9UutB/K3FgVM9IFxsS0mGxNMYrUfEvfhEMIo0+s?=
 =?us-ascii?Q?9TF7fUnZx1mx/c+U+UOG34gXFGm9tHW8A3ngHIC9LP5+i7Vl+BKaQdD/eIbp?=
 =?us-ascii?Q?KGu3Ms4wIpAwNdD3yzel9RPCtPBG1FVUKloBkVkSYM5xL5XGQBZ94aL78QQx?=
 =?us-ascii?Q?ZLqnZb0qBvm+gLfVaxOAMVUexRJQcWaMBomNV5zJsy1sJ7zb9BFehX5iHPO0?=
 =?us-ascii?Q?MyO/3N2aTPB/grE3lZrlFhQBtN2g0UQ6MTrhLvgPn+l3b1+xO6bEr9z9y3S2?=
 =?us-ascii?Q?vUoIH5E58NCSYKt+/4xC/0Ef?=
X-OriginatorOrg: nxp.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 1874b378-37ef-4b29-6ac2-08d98e983297
X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB5136.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Oct 2021 22:24:18.6631
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: i6Whb7QV+FqEByHlYmGoiuXdUUDFF2QDgXRome9/R7qS97QucyOG5JPWC/b1NR/LULyOKPo/SgbfL/gl4QJgqA==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB4816
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

In the new behavior, the sja1105 driver expects there to be explicit
RGMII delays present on the fixed-link ports, otherwise it will complain
that it falls back to legacy behavior, which is to apply RGMII delays
incorrectly derived from the phy-mode string.

In this case, the legacy behavior of the driver is to apply both RX and
TX delays. To preserve that, add explicit 2 nanosecond delays, which are
identical with what the driver used to add (a 90 degree phase shift).
The delays from the phy-mode are ignored by new kernels (it's still
RGMII as long as it's "rgmii*" something), and the explicit
{rx,tx}-internal-delay-ps properties are ignored by old kernels, so the
change works both ways.

Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com>
---
 arch/arm/boot/dts/imx6qp-prtwd3.dts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/arch/arm/boot/dts/imx6qp-prtwd3.dts b/arch/arm/boot/dts/imx6qp-prtwd3.dts
index b92e0f2748a5..29dd59bfa73d 100644
--- a/arch/arm/boot/dts/imx6qp-prtwd3.dts
+++ b/arch/arm/boot/dts/imx6qp-prtwd3.dts
@@ -178,6 +178,8 @@ port@4 {
 				label = "cpu";
 				ethernet = <&fec>;
 				phy-mode = "rgmii-id";
+				rx-internal-delay-ps = <2000>;
+				tx-internal-delay-ps = <2000>;
 
 				fixed-link {
 					speed = <100>;
-- 
2.25.1