[PATCH 2/5] fixup! net: eqos: Rockchip support

[Ahmad Fatoum]

The rk3568 requests some extra clocks, which aren't needed/available for
other SoCs, like the rk3399. To make the driver easier to extend, split
up the clk array into common clocks, needed by all variants and extra
clocks, which are per-variant. This will come in handy for extending
the driver later.

Signed-off-by: Ahmad Fatoum <a.fatoum at pengutronix.de>
---
 drivers/net/designware_rockchip.c | 80 +++++++++++++++++++++----------
 1 file changed, 56 insertions(+), 24 deletions(-)

diff --git a/drivers/net/designware_rockchip.c b/drivers/net/designware_rockchip.c
index 79c514e73054..a4c7bfe925db 100644
--- a/drivers/net/designware_rockchip.c
+++ b/drivers/net/designware_rockchip.c
@@ -20,11 +20,14 @@ struct rk_gmac_ops {
 	void (*set_to_rmii)(struct eqos *eqos);
 	void (*set_speed)(struct eqos *eqos, int speed);
 	void (*integrated_phy_powerup)(struct eqos *eqos);
+
+	const struct clk_bulk_data *extra_clks;
+	unsigned num_extra_clks;
 };
 
 struct eqos_rk_gmac {
-	struct clk_bulk_data *clks;
-	int num_clks;
+	struct clk_bulk_data *common_clks;
+	struct clk_bulk_data *extra_clks;
 	bool clock_input;
 	const struct rk_gmac_ops *ops;
 	struct regmap *grf;
@@ -41,9 +44,6 @@ enum {
 	CLK_MAC_REFOUT,
 	CLK_MAC_ACLK,
 	CLK_MAC_PCLK,
-	CLK_MAC_SPEED,
-	CLK_PTP_REF,
-	CLK_XPCS_PCLK,
 };
 
 static const struct clk_bulk_data rk_gmac_clks[] = {
@@ -53,9 +53,6 @@ static const struct clk_bulk_data rk_gmac_clks[] = {
 	[CLK_MAC_REFOUT]  = { .id = "clk_mac_refout" },
 	[CLK_MAC_ACLK]    = { .id = "aclk_mac" },
 	[CLK_MAC_PCLK]    = { .id = "pclk_mac" },
-	[CLK_MAC_SPEED]   = { .id = "clk_mac_speed" },
-	[CLK_PTP_REF]     = { .id = "ptp_ref" },
-	[CLK_XPCS_PCLK]   = { .id = "pclk_xpcs" },
 };
 
 static inline struct eqos_rk_gmac *to_rk_gmac(struct eqos *eqos)
@@ -94,7 +91,7 @@ static unsigned long eqos_get_csr_clk_rate_rk_gmac(struct eqos *eqos)
 {
 	struct eqos_rk_gmac *priv = to_rk_gmac(eqos);
 
-	return clk_get_rate(priv->clks[CLK_STMMACETH].clk);
+	return clk_get_rate(priv->common_clks[CLK_STMMACETH].clk);
 }
 
 static void rk3568_set_to_rgmii(struct eqos *eqos,
@@ -142,6 +139,18 @@ static void rk3568_set_to_rmii(struct eqos *eqos)
 		     RK3568_GMAC_PHY_INTF_SEL_RMII);
 }
 
+enum {
+	CLK_MAC_SPEED,
+	CLK_PTP_REF,
+	CLK_XPCS_PCLK,
+};
+
+static const struct clk_bulk_data rk3568_gmac_clks[] = {
+	[CLK_MAC_SPEED]   = { .id = "clk_mac_speed" },
+	[CLK_PTP_REF]     = { .id = "ptp_ref" },
+	[CLK_XPCS_PCLK]   = { .id = "pclk_xpcs" },
+};
+
 static void rk3568_set_gmac_speed(struct eqos *eqos, int speed)
 {
 	struct eqos_rk_gmac *priv = to_rk_gmac(eqos);
@@ -164,7 +173,7 @@ static void rk3568_set_gmac_speed(struct eqos *eqos, int speed)
 		return;
 	}
 
-	ret = clk_set_rate(priv->clks[CLK_MAC_SPEED].clk, rate);
+	ret = clk_set_rate(priv->extra_clks[CLK_MAC_SPEED].clk, rate);
 	if (ret)
 		dev_err(dev, "%s: set clk_mac_speed rate %ld failed %d\n",
 			__func__, rate, ret);
@@ -174,6 +183,9 @@ static const struct rk_gmac_ops rk3568_ops = {
 	.set_to_rgmii = rk3568_set_to_rgmii,
 	.set_to_rmii = rk3568_set_to_rmii,
 	.set_speed = rk3568_set_gmac_speed,
+
+	.extra_clks = rk3568_gmac_clks,
+	.num_extra_clks = ARRAY_SIZE(rk3568_gmac_clks),
 };
 
 static int rk_gmac_powerup(struct eqos *eqos)
@@ -221,6 +233,33 @@ static void eqos_rk_adjust_link(struct eth_device *edev)
 	eqos_adjust_link(edev);
 }
 
+static struct clk_bulk_data *eqos_rk_enable_clocks(struct device_d *dev,
+						   const struct clk_bulk_data *_clks,
+						   unsigned num_clks)
+{
+	struct clk_bulk_data *clks;
+	int ret;
+
+	if (!num_clks)
+		return NULL;
+
+	clks = xmemdup(_clks, num_clks * sizeof(*clks));
+
+	ret = clk_bulk_get(dev, num_clks, clks);
+	if (ret) {
+		dev_err(dev, "Failed to get common clks: %s\n", strerror(-ret));
+		return ERR_PTR(ret);
+	}
+
+	ret = clk_bulk_enable(num_clks, clks);
+	if (ret) {
+		dev_err(dev, "Failed to enable common clks: %s\n", strerror(-ret));
+		return ERR_PTR(ret);
+	}
+
+	return clks;
+}
+
 static int eqos_init_rk_gmac(struct device_d *dev, struct eqos *eqos)
 {
 	struct device_node *np = dev->device_node;
@@ -257,21 +296,14 @@ static int eqos_init_rk_gmac(struct device_d *dev, struct eqos *eqos)
 	priv->rx_delay = 0x10;
 	of_property_read_u32(np, "rx_delay", &priv->rx_delay);
 
-	priv->num_clks = ARRAY_SIZE(rk_gmac_clks);
-	priv->clks = xmalloc(priv->num_clks * sizeof(*priv->clks));
-	memcpy(priv->clks, rk_gmac_clks, sizeof rk_gmac_clks);
+	priv->common_clks = eqos_rk_enable_clocks(dev, rk_gmac_clks, ARRAY_SIZE(rk_gmac_clks));
+	if (IS_ERR(priv->common_clks))
+		return PTR_ERR(priv->common_clks);
 
-	ret = clk_bulk_get(dev, priv->num_clks, priv->clks);
-	if (ret) {
-		dev_err(dev, "Failed to get clks: %s\n", strerror(-ret));
-		return ret;
-	}
-
-	ret = clk_bulk_enable(priv->num_clks, priv->clks);
-	if (ret) {
-		dev_err(dev, "Failed to enable clks: %s\n", strerror(-ret));
-		return ret;
-	}
+	priv->extra_clks = eqos_rk_enable_clocks(dev, priv->ops->extra_clks,
+						 priv->ops->num_extra_clks);
+	if (IS_ERR(priv->extra_clks))
+		return PTR_ERR(priv->extra_clks);
 
 	rk_gmac_powerup(eqos);
 
-- 
2.29.2