mirror of
https://github.com/brain-hackers/u-boot-brain
synced 2024-09-30 08:30:50 +09:00
First set of u-boot-atmel fixes for 2021.04 cycle
-----BEGIN PGP SIGNATURE----- iQFQBAABCgA6FiEEqxhEmNJ6d7ZdeFLIHrMeAg6sL8gFAmAmOowcHGV1Z2VuLmhy aXN0ZXZAbWljcm9jaGlwLmNvbQAKCRAesx4CDqwvyGEpB/oD2ZQdqY/kfu0SlKE6 2Qor+MSwDA8yQlAKfiX2J3x0sAaGNkeUPQrWLxutACd34MJsjG41sr6uvLwu4E9f bc91Gk1Xv/kmySi7JPfpctb01Bd1GVpzuHELIumGgYRkNSwAFFaXrqVPxr/9cN3t dEcfbKX0p4qXUv/TDw3tE1D63dYPIJC3yX0/4n/n824AKeqRyTMVC34rjfEOoE/r 0w6YSxwQ8hlh23xwc2tyEMSKR4jNp8mAtQcl03Gi/6xiaqgH6lQ6ardSblr3qvjW 6Ev1nd3f9d8i0CzipbLH6PL4G31Ft+ZG/Z/z8wqA6w15h29wu7CfV8yC0aBV0g0/ N1ko =7ddr -----END PGP SIGNATURE----- Merge tag 'u-boot-atmel-fixes-2021.04-a' of https://gitlab.denx.de/u-boot/custodians/u-boot-atmel First set of u-boot-atmel fixes for 2021.04 cycle: This small PR includes just two fixes but very important: one revert in the clk subsystem which fixes the boot on many old boards (sama5d2_xplained, sama5d4_xplained), which currently crash at boot; and one small fix related to debug serial on sama7g5ek board.
This commit is contained in:
commit
7c82e12cc4
@ -122,7 +122,7 @@
|
|||||||
pinctrl_flx3_default: flx3_default {
|
pinctrl_flx3_default: flx3_default {
|
||||||
pinmux = <PIN_PD16__FLEXCOM3_IO0>,
|
pinmux = <PIN_PD16__FLEXCOM3_IO0>,
|
||||||
<PIN_PD17__FLEXCOM3_IO1>;
|
<PIN_PD17__FLEXCOM3_IO1>;
|
||||||
bias-disable;
|
bias-pull-up;
|
||||||
};
|
};
|
||||||
|
|
||||||
pinctrl_sdmmc0_cmd_data_default: sdmmc0_cmd_data_default {
|
pinctrl_sdmmc0_cmd_data_default: sdmmc0_cmd_data_default {
|
||||||
|
@ -62,30 +62,34 @@ static int at91_pmc_core_probe(struct udevice *dev)
|
|||||||
*/
|
*/
|
||||||
int at91_clk_sub_device_bind(struct udevice *dev, const char *drv_name)
|
int at91_clk_sub_device_bind(struct udevice *dev, const char *drv_name)
|
||||||
{
|
{
|
||||||
ofnode parent = dev_ofnode(dev);
|
const void *fdt = gd->fdt_blob;
|
||||||
ofnode node;
|
int offset = dev_of_offset(dev);
|
||||||
bool pre_reloc_only = !(gd->flags & GD_FLG_RELOC);
|
bool pre_reloc_only = !(gd->flags & GD_FLG_RELOC);
|
||||||
const char *name;
|
const char *name;
|
||||||
int ret;
|
int ret;
|
||||||
|
|
||||||
ofnode_for_each_subnode(node, parent) {
|
for (offset = fdt_first_subnode(fdt, offset);
|
||||||
if (pre_reloc_only && !ofnode_pre_reloc(node))
|
offset > 0;
|
||||||
|
offset = fdt_next_subnode(fdt, offset)) {
|
||||||
|
if (pre_reloc_only &&
|
||||||
|
!ofnode_pre_reloc(offset_to_ofnode(offset)))
|
||||||
continue;
|
continue;
|
||||||
/*
|
/*
|
||||||
* If this node has "compatible" property, this is not
|
* If this node has "compatible" property, this is not
|
||||||
* a clock sub-node, but a normal device. skip.
|
* a clock sub-node, but a normal device. skip.
|
||||||
*/
|
*/
|
||||||
if (ofnode_read_prop(node, "compatible", NULL))
|
fdt_get_property(fdt, offset, "compatible", &ret);
|
||||||
|
if (ret >= 0)
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
if (ret != -FDT_ERR_NOTFOUND)
|
if (ret != -FDT_ERR_NOTFOUND)
|
||||||
return ret;
|
return ret;
|
||||||
|
|
||||||
name = ofnode_get_name(node);
|
name = fdt_get_name(fdt, offset, NULL);
|
||||||
if (!name)
|
if (!name)
|
||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
ret = device_bind_driver_to_node(dev, drv_name, name, node,
|
ret = device_bind_driver_to_node(dev, drv_name, name,
|
||||||
NULL);
|
offset_to_ofnode(offset), NULL);
|
||||||
if (ret)
|
if (ret)
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user