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>,
Russell King <linux@armlinux.org.uk>,
netdev@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [RFC PATCH net-next v2 05/17] net: dsa: qca8k: add support for qca8327 switch
Date: Mon, 3 May 2021 01:06:57 +0200 [thread overview]
Message-ID: <20210502230710.30676-5-ansuelsmth@gmail.com> (raw)
In-Reply-To: <20210502230710.30676-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 | 23 ++++++++++++++++++++---
drivers/net/dsa/qca8k.h | 6 ++++++
2 files changed, 26 insertions(+), 3 deletions(-)
diff --git a/drivers/net/dsa/qca8k.c b/drivers/net/dsa/qca8k.c
index 0678c213065f..acfe072e9430 100644
--- a/drivers/net/dsa/qca8k.c
+++ b/drivers/net/dsa/qca8k.c
@@ -1522,6 +1522,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;
int ret;
u32 id;
@@ -1550,6 +1551,11 @@ 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 */
ret = qca8k_read(priv, QCA8K_REG_MASK_CTRL, &id);
if (ret)
@@ -1557,8 +1563,10 @@ qca8k_sw_probe(struct mdio_device *mdiodev)
id >>= QCA8K_MASK_CTRL_ID_S;
id &= QCA8K_MASK_CTRL_ID_M;
- if (id != QCA8K_ID_QCA8337)
+ if (id != data->id) {
+ dev_err(&mdiodev->dev, "Switch id detected %x but expected %x", id, data->id);
return -ENODEV;
+ }
priv->ds = devm_kzalloc(&mdiodev->dev, sizeof(*priv->ds), GFP_KERNEL);
if (!priv->ds)
@@ -1623,9 +1631,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 7ca4b93e0bb5..86e8d479c9f9 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
@@ -211,6 +213,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
next prev parent reply other threads:[~2021-05-02 23:07 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-02 23:06 [RFC PATCH net-next v2 01/17] net: mdio: ipq8064: clean whitespaces in define Ansuel Smith
2021-05-02 23:06 ` [RFC PATCH net-next v2 02/17] net: mdio: ipq8064: switch to write/readl function Ansuel Smith
2021-05-03 12:49 ` Andrew Lunn
2021-05-03 14:24 ` Ansuel Smith
2021-05-03 14:44 ` Andrew Lunn
2021-05-02 23:06 ` [RFC PATCH net-next v2 03/17] net: mdio: ipq8064: enlarge sleep after read/write operation Ansuel Smith
2021-05-02 23:06 ` [RFC PATCH net-next v2 04/17] net: dsa: qca8k: rework read/write/set_page to provide error Ansuel Smith
2021-05-02 23:06 ` Ansuel Smith [this message]
2021-05-02 23:06 ` [RFC PATCH net-next v2 06/17] devicetree: net: dsa: qca8k: Document new compatible qca8327 Ansuel Smith
2021-05-02 23:06 ` [RFC PATCH net-next v2 07/17] net: dsa: qca8k: add priority tweak to qca8337 switch Ansuel Smith
2021-05-02 23:07 ` [RFC PATCH net-next v2 08/17] net: dsa: qca8k: add GLOBAL_FC settings needed for qca8327 Ansuel Smith
2021-05-02 23:07 ` [RFC PATCH net-next v2 09/17] net: dsa: qca8k: add support for switch rev Ansuel Smith
2021-05-02 23:07 ` [RFC PATCH net-next v2 10/17] net: dsa: qca8k: make rgmii delay configurable Ansuel Smith
2021-05-03 0:54 ` Ansuel Smith
2021-05-02 23:07 ` [RFC PATCH net-next v2 11/17] net: dsa: qca8k: clear MASTER_EN after phy read/write Ansuel Smith
2021-05-02 23:07 ` [RFC PATCH net-next v2 12/17] net: dsa: qca8k: dsa: qca8k: protect MASTER busy_wait with mdio mutex Ansuel Smith
2021-05-02 23:07 ` [RFC PATCH net-next v2 13/17] net: dsa: qca8k: enlarge mdio delay and timeout Ansuel Smith
2021-05-02 23:07 ` [RFC PATCH net-next v2 14/17] net: phy: phylink: permit to pass dev_flags to phylink_connect_phy Ansuel Smith
2021-05-02 23:07 ` [RFC PATCH net-next v2 15/17] net: dsa: slave: pass dev_flags also to internal PHY Ansuel Smith
2021-05-02 23:07 ` [RFC PATCH net-next v2 16/17] net: dsa: qca8k: pass switch_revision info to phy dev_flags Ansuel Smith
2021-05-02 23:07 ` [RFC PATCH net-next v2 17/17] net: phy: add qca8k driver for qca8k switch internal PHY Ansuel Smith
2021-05-02 23:07 ` [RFC PATCH net-next v2 00/17] Multiple improvement to qca8k stability Ansuel Smith
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=20210502230710.30676-5-ansuelsmth@gmail.com \
--to=ansuelsmth@gmail.com \
--cc=andrew@lunn.ch \
--cc=davem@davemloft.net \
--cc=f.fainelli@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=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).