2024-04-10 14:14:32 +00:00
|
|
|
|
From 12c511cd31c2dc6bd96e4a89f7709d515aa8a76b Mon Sep 17 00:00:00 2001
|
|
|
|
|
|
From: =?UTF-8?q?Ar=C4=B1n=C3=A7=20=C3=9CNAL?= <arinc.unal@arinc9.com>
|
|
|
|
|
|
Date: Tue, 6 Feb 2024 01:08:03 +0300
|
|
|
|
|
|
Subject: [PATCH 13/30] net: dsa: mt7530: move XTAL check to mt7530_setup()
|
|
|
|
|
|
MIME-Version: 1.0
|
|
|
|
|
|
Content-Type: text/plain; charset=UTF-8
|
|
|
|
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
|
|
|
|
|
|
|
|
The crystal frequency concerns the switch core. The frequency should be
|
|
|
|
|
|
checked when the switch is being set up so the driver can reject the
|
|
|
|
|
|
unsupported hardware earlier and without requiring port 6 to be used.
|
|
|
|
|
|
|
|
|
|
|
|
Move it to mt7530_setup(). Drop the unnecessary function printing.
|
|
|
|
|
|
|
|
|
|
|
|
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
|
|
|
|
|
|
Reviewed-by: Vladimir Oltean <olteanv@gmail.com>
|
|
|
|
|
|
Reviewed-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
|
|
|
|
|
|
Signed-off-by: Arınç ÜNAL <arinc.unal@arinc9.com>
|
|
|
|
|
|
Link: https://lore.kernel.org/r/20240206-for-netnext-mt7530-improvements-2-v5-2-d7d92a185cb1@arinc9.com
|
|
|
|
|
|
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
|
|
|
|
|
|
---
|
|
|
|
|
|
drivers/net/dsa/mt7530.c | 13 ++++++-------
|
|
|
|
|
|
1 file changed, 6 insertions(+), 7 deletions(-)
|
|
|
|
|
|
|
|
|
|
|
|
--- a/drivers/net/dsa/mt7530.c
|
|
|
|
|
|
+++ b/drivers/net/dsa/mt7530.c
|
|
|
|
|
|
@@ -422,13 +422,6 @@ mt7530_pad_clk_setup(struct dsa_switch *
|
|
|
|
|
|
|
|
|
|
|
|
xtal = mt7530_read(priv, MT7530_MHWTRAP) & HWTRAP_XTAL_MASK;
|
|
|
|
|
|
|
|
|
|
|
|
- if (xtal == HWTRAP_XTAL_20MHZ) {
|
|
|
|
|
|
- dev_err(priv->dev,
|
|
|
|
|
|
- "%s: MT7530 with a 20MHz XTAL is not supported!\n",
|
|
|
|
|
|
- __func__);
|
|
|
|
|
|
- return -EINVAL;
|
|
|
|
|
|
- }
|
|
|
|
|
|
-
|
|
|
|
|
|
switch (interface) {
|
|
|
|
|
|
case PHY_INTERFACE_MODE_RGMII:
|
|
|
|
|
|
trgint = 0;
|
2024-04-28 06:25:30 +00:00
|
|
|
|
@@ -2458,6 +2451,12 @@ mt7530_setup(struct dsa_switch *ds)
|
2024-04-10 14:14:32 +00:00
|
|
|
|
return -ENODEV;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
+ if ((val & HWTRAP_XTAL_MASK) == HWTRAP_XTAL_20MHZ) {
|
|
|
|
|
|
+ dev_err(priv->dev,
|
|
|
|
|
|
+ "MT7530 with a 20MHz XTAL is not supported!\n");
|
|
|
|
|
|
+ return -EINVAL;
|
|
|
|
|
|
+ }
|
|
|
|
|
|
+
|
|
|
|
|
|
/* Reset the switch through internal reset */
|
|
|
|
|
|
mt7530_write(priv, MT7530_SYS_CTRL,
|
|
|
|
|
|
SYS_CTRL_PHY_RST | SYS_CTRL_SW_RST |
|
