[PATCH 0/3] add NETCMIX block control support on i.MX95

[PATCH 0/3] 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.

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

 .../devicetree/bindings/clock/nxp,imx95-blk-ctl.yaml |  1 +
 arch/arm64/boot/dts/freescale/imx95.dtsi             | 12 ++++++++++++
 drivers/clk/imx/clk-imx95-blk-ctl.c                  |  1 +
 3 files changed, 14 insertions(+)

-- 
2.34.1

[PATCH 1/3] 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>
---
 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..b0072bae12d9 100644
--- a/Documentation/devicetree/bindings/clock/nxp,imx95-blk-ctl.yaml
+++ b/Documentation/devicetree/bindings/clock/nxp,imx95-blk-ctl.yaml
@@ -17,6 +17,7 @@ properties:
           - nxp,imx95-display-csr
           - nxp,imx95-camera-csr
           - nxp,imx95-vpu-csr
+          - nxp,imx95-netcmix-blk-ctrl
       - const: syscon
 
   reg:
-- 
2.34.1

Re: [PATCH 1/3] dt-bindings: clock: add i.MX95 NETCMIX block control

[Rob Herring (Arm)]

On Tue, 09 Jul 2024 15:36:02 +0800, Wei Fang wrote:
> Add 'nxp,imx95-netcmix-blk-ctrl' compatible string for i.MX95 platform.
> 
> Signed-off-by: Wei Fang <wei.fang@nxp.com>
> ---
>  Documentation/devicetree/bindings/clock/nxp,imx95-blk-ctl.yaml | 1 +
>  1 file changed, 1 insertion(+)
> 

Acked-by: Rob Herring (Arm) <robh@kernel.org>

[PATCH 2/3] 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>
---
 drivers/clk/imx/clk-imx95-blk-ctl.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/clk/imx/clk-imx95-blk-ctl.c b/drivers/clk/imx/clk-imx95-blk-ctl.c
index 74f595f9e5e3..07c70c0a53d4 100644
--- a/drivers/clk/imx/clk-imx95-blk-ctl.c
+++ b/drivers/clk/imx/clk-imx95-blk-ctl.c
@@ -419,6 +419,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", },
 	{ /* Sentinel */ },
 };
 MODULE_DEVICE_TABLE(of, imx95_bc_of_match);
-- 
2.34.1

RE: [PATCH 2/3] clk: imx95: enable the clock of NETCMIX block control

[Peng Fan]

> Subject: [PATCH 2/3] clk: imx95: enable the clock of NETCMIX block
> control
> 
> 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>
> ---
>  drivers/clk/imx/clk-imx95-blk-ctl.c | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/drivers/clk/imx/clk-imx95-blk-ctl.c b/drivers/clk/imx/clk-
> imx95-blk-ctl.c
> index 74f595f9e5e3..07c70c0a53d4 100644
> --- a/drivers/clk/imx/clk-imx95-blk-ctl.c
> +++ b/drivers/clk/imx/clk-imx95-blk-ctl.c
> @@ -419,6 +419,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", },

This should not be added here if no real clocks are
included.

Regards,
Peng.

>  	{ /* Sentinel */ },
>  };
>  MODULE_DEVICE_TABLE(of, imx95_bc_of_match);
> --
> 2.34.1

RE: [PATCH 2/3] clk: imx95: enable the clock of NETCMIX block control

[Wei Fang]

> -----Original Message-----
> From: Peng Fan <peng.fan@nxp.com>
> Sent: 2024年7月9日 22:13
> To: Wei Fang <wei.fang@nxp.com>; 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
> 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 2/3] clk: imx95: enable the clock of NETCMIX block
> control
> 
> > Subject: [PATCH 2/3] clk: imx95: enable the clock of NETCMIX block
> > control
> >
> > 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>
> > ---
> >  drivers/clk/imx/clk-imx95-blk-ctl.c | 1 +
> >  1 file changed, 1 insertion(+)
> >
> > diff --git a/drivers/clk/imx/clk-imx95-blk-ctl.c
> > b/drivers/clk/imx/clk- imx95-blk-ctl.c index
> > 74f595f9e5e3..07c70c0a53d4 100644
> > --- a/drivers/clk/imx/clk-imx95-blk-ctl.c
> > +++ b/drivers/clk/imx/clk-imx95-blk-ctl.c
> > @@ -419,6 +419,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", },
> 
> This should not be added here if no real clocks are included.
> 
This is the first phase, and we are currently prioritizing supporting the RGMII
interface of ENETC on upstream. We will add support for multiplexing of the
RMII reference clock later.

> 
> >  	{ /* Sentinel */ },
> >  };
> >  MODULE_DEVICE_TABLE(of, imx95_bc_of_match);
> > --
> > 2.34.1

RE: [PATCH 2/3] clk: imx95: enable the clock of NETCMIX block control

[Peng Fan]

> Subject: RE: [PATCH 2/3] clk: imx95: enable the clock of NETCMIX
> block control
> 
> > -----Original Message-----
> > From: Peng Fan <peng.fan@nxp.com>
> > Sent: 2024年7月9日 22:13
> > To: Wei Fang <wei.fang@nxp.com>; 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
> > 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 2/3] clk: imx95: enable the clock of NETCMIX
> block
> > control
> >
> > > Subject: [PATCH 2/3] clk: imx95: enable the clock of NETCMIX block
> > > control
> > >
> > > 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>
> > > ---
> > >  drivers/clk/imx/clk-imx95-blk-ctl.c | 1 +
> > >  1 file changed, 1 insertion(+)
> > >
> > > diff --git a/drivers/clk/imx/clk-imx95-blk-ctl.c
> > > b/drivers/clk/imx/clk- imx95-blk-ctl.c index
> > > 74f595f9e5e3..07c70c0a53d4 100644
> > > --- a/drivers/clk/imx/clk-imx95-blk-ctl.c
> > > +++ b/drivers/clk/imx/clk-imx95-blk-ctl.c
> > > @@ -419,6 +419,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", },
> >
> > This should not be added here if no real clocks are included.
> >
> This is the first phase, and we are currently prioritizing supporting the
> RGMII interface of ENETC on upstream. We will add support for
> multiplexing of the RMII reference clock later.

No, please include clock changes, otherwise, this is
just let device tree node assigned-clock and power domains
setup by platform pre-probe code, and nothing else.

Regards,
Peng.

> 
> >
> > >  	{ /* Sentinel */ },
> > >  };
> > >  MODULE_DEVICE_TABLE(of, imx95_bc_of_match);
> > > --
> > > 2.34.1

RE: [PATCH 2/3] clk: imx95: enable the clock of NETCMIX block control

[Wei Fang]

> -----Original Message-----
> From: Peng Fan <peng.fan@nxp.com>
> Sent: 2024年7月10日 10:23
> To: Wei Fang <wei.fang@nxp.com>; 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; Clark Wang <xiaoning.wang@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 2/3] clk: imx95: enable the clock of NETCMIX block control
> 
> > Subject: RE: [PATCH 2/3] clk: imx95: enable the clock of NETCMIX block
> > control
> >
> > > -----Original Message-----
> > > From: Peng Fan <peng.fan@nxp.com>
> > > Sent: 2024年7月9日 22:13
> > > To: Wei Fang <wei.fang@nxp.com>; 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
> > > 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 2/3] clk: imx95: enable the clock of NETCMIX
> > block
> > > control
> > >
> > > > Subject: [PATCH 2/3] clk: imx95: enable the clock of NETCMIX block
> > > > control
> > > >
> > > > 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>
> > > > ---
> > > >  drivers/clk/imx/clk-imx95-blk-ctl.c | 1 +
> > > >  1 file changed, 1 insertion(+)
> > > >
> > > > diff --git a/drivers/clk/imx/clk-imx95-blk-ctl.c
> > > > b/drivers/clk/imx/clk- imx95-blk-ctl.c index
> > > > 74f595f9e5e3..07c70c0a53d4 100644
> > > > --- a/drivers/clk/imx/clk-imx95-blk-ctl.c
> > > > +++ b/drivers/clk/imx/clk-imx95-blk-ctl.c
> > > > @@ -419,6 +419,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", },
> > >
> > > This should not be added here if no real clocks are included.
> > >
> > This is the first phase, and we are currently prioritizing supporting
> > the RGMII interface of ENETC on upstream. We will add support for
> > multiplexing of the RMII reference clock later.
> 
> No, please include clock changes, otherwise, this is just let device tree node
> assigned-clock and power domains setup by platform pre-probe code, and
> nothing else.
> 
I saw that "nxp,imx95-display-master-csr" was added here, so I thought adding
"nxp,imx95-netcmix-blk-ctrl" was also fine. Is there any difference between these
two?

> 
> >
> > >
> > > >  	{ /* Sentinel */ },
> > > >  };
> > > >  MODULE_DEVICE_TABLE(of, imx95_bc_of_match);
> > > > --
> > > > 2.34.1

[PATCH 3/3] arm64: dts: imx95: Add NETCMIX block control support

[Wei Fang]

Add NETCMIX block control support.

Signed-off-by: Wei Fang <wei.fang@nxp.com>
---
 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 1bbf9a0468f6..6e86aa98b431 100644
--- a/arch/arm64/boot/dts/freescale/imx95.dtsi
+++ b/arch/arm64/boot/dts/freescale/imx95.dtsi
@@ -1188,5 +1188,17 @@ pcie1_ep: pcie-ep@4c380000 {
 			power-domains = <&scmi_devpd IMX95_PD_HSIO_TOP>;
 			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";
+		};
 	};
 };
-- 
2.34.1