add NETCMIX block control support on i.MX95
v2 cover add NETCMIX block control support on i.MX95
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/[email protected]/
Link to V2: https://lore.kernel.org/all/[email protected]/
---
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(+)
Signature · 1 line
2.34.1
PATCH RESEND v2 1/4 dt-bindings: clock: add i.MX95 NETCMIX block control
Add 'nxp,imx95-netcmix-blk-ctrl' compatible string for i.MX95 platform.
--- Documentation/devicetree/bindings/clock/nxp,imx95-blk-ctl.yaml | 1 + 1 file changed, 1 insertion(+)
Documentation/devicetree/bindings/clock/nxp,imx95-blk-ctl.yaml +1 -0
@@ -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:
Signature · 1 line
2.34.1
Re: [PATCH v2 RESEND 1/4] dt-bindings: clock: add i.MX95 NETCMIX block control
Quoted 13 lines · Wei Fang
Add 'nxp,imx95-netcmix-blk-ctrl' compatible string for i.MX95 platform.
Signed-off-by Wei Fang <[email protected]>--- Documentation/devicetree/bindings/clock/nxp,imx95-blk-ctl.yaml | 1 + 1 file changed, 1 insertion(+)Documentation/devicetree/bindings/clock/nxp,imx95-blk-ctl.yaml +0
-0
Documentation/devicetree/bindings/clock/nxp,imx95-blk-ctl.yaml properties: · line 20
Quoted 4 lines
Documentation/devicetree/bindings/clock/nxp,imx95-blk-ctl.yaml +1
-0@@ -17,6 +17,7 @@ properties: - nxp,imx95-display-csr - nxp,imx95-camera-csr - nxp,imx95-vpu-csr + - nxp,imx95-netcmix-blk-ctrl
Move this above vpu-csr, please.
Also, for some reason, this patchset doesn't apply cleanly.
Please respin.
Quoted 6 lines
Documentation/devicetree/bindings/clock/nxp,imx95-blk-ctl.yaml +0
-0- const: syscon reg:Signature · 1 line
2.34.1
RE: [PATCH v2 RESEND 1/4] dt-bindings: clock: add i.MX95 NETCMIX block control
Quoted 22 lines · Wei Fang
Review
Quoted 9 lines
Add 'nxp,imx95-netcmix-blk-ctrl' compatible string for i.MX95 platform.
Signed-off-by Wei Fang <[email protected]>--- Documentation/devicetree/bindings/clock/nxp,imx95-blk-ctl.yaml | 1 + 1 file changed, 1 insertion(+)(quoted diff) +0
-0
b/Documentation/devicetree/bindings/clock/nxp,imx95-blk-ctl.yamlDocumentation/devicetree/bindings/clock/nxp,imx95-blk-ctl.yaml properties: · line 20
Quoted 8 lines
index
2dffc02dcd8b..b0072bae12d9100644Documentation/devicetree/bindings/clock/nxp,imx95-blk-ctl.yaml +1
-0@@ -17,6 +17,7 @@ properties: - nxp,imx95-display-csr - nxp,imx95-camera-csr - nxp,imx95-vpu-csr + - nxp,imx95-netcmix-blk-ctrlMove this above vpu-csr, please.
Quoted 4 lines
Also, for some reason, this patchset doesn't apply cleanly.
Please respin.
Okay, let me update my local tree. I use the linux-next tree as the code Base, is this tree okay?
Re: [PATCH v2 RESEND 1/4] dt-bindings: clock: add i.MX95 NETCMIX block control
Quoted 22 lines · Wei Fang
Quoted 22 lines · Wei Fang
Review
Quoted 9 lines
Add 'nxp,imx95-netcmix-blk-ctrl' compatible string for i.MX95 platform.
Signed-off-by Wei Fang <[email protected]>--- Documentation/devicetree/bindings/clock/nxp,imx95-blk-ctl.yaml | 1 + 1 file changed, 1 insertion(+)(quoted diff) +0
-0
b/Documentation/devicetree/bindings/clock/nxp,imx95-blk-ctl.yamlDocumentation/devicetree/bindings/clock/nxp,imx95-blk-ctl.yaml properties: · line 20
Quoted 8 lines
index
2dffc02dcd8b..b0072bae12d9100644Documentation/devicetree/bindings/clock/nxp,imx95-blk-ctl.yaml +1
-0@@ -17,6 +17,7 @@ properties: - nxp,imx95-display-csr - nxp,imx95-camera-csr - nxp,imx95-vpu-csr + - nxp,imx95-netcmix-blk-ctrlMove this above vpu-csr, please.
Quoted 7 lines
Quoted 4 lines
Also, for some reason, this patchset doesn't apply cleanly.
Please respin.
Okay, let me update my local tree. I use the linux-next tree as the code Base, is this tree okay?
Sure.
PATCH RESEND v2 2/4 dt-bindings: clock: add RMII clock selection
In reply to Wei FangAdd RMII clock selection for ENETC0 and ENETC1.
--- include/dt-bindings/clock/nxp,imx95-clock.h | 3 +++ 1 file changed, 3 insertions(+)
include/dt-bindings/clock/nxp,imx95-clock.h +3 -0
@@ -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 */
Signature · 1 line
2.34.1
PATCH RESEND v2 3/4 clk: imx95: enable the clock of NETCMIX block control
In reply to Wei FangThe NETCMIX block control consists of registers for configuration of peripherals in the NETC domain, so enable the clock of NETCMIX to support the configuration.
--- drivers/clk/imx/clk-imx95-blk-ctl.c | 30 +++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+)
drivers/clk/imx/clk-imx95-blk-ctl.c +30 -0
@@ -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);
Signature · 1 line
2.34.1
PATCH RESEND v2 4/4 arm64: dts: imx95: Add NETCMIX block control support
In reply to Wei FangAdd NETCMIX block control support.
--- arch/arm64/boot/dts/freescale/imx95.dtsi | 12 ++++++++++++ 1 file changed, 12 insertions(+)
arch/arm64/boot/dts/freescale/imx95.dtsi +12 -0
@@ -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"; + }; }; };
Signature · 1 line
2.34.1
Quoted 32 lines
-----Original Message-----
From: Wei Fang
Sent: 2024年7月29日 9:41
To: [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; Peng Fan <[email protected]>
Cc: [email protected]; [email protected]; [email protected]; [email protected]; [email protected]
Subject: [PATCH v2 RESEND 0/4] add NETCMIX block control support on i.MX95The 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/[email protected]/
Link to V2:
https://lore.kernel.org/all/[email protected]/
---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
Quoted 8 lines
.../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
There appear to be no further comments.
Hi Abel,
Can you help apply the first three patches to your tree? Our i.MX95 Ethernet driver depends on this patch set to be able to go upstream. Thanks!
Hi Shawn,
Can you help apply the last patch ("arm64: dts: imx95: Add NETCMIX block control support") to your tree? Or should I wait until the first three patches are applied and then send a separate patch about DTS?
Quoted 8 lines · Wei Fang
Hi Abel,
Can you help apply the first three patches to your tree? Our i.MX95 Ethernet driver depends on this patch set to be able to go upstream. Thanks!Hi Shawn,
Can you help apply the last patch ("arm64: dts: imx95: Add NETCMIX block control support") to your tree? Or should I wait until the first three patches are applied and then send a separate patch about DTS?
I will pick up the DTS one after the first 3 patches get applied.
Shawn