stable.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH v2] ARM: dts: imx: Fix the AR803X phy-mode
@ 2019-04-02  0:36 Fabio Estevam
  2019-04-02  1:13 ` Adam Ford
       [not found] ` <20190403122936.442C02147A@mail.kernel.org>
  0 siblings, 2 replies; 4+ messages in thread
From: Fabio Estevam @ 2019-04-02  0:36 UTC (permalink / raw)
  To: shawnguo
  Cc: linux-arm-kernel, baruch, smoch, stwiss.opensource, kernel,
	linux-imx, linux, andrew, sebastien.szymanski, aford173,
	Fabio Estevam, stable, Marc Kleine-Budde

Commit 6d4cd041f0af ("net: phy: at803x: disable delay only for RGMII mode")
exposed an issue on imx DTS files using AR8031/AR8035 PHYs.

The end result is that the boards can no longer obtain an IP address
via UDHCP, for example.

Quoting Andrew Lunn:

"The problem here is, all the DTs were broken since day 0. However,
because the PHY driver was also broken, nobody noticed and it
worked. Now that the PHY driver has been fixed, all the bugs in the
DTs now become an issue"

To fix this problem, the phy-mode property needs to be "rgmii-id",  which
has the following meaning as per 
Documentation/devicetree/bindings/net/ethernet.txt:

"RGMII with internal RX and TX delays provided by the PHY, the MAC should
not add the RX or TX delays in this case)"

Tested on imx6-sabresd, imx6sx-sdb and imx7d-pico boards with
successfully restored networking.

Based on the initial submission from Steve Twiss for the
imx6qdl-sabresd.

Cc: <stable@vger.kernel.org> # 4.9+
Signed-off-by: Fabio Estevam <festevam@gmail.com>
Tested-by: Baruch Siach <baruch@tkos.co.il>
Tested-by: Soeren Moch <smoch@web.de>
Tested-by: Steve Twiss <stwiss.opensource@diasemi.com>
Tested-by: Adam Thomson <Adam.Thomson@diasemi.com>
Signed-off-by: Steve Twiss <stwiss.opensource@diasemi.com>
Tested-by: Marc Kleine-Budde <mkl@pengutronix.de>
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
---
Changes since v1:
- Also fix imx6-logicpd and imx6q-marsboard

 arch/arm/boot/dts/imx6-logicpd-baseboard.dtsi | 2 +-
 arch/arm/boot/dts/imx6dl-riotboard.dts        | 2 +-
 arch/arm/boot/dts/imx6q-marsboard.dts         | 2 +-
 arch/arm/boot/dts/imx6q-tbs2910.dts           | 2 +-
 arch/arm/boot/dts/imx6qdl-apf6.dtsi           | 2 +-
 arch/arm/boot/dts/imx6qdl-sabreauto.dtsi      | 2 +-
 arch/arm/boot/dts/imx6qdl-sabresd.dtsi        | 2 +-
 arch/arm/boot/dts/imx6qdl-sr-som.dtsi         | 2 +-
 arch/arm/boot/dts/imx6qdl-wandboard.dtsi      | 2 +-
 arch/arm/boot/dts/imx6sx-sabreauto.dts        | 2 +-
 arch/arm/boot/dts/imx6sx-sdb.dtsi             | 2 +-
 arch/arm/boot/dts/imx7d-pico.dtsi             | 2 +-
 12 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/arch/arm/boot/dts/imx6-logicpd-baseboard.dtsi b/arch/arm/boot/dts/imx6-logicpd-baseboard.dtsi
index fb01fa6e4224..3cae139e6396 100644
--- a/arch/arm/boot/dts/imx6-logicpd-baseboard.dtsi
+++ b/arch/arm/boot/dts/imx6-logicpd-baseboard.dtsi
@@ -216,7 +216,7 @@
 &fec {
 	pinctrl-names = "default";
 	pinctrl-0 = <&pinctrl_enet>;
-	phy-mode = "rgmii";
+	phy-mode = "rgmii-id";
 	phy-reset-duration = <10>;
 	phy-reset-gpios = <&gpio1 24 GPIO_ACTIVE_LOW>;
 	phy-supply = <&reg_enet>;
diff --git a/arch/arm/boot/dts/imx6dl-riotboard.dts b/arch/arm/boot/dts/imx6dl-riotboard.dts
index 65c184bb8fb0..d9de49efa802 100644
--- a/arch/arm/boot/dts/imx6dl-riotboard.dts
+++ b/arch/arm/boot/dts/imx6dl-riotboard.dts
@@ -92,7 +92,7 @@
 &fec {
 	pinctrl-names = "default";
 	pinctrl-0 = <&pinctrl_enet>;
-	phy-mode = "rgmii";
+	phy-mode = "rgmii-id";
 	phy-reset-gpios = <&gpio3 31 GPIO_ACTIVE_LOW>;
 	interrupts-extended = <&gpio1 6 IRQ_TYPE_LEVEL_HIGH>,
 			      <&intc 0 119 IRQ_TYPE_LEVEL_HIGH>;
diff --git a/arch/arm/boot/dts/imx6q-marsboard.dts b/arch/arm/boot/dts/imx6q-marsboard.dts
index d8ccb533b6b7..84b30bd6908f 100644
--- a/arch/arm/boot/dts/imx6q-marsboard.dts
+++ b/arch/arm/boot/dts/imx6q-marsboard.dts
@@ -110,7 +110,7 @@
 &fec {
 	pinctrl-names = "default";
 	pinctrl-0 = <&pinctrl_enet>;
-	phy-mode = "rgmii";
+	phy-mode = "rgmii-id";
 	phy-reset-gpios = <&gpio3 31 GPIO_ACTIVE_LOW>;
 	status = "okay";
 };
diff --git a/arch/arm/boot/dts/imx6q-tbs2910.dts b/arch/arm/boot/dts/imx6q-tbs2910.dts
index 2ce8399a10ba..bfff87ce2e1f 100644
--- a/arch/arm/boot/dts/imx6q-tbs2910.dts
+++ b/arch/arm/boot/dts/imx6q-tbs2910.dts
@@ -98,7 +98,7 @@
 &fec {
 	pinctrl-names = "default";
 	pinctrl-0 = <&pinctrl_enet>;
-	phy-mode = "rgmii";
+	phy-mode = "rgmii-id";
 	phy-reset-gpios = <&gpio1 25 GPIO_ACTIVE_LOW>;
 	status = "okay";
 };
diff --git a/arch/arm/boot/dts/imx6qdl-apf6.dtsi b/arch/arm/boot/dts/imx6qdl-apf6.dtsi
index 1ebf29f43a24..4738c3c1ab50 100644
--- a/arch/arm/boot/dts/imx6qdl-apf6.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-apf6.dtsi
@@ -51,7 +51,7 @@
 &fec {
 	pinctrl-names = "default";
 	pinctrl-0 = <&pinctrl_enet>;
-	phy-mode = "rgmii";
+	phy-mode = "rgmii-id";
 	phy-reset-duration = <10>;
 	phy-reset-gpios = <&gpio1 24 GPIO_ACTIVE_LOW>;
 	status = "okay";
diff --git a/arch/arm/boot/dts/imx6qdl-sabreauto.dtsi b/arch/arm/boot/dts/imx6qdl-sabreauto.dtsi
index 1280de50a984..f3404dd10537 100644
--- a/arch/arm/boot/dts/imx6qdl-sabreauto.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-sabreauto.dtsi
@@ -292,7 +292,7 @@
 &fec {
 	pinctrl-names = "default";
 	pinctrl-0 = <&pinctrl_enet>;
-	phy-mode = "rgmii";
+	phy-mode = "rgmii-id";
 	interrupts-extended = <&gpio1 6 IRQ_TYPE_LEVEL_HIGH>,
 			      <&intc 0 119 IRQ_TYPE_LEVEL_HIGH>;
 	fsl,err006687-workaround-present;
diff --git a/arch/arm/boot/dts/imx6qdl-sabresd.dtsi b/arch/arm/boot/dts/imx6qdl-sabresd.dtsi
index a0705066ccba..185fb17a3500 100644
--- a/arch/arm/boot/dts/imx6qdl-sabresd.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-sabresd.dtsi
@@ -202,7 +202,7 @@
 &fec {
 	pinctrl-names = "default";
 	pinctrl-0 = <&pinctrl_enet>;
-	phy-mode = "rgmii";
+	phy-mode = "rgmii-id";
 	phy-reset-gpios = <&gpio1 25 GPIO_ACTIVE_LOW>;
 	status = "okay";
 };
diff --git a/arch/arm/boot/dts/imx6qdl-sr-som.dtsi b/arch/arm/boot/dts/imx6qdl-sr-som.dtsi
index 4ccb7afc4b35..6d7f6b9035bc 100644
--- a/arch/arm/boot/dts/imx6qdl-sr-som.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-sr-som.dtsi
@@ -53,7 +53,7 @@
 &fec {
 	pinctrl-names = "default";
 	pinctrl-0 = <&pinctrl_microsom_enet_ar8035>;
-	phy-mode = "rgmii";
+	phy-mode = "rgmii-id";
 	phy-reset-duration = <2>;
 	phy-reset-gpios = <&gpio4 15 GPIO_ACTIVE_LOW>;
 	status = "okay";
diff --git a/arch/arm/boot/dts/imx6qdl-wandboard.dtsi b/arch/arm/boot/dts/imx6qdl-wandboard.dtsi
index b7d5fb421404..50d9a989e06a 100644
--- a/arch/arm/boot/dts/imx6qdl-wandboard.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-wandboard.dtsi
@@ -224,7 +224,7 @@
 &fec {
 	pinctrl-names = "default";
 	pinctrl-0 = <&pinctrl_enet>;
-	phy-mode = "rgmii";
+	phy-mode = "rgmii-id";
 	phy-reset-gpios = <&gpio3 29 GPIO_ACTIVE_LOW>;
 	interrupts-extended = <&gpio1 6 IRQ_TYPE_LEVEL_HIGH>,
 			      <&intc 0 119 IRQ_TYPE_LEVEL_HIGH>;
diff --git a/arch/arm/boot/dts/imx6sx-sabreauto.dts b/arch/arm/boot/dts/imx6sx-sabreauto.dts
index b0ee324afe58..315044ccd65f 100644
--- a/arch/arm/boot/dts/imx6sx-sabreauto.dts
+++ b/arch/arm/boot/dts/imx6sx-sabreauto.dts
@@ -75,7 +75,7 @@
 &fec1 {
 	pinctrl-names = "default";
 	pinctrl-0 = <&pinctrl_enet1>;
-	phy-mode = "rgmii";
+	phy-mode = "rgmii-id";
 	phy-handle = <&ethphy1>;
 	fsl,magic-packet;
 	status = "okay";
diff --git a/arch/arm/boot/dts/imx6sx-sdb.dtsi b/arch/arm/boot/dts/imx6sx-sdb.dtsi
index 08ede56c3f10..f6972deb5e39 100644
--- a/arch/arm/boot/dts/imx6sx-sdb.dtsi
+++ b/arch/arm/boot/dts/imx6sx-sdb.dtsi
@@ -191,7 +191,7 @@
 	pinctrl-names = "default";
 	pinctrl-0 = <&pinctrl_enet1>;
 	phy-supply = <&reg_enet_3v3>;
-	phy-mode = "rgmii";
+	phy-mode = "rgmii-id";
 	phy-handle = <&ethphy1>;
 	phy-reset-gpios = <&gpio2 7 GPIO_ACTIVE_LOW>;
 	status = "okay";
diff --git a/arch/arm/boot/dts/imx7d-pico.dtsi b/arch/arm/boot/dts/imx7d-pico.dtsi
index 3fd595a71202..6f50ebf31a0a 100644
--- a/arch/arm/boot/dts/imx7d-pico.dtsi
+++ b/arch/arm/boot/dts/imx7d-pico.dtsi
@@ -92,7 +92,7 @@
 			  <&clks IMX7D_ENET1_TIME_ROOT_CLK>;
 	assigned-clock-parents = <&clks IMX7D_PLL_ENET_MAIN_100M_CLK>;
 	assigned-clock-rates = <0>, <100000000>;
-	phy-mode = "rgmii";
+	phy-mode = "rgmii-id";
 	phy-handle = <&ethphy0>;
 	fsl,magic-packet;
 	phy-reset-gpios = <&gpio6 11 GPIO_ACTIVE_LOW>;
-- 
2.17.1


^ permalink raw reply related	[flat|nested] 4+ messages in thread

* Re: [PATCH v2] ARM: dts: imx: Fix the AR803X phy-mode
  2019-04-02  0:36 [PATCH v2] ARM: dts: imx: Fix the AR803X phy-mode Fabio Estevam
@ 2019-04-02  1:13 ` Adam Ford
       [not found] ` <20190403122936.442C02147A@mail.kernel.org>
  1 sibling, 0 replies; 4+ messages in thread
From: Adam Ford @ 2019-04-02  1:13 UTC (permalink / raw)
  To: Fabio Estevam
  Cc: Shawn Guo, arm-soc, Baruch Siach, smoch, stwiss.opensource,
	Sascha Hauer, NXP Linux Team, Russell King, Andrew Lunn,
	sebastien.szymanski, stable, Marc Kleine-Budde

On Mon, Apr 1, 2019 at 7:37 PM Fabio Estevam <festevam@gmail.com> wrote:
>
> Commit 6d4cd041f0af ("net: phy: at803x: disable delay only for RGMII mode")
> exposed an issue on imx DTS files using AR8031/AR8035 PHYs.
>
> The end result is that the boards can no longer obtain an IP address
> via UDHCP, for example.
>
> Quoting Andrew Lunn:
>
> "The problem here is, all the DTs were broken since day 0. However,
> because the PHY driver was also broken, nobody noticed and it
> worked. Now that the PHY driver has been fixed, all the bugs in the
> DTs now become an issue"
>
> To fix this problem, the phy-mode property needs to be "rgmii-id",  which
> has the following meaning as per
> Documentation/devicetree/bindings/net/ethernet.txt:
>
> "RGMII with internal RX and TX delays provided by the PHY, the MAC should
> not add the RX or TX delays in this case)"
>
> Tested on imx6-sabresd, imx6sx-sdb and imx7d-pico boards with
> successfully restored networking.
>
> Based on the initial submission from Steve Twiss for the
> imx6qdl-sabresd.
>
> Cc: <stable@vger.kernel.org> # 4.9+
> Signed-off-by: Fabio Estevam <festevam@gmail.com>
> Tested-by: Baruch Siach <baruch@tkos.co.il>
> Tested-by: Soeren Moch <smoch@web.de>
> Tested-by: Steve Twiss <stwiss.opensource@diasemi.com>
> Tested-by: Adam Thomson <Adam.Thomson@diasemi.com>
> Signed-off-by: Steve Twiss <stwiss.opensource@diasemi.com>
> Tested-by: Marc Kleine-Budde <mkl@pengutronix.de>
> Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>

Tested-by: Adam Ford <aford173@gmail.com>

> ---
> Changes since v1:
> - Also fix imx6-logicpd and imx6q-marsboard
>
>  arch/arm/boot/dts/imx6-logicpd-baseboard.dtsi | 2 +-

Thanks for doing that.

adam
>  arch/arm/boot/dts/imx6dl-riotboard.dts        | 2 +-
>  arch/arm/boot/dts/imx6q-marsboard.dts         | 2 +-
>  arch/arm/boot/dts/imx6q-tbs2910.dts           | 2 +-
>  arch/arm/boot/dts/imx6qdl-apf6.dtsi           | 2 +-
>  arch/arm/boot/dts/imx6qdl-sabreauto.dtsi      | 2 +-
>  arch/arm/boot/dts/imx6qdl-sabresd.dtsi        | 2 +-
>  arch/arm/boot/dts/imx6qdl-sr-som.dtsi         | 2 +-
>  arch/arm/boot/dts/imx6qdl-wandboard.dtsi      | 2 +-
>  arch/arm/boot/dts/imx6sx-sabreauto.dts        | 2 +-
>  arch/arm/boot/dts/imx6sx-sdb.dtsi             | 2 +-
>  arch/arm/boot/dts/imx7d-pico.dtsi             | 2 +-
>  12 files changed, 12 insertions(+), 12 deletions(-)
>
> diff --git a/arch/arm/boot/dts/imx6-logicpd-baseboard.dtsi b/arch/arm/boot/dts/imx6-logicpd-baseboard.dtsi
> index fb01fa6e4224..3cae139e6396 100644
> --- a/arch/arm/boot/dts/imx6-logicpd-baseboard.dtsi
> +++ b/arch/arm/boot/dts/imx6-logicpd-baseboard.dtsi
> @@ -216,7 +216,7 @@
>  &fec {
>         pinctrl-names = "default";
>         pinctrl-0 = <&pinctrl_enet>;
> -       phy-mode = "rgmii";
> +       phy-mode = "rgmii-id";
>         phy-reset-duration = <10>;
>         phy-reset-gpios = <&gpio1 24 GPIO_ACTIVE_LOW>;
>         phy-supply = <&reg_enet>;
> diff --git a/arch/arm/boot/dts/imx6dl-riotboard.dts b/arch/arm/boot/dts/imx6dl-riotboard.dts
> index 65c184bb8fb0..d9de49efa802 100644
> --- a/arch/arm/boot/dts/imx6dl-riotboard.dts
> +++ b/arch/arm/boot/dts/imx6dl-riotboard.dts
> @@ -92,7 +92,7 @@
>  &fec {
>         pinctrl-names = "default";
>         pinctrl-0 = <&pinctrl_enet>;
> -       phy-mode = "rgmii";
> +       phy-mode = "rgmii-id";
>         phy-reset-gpios = <&gpio3 31 GPIO_ACTIVE_LOW>;
>         interrupts-extended = <&gpio1 6 IRQ_TYPE_LEVEL_HIGH>,
>                               <&intc 0 119 IRQ_TYPE_LEVEL_HIGH>;
> diff --git a/arch/arm/boot/dts/imx6q-marsboard.dts b/arch/arm/boot/dts/imx6q-marsboard.dts
> index d8ccb533b6b7..84b30bd6908f 100644
> --- a/arch/arm/boot/dts/imx6q-marsboard.dts
> +++ b/arch/arm/boot/dts/imx6q-marsboard.dts
> @@ -110,7 +110,7 @@
>  &fec {
>         pinctrl-names = "default";
>         pinctrl-0 = <&pinctrl_enet>;
> -       phy-mode = "rgmii";
> +       phy-mode = "rgmii-id";
>         phy-reset-gpios = <&gpio3 31 GPIO_ACTIVE_LOW>;
>         status = "okay";
>  };
> diff --git a/arch/arm/boot/dts/imx6q-tbs2910.dts b/arch/arm/boot/dts/imx6q-tbs2910.dts
> index 2ce8399a10ba..bfff87ce2e1f 100644
> --- a/arch/arm/boot/dts/imx6q-tbs2910.dts
> +++ b/arch/arm/boot/dts/imx6q-tbs2910.dts
> @@ -98,7 +98,7 @@
>  &fec {
>         pinctrl-names = "default";
>         pinctrl-0 = <&pinctrl_enet>;
> -       phy-mode = "rgmii";
> +       phy-mode = "rgmii-id";
>         phy-reset-gpios = <&gpio1 25 GPIO_ACTIVE_LOW>;
>         status = "okay";
>  };
> diff --git a/arch/arm/boot/dts/imx6qdl-apf6.dtsi b/arch/arm/boot/dts/imx6qdl-apf6.dtsi
> index 1ebf29f43a24..4738c3c1ab50 100644
> --- a/arch/arm/boot/dts/imx6qdl-apf6.dtsi
> +++ b/arch/arm/boot/dts/imx6qdl-apf6.dtsi
> @@ -51,7 +51,7 @@
>  &fec {
>         pinctrl-names = "default";
>         pinctrl-0 = <&pinctrl_enet>;
> -       phy-mode = "rgmii";
> +       phy-mode = "rgmii-id";
>         phy-reset-duration = <10>;
>         phy-reset-gpios = <&gpio1 24 GPIO_ACTIVE_LOW>;
>         status = "okay";
> diff --git a/arch/arm/boot/dts/imx6qdl-sabreauto.dtsi b/arch/arm/boot/dts/imx6qdl-sabreauto.dtsi
> index 1280de50a984..f3404dd10537 100644
> --- a/arch/arm/boot/dts/imx6qdl-sabreauto.dtsi
> +++ b/arch/arm/boot/dts/imx6qdl-sabreauto.dtsi
> @@ -292,7 +292,7 @@
>  &fec {
>         pinctrl-names = "default";
>         pinctrl-0 = <&pinctrl_enet>;
> -       phy-mode = "rgmii";
> +       phy-mode = "rgmii-id";
>         interrupts-extended = <&gpio1 6 IRQ_TYPE_LEVEL_HIGH>,
>                               <&intc 0 119 IRQ_TYPE_LEVEL_HIGH>;
>         fsl,err006687-workaround-present;
> diff --git a/arch/arm/boot/dts/imx6qdl-sabresd.dtsi b/arch/arm/boot/dts/imx6qdl-sabresd.dtsi
> index a0705066ccba..185fb17a3500 100644
> --- a/arch/arm/boot/dts/imx6qdl-sabresd.dtsi
> +++ b/arch/arm/boot/dts/imx6qdl-sabresd.dtsi
> @@ -202,7 +202,7 @@
>  &fec {
>         pinctrl-names = "default";
>         pinctrl-0 = <&pinctrl_enet>;
> -       phy-mode = "rgmii";
> +       phy-mode = "rgmii-id";
>         phy-reset-gpios = <&gpio1 25 GPIO_ACTIVE_LOW>;
>         status = "okay";
>  };
> diff --git a/arch/arm/boot/dts/imx6qdl-sr-som.dtsi b/arch/arm/boot/dts/imx6qdl-sr-som.dtsi
> index 4ccb7afc4b35..6d7f6b9035bc 100644
> --- a/arch/arm/boot/dts/imx6qdl-sr-som.dtsi
> +++ b/arch/arm/boot/dts/imx6qdl-sr-som.dtsi
> @@ -53,7 +53,7 @@
>  &fec {
>         pinctrl-names = "default";
>         pinctrl-0 = <&pinctrl_microsom_enet_ar8035>;
> -       phy-mode = "rgmii";
> +       phy-mode = "rgmii-id";
>         phy-reset-duration = <2>;
>         phy-reset-gpios = <&gpio4 15 GPIO_ACTIVE_LOW>;
>         status = "okay";
> diff --git a/arch/arm/boot/dts/imx6qdl-wandboard.dtsi b/arch/arm/boot/dts/imx6qdl-wandboard.dtsi
> index b7d5fb421404..50d9a989e06a 100644
> --- a/arch/arm/boot/dts/imx6qdl-wandboard.dtsi
> +++ b/arch/arm/boot/dts/imx6qdl-wandboard.dtsi
> @@ -224,7 +224,7 @@
>  &fec {
>         pinctrl-names = "default";
>         pinctrl-0 = <&pinctrl_enet>;
> -       phy-mode = "rgmii";
> +       phy-mode = "rgmii-id";
>         phy-reset-gpios = <&gpio3 29 GPIO_ACTIVE_LOW>;
>         interrupts-extended = <&gpio1 6 IRQ_TYPE_LEVEL_HIGH>,
>                               <&intc 0 119 IRQ_TYPE_LEVEL_HIGH>;
> diff --git a/arch/arm/boot/dts/imx6sx-sabreauto.dts b/arch/arm/boot/dts/imx6sx-sabreauto.dts
> index b0ee324afe58..315044ccd65f 100644
> --- a/arch/arm/boot/dts/imx6sx-sabreauto.dts
> +++ b/arch/arm/boot/dts/imx6sx-sabreauto.dts
> @@ -75,7 +75,7 @@
>  &fec1 {
>         pinctrl-names = "default";
>         pinctrl-0 = <&pinctrl_enet1>;
> -       phy-mode = "rgmii";
> +       phy-mode = "rgmii-id";
>         phy-handle = <&ethphy1>;
>         fsl,magic-packet;
>         status = "okay";
> diff --git a/arch/arm/boot/dts/imx6sx-sdb.dtsi b/arch/arm/boot/dts/imx6sx-sdb.dtsi
> index 08ede56c3f10..f6972deb5e39 100644
> --- a/arch/arm/boot/dts/imx6sx-sdb.dtsi
> +++ b/arch/arm/boot/dts/imx6sx-sdb.dtsi
> @@ -191,7 +191,7 @@
>         pinctrl-names = "default";
>         pinctrl-0 = <&pinctrl_enet1>;
>         phy-supply = <&reg_enet_3v3>;
> -       phy-mode = "rgmii";
> +       phy-mode = "rgmii-id";
>         phy-handle = <&ethphy1>;
>         phy-reset-gpios = <&gpio2 7 GPIO_ACTIVE_LOW>;
>         status = "okay";
> diff --git a/arch/arm/boot/dts/imx7d-pico.dtsi b/arch/arm/boot/dts/imx7d-pico.dtsi
> index 3fd595a71202..6f50ebf31a0a 100644
> --- a/arch/arm/boot/dts/imx7d-pico.dtsi
> +++ b/arch/arm/boot/dts/imx7d-pico.dtsi
> @@ -92,7 +92,7 @@
>                           <&clks IMX7D_ENET1_TIME_ROOT_CLK>;
>         assigned-clock-parents = <&clks IMX7D_PLL_ENET_MAIN_100M_CLK>;
>         assigned-clock-rates = <0>, <100000000>;
> -       phy-mode = "rgmii";
> +       phy-mode = "rgmii-id";
>         phy-handle = <&ethphy0>;
>         fsl,magic-packet;
>         phy-reset-gpios = <&gpio6 11 GPIO_ACTIVE_LOW>;
> --
> 2.17.1
>

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [PATCH v2] ARM: dts: imx: Fix the AR803X phy-mode
       [not found] ` <20190403122936.442C02147A@mail.kernel.org>
@ 2019-04-03 12:34   ` Adam Ford
  2019-04-03 12:37     ` Fabio Estevam
  0 siblings, 1 reply; 4+ messages in thread
From: Adam Ford @ 2019-04-03 12:34 UTC (permalink / raw)
  To: Sasha Levin; +Cc: Fabio Estevam, Shawn Guo, Baruch Siach, stable, arm-soc

On Wed, Apr 3, 2019 at 7:29 AM Sasha Levin <sashal@kernel.org> wrote:
>
> Hi,
>
> [This is an automated email]
>
> This commit has been processed because it contains a -stable tag.
> The stable tag indicates that it's relevant for the following trees: 4.9+
>
> The bot has tested the following trees: v5.0.5, v4.19.32, v4.14.109, v4.9.166.

Support for the LogicPD i.MX6QD EVM wasn't added until recently.  I
would expect it's OK to ignore it.  It's not present in anything older
than 5.1-RCx

adam
>
> v5.0.5: Failed to apply! Possible dependencies:
>     1c207f911fe9 ("ARM: dts: imx: Add support for Logic PD i.MX6QD EVM")
>
> v4.19.32: Failed to apply! Possible dependencies:
>     1c207f911fe9 ("ARM: dts: imx: Add support for Logic PD i.MX6QD EVM")
>     29988e867cb1 ("ARM: dts: imx7: Fix memory node duplication")
>     4edbe6aa46d1 ("ARM: dts: imx7d-pico-pi: Move SoM related part to imx7d-pico.dtsi")
>     50536c661194 ("ARM: dts: imx7d-pico: Do not harcode the memory size")
>
> v4.14.109: Failed to apply! Possible dependencies:
>     1bf52b98ae1c ("ARM: dts: imx6sx-sabreauto: add external 24MHz clock source")
>     1c207f911fe9 ("ARM: dts: imx: Add support for Logic PD i.MX6QD EVM")
>     221aaa198e70 ("ARM: dts: imx6sx-sabreauto: drop board specific pinctrl container node")
>     37accf72e04b ("ARM: dts: imx6sx-sabreauto: add fec support")
>     41bbeadceb03 ("ARM: dts: imx7d-pico-pi: Separate into cpu and baseboard dts")
>     4edbe6aa46d1 ("ARM: dts: imx7d-pico-pi: Move SoM related part to imx7d-pico.dtsi")
>     76dc340e7585 ("ARM: dts: imx6qdl: SolidRun: move AR8035 into microsom")
>     8dccafaa281a ("arm: dts: fix unit-address leading 0s")
>     99a52450c707 ("ARM: dts: imx7d-pico: Add Wifi support")
>     d9e246cc2880 ("ARM: dts: imx6sx-sabreauto: add PMIC support")
>
> v4.9.166: Failed to apply! Possible dependencies:
>     12de44f55dcd ("ARM: dts: imx: Fix Ethernet PHY reset polarity")
>     1317efa1699f ("ARM: dts: imx6ul: Add DTS for liteSOM module")
>     13283626c889 ("ARM: dts: imx/vf: Correct license text")
>     1bf52b98ae1c ("ARM: dts: imx6sx-sabreauto: add external 24MHz clock source")
>     1c207f911fe9 ("ARM: dts: imx: Add support for Logic PD i.MX6QD EVM")
>     221aaa198e70 ("ARM: dts: imx6sx-sabreauto: drop board specific pinctrl container node")
>     23c787a99ff7 ("ARM: dts: imx7d-pico: Add initial support")
>     26ca8b52d6e1 ("ARM: dts: add support for Turris Omnia")
>     37accf72e04b ("ARM: dts: imx6sx-sabreauto: add fec support")
>     3faa1bb2e89c ("ARM: dts: imx: add Boundary Devices Nitrogen6_SOM2 support")
>     41bbeadceb03 ("ARM: dts: imx7d-pico-pi: Separate into cpu and baseboard dts")
>     478c9440b328 ("ARM: dts: imx6ul: Add DTS for liteBoard")
>     4edbe6aa46d1 ("ARM: dts: imx7d-pico-pi: Move SoM related part to imx7d-pico.dtsi")
>     6df11287f7c9 ("ARM: dts: imx6q: Add Engicam i.CoreM6 Quad/Dual initial support")
>     76dc340e7585 ("ARM: dts: imx6qdl: SolidRun: move AR8035 into microsom")
>     8dccafaa281a ("arm: dts: fix unit-address leading 0s")
>     99a52450c707 ("ARM: dts: imx7d-pico: Add Wifi support")
>     9daee3076940 ("ARM: dts: imx6q: Add Engicam i.CoreM6 DualLite/Solo initial support")
>     a58d73340b0e ("ARM: dts: armada-385-synology-ds116: add support for Synology DS116 NAS")
>     c201369d4aa5 ("ARM: dts: imx6ull: add imx6ull support")
>     d9e246cc2880 ("ARM: dts: imx6sx-sabreauto: add PMIC support")
>     fc48e76489fd ("ARM: dts: imx6: Add support for Toradex Colibri iMX6 module")
>
>
> How should we proceed with this patch?
>
> --
> Thanks,
> Sasha
>
> _______________________________________________
> 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] 4+ messages in thread

* Re: [PATCH v2] ARM: dts: imx: Fix the AR803X phy-mode
  2019-04-03 12:34   ` Adam Ford
@ 2019-04-03 12:37     ` Fabio Estevam
  0 siblings, 0 replies; 4+ messages in thread
From: Fabio Estevam @ 2019-04-03 12:37 UTC (permalink / raw)
  To: Adam Ford; +Cc: Sasha Levin, Shawn Guo, Baruch Siach, stable, arm-soc

On Wed, Apr 3, 2019 at 9:34 AM Adam Ford <aford173@gmail.com> wrote:

> Support for the LogicPD i.MX6QD EVM wasn't added until recently.  I
> would expect it's OK to ignore it.  It's not present in anything older
> than 5.1-RCx

Shawn, maybe you could drop the CC: stable line, so that this patch
gets applied only for 5.1-rc.

After it reaches mainline, I can then manually adapt it for the older
stable trees.

Thanks

^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2019-04-03 12:37 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-04-02  0:36 [PATCH v2] ARM: dts: imx: Fix the AR803X phy-mode Fabio Estevam
2019-04-02  1:13 ` Adam Ford
     [not found] ` <20190403122936.442C02147A@mail.kernel.org>
2019-04-03 12:34   ` Adam Ford
2019-04-03 12:37     ` Fabio Estevam

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).