f2f42a54e8
The qca8k patch series brings the numbering to 799. This patch renames 7xx patches to create space for more backports to be added. Signed-off-by: Matthew Hagan <mnhagan88@gmail.com> [rename 729->719] Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
79 lines
2.4 KiB
Diff
79 lines
2.4 KiB
Diff
From f477d1c8bdbef4f400718238e350f16f521d2a3e Mon Sep 17 00:00:00 2001
|
|
From: Ansuel Smith <ansuelsmth@gmail.com>
|
|
Date: Thu, 14 Oct 2021 00:39:17 +0200
|
|
Subject: net: dsa: qca8k: add support for QCA8328
|
|
|
|
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>
|
|
Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
|
|
Signed-off-by: David S. Miller <davem@davemloft.net>
|
|
---
|
|
drivers/net/dsa/qca8k.c | 19 ++++++++++++++++---
|
|
drivers/net/dsa/qca8k.h | 1 +
|
|
2 files changed, 17 insertions(+), 3 deletions(-)
|
|
|
|
--- a/drivers/net/dsa/qca8k.c
|
|
+++ b/drivers/net/dsa/qca8k.c
|
|
@@ -935,6 +935,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;
|
|
|
|
@@ -943,8 +944,14 @@ qca8k_setup_of_pws_reg(struct qca8k_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;
|
|
}
|
|
@@ -2098,7 +2105,12 @@ static int qca8k_resume(struct device *d
|
|
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,
|
|
};
|
|
|
|
@@ -2107,7 +2119,8 @@ static const struct qca8k_match_data qca
|
|
};
|
|
|
|
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 */ },
|
|
--- a/drivers/net/dsa/qca8k.h
|
|
+++ b/drivers/net/dsa/qca8k.h
|
|
@@ -260,6 +260,7 @@ struct ar8xxx_port_status {
|
|
|
|
struct qca8k_match_data {
|
|
u8 id;
|
|
+ bool reduced_package;
|
|
};
|
|
|
|
enum {
|