diff mbox series

[1/1] net: stmmac: rk3588: Allow multiple gmac controller

Message ID 20221021172422.88534-1-sebastian.reichel@collabora.com (mailing list archive)
State New, archived
Headers show
Series [1/1] net: stmmac: rk3588: Allow multiple gmac controller | expand

Commit Message

Sebastian Reichel Oct. 21, 2022, 5:24 p.m. UTC
From: Benjamin Gaignard <benjamin.gaignard@collabora.com>

RK3588(s) can have multiple gmac controllers.
Re-use rk3568 logic to distinguish them.

Fixes: 2f2b60a0ec28 ("net: ethernet: stmmac: dwmac-rk: Add gmac support for rk3588")
Signed-off-by: Benjamin Gaignard <benjamin.gaignard@collabora.com>
Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>
---
This is required to access gmac1, which is the only existing controller
in the rk3588s (slim variant of rk3588).
---
 drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c | 6 ++++++
 1 file changed, 6 insertions(+)

Comments

patchwork-bot+netdevbpf@kernel.org Oct. 25, 2022, 9:20 a.m. UTC | #1
Hello:

This patch was applied to netdev/net.git (master)
by Paolo Abeni <pabeni@redhat.com>:

On Fri, 21 Oct 2022 19:24:22 +0200 you wrote:
> From: Benjamin Gaignard <benjamin.gaignard@collabora.com>
> 
> RK3588(s) can have multiple gmac controllers.
> Re-use rk3568 logic to distinguish them.
> 
> Fixes: 2f2b60a0ec28 ("net: ethernet: stmmac: dwmac-rk: Add gmac support for rk3588")
> Signed-off-by: Benjamin Gaignard <benjamin.gaignard@collabora.com>
> Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>
> 
> [...]

Here is the summary with links:
  - [1/1] net: stmmac: rk3588: Allow multiple gmac controller
    https://git.kernel.org/netdev/net/c/88619e77b33d

You are awesome, thank you!
diff mbox series

Patch

diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c
index f7269d79a385..6656d76b6766 100644
--- a/drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c
+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c
@@ -1243,6 +1243,12 @@  static const struct rk_gmac_ops rk3588_ops = {
 	.set_rgmii_speed = rk3588_set_gmac_speed,
 	.set_rmii_speed = rk3588_set_gmac_speed,
 	.set_clock_selection = rk3588_set_clock_selection,
+	.regs_valid = true,
+	.regs = {
+		0xfe1b0000, /* gmac0 */
+		0xfe1c0000, /* gmac1 */
+		0x0, /* sentinel */
+	},
 };
 
 #define RV1108_GRF_GMAC_CON0		0X0900