Commit bd37d156 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'uniphier-fixes-v4.17' of... 

Merge tag 'uniphier-fixes-v4.17' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-uniphier into fixes

UniPhier ARM SoC fixes for v4.17

- Fix input delay parameter of eMMC PHY
- Weaken drive-strength of ethernet PHY pins of LD20 reference board

* tag 'uniphier-fixes-v4.17' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-uniphier

:
  arm64: dts: uniphier: stabilize ethernet of LD20 reference board
  arm64: dts: uniphier: fix input delay value for legacy mode of eMMC

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 67b8d5c7 8b82b66e

arch/arm64/boot/dts/socionext/uniphier-ld11.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -414,7 +414,7 @@ 
			mmc-ddr-1_8v;

			mmc-hs200-1_8v;

			mmc-pwrseq = <&emmc_pwrseq>;

			cdns,phy-input-delay-legacy = <4>;

			cdns,phy-input-delay-legacy = <9>;

			cdns,phy-input-delay-mmc-highspeed = <2>;

			cdns,phy-input-delay-mmc-ddr = <3>;

			cdns,phy-dll-delay-sdclk = <21>;

arch/arm64/boot/dts/socionext/uniphier-ld20-ref.dts

+8 −0
Original line number Diff line number Diff line
@@ -67,3 +67,11 @@ 
		reg = <0>;

	};

};



&pinctrl_ether_rgmii {

	tx {

		pins = "RGMII_TXCLK", "RGMII_TXD0", "RGMII_TXD1",

		       "RGMII_TXD2", "RGMII_TXD3", "RGMII_TXCTL";

		drive-strength = <9>;

	};

};

arch/arm64/boot/dts/socionext/uniphier-ld20.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -519,7 +519,7 @@ 
			mmc-ddr-1_8v;

			mmc-hs200-1_8v;

			mmc-pwrseq = <&emmc_pwrseq>;

			cdns,phy-input-delay-legacy = <4>;

			cdns,phy-input-delay-legacy = <9>;

			cdns,phy-input-delay-mmc-highspeed = <2>;

			cdns,phy-input-delay-mmc-ddr = <3>;

			cdns,phy-dll-delay-sdclk = <21>;

arch/arm64/boot/dts/socionext/uniphier-pxs3.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -334,7 +334,7 @@ 
			mmc-ddr-1_8v;

			mmc-hs200-1_8v;

			mmc-pwrseq = <&emmc_pwrseq>;

			cdns,phy-input-delay-legacy = <4>;

			cdns,phy-input-delay-legacy = <9>;

			cdns,phy-input-delay-mmc-highspeed = <2>;

			cdns,phy-input-delay-mmc-ddr = <3>;

			cdns,phy-dll-delay-sdclk = <21>;

CRA Git | Maintained and supported by SUSTech CRA and CCSE