From: Peng Fan <[email protected]>
Patchset based on
https://lists.infradead.org/pipermail/linux-arm-kernel/2021-November/697704.html
This patchset is to enable FEC for i.MX8ULP-EVK
Patch 1 is simplify ymal
Patch 2 is add dt-bindings
Patch 3 is add fec node
Patch 4 is enable fec
Peng Fan (4):
dt-bindings: net: fec: simplify yaml
dt-bindings: net: fec: Add imx8ulp compatible string
arm64: dts: imx8ulp: add fec node
arm64: dts: imx8ulp-evk: enable fec
.../devicetree/bindings/net/fsl,fec.yaml | 12 +++----
arch/arm64/boot/dts/freescale/imx8ulp-evk.dts | 34 +++++++++++++++++++
arch/arm64/boot/dts/freescale/imx8ulp.dtsi | 18 ++++++++++
3 files changed, 58 insertions(+), 6 deletions(-)
--
2.25.1
From: Peng Fan <[email protected]>
i.MX7D, i.MX8MQ and i.MX8QM are compatible with i.MX6SX, so no need
to split them into three items.
Signed-off-by: Peng Fan <[email protected]>
---
Documentation/devicetree/bindings/net/fsl,fec.yaml | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
diff --git a/Documentation/devicetree/bindings/net/fsl,fec.yaml b/Documentation/devicetree/bindings/net/fsl,fec.yaml
index eca41443fcce..dbf63a9c2a46 100644
--- a/Documentation/devicetree/bindings/net/fsl,fec.yaml
+++ b/Documentation/devicetree/bindings/net/fsl,fec.yaml
@@ -39,9 +39,8 @@ properties:
- items:
- enum:
- fsl,imx7d-fec
- - const: fsl,imx6sx-fec
- - items:
- - const: fsl,imx8mq-fec
+ - fsl,imx8mq-fec
+ - fsl,imx8qm-fec
- const: fsl,imx6sx-fec
- items:
- enum:
@@ -50,9 +49,6 @@ properties:
- fsl,imx8mp-fec
- const: fsl,imx8mq-fec
- const: fsl,imx6sx-fec
- - items:
- - const: fsl,imx8qm-fec
- - const: fsl,imx6sx-fec
- items:
- enum:
- fsl,imx8qxp-fec
--
2.25.1
From: Peng Fan <[email protected]>
Add ethernet node and its alias
Signed-off-by: Peng Fan <[email protected]>
---
arch/arm64/boot/dts/freescale/imx8ulp.dtsi | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
diff --git a/arch/arm64/boot/dts/freescale/imx8ulp.dtsi b/arch/arm64/boot/dts/freescale/imx8ulp.dtsi
index edac63cf3668..e3c658b45ae6 100644
--- a/arch/arm64/boot/dts/freescale/imx8ulp.dtsi
+++ b/arch/arm64/boot/dts/freescale/imx8ulp.dtsi
@@ -16,6 +16,7 @@ / {
#size-cells = <2>;
aliases {
+ ethernet0 = &fec;
gpio0 = &gpiod;
gpio1 = &gpioe;
gpio2 = &gpiof;
@@ -365,6 +366,23 @@ usdhc2: mmc@298f0000 {
bus-width = <4>;
status = "disabled";
};
+
+ fec: ethernet@29950000 {
+ compatible = "fsl,imx8ulp-fec", "fsl,imx6ul-fec";
+ reg = <0x29950000 0x10000>;
+ interrupts = <GIC_SPI 107 IRQ_TYPE_LEVEL_HIGH>;
+ interrupt-names = "int0";
+ clocks = <&pcc4 IMX8ULP_CLK_ENET>,
+ <&pcc4 IMX8ULP_CLK_ENET>,
+ <&cgc1 IMX8ULP_CLK_ENET_TS_SEL>;
+ clock-names = "ipg", "ahb", "ptp";
+ assigned-clocks = <&cgc1 IMX8ULP_CLK_ENET_TS_SEL>;
+ assigned-clock-parents = <&sosc>;
+ assigned-clock-rates = <24000000>;
+ fsl,num-tx-queues = <1>;
+ fsl,num-rx-queues = <1>;
+ status = "disabled";
+ };
};
gpioe: gpio@2d000000 {
--
2.25.1
From: Peng Fan <[email protected]>
Enable fec, add pinctrl for fec
Signed-off-by: Peng Fan <[email protected]>
---
arch/arm64/boot/dts/freescale/imx8ulp-evk.dts | 34 +++++++++++++++++++
1 file changed, 34 insertions(+)
diff --git a/arch/arm64/boot/dts/freescale/imx8ulp-evk.dts b/arch/arm64/boot/dts/freescale/imx8ulp-evk.dts
index 33e84c4e9ed8..7103fed3a6cc 100644
--- a/arch/arm64/boot/dts/freescale/imx8ulp-evk.dts
+++ b/arch/arm64/boot/dts/freescale/imx8ulp-evk.dts
@@ -21,6 +21,24 @@ memory@80000000 {
};
};
+&fec {
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_enet>;
+ phy-mode = "rmii";
+ phy-handle = <ðphy>;
+ status = "okay";
+
+ mdio {
+ #address-cells = <1>;
+ #size-cells = <0>;
+
+ ethphy: ethernet-phy {
+ reg = <1>;
+ micrel,led-mode = <1>;
+ };
+ };
+};
+
&lpuart5 {
/* console */
pinctrl-names = "default", "sleep";
@@ -39,6 +57,22 @@ &usdhc0 {
};
&iomuxc1 {
+ pinctrl_enet: enetgrp {
+ fsl,pins = <
+ MX8ULP_PAD_PTE15__ENET0_MDC 0x43
+ MX8ULP_PAD_PTE14__ENET0_MDIO 0x43
+ MX8ULP_PAD_PTE17__ENET0_RXER 0x43
+ MX8ULP_PAD_PTE18__ENET0_CRS_DV 0x43
+ MX8ULP_PAD_PTF1__ENET0_RXD0 0x43
+ MX8ULP_PAD_PTE20__ENET0_RXD1 0x43
+ MX8ULP_PAD_PTE16__ENET0_TXEN 0x43
+ MX8ULP_PAD_PTE23__ENET0_TXD0 0x43
+ MX8ULP_PAD_PTE22__ENET0_TXD1 0x43
+ MX8ULP_PAD_PTE19__ENET0_REFCLK 0x43
+ MX8ULP_PAD_PTF10__ENET0_1588_CLKIN 0x43
+ >;
+ };
+
pinctrl_lpuart5: lpuart5grp {
fsl,pins = <
MX8ULP_PAD_PTF14__LPUART5_TX 0x3
--
2.25.1
From: Peng Fan <[email protected]>
The fec on i.MX8ULP is derived from i.MX6UL, it uses two compatible
strings, so update the compatible string for i.MX8ULP.
Signed-off-by: Peng Fan <[email protected]>
---
Documentation/devicetree/bindings/net/fsl,fec.yaml | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/Documentation/devicetree/bindings/net/fsl,fec.yaml b/Documentation/devicetree/bindings/net/fsl,fec.yaml
index dbf63a9c2a46..979fbc73f0b6 100644
--- a/Documentation/devicetree/bindings/net/fsl,fec.yaml
+++ b/Documentation/devicetree/bindings/net/fsl,fec.yaml
@@ -55,6 +55,10 @@ properties:
- const: fsl,imx8qm-fec
- const: fsl,imx6sx-fec
+ - items:
+ - const: fsl,imx8ulp-fec
+ - const: fsl,imx6ul-fec
+
reg:
maxItems: 1
--
2.25.1
> +&fec {
> + pinctrl-names = "default";
> + pinctrl-0 = <&pinctrl_enet>;
> + phy-mode = "rmii";
Is this really a Fast Ethernet? Not 1G?
> + phy-handle = <ðphy>;
> + status = "okay";
> +
> + mdio {
> + #address-cells = <1>;
> + #size-cells = <0>;
> +
> + ethphy: ethernet-phy {
> + reg = <1>;
I'm surprised this does not give warnings from the DTS tools. There is
a reg value, so it should be ethernet-phy@1
Andrew
> Subject: Re: [PATCH 4/4] arm64: dts: imx8ulp-evk: enable fec
>
> > +&fec {
> > + pinctrl-names = "default";
> > + pinctrl-0 = <&pinctrl_enet>;
> > + phy-mode = "rmii";
>
> Is this really a Fast Ethernet? Not 1G?
Not 1G. it only support 10M/100M ethernet.
>
> > + phy-handle = <ðphy>;
> > + status = "okay";
> > +
> > + mdio {
> > + #address-cells = <1>;
> > + #size-cells = <0>;
> > +
> > + ethphy: ethernet-phy {
> > + reg = <1>;
>
> I'm surprised this does not give warnings from the DTS tools. There is a reg
> value, so it should be ethernet-phy@1
I not see warning per my build:
"
*** Default configuration is based on 'defconfig'
#
# No change to .config
#
CALL scripts/atomic/check-atomics.sh
CALL scripts/checksyscalls.sh
CHK include/generated/compile.h
DTC arch/arm64/boot/dts/freescale/imx8ulp-evk.dtb
"
Anyway I will check and fix if the node needs a fix.
Thanks,
Peng
>
> Andrew
Hi Peng,
Thanks a lot for helping upstream this patch set.
For this change, have you run 'make dtbs_check'? I remember that split them to pass dtbs_check when convert it into yaml.
Best Regards,
Joakim Zhang
> -----Original Message-----
> From: Peng Fan (OSS) <[email protected]>
> Sent: 2021??11??20?? 19:58
> To: [email protected]; Aisheng Dong <[email protected]>; Joakim
> Zhang <[email protected]>; [email protected];
> [email protected]; [email protected]; [email protected]
> Cc: [email protected]; [email protected]; dl-linux-imx
> <[email protected]>; [email protected];
> [email protected]; [email protected];
> [email protected]; Peng Fan <[email protected]>
> Subject: [PATCH 1/4] dt-bindings: net: fec: simplify yaml
>
> From: Peng Fan <[email protected]>
>
> i.MX7D, i.MX8MQ and i.MX8QM are compatible with i.MX6SX, so no need to
> split them into three items.
>
> Signed-off-by: Peng Fan <[email protected]>
> ---
> Documentation/devicetree/bindings/net/fsl,fec.yaml | 8 ++------
> 1 file changed, 2 insertions(+), 6 deletions(-)
>
> diff --git a/Documentation/devicetree/bindings/net/fsl,fec.yaml
> b/Documentation/devicetree/bindings/net/fsl,fec.yaml
> index eca41443fcce..dbf63a9c2a46 100644
> --- a/Documentation/devicetree/bindings/net/fsl,fec.yaml
> +++ b/Documentation/devicetree/bindings/net/fsl,fec.yaml
> @@ -39,9 +39,8 @@ properties:
> - items:
> - enum:
> - fsl,imx7d-fec
> - - const: fsl,imx6sx-fec
> - - items:
> - - const: fsl,imx8mq-fec
> + - fsl,imx8mq-fec
> + - fsl,imx8qm-fec
> - const: fsl,imx6sx-fec
> - items:
> - enum:
> @@ -50,9 +49,6 @@ properties:
> - fsl,imx8mp-fec
> - const: fsl,imx8mq-fec
> - const: fsl,imx6sx-fec
> - - items:
> - - const: fsl,imx8qm-fec
> - - const: fsl,imx6sx-fec
> - items:
> - enum:
> - fsl,imx8qxp-fec
> --
> 2.25.1
Hi Peng,
I saw it's not the latest version(clock setting) compared to our local implementation, could you help update it or need a follow up later?
Best Regards,
Joakim Zhang
> -----Original Message-----
> From: Peng Fan (OSS) <[email protected]>
> Sent: 2021??11??20?? 19:58
> To: [email protected]; Aisheng Dong <[email protected]>; Joakim
> Zhang <[email protected]>; [email protected];
> [email protected]; [email protected]; [email protected]
> Cc: [email protected]; [email protected]; dl-linux-imx
> <[email protected]>; [email protected];
> [email protected]; [email protected];
> [email protected]; Peng Fan <[email protected]>
> Subject: [PATCH 3/4] arm64: dts: imx8ulp: add fec node
>
> From: Peng Fan <[email protected]>
>
> Add ethernet node and its alias
>
> Signed-off-by: Peng Fan <[email protected]>
> ---
> arch/arm64/boot/dts/freescale/imx8ulp.dtsi | 18 ++++++++++++++++++
> 1 file changed, 18 insertions(+)
>
> diff --git a/arch/arm64/boot/dts/freescale/imx8ulp.dtsi
> b/arch/arm64/boot/dts/freescale/imx8ulp.dtsi
> index edac63cf3668..e3c658b45ae6 100644
> --- a/arch/arm64/boot/dts/freescale/imx8ulp.dtsi
> +++ b/arch/arm64/boot/dts/freescale/imx8ulp.dtsi
> @@ -16,6 +16,7 @@ / {
> #size-cells = <2>;
>
> aliases {
> + ethernet0 = &fec;
> gpio0 = &gpiod;
> gpio1 = &gpioe;
> gpio2 = &gpiof;
> @@ -365,6 +366,23 @@ usdhc2: mmc@298f0000 {
> bus-width = <4>;
> status = "disabled";
> };
> +
> + fec: ethernet@29950000 {
> + compatible = "fsl,imx8ulp-fec", "fsl,imx6ul-fec";
> + reg = <0x29950000 0x10000>;
> + interrupts = <GIC_SPI 107 IRQ_TYPE_LEVEL_HIGH>;
> + interrupt-names = "int0";
> + clocks = <&pcc4 IMX8ULP_CLK_ENET>,
> + <&pcc4 IMX8ULP_CLK_ENET>,
> + <&cgc1 IMX8ULP_CLK_ENET_TS_SEL>;
> + clock-names = "ipg", "ahb", "ptp";
> + assigned-clocks = <&cgc1 IMX8ULP_CLK_ENET_TS_SEL>;
> + assigned-clock-parents = <&sosc>;
> + assigned-clock-rates = <24000000>;
> + fsl,num-tx-queues = <1>;
> + fsl,num-rx-queues = <1>;
> + status = "disabled";
> + };
> };
>
> gpioe: gpio@2d000000 {
> --
> 2.25.1
Hi Peng,
> -----Original Message-----
> From: Peng Fan <[email protected]>
> Sent: 2021??11??22?? 9:04
> To: Andrew Lunn <[email protected]>; Peng Fan (OSS)
> <[email protected]>
> Cc: [email protected]; Aisheng Dong <[email protected]>; Joakim
> Zhang <[email protected]>; [email protected];
> [email protected]; [email protected]; [email protected];
> [email protected]; [email protected]; dl-linux-imx
> <[email protected]>; [email protected];
> [email protected]; [email protected];
> [email protected]
> Subject: RE: [PATCH 4/4] arm64: dts: imx8ulp-evk: enable fec
>
> > Subject: Re: [PATCH 4/4] arm64: dts: imx8ulp-evk: enable fec
> >
> > > +&fec {
> > > + pinctrl-names = "default";
> > > + pinctrl-0 = <&pinctrl_enet>;
> > > + phy-mode = "rmii";
> >
> > Is this really a Fast Ethernet? Not 1G?
>
> Not 1G. it only support 10M/100M ethernet.
>
> >
> > > + phy-handle = <ðphy>;
> > > + status = "okay";
> > > +
> > > + mdio {
> > > + #address-cells = <1>;
> > > + #size-cells = <0>;
> > > +
> > > + ethphy: ethernet-phy {
> > > + reg = <1>;
> >
> > I'm surprised this does not give warnings from the DTS tools. There is
> > a reg value, so it should be ethernet-phy@1
>
> I not see warning per my build:
> "
> *** Default configuration is based on 'defconfig'
> #
> # No change to .config
> #
> CALL scripts/atomic/check-atomics.sh
> CALL scripts/checksyscalls.sh
> CHK include/generated/compile.h
> DTC arch/arm64/boot/dts/freescale/imx8ulp-evk.dtb
> "
> Anyway I will check and fix if the node needs a fix.
According to PHY guide, Documentation/devicetree/bindings/net/ethernet-phy.yaml, yes, we need write to ' ethernet-phy@1'.
DTS tool may not complain it, I guess 'make dtbs_check' could give a warning...
Best Regards,
Joakim Zhang
> Thanks,
> Peng
>
> >
> > Andrew
> Subject: RE: [PATCH 1/4] dt-bindings: net: fec: simplify yaml
>
>
> Hi Peng,
>
> Thanks a lot for helping upstream this patch set.
>
> For this change, have you run 'make dtbs_check'? I remember that split them
> to pass dtbs_check when convert it into yaml.
" arch/arm/boot/dts/imx6dl-nitrogen6x.dt.yaml:
ethernet@2188000: More than one condition true in oneOf schema: "
But this is not introduced by my patch, it already there even drop my
patch.
I not see other issues.
Thanks,
Peng.
>
> Best Regards,
> Joakim Zhang
> > -----Original Message-----
> > From: Peng Fan (OSS) <[email protected]>
> > Sent: 2021??11??20?? 19:58
> > To: [email protected]; Aisheng Dong <[email protected]>; Joakim
> > Zhang <[email protected]>; [email protected];
> [email protected];
> > [email protected]; [email protected]
> > Cc: [email protected]; [email protected]; dl-linux-imx
> > <[email protected]>; [email protected];
> > [email protected]; [email protected];
> > [email protected]; Peng Fan <[email protected]>
> > Subject: [PATCH 1/4] dt-bindings: net: fec: simplify yaml
> >
> > From: Peng Fan <[email protected]>
> >
> > i.MX7D, i.MX8MQ and i.MX8QM are compatible with i.MX6SX, so no need
> to
> > split them into three items.
> >
> > Signed-off-by: Peng Fan <[email protected]>
> > ---
> > Documentation/devicetree/bindings/net/fsl,fec.yaml | 8 ++------
> > 1 file changed, 2 insertions(+), 6 deletions(-)
> >
> > diff --git a/Documentation/devicetree/bindings/net/fsl,fec.yaml
> > b/Documentation/devicetree/bindings/net/fsl,fec.yaml
> > index eca41443fcce..dbf63a9c2a46 100644
> > --- a/Documentation/devicetree/bindings/net/fsl,fec.yaml
> > +++ b/Documentation/devicetree/bindings/net/fsl,fec.yaml
> > @@ -39,9 +39,8 @@ properties:
> > - items:
> > - enum:
> > - fsl,imx7d-fec
> > - - const: fsl,imx6sx-fec
> > - - items:
> > - - const: fsl,imx8mq-fec
> > + - fsl,imx8mq-fec
> > + - fsl,imx8qm-fec
> > - const: fsl,imx6sx-fec
> > - items:
> > - enum:
> > @@ -50,9 +49,6 @@ properties:
> > - fsl,imx8mp-fec
> > - const: fsl,imx8mq-fec
> > - const: fsl,imx6sx-fec
> > - - items:
> > - - const: fsl,imx8qm-fec
> > - - const: fsl,imx6sx-fec
> > - items:
> > - enum:
> > - fsl,imx8qxp-fec
> > --
> > 2.25.1
Hi Peng,
> -----Original Message-----
> From: Peng Fan <[email protected]>
> Sent: 2021??11??23?? 17:29
> To: Joakim Zhang <[email protected]>; Peng Fan (OSS)
> <[email protected]>; [email protected]; Aisheng Dong
> <[email protected]>; [email protected]; [email protected];
> [email protected]; [email protected]
> Cc: [email protected]; [email protected]; dl-linux-imx
> <[email protected]>; [email protected];
> [email protected]; [email protected];
> [email protected]
> Subject: RE: [PATCH 1/4] dt-bindings: net: fec: simplify yaml
>
> > Subject: RE: [PATCH 1/4] dt-bindings: net: fec: simplify yaml
> >
> >
> > Hi Peng,
> >
> > Thanks a lot for helping upstream this patch set.
> >
> > For this change, have you run 'make dtbs_check'? I remember that split
> > them to pass dtbs_check when convert it into yaml.
>
> " arch/arm/boot/dts/imx6dl-nitrogen6x.dt.yaml:
> ethernet@2188000: More than one condition true in oneOf schema: "
>
> But this is not introduced by my patch, it already there even drop my patch.
>
> I not see other issues.
For this error: ethernet@2188000: More than one condition true in oneOf schema:
This is caused by ['interrupts'] and ['interrupts-extended'], this should be a common limitation, this is a known warning.
'oneOf': [{'required': ['interrupts']},
{'required': ['interrupts-extended']}],
After applying this patch, I verified on both arm and arm64 platforms, indeed there is no regression targets to ['compatible']. I am okay with this patch, sorry for this inconvenience.
Best Regards,
Joakim Zhang
> Thanks,
> Peng.
>
> >
> > Best Regards,
> > Joakim Zhang
> > > -----Original Message-----
> > > From: Peng Fan (OSS) <[email protected]>
> > > Sent: 2021??11??20?? 19:58
> > > To: [email protected]; Aisheng Dong <[email protected]>;
> Joakim
> > > Zhang <[email protected]>; [email protected];
> > [email protected];
> > > [email protected]; [email protected]
> > > Cc: [email protected]; [email protected]; dl-linux-imx
> > > <[email protected]>; [email protected];
> > > [email protected]; [email protected];
> > > [email protected]; Peng Fan <[email protected]>
> > > Subject: [PATCH 1/4] dt-bindings: net: fec: simplify yaml
> > >
> > > From: Peng Fan <[email protected]>
> > >
> > > i.MX7D, i.MX8MQ and i.MX8QM are compatible with i.MX6SX, so no need
> > to
> > > split them into three items.
> > >
> > > Signed-off-by: Peng Fan <[email protected]>
> > > ---
> > > Documentation/devicetree/bindings/net/fsl,fec.yaml | 8 ++------
> > > 1 file changed, 2 insertions(+), 6 deletions(-)
> > >
> > > diff --git a/Documentation/devicetree/bindings/net/fsl,fec.yaml
> > > b/Documentation/devicetree/bindings/net/fsl,fec.yaml
> > > index eca41443fcce..dbf63a9c2a46 100644
> > > --- a/Documentation/devicetree/bindings/net/fsl,fec.yaml
> > > +++ b/Documentation/devicetree/bindings/net/fsl,fec.yaml
> > > @@ -39,9 +39,8 @@ properties:
> > > - items:
> > > - enum:
> > > - fsl,imx7d-fec
> > > - - const: fsl,imx6sx-fec
> > > - - items:
> > > - - const: fsl,imx8mq-fec
> > > + - fsl,imx8mq-fec
> > > + - fsl,imx8qm-fec
> > > - const: fsl,imx6sx-fec
> > > - items:
> > > - enum:
> > > @@ -50,9 +49,6 @@ properties:
> > > - fsl,imx8mp-fec
> > > - const: fsl,imx8mq-fec
> > > - const: fsl,imx6sx-fec
> > > - - items:
> > > - - const: fsl,imx8qm-fec
> > > - - const: fsl,imx6sx-fec
> > > - items:
> > > - enum:
> > > - fsl,imx8qxp-fec
> > > --
> > > 2.25.1
On Sat, 20 Nov 2021 19:58:22 +0800, Peng Fan (OSS) wrote:
> From: Peng Fan <[email protected]>
>
> i.MX7D, i.MX8MQ and i.MX8QM are compatible with i.MX6SX, so no need
> to split them into three items.
>
> Signed-off-by: Peng Fan <[email protected]>
> ---
> Documentation/devicetree/bindings/net/fsl,fec.yaml | 8 ++------
> 1 file changed, 2 insertions(+), 6 deletions(-)
>
Reviewed-by: Rob Herring <[email protected]>
On Sat, 20 Nov 2021 19:58:23 +0800, Peng Fan (OSS) wrote:
> From: Peng Fan <[email protected]>
>
> The fec on i.MX8ULP is derived from i.MX6UL, it uses two compatible
> strings, so update the compatible string for i.MX8ULP.
>
> Signed-off-by: Peng Fan <[email protected]>
> ---
> Documentation/devicetree/bindings/net/fsl,fec.yaml | 4 ++++
> 1 file changed, 4 insertions(+)
>
Reviewed-by: Rob Herring <[email protected]>