[PATCH v2] clk: vf610: Add support for the Ethernet switch clocks

[PATCH v2] clk: vf610: Add support for the Ethernet switch clocks

[Lukasz Majewski]

From: Lukasz Majewski <lukma@denx.de>

The vf610 device has built in the MoreThanIP L2 switch. For proper
operation it is required to enable ESW and MAC table lookup clocks.

The MAC table spans from 0x400E_C000 for 0x4000 and it is necessary
to provide clocks for each AIPS1-"slot", which size is 0x1000
(hence four separate entries).

Those can be enabled via clock gating CCM_CCGR10 register (0x4006_B068).

This patch also adds VF610_CLK_ESW and VF610_CLK_ESW_MAC_TAB{0123}
macros definitions for L2 switch.

The VF610_CLK_END has been removed as its number had to be increased
when MTIP L2 switch clocks were added.

Signed-off-by: Lukasz Majewski <lukma@nabladev.com>
---
Changes for v2:
- Squash clock DT bindings to this single patch
- Replace VF610_CLK_END with VF610_CLK_ESW_MAC_TAB3 + 1
---
 drivers/clk/imx/clk-vf610.c             | 7 ++++++-
 include/dt-bindings/clock/vf610-clock.h | 6 +++++-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/drivers/clk/imx/clk-vf610.c b/drivers/clk/imx/clk-vf610.c
index 9e11f1c7c397..e074442c12fd 100644
--- a/drivers/clk/imx/clk-vf610.c
+++ b/drivers/clk/imx/clk-vf610.c
@@ -110,7 +110,7 @@ static const struct clk_div_table pll4_audio_div_table[] = {
 	{ }
 };
 
-static struct clk *clk[VF610_CLK_END];
+static struct clk *clk[VF610_CLK_ESW_MAC_TAB3 + 1];
 static struct clk_onecell_data clk_data;
 
 static u32 cscmr1;
@@ -309,6 +309,11 @@ static void __init vf610_clocks_init(struct device_node *ccm_node)
 	clk[VF610_CLK_ENET_TS] = imx_clk_gate("enet_ts", "enet_ts_sel", CCM_CSCDR1, 23);
 	clk[VF610_CLK_ENET0] = imx_clk_gate2("enet0", "ipg_bus", CCM_CCGR9, CCM_CCGRx_CGn(0));
 	clk[VF610_CLK_ENET1] = imx_clk_gate2("enet1", "ipg_bus", CCM_CCGR9, CCM_CCGRx_CGn(1));
+	clk[VF610_CLK_ESW] = imx_clk_gate2("esw", "ipg_bus", CCM_CCGR10, CCM_CCGRx_CGn(8));
+	clk[VF610_CLK_ESW_MAC_TAB0] = imx_clk_gate2("esw_tab0", "ipg_bus", CCM_CCGR10, CCM_CCGRx_CGn(12));
+	clk[VF610_CLK_ESW_MAC_TAB1] = imx_clk_gate2("esw_tab1", "ipg_bus", CCM_CCGR10, CCM_CCGRx_CGn(13));
+	clk[VF610_CLK_ESW_MAC_TAB2] = imx_clk_gate2("esw_tab2", "ipg_bus", CCM_CCGR10, CCM_CCGRx_CGn(14));
+	clk[VF610_CLK_ESW_MAC_TAB3] = imx_clk_gate2("esw_tab3", "ipg_bus", CCM_CCGR10, CCM_CCGRx_CGn(15));
 
 	clk[VF610_CLK_PIT] = imx_clk_gate2("pit", "ipg_bus", CCM_CCGR1, CCM_CCGRx_CGn(7));
 
diff --git a/include/dt-bindings/clock/vf610-clock.h b/include/dt-bindings/clock/vf610-clock.h
index 373644e46747..5d94bd561a2e 100644
--- a/include/dt-bindings/clock/vf610-clock.h
+++ b/include/dt-bindings/clock/vf610-clock.h
@@ -197,6 +197,10 @@
 #define VF610_CLK_TCON1			188
 #define VF610_CLK_CAAM			189
 #define VF610_CLK_CRC			190
-#define VF610_CLK_END			191
+#define VF610_CLK_ESW			191
+#define VF610_CLK_ESW_MAC_TAB0		192
+#define VF610_CLK_ESW_MAC_TAB1		193
+#define VF610_CLK_ESW_MAC_TAB2		194
+#define VF610_CLK_ESW_MAC_TAB3		195
 
 #endif /* __DT_BINDINGS_CLOCK_VF610_H */
-- 
2.39.5

Re: [PATCH v2] clk: vf610: Add support for the Ethernet switch clocks

[Andrew Lunn]

On Mon, Jan 26, 2026 at 12:53:49PM +0100, Lukasz Majewski wrote:
> From: Lukasz Majewski <lukma@denx.de>
> 
> The vf610 device has built in the MoreThanIP L2 switch. For proper
> operation it is required to enable ESW and MAC table lookup clocks.
> 
> The MAC table spans from 0x400E_C000 for 0x4000 and it is necessary
> to provide clocks for each AIPS1-"slot", which size is 0x1000
> (hence four separate entries).
> 
> Those can be enabled via clock gating CCM_CCGR10 register (0x4006_B068).
> 
> This patch also adds VF610_CLK_ESW and VF610_CLK_ESW_MAC_TAB{0123}
> macros definitions for L2 switch.
> 
> The VF610_CLK_END has been removed as its number had to be increased
> when MTIP L2 switch clocks were added.
> 
> Signed-off-by: Lukasz Majewski <lukma@nabladev.com>
> ---
> Changes for v2:
> - Squash clock DT bindings to this single patch
> - Replace VF610_CLK_END with VF610_CLK_ESW_MAC_TAB3 + 1

I'm not sure this is the correct thing to do. Normally these _END
values are there so you don't need to change any code when new things
are added to the list. 

Why not just keep VF610_CLK_END at the end, with the value of 196?

    Andrew

Re: [PATCH v2] clk: vf610: Add support for the Ethernet switch clocks

[Łukasz Majewski]

Hi Andrew,

> On Mon, Jan 26, 2026 at 12:53:49PM +0100, Lukasz Majewski wrote:
> > From: Lukasz Majewski <lukma@denx.de>
> > 
> > The vf610 device has built in the MoreThanIP L2 switch. For proper
> > operation it is required to enable ESW and MAC table lookup clocks.
> > 
> > The MAC table spans from 0x400E_C000 for 0x4000 and it is necessary
> > to provide clocks for each AIPS1-"slot", which size is 0x1000
> > (hence four separate entries).
> > 
> > Those can be enabled via clock gating CCM_CCGR10 register
> > (0x4006_B068).
> > 
> > This patch also adds VF610_CLK_ESW and VF610_CLK_ESW_MAC_TAB{0123}
> > macros definitions for L2 switch.
> > 
> > The VF610_CLK_END has been removed as its number had to be increased
> > when MTIP L2 switch clocks were added.
> > 
> > Signed-off-by: Lukasz Majewski <lukma@nabladev.com>
> > ---
> > Changes for v2:
> > - Squash clock DT bindings to this single patch
> > - Replace VF610_CLK_END with VF610_CLK_ESW_MAC_TAB3 + 1  
> 
> I'm not sure this is the correct thing to do. Normally these _END
> values are there so you don't need to change any code when new things
> are added to the list. 
> 
> Why not just keep VF610_CLK_END at the end, with the value of 196?
> 
>     Andrew

Conor (on CC) explicitly asked to remove VF610_CLK_END:
"[PATCH] dt-bindings: clock: vf610: Add definitions for MTIP L2 switch"

------>8------------
> -#define VF610_CLK_END			191  

If end is modifiable, it is removable. If you need the define for the
driver, please move it there.
------8<------------

I just follow what he asked.

-- 
Best regards,

Lukasz Majewski

--
Nabla Software Engineering GmbH
HRB 40522 Augsburg
Phone: +49 821 45592596
E-Mail: office@nabladev.com
Managing Director : Stefano Babic

Re: [PATCH v2] clk: vf610: Add support for the Ethernet switch clocks

[Fabio Estevam]

Hi Łukasz,

On Mon, Jan 26, 2026 at 4:33 PM Łukasz Majewski <lukma@nabladev.com> wrote:

> Conor (on CC) explicitly asked to remove VF610_CLK_END:
> "[PATCH] dt-bindings: clock: vf610: Add definitions for MTIP L2 switch"
>
> ------>8------------
> > -#define VF610_CLK_END                        191
>
> If end is modifiable, it is removable. If you need the define for the
> driver, please move it there.
> ------8<------------
>
> I just follow what he asked.

You should still use VF610_CLK_END. Just define it inside the clk
driver instead of in the dt-bindings.

Please check these two i.MX93 patches that explain the rationale:

https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?h=v6.19-rc7&id=c0813ce2e5b0d1174782aff30d366509377abc7b

https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?h=v6.19-rc7&id=0af18ba60752e8a4ba34404c1d9a4a799da690f5

Re: [PATCH v2] clk: vf610: Add support for the Ethernet switch clocks

[Łukasz Majewski]

Hi Fabio,

> Hi Łukasz,
> 
> On Mon, Jan 26, 2026 at 4:33 PM Łukasz Majewski <lukma@nabladev.com>
> wrote:
> 
> > Conor (on CC) explicitly asked to remove VF610_CLK_END:
> > "[PATCH] dt-bindings: clock: vf610: Add definitions for MTIP L2
> > switch" 
> > ------>8------------
> > > -#define VF610_CLK_END                        191  
> >
> > If end is modifiable, it is removable. If you need the define for
> > the driver, please move it there.
> > ------8<------------
> >
> > I just follow what he asked.  
> 
> You should still use VF610_CLK_END. Just define it inside the clk
> driver instead of in the dt-bindings.
> 
> Please check these two i.MX93 patches that explain the rationale:
> 
> https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?h=v6.19-rc7&id=c0813ce2e5b0d1174782aff30d366509377abc7b
> 
> https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?h=v6.19-rc7&id=0af18ba60752e8a4ba34404c1d9a4a799da690f5

Ok, if this is the agreed approach, I'm going to use it.

Thanks for pointing this out.

-- 
Best regards,

Lukasz Majewski

--
Nabla Software Engineering GmbH
HRB 40522 Augsburg
Phone: +49 821 45592596
E-Mail: office@nabladev.com
Managing Director : Stefano Babic