* [PATCH 0/3] Add imx93 support for dwmac-imx
@ 2022-10-12 10:51 Clark Wang
2022-10-12 10:51 ` [PATCH 1/3] net: stmmac: add imx93 platform support Clark Wang
` (2 more replies)
0 siblings, 3 replies; 7+ messages in thread
From: Clark Wang @ 2022-10-12 10:51 UTC (permalink / raw)
To: davem, edumazet, kuba, pabeni, robh+dt, krzysztof.kozlowski+dt,
shawnguo, s.hauer, festevam, peppe.cavallaro, alexandre.torgue,
joabreu, mcoquelin.stm32
Cc: kernel, netdev, devicetree, linux-arm-kernel, linux-kernel, linux-stm32
Hi,
This patchset add imx93 support for dwmac-imx glue driver.
There are some changes of GPR implement
Clark Wang (3):
net: stmmac: add imx93 platform support
dt-bindings: add mx93 description
arm64: dts: imx93: add fec and eqos support
.../bindings/net/nxp,dwmac-imx.yaml | 4 +-
.../boot/dts/freescale/imx93-11x11-evk.dts | 40 ++++++++++++++
arch/arm64/boot/dts/freescale/imx93.dtsi | 22 ++++++++
.../net/ethernet/stmicro/stmmac/dwmac-imx.c | 55 +++++++++++++++++--
4 files changed, 115 insertions(+), 6 deletions(-)
--
2.34.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH 1/3] net: stmmac: add imx93 platform support
2022-10-12 10:51 [PATCH 0/3] Add imx93 support for dwmac-imx Clark Wang
@ 2022-10-12 10:51 ` Clark Wang
2022-10-12 21:29 ` Andrew Lunn
2022-10-12 10:51 ` [PATCH 2/3] dt-bindings: add mx93 description Clark Wang
2022-10-12 10:51 ` [PATCH 3/3] arm64: dts: imx93: add fec and eqos support Clark Wang
2 siblings, 1 reply; 7+ messages in thread
From: Clark Wang @ 2022-10-12 10:51 UTC (permalink / raw)
To: davem, edumazet, kuba, pabeni, robh+dt, krzysztof.kozlowski+dt,
shawnguo, s.hauer, festevam, peppe.cavallaro, alexandre.torgue,
joabreu, mcoquelin.stm32
Cc: kernel, netdev, devicetree, linux-arm-kernel, linux-kernel, linux-stm32
Add imx93 platform support for dwmac-imx driver.
Signed-off-by: Clark Wang <xiaoning.wang@nxp.com>
---
.../net/ethernet/stmicro/stmmac/dwmac-imx.c | 55 +++++++++++++++++--
1 file changed, 50 insertions(+), 5 deletions(-)
diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-imx.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-imx.c
index bd52fb7cf486..b670f07ea2a9 100644
--- a/drivers/net/ethernet/stmicro/stmmac/dwmac-imx.c
+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-imx.c
@@ -31,6 +31,12 @@
#define GPR_ENET_QOS_CLK_TX_CLK_SEL (0x1 << 20)
#define GPR_ENET_QOS_RGMII_EN (0x1 << 21)
+#define MX93_GPR_ENET_QOS_INTF_MODE_MASK GENMASK(3, 0)
+#define MX93_GPR_ENET_QOS_INTF_SEL_MII (0x0 << 1)
+#define MX93_GPR_ENET_QOS_INTF_SEL_RMII (0x4 << 1)
+#define MX93_GPR_ENET_QOS_INTF_SEL_RGMII (0x1 << 1)
+#define MX93_GPR_ENET_QOS_CLK_GEN_EN (0x1 << 0)
+
struct imx_dwmac_ops {
u32 addr_width;
bool mac_rgmii_txclk_auto_adj;
@@ -90,6 +96,35 @@ imx8dxl_set_intf_mode(struct plat_stmmacenet_data *plat_dat)
return ret;
}
+static int imx93_set_intf_mode(struct plat_stmmacenet_data *plat_dat)
+{
+ struct imx_priv_data *dwmac = plat_dat->bsp_priv;
+ int val;
+
+ switch (plat_dat->interface) {
+ case PHY_INTERFACE_MODE_MII:
+ val = MX93_GPR_ENET_QOS_INTF_SEL_MII;
+ break;
+ case PHY_INTERFACE_MODE_RMII:
+ val = MX93_GPR_ENET_QOS_INTF_SEL_RMII;
+ break;
+ case PHY_INTERFACE_MODE_RGMII:
+ case PHY_INTERFACE_MODE_RGMII_ID:
+ case PHY_INTERFACE_MODE_RGMII_RXID:
+ case PHY_INTERFACE_MODE_RGMII_TXID:
+ val = MX93_GPR_ENET_QOS_INTF_SEL_RGMII;
+ break;
+ default:
+ pr_debug("imx dwmac doesn't support %d interface\n",
+ plat_dat->interface);
+ return -EINVAL;
+ }
+
+ val |= MX93_GPR_ENET_QOS_CLK_GEN_EN;
+ return regmap_update_bits(dwmac->intf_regmap, dwmac->intf_reg_off,
+ MX93_GPR_ENET_QOS_INTF_MODE_MASK, val);
+};
+
static int imx_dwmac_clks_config(void *priv, bool enabled)
{
struct imx_priv_data *dwmac = priv;
@@ -188,7 +223,9 @@ imx_dwmac_parse_dt(struct imx_priv_data *dwmac, struct device *dev)
}
dwmac->clk_mem = NULL;
- if (of_machine_is_compatible("fsl,imx8dxl")) {
+
+ if (of_machine_is_compatible("fsl,imx8dxl") ||
+ of_machine_is_compatible("fsl,imx93")) {
dwmac->clk_mem = devm_clk_get(dev, "mem");
if (IS_ERR(dwmac->clk_mem)) {
dev_err(dev, "failed to get mem clock\n");
@@ -196,10 +233,11 @@ imx_dwmac_parse_dt(struct imx_priv_data *dwmac, struct device *dev)
}
}
- if (of_machine_is_compatible("fsl,imx8mp")) {
- /* Binding doc describes the property:
- is required by i.MX8MP.
- is optional for i.MX8DXL.
+ if (of_machine_is_compatible("fsl,imx8mp") ||
+ of_machine_is_compatible("fsl,imx93")) {
+ /* Binding doc describes the propety:
+ * is required by i.MX8MP, i.MX93.
+ * is optinoal for i.MX8DXL.
*/
dwmac->intf_regmap = syscon_regmap_lookup_by_phandle(np, "intf_mode");
if (IS_ERR(dwmac->intf_regmap))
@@ -296,9 +334,16 @@ static struct imx_dwmac_ops imx8dxl_dwmac_data = {
.set_intf_mode = imx8dxl_set_intf_mode,
};
+static struct imx_dwmac_ops imx93_dwmac_data = {
+ .addr_width = 32,
+ .mac_rgmii_txclk_auto_adj = true,
+ .set_intf_mode = imx93_set_intf_mode,
+};
+
static const struct of_device_id imx_dwmac_match[] = {
{ .compatible = "nxp,imx8mp-dwmac-eqos", .data = &imx8mp_dwmac_data },
{ .compatible = "nxp,imx8dxl-dwmac-eqos", .data = &imx8dxl_dwmac_data },
+ { .compatible = "nxp,imx93-dwmac-eqos", .data = &imx93_dwmac_data },
{ }
};
MODULE_DEVICE_TABLE(of, imx_dwmac_match);
--
2.34.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH 2/3] dt-bindings: add mx93 description
2022-10-12 10:51 [PATCH 0/3] Add imx93 support for dwmac-imx Clark Wang
2022-10-12 10:51 ` [PATCH 1/3] net: stmmac: add imx93 platform support Clark Wang
@ 2022-10-12 10:51 ` Clark Wang
2022-10-12 13:12 ` Krzysztof Kozlowski
2022-10-12 10:51 ` [PATCH 3/3] arm64: dts: imx93: add fec and eqos support Clark Wang
2 siblings, 1 reply; 7+ messages in thread
From: Clark Wang @ 2022-10-12 10:51 UTC (permalink / raw)
To: davem, edumazet, kuba, pabeni, robh+dt, krzysztof.kozlowski+dt,
shawnguo, s.hauer, festevam, peppe.cavallaro, alexandre.torgue,
joabreu, mcoquelin.stm32
Cc: kernel, netdev, devicetree, linux-arm-kernel, linux-kernel, linux-stm32
Add mx93 compatible string for eqos driver.
Signed-off-by: Clark Wang <xiaoning.wang@nxp.com>
---
Documentation/devicetree/bindings/net/nxp,dwmac-imx.yaml | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/Documentation/devicetree/bindings/net/nxp,dwmac-imx.yaml b/Documentation/devicetree/bindings/net/nxp,dwmac-imx.yaml
index 4c155441acbf..29b0d119405f 100644
--- a/Documentation/devicetree/bindings/net/nxp,dwmac-imx.yaml
+++ b/Documentation/devicetree/bindings/net/nxp,dwmac-imx.yaml
@@ -4,7 +4,7 @@
$id: http://devicetree.org/schemas/net/nxp,dwmac-imx.yaml#
$schema: http://devicetree.org/meta-schemas/core.yaml#
-title: NXP i.MX8 DWMAC glue layer
+title: NXP i.MX8/9 DWMAC glue layer
maintainers:
- Joakim Zhang <qiangqing.zhang@nxp.com>
@@ -17,6 +17,7 @@ select:
enum:
- nxp,imx8mp-dwmac-eqos
- nxp,imx8dxl-dwmac-eqos
+ - nxp,imx93-dwmac-eqos
required:
- compatible
@@ -30,6 +31,7 @@ properties:
- enum:
- nxp,imx8mp-dwmac-eqos
- nxp,imx8dxl-dwmac-eqos
+ - nxp,imx93-dwmac-eqos
- const: snps,dwmac-5.10a
clocks:
--
2.34.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH 3/3] arm64: dts: imx93: add fec and eqos support
2022-10-12 10:51 [PATCH 0/3] Add imx93 support for dwmac-imx Clark Wang
2022-10-12 10:51 ` [PATCH 1/3] net: stmmac: add imx93 platform support Clark Wang
2022-10-12 10:51 ` [PATCH 2/3] dt-bindings: add mx93 description Clark Wang
@ 2022-10-12 10:51 ` Clark Wang
2022-10-12 21:32 ` Andrew Lunn
2 siblings, 1 reply; 7+ messages in thread
From: Clark Wang @ 2022-10-12 10:51 UTC (permalink / raw)
To: davem, edumazet, kuba, pabeni, robh+dt, krzysztof.kozlowski+dt,
shawnguo, s.hauer, festevam, peppe.cavallaro, alexandre.torgue,
joabreu, mcoquelin.stm32
Cc: kernel, netdev, devicetree, linux-arm-kernel, linux-kernel, linux-stm32
Enable EQoS functions for imx93 platform.
Signed-off-by: Clark Wang <xiaoning.wang@nxp.com>
---
.../boot/dts/freescale/imx93-11x11-evk.dts | 40 +++++++++++++++++++
arch/arm64/boot/dts/freescale/imx93.dtsi | 22 ++++++++++
2 files changed, 62 insertions(+)
diff --git a/arch/arm64/boot/dts/freescale/imx93-11x11-evk.dts b/arch/arm64/boot/dts/freescale/imx93-11x11-evk.dts
index 69786c326db0..837f8b47ee4f 100644
--- a/arch/arm64/boot/dts/freescale/imx93-11x11-evk.dts
+++ b/arch/arm64/boot/dts/freescale/imx93-11x11-evk.dts
@@ -35,6 +35,27 @@ &mu2 {
status = "okay";
};
+&eqos {
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_eqos>;
+ phy-mode = "rgmii-id";
+ phy-handle = <ðphy1>;
+ status = "okay";
+
+ mdio {
+ compatible = "snps,dwmac-mdio";
+ #address-cells = <1>;
+ #size-cells = <0>;
+ clock-frequency = <5000000>;
+
+ ethphy1: ethernet-phy@1 {
+ compatible = "ethernet-phy-ieee802.3-c22";
+ reg = <1>;
+ eee-broken-1000t;
+ };
+ };
+};
+
&lpuart1 { /* console */
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_uart1>;
@@ -65,6 +86,25 @@ &usdhc2 {
};
&iomuxc {
+ pinctrl_eqos: eqosgrp {
+ fsl,pins = <
+ MX93_PAD_ENET1_MDC__ENET_QOS_MDC 0x57e
+ MX93_PAD_ENET1_MDIO__ENET_QOS_MDIO 0x57e
+ MX93_PAD_ENET1_RD0__ENET_QOS_RGMII_RD0 0x57e
+ MX93_PAD_ENET1_RD1__ENET_QOS_RGMII_RD1 0x57e
+ MX93_PAD_ENET1_RD2__ENET_QOS_RGMII_RD2 0x57e
+ MX93_PAD_ENET1_RD3__ENET_QOS_RGMII_RD3 0x57e
+ MX93_PAD_ENET1_RXC__CCM_ENET_QOS_CLOCK_GENERATE_RX_CLK 0x5fe
+ MX93_PAD_ENET1_RX_CTL__ENET_QOS_RGMII_RX_CTL 0x57e
+ MX93_PAD_ENET1_TD0__ENET_QOS_RGMII_TD0 0x57e
+ MX93_PAD_ENET1_TD1__ENET_QOS_RGMII_TD1 0x57e
+ MX93_PAD_ENET1_TD2__ENET_QOS_RGMII_TD2 0x57e
+ MX93_PAD_ENET1_TD3__ENET_QOS_RGMII_TD3 0x57e
+ MX93_PAD_ENET1_TXC__CCM_ENET_QOS_CLOCK_GENERATE_TX_CLK 0x5fe
+ MX93_PAD_ENET1_TX_CTL__ENET_QOS_RGMII_TX_CTL 0x57e
+ >;
+ };
+
pinctrl_uart1: uart1grp {
fsl,pins = <
MX93_PAD_UART1_RXD__LPUART1_RX 0x31e
diff --git a/arch/arm64/boot/dts/freescale/imx93.dtsi b/arch/arm64/boot/dts/freescale/imx93.dtsi
index 3a5713bb4880..8cb7d7d88086 100644
--- a/arch/arm64/boot/dts/freescale/imx93.dtsi
+++ b/arch/arm64/boot/dts/freescale/imx93.dtsi
@@ -425,6 +425,28 @@ usdhc2: mmc@42860000 {
status = "disabled";
};
+ eqos: ethernet@428a0000 {
+ compatible = "nxp,imx93-dwmac-eqos", "snps,dwmac-5.10a";
+ reg = <0x428a0000 0x10000>;
+ interrupts = <GIC_SPI 183 IRQ_TYPE_LEVEL_HIGH>,
+ <GIC_SPI 184 IRQ_TYPE_LEVEL_HIGH>;
+ interrupt-names = "eth_wake_irq", "macirq";
+ clocks = <&clk IMX93_CLK_ENET_QOS_GATE>,
+ <&clk IMX93_CLK_ENET_QOS_GATE>,
+ <&clk IMX93_CLK_ENET_TIMER2>,
+ <&clk IMX93_CLK_ENET>,
+ <&clk IMX93_CLK_ENET_QOS_GATE>;
+ clock-names = "stmmaceth", "pclk", "ptp_ref", "tx", "mem";
+ assigned-clocks = <&clk IMX93_CLK_ENET_TIMER2>,
+ <&clk IMX93_CLK_ENET>;
+ assigned-clock-parents = <&clk IMX93_CLK_SYS_PLL_PFD1_DIV2>,
+ <&clk IMX93_CLK_SYS_PLL_PFD0_DIV2>;
+ assigned-clock-rates = <100000000>, <250000000>;
+ intf_mode = <&wakeupmix_gpr 0x28>;
+ clk_csr = <0>;
+ status = "disabled";
+ };
+
usdhc3: mmc@428b0000 {
compatible = "fsl,imx93-usdhc", "fsl,imx8mm-usdhc";
reg = <0x428b0000 0x10000>;
--
2.34.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [PATCH 2/3] dt-bindings: add mx93 description
2022-10-12 10:51 ` [PATCH 2/3] dt-bindings: add mx93 description Clark Wang
@ 2022-10-12 13:12 ` Krzysztof Kozlowski
0 siblings, 0 replies; 7+ messages in thread
From: Krzysztof Kozlowski @ 2022-10-12 13:12 UTC (permalink / raw)
To: Clark Wang, davem, edumazet, kuba, pabeni, robh+dt,
krzysztof.kozlowski+dt, shawnguo, s.hauer, festevam,
peppe.cavallaro, alexandre.torgue, joabreu, mcoquelin.stm32
Cc: kernel, netdev, devicetree, linux-arm-kernel, linux-kernel, linux-stm32
On 12/10/2022 06:51, Clark Wang wrote:
> Add mx93 compatible string for eqos driver.
>
> Signed-off-by: Clark Wang <xiaoning.wang@nxp.com>
> ---
Acked-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Best regards,
Krzysztof
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH 1/3] net: stmmac: add imx93 platform support
2022-10-12 10:51 ` [PATCH 1/3] net: stmmac: add imx93 platform support Clark Wang
@ 2022-10-12 21:29 ` Andrew Lunn
0 siblings, 0 replies; 7+ messages in thread
From: Andrew Lunn @ 2022-10-12 21:29 UTC (permalink / raw)
To: Clark Wang
Cc: davem, edumazet, kuba, pabeni, robh+dt, krzysztof.kozlowski+dt,
shawnguo, s.hauer, festevam, peppe.cavallaro, alexandre.torgue,
joabreu, mcoquelin.stm32, kernel, netdev, devicetree,
linux-arm-kernel, linux-kernel, linux-stm32
> +static int imx93_set_intf_mode(struct plat_stmmacenet_data *plat_dat)
> +{
> + struct imx_priv_data *dwmac = plat_dat->bsp_priv;
> + int val;
> +
> + switch (plat_dat->interface) {
> + case PHY_INTERFACE_MODE_MII:
> + val = MX93_GPR_ENET_QOS_INTF_SEL_MII;
> + break;
> + case PHY_INTERFACE_MODE_RMII:
> + val = MX93_GPR_ENET_QOS_INTF_SEL_RMII;
> + break;
> + case PHY_INTERFACE_MODE_RGMII:
> + case PHY_INTERFACE_MODE_RGMII_ID:
> + case PHY_INTERFACE_MODE_RGMII_RXID:
> + case PHY_INTERFACE_MODE_RGMII_TXID:
> + val = MX93_GPR_ENET_QOS_INTF_SEL_RGMII;
> + break;
> + default:
> + pr_debug("imx dwmac doesn't support %d interface\n",
> + plat_dat->interface);
netdev_debug(), or dev_debug(), so there is some clue which of the 42
dwmac instances has a bad value in DT.
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH 3/3] arm64: dts: imx93: add fec and eqos support
2022-10-12 10:51 ` [PATCH 3/3] arm64: dts: imx93: add fec and eqos support Clark Wang
@ 2022-10-12 21:32 ` Andrew Lunn
0 siblings, 0 replies; 7+ messages in thread
From: Andrew Lunn @ 2022-10-12 21:32 UTC (permalink / raw)
To: Clark Wang
Cc: davem, edumazet, kuba, pabeni, robh+dt, krzysztof.kozlowski+dt,
shawnguo, s.hauer, festevam, peppe.cavallaro, alexandre.torgue,
joabreu, mcoquelin.stm32, kernel, netdev, devicetree,
linux-arm-kernel, linux-kernel, linux-stm32
> + mdio {
> + compatible = "snps,dwmac-mdio";
> + #address-cells = <1>;
> + #size-cells = <0>;
> + clock-frequency = <5000000>;
> +
> + ethphy1: ethernet-phy@1 {
> + compatible = "ethernet-phy-ieee802.3-c22";
It is not wrong, but this is not needed, its the default.
Andrew
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2022-10-12 21:33 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-10-12 10:51 [PATCH 0/3] Add imx93 support for dwmac-imx Clark Wang
2022-10-12 10:51 ` [PATCH 1/3] net: stmmac: add imx93 platform support Clark Wang
2022-10-12 21:29 ` Andrew Lunn
2022-10-12 10:51 ` [PATCH 2/3] dt-bindings: add mx93 description Clark Wang
2022-10-12 13:12 ` Krzysztof Kozlowski
2022-10-12 10:51 ` [PATCH 3/3] arm64: dts: imx93: add fec and eqos support Clark Wang
2022-10-12 21:32 ` Andrew Lunn
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).