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:   Colin Foster <colin.foster@in-advantage.com>
To:     colin.foster@in-advantage.com,
        Vladimir Oltean <vladimir.oltean@nxp.com>,
        Claudiu Manoil <claudiu.manoil@nxp.com>,
        Alexandre Belloni <alexandre.belloni@bootlin.com>,
        UNGLinuxDriver@microchip.com,
        "David S. Miller" <davem@davemloft.net>,
        Jakub Kicinski <kuba@kernel.org>
Cc:     netdev@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH v1 net] net: mscc: ocelot: remove buggy duplicate write to DEV_CLOCK_CFG
Date:   Wed, 15 Sep 2021 18:23:40 -0700
Message-Id: <20210916012341.518512-1-colin.foster@in-advantage.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?noKo9o8NBe0DnAvIOSvm9fX7soFvgVm1xhTvQXWtt+XqjLFcSefq5wp1/Cy+?=
 =?us-ascii?Q?YiH/XqkiKbJiI4URSaHahaQCiqqX/aiYFy6obPYo50Pa+cmYo94ex1p0Ya+s?=
 =?us-ascii?Q?uE7moX/GV3vcxWQS9uPgbGzjAdPReZTvSVGWXhDic/0+yB2mGxu2XlL+S8gV?=
 =?us-ascii?Q?MveEk+TS2i6ywGgPiMXGl1q+J6yInbNfBtG7VSf9ekMQp/AQVk1RUCrtkkjA?=
 =?us-ascii?Q?sJcpyuUXVbvh915GgLa1iNbW/oQ/XQqqdHREcvTHYCvm0AJrsnF4ncmmDXIH?=
 =?us-ascii?Q?pBfFPfkX8Xt2abvSpSxQ3P8bYaHekQg1crkT1k6TgjwhGfI9b8AnlBa4VZ2w?=
 =?us-ascii?Q?f62lyXKp34OaExdavmPG46pEAv+FWrkJW2V1RQvcF+11nOM1EdueyU2Sz33m?=
 =?us-ascii?Q?ntdFnB+RKCV8DCG6abP7S7ncZ/8Rn0ecH80JQft8US0juVVbvIoLOWDVZrmb?=
 =?us-ascii?Q?aFzEpeWZR3tMOPbhHmcVLof87tq4H2mJv1DFfmFKJbr9GvQVSe6qdQHYjaal?=
 =?us-ascii?Q?cKCjYP/7mvOJfrz5racNDIhGt0MnD5nJQp0CpHw7hws/UQ6dKDOG2u2LzJIy?=
 =?us-ascii?Q?WnGyrFA+L8EjzivpbDLw6nfvmbHER6w1DSjS1464Rvf/JIjubSBFb+UILBP5?=
 =?us-ascii?Q?0YqJ9Zyvz5llNPuVyeKcfRU/HOq5oPCL1Dhg/QpUMJFSP8CR6D6RNrk7PIGA?=
 =?us-ascii?Q?7sCFQUVS7IJPG8uh1uq4gREi5aqZwFuXmRfQWXjtFEa28MLyuAKAfQg3131G?=
 =?us-ascii?Q?9HkK5WBk08gsO0aLtnjgZl7/lFYmAUnW4vAierpLxHRSsJ5/VEq2gEtxP1Q0?=
 =?us-ascii?Q?xHRHNoZpfWYoNWa7FZRXOA74XKoa9CoKf/dXsRMp6JAsZaPZxn+dcAf2i3uQ?=
 =?us-ascii?Q?QCyTLTmbLq6xWsYHjyZu1PO4U9faS+Q6Llo3/DGXL8isVv7xSMU2XEyxHxGH?=
 =?us-ascii?Q?PjRYgix+GqrxoxHI4334S2+/JR1GLvZ1SLsQ2+1ign3r1O51A5ZbslVNOocp?=
 =?us-ascii?Q?X1XL/SRmLq9xh8Fd98ihlW2qpdPkCNihEx3ef94j8X3cm3wleKBvAwW02c99?=
 =?us-ascii?Q?HGd58uEoyfJaPw0yFvmZK1Gvh8wSjzABUgsh334fwxtCc5DRmVw4DjnzQB68?=
 =?us-ascii?Q?ztmb3ZwgxIKfEgNvllwfxrTfhH52HA+7vQi+ar0dg+g0Y8ispBhb6fl52fTd?=
 =?us-ascii?Q?iSAoFs1XgxvtND8IHRn3YLxJbPWWoPWF4mrS+ci57WQJ91vcGcANPQstlxLB?=
 =?us-ascii?Q?rYsDSt1MjNCIHGPmTs5VY8xhwCDd9ixHRkuVemR1WamSc93GmRbzcW7NZVwU?=
 =?us-ascii?Q?DA/1e6OmdUQyOuT/fGsNVgfk?=
X-OriginatorOrg: in-advantage.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 9ca47370-443a-42bf-5b4b-08d978b0a9eb
X-MS-Exchange-CrossTenant-AuthSource: MWHPR1001MB2351.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Sep 2021 01:24:01.2235
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 48e842ca-fbd8-4633-a79d-0c955a7d3aae
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: 7zuOSpmdhd0bX4TfI78ahojLlIp9/20Nns+3mKxhpyEuWrGsuSwQ1R0jRM16BcwqJztlNePV+mKieCEpt9WHVOKO1jELABFJx1pctXJl4rU=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: CO6PR10MB5633
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

When updating ocelot to use phylink, a second write to DEV_CLOCK_CFG was
mistakenly left in. It used the variable "speed" which, previously, would
would have been assigned a value of OCELOT_SPEED_1000. In phylink the
variable is be SPEED_1000, which is invalid for the
DEV_CLOCK_LINK_SPEED macro. Removing it as unnecessary and buggy.

Fixes: e6e12df625f2 ("net: mscc: ocelot: convert to phylink")
Signed-off-by: Colin Foster <colin.foster@in-advantage.com>
---
 drivers/net/ethernet/mscc/ocelot.c | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/drivers/net/ethernet/mscc/ocelot.c b/drivers/net/ethernet/mscc/ocelot.c
index 08be0440af28..729ba826ba17 100644
--- a/drivers/net/ethernet/mscc/ocelot.c
+++ b/drivers/net/ethernet/mscc/ocelot.c
@@ -563,12 +563,6 @@ void ocelot_phylink_mac_link_up(struct ocelot *ocelot, int port,
 	ocelot_port_writel(ocelot_port, DEV_MAC_ENA_CFG_RX_ENA |
 			   DEV_MAC_ENA_CFG_TX_ENA, DEV_MAC_ENA_CFG);
 
-	/* Take MAC, Port, Phy (intern) and PCS (SGMII/Serdes) clock out of
-	 * reset
-	 */
-	ocelot_port_writel(ocelot_port, DEV_CLOCK_CFG_LINK_SPEED(speed),
-			   DEV_CLOCK_CFG);
-
 	/* Core: Enable port for frame transfer */
 	ocelot_fields_write(ocelot, port,
 			    QSYS_SWITCH_PORT_MODE_PORT_ENA, 1);
-- 
2.25.1