mirror of
https://github.com/brain-hackers/u-boot-brain
synced 2024-09-28 23:50:26 +09:00
- fixes on AV96 board: pull up on UART4 RX and adjust PLL4
-----BEGIN PGP SIGNATURE----- iQEzBAABCgAdFiEE56Yx6b9SnloYCWtD4rK92eCqk3UFAl9Y2ScACgkQ4rK92eCq k3WD1wf9FdSNzXaGSezIc1PNF9KnoSDsPD+K1ipw3hJbn5M+PkuTAoy3UcLmWedI mBSoU+l9qDJhK2ady2zXI2qrOglvIX6OcHnoEGtUqikCV+Il7A8CWtDkd0m2ajyI EixCAGw8GikrrYZITPMV1wfJJSROT4jHgfK5M92mETtSGff0X+3OjsaJiTzGk5jl CBPVtLIF4meqggMlOeB4FOQ4fywSZZPv0pvnwjiwIqm00tHG85qiWo9H+W18NuD6 dXPii2xzUIeBkynKurC/dD8zmLQUX5nyydKnY16Hkpl0NQxwtWSHFOUouOEaXLK+ xo+9cxHRv/aK+34CcIU2okv4R0Pu5w== =O+jw -----END PGP SIGNATURE----- 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
This commit is contained in:
commit
a34746b86e
@ -75,6 +75,8 @@
|
|||||||
};
|
};
|
||||||
pins2 {
|
pins2 {
|
||||||
u-boot,dm-pre-reloc;
|
u-boot,dm-pre-reloc;
|
||||||
|
/delete-property/ bias-disable;
|
||||||
|
bias-pull-up;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -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;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
@ -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
|
||||||
|
Loading…
Reference in New Issue
Block a user