dany/u-boot-megous
1
0
Fork 0
mirror of https://xff.cz/git/u-boot/ synced 2025-09-03 17:52:07 +02:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
- fixes on AV96 board: pull up on UART4 RX and adjust PLL4
This commit is contained in:
Tom Rini
2020-09-09 12:59:02 -04:00
parent a14b71d0c2 b6055945d6
commit a34746b86e
3 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/dts/stm32mp15xx-dhcor-avenger96-u-boot.dtsi
View File

@@ -75,6 +75,8 @@
}; };
pins2 { pins2 {
u-boot,dm-pre-reloc; u-boot,dm-pre-reloc;
/delete-property/ bias-disable;
bias-pull-up;
}; };
}; };

4
arch/arm/dts/stm32mp15xx-dhcor-u-boot.dtsi
View File

@@ -132,11 +132,11 @@
u-boot,dm-pre-reloc; 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 { pll4: st,pll@3 {
compatible = "st,stm32mp1-pll"; compatible = "st,stm32mp1-pll";
reg = <3>; 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; u-boot,dm-pre-reloc;
}; };
}; };

4
arch/arm/mach-stm32mp/cpu.c
View File

@@ -580,8 +580,8 @@ __weak int setup_mac_address(void)
return -EINVAL; return -EINVAL;
} }
pr_debug("OTP MAC address = %pM\n", enetaddr); pr_debug("OTP MAC address = %pM\n", enetaddr);
ret = !eth_env_set_enetaddr("ethaddr", enetaddr); ret = eth_env_set_enetaddr("ethaddr", enetaddr);
if (!ret) if (ret)
pr_err("Failed to set mac address %pM from OTP: %d\n", pr_err("Failed to set mac address %pM from OTP: %d\n",
enetaddr, ret); enetaddr, ret);
#endif #endif