diff options
| author | Tom Rini <[email protected]> | 2022-06-16 08:38:46 -0400 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2022-06-16 08:38:46 -0400 |
| commit | 9abfbef57f55f31e42940ac2a18ebccfb087e5c6 (patch) | |
| tree | 96a13568c13a7bffda05adb85cb5b7daabebc4ad /arch | |
| parent | fd27812e520881d73bd97a2c034f3b5ecc361c4b (diff) | |
| parent | 1a558fafbbdff80cb6a7c8e883addec7f02fe8e5 (diff) | |
Merge tag 'u-boot-imx-20220616' of https://gitlab.denx.de/u-boot/custodians/u-boot-imx
u-boot-imx-20220616
-------------------
Fixes for 2022.07 + Toradex apalis-imx8 (missed in last PR)
CI: https://source.denx.de/u-boot/custodians/u-boot-imx/-/pipelines/12322
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/dts/imx6qdl-sr-som.dtsi | 17 | ||||
| -rw-r--r-- | arch/arm/dts/imx8mn-evk-u-boot.dtsi | 4 |
2 files changed, 18 insertions, 3 deletions
diff --git a/arch/arm/dts/imx6qdl-sr-som.dtsi b/arch/arm/dts/imx6qdl-sr-som.dtsi index b06577808ff..c20bed27219 100644 --- a/arch/arm/dts/imx6qdl-sr-som.dtsi +++ b/arch/arm/dts/imx6qdl-sr-som.dtsi @@ -55,7 +55,13 @@ pinctrl-0 = <&pinctrl_microsom_enet_ar8035>; phy-handle = <&phy>; phy-mode = "rgmii-id"; - phy-reset-duration = <2>; + + /* + * The PHY seems to require a long-enough reset duration to avoid + * some rare issues where the PHY gets stuck in an inconsistent and + * non-functional state at boot-up. 10ms proved to be fine . + */ + phy-reset-duration = <10>; phy-reset-gpios = <&gpio4 15 GPIO_ACTIVE_LOW>; status = "okay"; @@ -64,8 +70,15 @@ #size-cells = <0>; phy: ethernet-phy@0 { - reg = <0>; + /* + * The PHY can appear either: + * - AR8035: at address 0 or 4 + * - ADIN1300: at address 1 + * Actual address being detected at runtime. + */ + reg = <0xffffffff>; qca,clk-out-frequency = <125000000>; + adi,phy-output-clock = "125mhz-free-running"; }; }; }; diff --git a/arch/arm/dts/imx8mn-evk-u-boot.dtsi b/arch/arm/dts/imx8mn-evk-u-boot.dtsi index 3db46d4cbcb..593cf06eb95 100644 --- a/arch/arm/dts/imx8mn-evk-u-boot.dtsi +++ b/arch/arm/dts/imx8mn-evk-u-boot.dtsi @@ -58,7 +58,9 @@ }; - flash { + spl { + filename = "spl.bin"; + mkimage { args = "-n spl/u-boot-spl.cfgout -T imx8mimage -e 0x912000"; |