diff mbox series

arm64: dts: clearfog-gt-8k: fix ge phy reset pin

Message ID 20200328212115.12477-1-eichest@gmail.com (mailing list archive)
State New, archived
Headers show
Series arm64: dts: clearfog-gt-8k: fix ge phy reset pin | expand

Commit Message

Stefan Eichenberger March 28, 2020, 9:21 p.m. UTC
From: Stefan Eichenberger <eichest@gmail.com>

According to the ClearFog-GT-8K-rev-1_1-Simplified-Schematic the reset
pin for the gigabit phy is MPP62 and not MPP43.

Signed-off-by: Stefan Eichenberger <eichest@gmail.com>
---
 .../dts/marvell/armada-8040-clearfog-gt-8k.dts     | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

Comments

Baruch Siach March 29, 2020, 6:22 a.m. UTC | #1
Hi Stefan,

On Sun, Mar 29 2020, eichest@gmail.com wrote:
> From: Stefan Eichenberger <eichest@gmail.com>
>
> According to the ClearFog-GT-8K-rev-1_1-Simplified-Schematic the reset
> pin for the gigabit phy is MPP62 and not MPP43.

Have you tested that on real hardware?

The 1Gb PHY reset on my Clearfog GT-8K is connected to MPP43. Russell's
commit 46f94c7818e7 ("arm64: dts: clearfog-gt-8k: set gigabit PHY reset
deassert delay") indicates that this is the case on his board as well.

In case there was a hardware change between board revisions, we need
another dtb for that revision.

baruch

> Signed-off-by: Stefan Eichenberger <eichest@gmail.com>
> ---
>  .../dts/marvell/armada-8040-clearfog-gt-8k.dts     | 14 +++++++-------
>  1 file changed, 7 insertions(+), 7 deletions(-)
>
> diff --git a/arch/arm64/boot/dts/marvell/armada-8040-clearfog-gt-8k.dts b/arch/arm64/boot/dts/marvell/armada-8040-clearfog-gt-8k.dts
> index b90d78a5724b..d371d938b41e 100644
> --- a/arch/arm64/boot/dts/marvell/armada-8040-clearfog-gt-8k.dts
> +++ b/arch/arm64/boot/dts/marvell/armada-8040-clearfog-gt-8k.dts
> @@ -144,7 +144,6 @@
>  	 * [35-38] CP0 I2C1 and I2C0
>  	 * [39] GPIO reset button
>  	 * [40,41] LED0 and LED1
> -	 * [43] 1512 phy reset
>  	 * [47] USB VBUS EN (active low)
>  	 * [48] FAN PWM
>  	 * [49] SFP+ present signal
> @@ -155,6 +154,7 @@
>  	 * [54] NFC reset
>  	 * [55] Micro SD card detect
>  	 * [56-61] Micro SD
> +	 * [62] 1512 phy reset
>  	 */
>
>  	cp0_pci0_reset_pins: pci0-reset-pins {
> @@ -197,11 +197,6 @@
>  		marvell,function = "gpio";
>  	};
>
> -	cp0_copper_eth_phy_reset: copper-eth-phy-reset {
> -		marvell,pins = "mpp43";
> -		marvell,function = "gpio";
> -	};
> -
>  	cp0_xhci_vbus_pins: xhci0-vbus-pins {
>  		marvell,pins = "mpp47";
>  		marvell,function = "gpio";
> @@ -232,6 +227,11 @@
>  			       "mpp60", "mpp61";
>  		marvell,function = "sdio";
>  	};
> +
> +	cp0_copper_eth_phy_reset: copper-eth-phy-reset {
> +		marvell,pins = "mpp62";
> +		marvell,function = "gpio";
> +	};
>  };
>
>  &cp0_pcie0 {
> @@ -365,7 +365,7 @@
>  		reg = <0>;
>  		pinctrl-names = "default";
>  		pinctrl-0 = <&cp0_copper_eth_phy_reset>;
> -		reset-gpios = <&cp0_gpio2 11 GPIO_ACTIVE_LOW>;
> +		reset-gpios = <&cp0_gpio2 30 GPIO_ACTIVE_LOW>;
>  		reset-assert-us = <10000>;
>  		reset-deassert-us = <10000>;
>  	};


--
     http://baruch.siach.name/blog/                  ~. .~   Tk Open Systems
=}------------------------------------------------ooO--U--Ooo------------{=
   - baruch@tkos.co.il - tel: +972.52.368.4656, http://www.tkos.co.il -
Rabeeh Khoury March 29, 2020, 8:42 a.m. UTC | #2
On Sun, Mar 29, 2020 at 9:22 AM Baruch Siach <baruch@tkos.co.il> wrote:
>
> Hi Stefan,
>
> On Sun, Mar 29 2020, eichest@gmail.com wrote:
> > From: Stefan Eichenberger <eichest@gmail.com>
> >
> > According to the ClearFog-GT-8K-rev-1_1-Simplified-Schematic the reset
> > pin for the gigabit phy is MPP62 and not MPP43.
>
> Have you tested that on real hardware?
>
> The 1Gb PHY reset on my Clearfog GT-8K is connected to MPP43. Russell's
> commit 46f94c7818e7 ("arm64: dts: clearfog-gt-8k: set gigabit PHY reset
> deassert delay") indicates that this is the case on his board as well.
>
> In case there was a hardware change between board revisions, we need
> another dtb for that revision.

It's a bug in the simplified schematics since that schematics is based
on rev 1.0 and not rev 1.1 as claimed.

In rev 1.0; the 1Gbps phy reset was connected to MPP62; but that MPP
is not functional as a GPIO when selecting MPP[56:61] as SD card.
Due to that we manually rewired ALL rev 1.0 PCBs 1Gbps phy to be
connected to MPP43 via R8038 pads.

Rev 1.1 fixes this by that by disconnecting 1Gbps phy reset from MPP62
and wiring it to MPP43.
So basically rev 1.0 and rev 1.1 are compatible software wise. We will
fix the schematics.

Rabeeh
Stefan Eichenberger March 29, 2020, 9:20 a.m. UTC | #3
Hi Rabeeh and Baruch

On Sun, Mar 29, 2020 at 11:42:35AM +0300, Rabeeh Khoury wrote:
> On Sun, Mar 29, 2020 at 9:22 AM Baruch Siach <baruch@tkos.co.il> wrote:
> >
> > Hi Stefan,
> >
> > On Sun, Mar 29 2020, eichest@gmail.com wrote:
> > > From: Stefan Eichenberger <eichest@gmail.com>
> > >
> > > According to the ClearFog-GT-8K-rev-1_1-Simplified-Schematic the reset
> > > pin for the gigabit phy is MPP62 and not MPP43.
> >
> > Have you tested that on real hardware?
> >
> > The 1Gb PHY reset on my Clearfog GT-8K is connected to MPP43. Russell's
> > commit 46f94c7818e7 ("arm64: dts: clearfog-gt-8k: set gigabit PHY reset
> > deassert delay") indicates that this is the case on his board as well.
> >
> > In case there was a hardware change between board revisions, we need
> > another dtb for that revision.
> 
> It's a bug in the simplified schematics since that schematics is based
> on rev 1.0 and not rev 1.1 as claimed.
> 
> In rev 1.0; the 1Gbps phy reset was connected to MPP62; but that MPP
> is not functional as a GPIO when selecting MPP[56:61] as SD card.
> Due to that we manually rewired ALL rev 1.0 PCBs 1Gbps phy to be
> connected to MPP43 via R8038 pads.
> 
> Rev 1.1 fixes this by that by disconnecting 1Gbps phy reset from MPP62
> and wiring it to MPP43.
> So basically rev 1.0 and rev 1.1 are compatible software wise. We will
> fix the schematics.

Ahh now I see, I didn't enable the phy driver when I did the test with
the default devicetree and then when I changed the devicetree I also
enabled the driver, that's my fault.

Sorry for the confusion... I can confirm that it works with MPP43.
Thanks for the clarification!

Regards,
Stefan
diff mbox series

Patch

diff --git a/arch/arm64/boot/dts/marvell/armada-8040-clearfog-gt-8k.dts b/arch/arm64/boot/dts/marvell/armada-8040-clearfog-gt-8k.dts
index b90d78a5724b..d371d938b41e 100644
--- a/arch/arm64/boot/dts/marvell/armada-8040-clearfog-gt-8k.dts
+++ b/arch/arm64/boot/dts/marvell/armada-8040-clearfog-gt-8k.dts
@@ -144,7 +144,6 @@ 
 	 * [35-38] CP0 I2C1 and I2C0
 	 * [39] GPIO reset button
 	 * [40,41] LED0 and LED1
-	 * [43] 1512 phy reset
 	 * [47] USB VBUS EN (active low)
 	 * [48] FAN PWM
 	 * [49] SFP+ present signal
@@ -155,6 +154,7 @@ 
 	 * [54] NFC reset
 	 * [55] Micro SD card detect
 	 * [56-61] Micro SD
+	 * [62] 1512 phy reset
 	 */
 
 	cp0_pci0_reset_pins: pci0-reset-pins {
@@ -197,11 +197,6 @@ 
 		marvell,function = "gpio";
 	};
 
-	cp0_copper_eth_phy_reset: copper-eth-phy-reset {
-		marvell,pins = "mpp43";
-		marvell,function = "gpio";
-	};
-
 	cp0_xhci_vbus_pins: xhci0-vbus-pins {
 		marvell,pins = "mpp47";
 		marvell,function = "gpio";
@@ -232,6 +227,11 @@ 
 			       "mpp60", "mpp61";
 		marvell,function = "sdio";
 	};
+
+	cp0_copper_eth_phy_reset: copper-eth-phy-reset {
+		marvell,pins = "mpp62";
+		marvell,function = "gpio";
+	};
 };
 
 &cp0_pcie0 {
@@ -365,7 +365,7 @@ 
 		reg = <0>;
 		pinctrl-names = "default";
 		pinctrl-0 = <&cp0_copper_eth_phy_reset>;
-		reset-gpios = <&cp0_gpio2 11 GPIO_ACTIVE_LOW>;
+		reset-gpios = <&cp0_gpio2 30 GPIO_ACTIVE_LOW>;
 		reset-assert-us = <10000>;
 		reset-deassert-us = <10000>;
 	};