Merge tag 'u-boot-stm32-20200909' of https://gitlab.denx.de/u-boot/custodians/u-boot-stm

- fixes on AV96 board: pull up on UART4 RX and adjust PLL4

diff --git a/arch/arm/dts/stm32mp15xx-dhcor-avenger96-u-boot.dtsi b/arch/arm/dts/stm32mp15xx-dhcor-avenger96-u-boot.dtsi
index cb92fc9..1ae57e1 100644 (file)
--- a/arch/arm/dts/stm32mp15xx-dhcor-avenger96-u-boot.dtsi
+++ b/arch/arm/dts/stm32mp15xx-dhcor-avenger96-u-boot.dtsi
@@ -75,6 +75,8 @@
        };
        pins2 {
                u-boot,dm-pre-reloc;
+               /delete-property/ bias-disable;
+               bias-pull-up;
        };
 };
 

diff --git a/arch/arm/dts/stm32mp15xx-dhcor-u-boot.dtsi b/arch/arm/dts/stm32mp15xx-dhcor-u-boot.dtsi
index 7529068..c733184 100644 (file)
--- a/arch/arm/dts/stm32mp15xx-dhcor-u-boot.dtsi
+++ b/arch/arm/dts/stm32mp15xx-dhcor-u-boot.dtsi
@@ -132,11 +132,11 @@
                u-boot,dm-pre-reloc;
        };
 
-       /* VCO = 600.0 MHz => P = 100, Q = 50, R = 100 */
+       /* VCO = 600.0 MHz => P = 99, Q = 74, R = 99 */
        pll4: st,pll@3 {
                compatible = "st,stm32mp1-pll";
                reg = <3>;
-               cfg = < 1 49 5 11 5 PQR(1,1,1) >;
+               cfg = < 3 98 5 7 5 PQR(1,1,1) >;
                u-boot,dm-pre-reloc;
        };
 };

diff --git a/arch/arm/mach-stm32mp/cpu.c b/arch/arm/mach-stm32mp/cpu.c
index b7fcee2..f19e5c3 100644 (file)
--- a/arch/arm/mach-stm32mp/cpu.c
+++ b/arch/arm/mach-stm32mp/cpu.c
@@ -580,8 +580,8 @@ __weak int setup_mac_address(void)
                return -EINVAL;
        }
        pr_debug("OTP MAC address = %pM\n", enetaddr);
-       ret = !eth_env_set_enetaddr("ethaddr", enetaddr);
-       if (!ret)
+       ret = eth_env_set_enetaddr("ethaddr", enetaddr);
+       if (ret)
                pr_err("Failed to set mac address %pM from OTP: %d\n",
                       enetaddr, ret);
 #endif