[Patch v3 0/4] add NETCMIX block control support on i.MX95

[Patch v3 0/4] add NETCMIX block control support on i.MX95

[Wei Fang]

The NETCMIX block control consists of registers for configuration of
peripherals in the NETC domain, such as MQS, SAI and NETC. So add the
NETCMIX block control support on i.MX95 platform.

---
V2:
1. Patch 2 is new patch.
2. Add rmii reference clock mux for ENETC0 and ENETC1 in patch 3.
Link to V1: https://lore.kernel.org/all/20240709073603.1967609-3-wei.fang@nxp.com/
V3:
Respin the patch set due to merge conflicts.
Link to V2: https://lore.kernel.org/all/20240729012756.3686758-1-wei.fang@nxp.com/
---

Wei Fang (4):
  dt-bindings: clock: add i.MX95 NETCMIX block control
  dt-bindings: clock: add RMII clock selection
  clk: imx95: enable the clock of NETCMIX block control
  arm64: dts: imx95: Add NETCMIX block control support

 .../bindings/clock/nxp,imx95-blk-ctl.yaml     |  1 +
 arch/arm64/boot/dts/freescale/imx95.dtsi      | 12 ++++++++
 drivers/clk/imx/clk-imx95-blk-ctl.c           | 30 +++++++++++++++++++
 include/dt-bindings/clock/nxp,imx95-clock.h   |  3 ++
 4 files changed, 46 insertions(+)

-- 
2.34.1

[Patch v3 1/4] dt-bindings: clock: add i.MX95 NETCMIX block control

[Wei Fang]

Add 'nxp,imx95-netcmix-blk-ctrl' compatible string for i.MX95 platform.

Signed-off-by: Wei Fang <wei.fang@nxp.com>
Acked-by: Rob Herring (Arm) <robh@kernel.org>
---
V3 changes:
Move "nxp,imx95-netcmix-blk-ctrl" above "nxp,imx95-vpu-csr"
---
 Documentation/devicetree/bindings/clock/nxp,imx95-blk-ctl.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Documentation/devicetree/bindings/clock/nxp,imx95-blk-ctl.yaml b/Documentation/devicetree/bindings/clock/nxp,imx95-blk-ctl.yaml
index 2dffc02dcd8b..5dc360b2ea4b 100644
--- a/Documentation/devicetree/bindings/clock/nxp,imx95-blk-ctl.yaml
+++ b/Documentation/devicetree/bindings/clock/nxp,imx95-blk-ctl.yaml
@@ -16,6 +16,7 @@ properties:
           - nxp,imx95-lvds-csr
           - nxp,imx95-display-csr
           - nxp,imx95-camera-csr
+          - nxp,imx95-netcmix-blk-ctrl
           - nxp,imx95-vpu-csr
       - const: syscon
 
-- 
2.34.1

[Patch v3 2/4] dt-bindings: clock: add RMII clock selection

[Wei Fang]

Add RMII clock selection for ENETC0 and ENETC1.

Signed-off-by: Wei Fang <wei.fang@nxp.com>
Acked-by: Rob Herring (Arm) <robh@kernel.org>
---
V3 no changes
---
 include/dt-bindings/clock/nxp,imx95-clock.h | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/include/dt-bindings/clock/nxp,imx95-clock.h b/include/dt-bindings/clock/nxp,imx95-clock.h
index 782662c3e740..b7a713a9ac8c 100644
--- a/include/dt-bindings/clock/nxp,imx95-clock.h
+++ b/include/dt-bindings/clock/nxp,imx95-clock.h
@@ -25,4 +25,7 @@
 #define IMX95_CLK_DISPMIX_ENG0_SEL		0
 #define IMX95_CLK_DISPMIX_ENG1_SEL		1
 
+#define IMX95_CLK_NETCMIX_ENETC0_RMII		0
+#define IMX95_CLK_NETCMIX_ENETC1_RMII		1
+
 #endif	/* __DT_BINDINGS_CLOCK_IMX95_H */
-- 
2.34.1

[Patch v3 3/4] clk: imx95: enable the clock of NETCMIX block control

[Wei Fang]

The NETCMIX block control consists of registers for configuration of
peripherals in the NETC domain, so enable the clock of NETCMIX to
support the configuration.

Signed-off-by: Wei Fang <wei.fang@nxp.com>
Reviewed-by: Peng Fan <peng.fan@nxp.com>
---
V3 no changes
---
 drivers/clk/imx/clk-imx95-blk-ctl.c | 30 +++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/drivers/clk/imx/clk-imx95-blk-ctl.c b/drivers/clk/imx/clk-imx95-blk-ctl.c
index 74f595f9e5e3..19a62da74be4 100644
--- a/drivers/clk/imx/clk-imx95-blk-ctl.c
+++ b/drivers/clk/imx/clk-imx95-blk-ctl.c
@@ -248,6 +248,35 @@ static const struct imx95_blk_ctl_dev_data dispmix_csr_dev_data = {
 	.clk_reg_offset = 0,
 };
 
+static const struct imx95_blk_ctl_clk_dev_data netxmix_clk_dev_data[] = {
+	[IMX95_CLK_NETCMIX_ENETC0_RMII] = {
+		.name = "enetc0_rmii_sel",
+		.parent_names = (const char *[]){"ext_enetref", "enetref"},
+		.num_parents = 2,
+		.reg = 4,
+		.bit_idx = 5,
+		.bit_width = 1,
+		.type = CLK_MUX,
+		.flags = CLK_SET_RATE_NO_REPARENT | CLK_SET_RATE_PARENT,
+	},
+	[IMX95_CLK_NETCMIX_ENETC1_RMII] = {
+		.name = "enetc1_rmii_sel",
+		.parent_names = (const char *[]){"ext_enetref", "enetref"},
+		.num_parents = 2,
+		.reg = 4,
+		.bit_idx = 10,
+		.bit_width = 1,
+		.type = CLK_MUX,
+		.flags = CLK_SET_RATE_NO_REPARENT | CLK_SET_RATE_PARENT,
+	},
+};
+
+static const struct imx95_blk_ctl_dev_data netcmix_dev_data = {
+	.num_clks = ARRAY_SIZE(netxmix_clk_dev_data),
+	.clk_dev_data = netxmix_clk_dev_data,
+	.clk_reg_offset = 0,
+};
+
 static int imx95_bc_probe(struct platform_device *pdev)
 {
 	struct device *dev = &pdev->dev;
@@ -419,6 +448,7 @@ static const struct of_device_id imx95_bc_of_match[] = {
 	{ .compatible = "nxp,imx95-lvds-csr", .data = &lvds_csr_dev_data },
 	{ .compatible = "nxp,imx95-display-csr", .data = &dispmix_csr_dev_data },
 	{ .compatible = "nxp,imx95-vpu-csr", .data = &vpublk_dev_data },
+	{ .compatible = "nxp,imx95-netcmix-blk-ctrl", .data = &netcmix_dev_data},
 	{ /* Sentinel */ },
 };
 MODULE_DEVICE_TABLE(of, imx95_bc_of_match);
-- 
2.34.1

[Patch v3 4/4] arm64: dts: imx95: Add NETCMIX block control support

[Wei Fang]

Add NETCMIX block control support.

Signed-off-by: Wei Fang <wei.fang@nxp.com>
---
V3 no changes
---
 arch/arm64/boot/dts/freescale/imx95.dtsi | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/arch/arm64/boot/dts/freescale/imx95.dtsi b/arch/arm64/boot/dts/freescale/imx95.dtsi
index ecdc6b7b5129..03661e76550f 100644
--- a/arch/arm64/boot/dts/freescale/imx95.dtsi
+++ b/arch/arm64/boot/dts/freescale/imx95.dtsi
@@ -1607,6 +1607,18 @@ pcie1_ep: pcie-ep@4c380000 {
 			status = "disabled";
 		};
 
+		netcmix_blk_ctrl: syscon@4c810000 {
+			compatible = "nxp,imx95-netcmix-blk-ctrl", "syscon";
+			reg = <0x0 0x4c810000 0x0 0x10000>;
+			#clock-cells = <1>;
+			clocks = <&scmi_clk IMX95_CLK_BUSNETCMIX>;
+			assigned-clocks = <&scmi_clk IMX95_CLK_BUSNETCMIX>;
+			assigned-clock-parents = <&scmi_clk IMX95_CLK_SYSPLL1_PFD1_DIV2>;
+			assigned-clock-rates = <133333333>;
+			power-domains = <&scmi_devpd IMX95_PD_NETC>;
+			status = "disabled";
+		};
+
 		sai2: sai@4c880000 {
 			compatible = "fsl,imx95-sai";
 			reg = <0x0 0x4c880000 0x0 0x10000>;
-- 
2.34.1

Re: [Patch v3 4/4] arm64: dts: imx95: Add NETCMIX block control support

[Shawn Guo]

On Thu, Aug 29, 2024 at 09:18:49AM +0800, Wei Fang wrote:
> Add NETCMIX block control support.
> 
> Signed-off-by: Wei Fang <wei.fang@nxp.com>

Applied, thanks!

Re: [Patch v3 0/4] add NETCMIX block control support on i.MX95

[Abel Vesa]

On Thu, 29 Aug 2024 09:18:45 +0800, Wei Fang wrote:
> The NETCMIX block control consists of registers for configuration of
> peripherals in the NETC domain, such as MQS, SAI and NETC. So add the
> NETCMIX block control support on i.MX95 platform.
> 

Applied, thanks!

[1/4] dt-bindings: clock: add i.MX95 NETCMIX block control
      commit: 4b78b54762dbfc2f22f28655fa3cf6f5d50de197
[2/4] dt-bindings: clock: add RMII clock selection
      commit: b4f62001ccd3fa953769ccbd313c9a7a4f5f8f3d
[3/4] clk: imx95: enable the clock of NETCMIX block control
      commit: 42dc425fa8b5be982bcc2025d5bf30be8b26da86
[4/4] arm64: dts: imx95: Add NETCMIX block control support
      (no commit info)

Best regards,
-- 
Abel Vesa <abel.vesa@linaro.org>

RE: [Patch v3 0/4] add NETCMIX block control support on i.MX95

[Peng Fan]

Hi Abel,

> Subject: Re: [Patch v3 0/4] add NETCMIX block control support on
> i.MX95
> 
> 
> On Thu, 29 Aug 2024 09:18:45 +0800, Wei Fang wrote:
> > The NETCMIX block control consists of registers for configuration of
> > peripherals in the NETC domain, such as MQS, SAI and NETC. So add
> the
> > NETCMIX block control support on i.MX95 platform.
> >
> 
> Applied, thanks!
> 
> [1/4] dt-bindings: clock: add i.MX95 NETCMIX block control
>       commit: 4b78b54762dbfc2f22f28655fa3cf6f5d50de197
> [2/4] dt-bindings: clock: add RMII clock selection
>       commit: b4f62001ccd3fa953769ccbd313c9a7a4f5f8f3d
> [3/4] clk: imx95: enable the clock of NETCMIX block control
>       commit: 42dc425fa8b5be982bcc2025d5bf30be8b26da86
> [4/4] arm64: dts: imx95: Add NETCMIX block control support
>       (no commit info)

Patch 4 needs to go through shawn's tree to avoid merge
conflict

Regards
Peng.

> 
> Best regards,
> --
> Abel Vesa <abel.vesa@linaro.org>

Re: [Patch v3 0/4] add NETCMIX block control support on i.MX95

[Abel Vesa]

On 24-08-29 10:50:16, Abel Vesa wrote:
> 
> On Thu, 29 Aug 2024 09:18:45 +0800, Wei Fang wrote:
> > The NETCMIX block control consists of registers for configuration of
> > peripherals in the NETC domain, such as MQS, SAI and NETC. So add the
> > NETCMIX block control support on i.MX95 platform.
> > 
> 
> Applied, thanks!
> 
> [1/4] dt-bindings: clock: add i.MX95 NETCMIX block control
>       commit: 4b78b54762dbfc2f22f28655fa3cf6f5d50de197
> [2/4] dt-bindings: clock: add RMII clock selection
>       commit: b4f62001ccd3fa953769ccbd313c9a7a4f5f8f3d
> [3/4] clk: imx95: enable the clock of NETCMIX block control
>       commit: 42dc425fa8b5be982bcc2025d5bf30be8b26da86
> [4/4] arm64: dts: imx95: Add NETCMIX block control support
>       (no commit info)

For some reason, b4 ty thinks it's OK to mention this 4th patch as
applied, while it is obviously not.

I only applied the first 3 patches.

> 
> Best regards,
> -- 
> Abel Vesa <abel.vesa@linaro.org>

RE: [Patch v3 0/4] add NETCMIX block control support on i.MX95

[Wei Fang]

> -----Original Message-----
> From: Abel Vesa <abel.vesa@linaro.org>
> Sent: 2024年8月29日 15:53
> To: mturquette@baylibre.com; sboyd@kernel.org; robh@kernel.org;
> conor+dt@kernel.org; shawnguo@kernel.org; s.hauer@pengutronix.de;
> festevam@gmail.com; abelvesa@kernel.org; Peng Fan <peng.fan@nxp.com>;
> Wei Fang <wei.fang@nxp.com>
> Cc: linux-clk@vger.kernel.org; devicetree@vger.kernel.org; imx@lists.linux.dev;
> linux-arm-kernel@lists.infradead.org; linux-kernel@vger.kernel.org
> Subject: Re: [Patch v3 0/4] add NETCMIX block control support on i.MX95
> 
> On 24-08-29 10:50:16, Abel Vesa wrote:
> >
> > On Thu, 29 Aug 2024 09:18:45 +0800, Wei Fang wrote:
> > > The NETCMIX block control consists of registers for configuration of
> > > peripherals in the NETC domain, such as MQS, SAI and NETC. So add
> > > the NETCMIX block control support on i.MX95 platform.
> > >
> >
> > Applied, thanks!
> >
> > [1/4] dt-bindings: clock: add i.MX95 NETCMIX block control
> >       commit: 4b78b54762dbfc2f22f28655fa3cf6f5d50de197
> > [2/4] dt-bindings: clock: add RMII clock selection
> >       commit: b4f62001ccd3fa953769ccbd313c9a7a4f5f8f3d
> > [3/4] clk: imx95: enable the clock of NETCMIX block control
> >       commit: 42dc425fa8b5be982bcc2025d5bf30be8b26da86
> > [4/4] arm64: dts: imx95: Add NETCMIX block control support
> >       (no commit info)
> 
> For some reason, b4 ty thinks it's OK to mention this 4th patch as applied, while
> it is obviously not.
> 
> I only applied the first 3 patches.
> 
Many thanks.
I think Shawn will apply the 4th patch.

Re: [Patch v3 0/4] add NETCMIX block control support on i.MX95

[Konstantin Ryabitsev]

On Thu, Aug 29, 2024 at 10:53:28AM GMT, Abel Vesa wrote:
> > [1/4] dt-bindings: clock: add i.MX95 NETCMIX block control
> >       commit: 4b78b54762dbfc2f22f28655fa3cf6f5d50de197
> > [2/4] dt-bindings: clock: add RMII clock selection
> >       commit: b4f62001ccd3fa953769ccbd313c9a7a4f5f8f3d
> > [3/4] clk: imx95: enable the clock of NETCMIX block control
> >       commit: 42dc425fa8b5be982bcc2025d5bf30be8b26da86
> > [4/4] arm64: dts: imx95: Add NETCMIX block control support
> >       (no commit info)
> 
> For some reason, b4 ty thinks it's OK to mention this 4th patch as
> applied, while it is obviously not.
> 
> I only applied the first 3 patches.

Sorry for the confusion.

It's because you did "b4 am" on the entire series. We couldn't find the
matching commit for 4/4, but this often happens because maintainers tweak the
title or the patch contents, so we can't always assume that the patch wasn't
applied just because we can't find the exact match.

If you know you're going to apply a subset, it's best to run "b4 am -P 1-3" so
that b4 knows for a fact that you only intended to apply a subset.

-K