From: Ansuel Smith <ansuelsmth@gmail.com>
To: Andrew Lunn <andrew@lunn.ch>,
Vivien Didelot <vivien.didelot@gmail.com>,
Florian Fainelli <f.fainelli@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>,
Ansuel Smith <ansuelsmth@gmail.com>,
netdev@vger.kernel.org, devicetree@vger.kernel.org,
linux-kernel@vger.kernel.org
Subject: [net-next PATCH v2 14/15] drivers: net: dsa: qca8k: add support for QCA8328
Date: Fri, 8 Oct 2021 02:22:24 +0200 [thread overview]
Message-ID: <20211008002225.2426-15-ansuelsmth@gmail.com> (raw)
In-Reply-To: <20211008002225.2426-1-ansuelsmth@gmail.com>
QCA8328 switch is the bigger brother of the qca8327. Same regs different
chip. Change the function to set the correct pin layout and introduce a
new match_data to differentiate the 2 switch as they have the same ID
and their internal PHY have the same ID.
Signed-off-by: Ansuel Smith <ansuelsmth@gmail.com>
---
drivers/net/dsa/qca8k.c | 19 ++++++++++++++++---
drivers/net/dsa/qca8k.h | 1 +
2 files changed, 17 insertions(+), 3 deletions(-)
diff --git a/drivers/net/dsa/qca8k.c b/drivers/net/dsa/qca8k.c
index 0dc921cfb8c6..aae0cfcd0ce8 100644
--- a/drivers/net/dsa/qca8k.c
+++ b/drivers/net/dsa/qca8k.c
@@ -943,6 +943,7 @@ static int
qca8k_setup_of_pws_reg(struct qca8k_priv *priv)
{
struct device_node *node = priv->dev->of_node;
+ const struct qca8k_match_data *data;
u32 val = 0;
int ret;
@@ -951,8 +952,14 @@ qca8k_setup_of_pws_reg(struct qca8k_priv *priv)
* Should be applied by default but we set this just to make sure.
*/
if (priv->switch_id == QCA8K_ID_QCA8327) {
+ data = of_device_get_match_data(priv->dev);
+
+ /* Set the correct package of 148 pin for QCA8327 */
+ if (data->reduced_package)
+ val |= QCA8327_PWS_PACKAGE148_EN;
+
ret = qca8k_rmw(priv, QCA8K_REG_PWS, QCA8327_PWS_PACKAGE148_EN,
- QCA8327_PWS_PACKAGE148_EN);
+ val);
if (ret)
return ret;
}
@@ -1994,7 +2001,12 @@ 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 = {
+static const struct qca8k_match_data qca8327 = {
+ .id = QCA8K_ID_QCA8327,
+ .reduced_package = true,
+};
+
+static const struct qca8k_match_data qca8328 = {
.id = QCA8K_ID_QCA8327,
};
@@ -2003,7 +2015,8 @@ static const struct qca8k_match_data qca833x = {
};
static const struct of_device_id qca8k_of_match[] = {
- { .compatible = "qca,qca8327", .data = &qca832x },
+ { .compatible = "qca,qca8327", .data = &qca8327 },
+ { .compatible = "qca,qca8328", .data = &qca8328 },
{ .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 2c98b133ec4f..2d0c41e8cb75 100644
--- a/drivers/net/dsa/qca8k.h
+++ b/drivers/net/dsa/qca8k.h
@@ -262,6 +262,7 @@ struct ar8xxx_port_status {
struct qca8k_match_data {
u8 id;
+ bool reduced_package;
};
struct qca8k_priv {
--
2.32.0
next prev parent reply other threads:[~2021-10-08 0:23 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-10-08 0:22 [net-next PATCH v2 00/15] Multiple improvement for qca8337 switch Ansuel Smith
2021-10-08 0:22 ` [net PATCH v2 01/15] drivers: net: phy: at803x: fix resume for QCA8327 phy Ansuel Smith
2021-10-08 2:23 ` Jakub Kicinski
2021-10-08 8:45 ` Ansuel Smith
2021-10-08 14:21 ` Jakub Kicinski
2021-10-08 0:22 ` [net PATCH v2 02/15] drivers: net: phy: at803x: add DAC amplitude fix for 8327 phy Ansuel Smith
2021-10-08 0:22 ` [net-next PATCH v2 03/15] drivers: net: phy: at803x: enable prefer master for 83xx internal phy Ansuel Smith
2021-10-08 0:22 ` [net-next PATCH v2 04/15] drivers: net: phy: at803x: better describe debug regs Ansuel Smith
2021-10-09 15:08 ` Andrew Lunn
2021-10-08 0:22 ` [net-next PATCH v2 05/15] net: dsa: qca8k: add mac_power_sel support Ansuel Smith
2021-10-08 0:22 ` [net-next PATCH v2 06/15] dt-bindings: net: dsa: qca8k: document rgmii_1_8v bindings Ansuel Smith
2021-10-09 15:18 ` Andrew Lunn
2021-10-09 15:30 ` Ansuel Smith
2021-10-09 17:29 ` Andrew Lunn
2021-10-08 0:22 ` [net-next PATCH v2 07/15] net: dsa: qca8k: add support for mac6_exchange, sgmii falling edge Ansuel Smith
2021-10-08 0:22 ` [net-next PATCH v2 08/15] dt-bindings: net: dsa: qca8k: Add MAC swap and clock phase properties Ansuel Smith
2021-10-09 17:07 ` Andrew Lunn
2021-10-09 18:08 ` Ansuel Smith
2021-10-09 19:47 ` Andrew Lunn
2021-10-09 20:06 ` Ansuel Smith
2021-10-09 21:37 ` Andrew Lunn
2021-10-09 22:23 ` Ansuel Smith
2021-10-08 0:22 ` [net-next PATCH v2 09/15] net: dsa: qca8k: move rgmii delay detection to phylink mac_config Ansuel Smith
2021-10-08 0:22 ` [net-next PATCH v2 10/15] net: dsa: qca8k: add explicit SGMII PLL enable Ansuel Smith
2021-10-08 0:22 ` [net-next PATCH v2 11/15] dt-bindings: net: dsa: qca8k: Document qca,sgmii-enable-pll Ansuel Smith
2021-10-09 17:13 ` Andrew Lunn
2021-10-09 18:14 ` Ansuel Smith
2021-10-08 0:22 ` [net-next PATCH v2 12/15] drivers: net: dsa: qca8k: add support for pws config reg Ansuel Smith
2021-10-08 0:22 ` [net-next PATCH v2 13/15] dt-bindings: net: dsa: qca8k: document open drain binding Ansuel Smith
2021-10-09 17:20 ` Andrew Lunn
2021-10-09 23:16 ` Ansuel Smith
2021-10-08 0:22 ` Ansuel Smith [this message]
2021-10-08 0:22 ` [net-next PATCH v2 15/15] dt-bindings: net: dsa: qca8k: document support for qca8328 Ansuel Smith
2021-10-09 17:24 ` Andrew Lunn
2021-10-09 18:17 ` 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=20211008002225.2426-15-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).