devicetree.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Ansuel Smith <ansuelsmth@gmail.com>
To: Florian Fainelli <f.fainelli@gmail.com>
Cc: Ansuel Smith <ansuelsmth@gmail.com>, Andrew Lunn <andrew@lunn.ch>,
	Vivien Didelot <vivien.didelot@gmail.com>,
	Vladimir Oltean <olteanv@gmail.com>,
	"David S. Miller" <davem@davemloft.net>,
	Jakub Kicinski <kuba@kernel.org>,
	Rob Herring <robh+dt@kernel.org>,
	Heiner Kallweit <hkallweit1@gmail.com>,
	Russell King <linux@armlinux.org.uk>,
	netdev@vger.kernel.org, devicetree@vger.kernel.org,
	linux-kernel@vger.kernel.org
Subject: [PATCH 05/14] drivers: net: dsa: qca8k: add support for qca8327 switch
Date: Fri, 23 Apr 2021 03:47:31 +0200	[thread overview]
Message-ID: <20210423014741.11858-6-ansuelsmth@gmail.com> (raw)
In-Reply-To: <20210423014741.11858-1-ansuelsmth@gmail.com>

qca8327 switch is a low tier version of the more recent qca8337.
It does share the same regs used by the qca8k driver and can be
supported with minimal change.

Signed-off-by: Ansuel Smith <ansuelsmth@gmail.com>
---
 drivers/net/dsa/qca8k.c | 21 ++++++++++++++++++---
 drivers/net/dsa/qca8k.h |  6 ++++++
 2 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/drivers/net/dsa/qca8k.c b/drivers/net/dsa/qca8k.c
index 7408cbee05c2..ca12394c2ff7 100644
--- a/drivers/net/dsa/qca8k.c
+++ b/drivers/net/dsa/qca8k.c
@@ -1440,6 +1440,7 @@ static const struct dsa_switch_ops qca8k_switch_ops = {
 static int
 qca8k_sw_probe(struct mdio_device *mdiodev)
 {
+	const struct qca8k_match_data *data;
 	struct qca8k_priv *priv;
 	u32 id;
 
@@ -1467,11 +1468,16 @@ qca8k_sw_probe(struct mdio_device *mdiodev)
 		gpiod_set_value_cansleep(priv->reset_gpio, 0);
 	}
 
+	/* get the switches ID from the compatible */
+	data = of_device_get_match_data(&mdiodev->dev);
+	if (!data)
+		return -ENODEV;
+
 	/* read the switches ID register */
 	id = qca8k_read(priv, QCA8K_REG_MASK_CTRL);
 	id >>= QCA8K_MASK_CTRL_ID_S;
 	id &= QCA8K_MASK_CTRL_ID_M;
-	if (id != QCA8K_ID_QCA8337)
+	if (id != data->id)
 		return -ENODEV;
 
 	priv->ds = devm_kzalloc(&mdiodev->dev, sizeof(*priv->ds), GFP_KERNEL);
@@ -1537,9 +1543,18 @@ static int qca8k_resume(struct device *dev)
 static SIMPLE_DEV_PM_OPS(qca8k_pm_ops,
 			 qca8k_suspend, qca8k_resume);
 
+static const struct qca8k_match_data qca832x = {
+	.id = QCA8K_ID_QCA8327,
+};
+
+static const struct qca8k_match_data qca833x = {
+	.id = QCA8K_ID_QCA8337,
+};
+
 static const struct of_device_id qca8k_of_match[] = {
-	{ .compatible = "qca,qca8334" },
-	{ .compatible = "qca,qca8337" },
+	{ .compatible = "qca,qca8327", .data = &qca832x },
+	{ .compatible = "qca,qca8334", .data = &qca833x },
+	{ .compatible = "qca,qca8337", .data = &qca833x },
 	{ /* sentinel */ },
 };
 
diff --git a/drivers/net/dsa/qca8k.h b/drivers/net/dsa/qca8k.h
index 0ff7abbd40dc..d94129371a1c 100644
--- a/drivers/net/dsa/qca8k.h
+++ b/drivers/net/dsa/qca8k.h
@@ -15,6 +15,8 @@
 #define QCA8K_NUM_PORTS					7
 #define QCA8K_MAX_MTU					9000
 
+#define PHY_ID_QCA8327					0x004dd034
+#define QCA8K_ID_QCA8327				0x12
 #define PHY_ID_QCA8337					0x004dd036
 #define QCA8K_ID_QCA8337				0x13
 
@@ -234,6 +236,10 @@ struct ar8xxx_port_status {
 	int enabled;
 };
 
+struct qca8k_match_data {
+	u8 id;
+};
+
 struct qca8k_priv {
 	struct regmap *regmap;
 	struct mii_bus *bus;
-- 
2.30.2


  parent reply	other threads:[~2021-04-23  1:48 UTC|newest]

Thread overview: 36+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-04-23  1:47 [PATCH 00/14] Multiple improvement to qca8k stability Ansuel Smith
2021-04-23  1:47 ` [PATCH 01/14] drivers: net: dsa: qca8k: handle error with set_page Ansuel Smith
2021-04-23  1:52   ` Florian Fainelli
2021-04-23  1:47 ` [PATCH 02/14] drivers: net: dsa: qca8k: tweak internal delay to oem spec Ansuel Smith
2021-04-23  1:53   ` Florian Fainelli
2021-04-23  1:57     ` Ansuel Smith
2021-04-23  1:58       ` Florian Fainelli
2021-04-23 12:25   ` Andrew Lunn
2021-04-23  1:47 ` [PATCH 03/14] drivers: net: mdio: mdio-ip8064: improve busy wait delay Ansuel Smith
2021-04-23  1:56   ` Florian Fainelli
2021-04-23  2:03     ` Ansuel Smith
2021-04-23 12:38   ` Andrew Lunn
2021-04-23  1:47 ` [PATCH 04/14] drivers: net: dsa: qca8k: apply suggested packet priority Ansuel Smith
2021-04-23  1:47 ` Ansuel Smith [this message]
2021-04-23 12:42   ` [PATCH 05/14] drivers: net: dsa: qca8k: add support for qca8327 switch Andrew Lunn
2021-04-23  1:47 ` [PATCH 06/14] devicetree: net: dsa: qca8k: Document new compatible qca8327 Ansuel Smith
2021-04-23  1:47 ` [PATCH 07/14] drivers: net: dsa: qca8k: limit priority tweak to qca8337 switch Ansuel Smith
2021-04-23  1:59   ` Florian Fainelli
2021-04-23  1:47 ` [PATCH 08/14] drivers: net: dsa: qca8k: add GLOBAL_FC settings needed for qca8327 Ansuel Smith
2021-04-23  1:47 ` [PATCH 09/14] drivers: net: dsa: qca8k: add support for switch rev Ansuel Smith
2021-04-23  1:47 ` [PATCH 10/14] drivers: net: dsa: qca8k: add support for specific QCA access function Ansuel Smith
2021-04-23 12:47   ` Andrew Lunn
2021-04-23  1:47 ` [PATCH 11/14] drivers: net: dsa: qca8k: apply switch revision fix Ansuel Smith
2021-04-23  2:02   ` Florian Fainelli
2021-04-24 21:18     ` Ansuel Smith
2021-04-24 21:49       ` Heiner Kallweit
2021-04-25  1:09       ` Florian Fainelli
2021-04-25  1:19         ` Ansuel Smith
2021-04-25  4:45       ` DENG Qingfang
2021-04-25 11:59         ` Ansuel Smith
2021-04-25 14:33           ` Andrew Lunn
2021-04-23  1:47 ` [PATCH 12/14] drivers: net: dsa: qca8k: clear MASTER_EN after phy read/write Ansuel Smith
2021-04-23  1:47 ` [PATCH 13/14] drivers: net: dsa: qca8k: protect MASTER busy_wait with mdio mutex Ansuel Smith
2021-04-23 12:53   ` Andrew Lunn
2021-04-23  1:47 ` [PATCH 14/14] drivers: net: dsa: qca8k: enlarge mdio delay and timeout Ansuel Smith
2021-04-23  1:51 ` [PATCH 00/14] Multiple improvement to qca8k stability Florian Fainelli

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20210423014741.11858-6-ansuelsmth@gmail.com \
    --to=ansuelsmth@gmail.com \
    --cc=andrew@lunn.ch \
    --cc=davem@davemloft.net \
    --cc=devicetree@vger.kernel.org \
    --cc=f.fainelli@gmail.com \
    --cc=hkallweit1@gmail.com \
    --cc=kuba@kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux@armlinux.org.uk \
    --cc=netdev@vger.kernel.org \
    --cc=olteanv@gmail.com \
    --cc=robh+dt@kernel.org \
    --cc=vivien.didelot@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).