leandrof/u-boot
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fdt_support: Remove fdt_alloc_phandle() in favor of fdt_generate_phandle()

Browse Source 
Commit f0921f5098 ("fdt: Sync up to the latest libfdt") introduced
fdt_generate_phandle() in libfdt, making fdt_alloc_phandle() obsolete in
fdt_support.

Signed-off-by: Marek Behún <marek.behun@nic.cz>
Reviewed-by: Stefan Roese <sr@denx.de>
Cc: Simon Glass <sjg@chromium.org>
Cc: "hui.song" <hui.song_1@nxp.com>
Cc: Meenakshi Aggarwal <meenakshi.aggarwal@nxp.com>
Cc: Priyanka Jain <priyanka.jain@nxp.com>
Cc: Ioana Ciornei <ioana.ciornei@nxp.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Marek Behún 2021-11-26 14:57:07 +01:00 committed by Stefan Roese
parent 68a2faa9bc
commit 76f5a72835
4 changed files with 20 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
board/freescale/lx2160a/eth_lx2160aqds.c
View File

@ -775,10 +775,11 @@ int fdt_fixup_board_phy(void *fdt)
int fpga_offset, offset, subnodeoffset; int fpga_offset, offset, subnodeoffset;
struct mii_dev *mii_dev; struct mii_dev *mii_dev;
struct list_head *mii_devs, *entry; struct list_head *mii_devs, *entry;
int ret, dpmac_id, phandle, i; int ret, dpmac_id, i;
struct phy_device *phy_dev; struct phy_device *phy_dev;
char ethname[ETH_NAME_LEN]; char ethname[ETH_NAME_LEN];
phy_interface_t phy_iface; phy_interface_t phy_iface;
uint32_t phandle;
ret = 0; ret = 0;
/* we know FPGA is connected to i2c0, therefore search path directly, /* we know FPGA is connected to i2c0, therefore search path directly,
@ -794,7 +795,10 @@ int fdt_fixup_board_phy(void *fdt)
return fpga_offset; return fpga_offset;
} }
phandle = fdt_alloc_phandle(fdt); ret = fdt_generate_phandle(fdt, &phandle);
if (ret < 0)
return ret;
mii_devs = mdio_get_list_head(); mii_devs = mdio_get_list_head();
list_for_each(entry, mii_devs) { list_for_each(entry, mii_devs) {

8
board/freescale/lx2160a/eth_lx2162aqds.c
View File

@ -787,10 +787,11 @@ int fdt_fixup_board_phy(void *fdt)
int fpga_offset, offset, subnodeoffset; int fpga_offset, offset, subnodeoffset;
struct mii_dev *mii_dev; struct mii_dev *mii_dev;
struct list_head *mii_devs, *entry; struct list_head *mii_devs, *entry;
int ret, dpmac_id, phandle, i; int ret, dpmac_id, i;
struct phy_device *phy_dev; struct phy_device *phy_dev;
char ethname[ETH_NAME_LEN]; char ethname[ETH_NAME_LEN];
phy_interface_t phy_iface; phy_interface_t phy_iface;
uint32_t phandle;
ret = 0; ret = 0;
/* we know FPGA is connected to i2c0, therefore search path directly, /* we know FPGA is connected to i2c0, therefore search path directly,
@ -806,7 +807,10 @@ int fdt_fixup_board_phy(void *fdt)
return fpga_offset; return fpga_offset;
} }
phandle = fdt_alloc_phandle(fdt); ret = fdt_generate_phandle(fdt, &phandle);
if (ret < 0)
return ret;
mii_devs = mdio_get_list_head(); mii_devs = mdio_get_list_head();
list_for_each(entry, mii_devs) { list_for_each(entry, mii_devs) {

28
common/fdt_support.c
View File

@ -1463,24 +1463,6 @@ int fdt_node_offset_by_compat_reg(void *blob, const char *compat,
return -FDT_ERR_NOTFOUND; return -FDT_ERR_NOTFOUND;
} }
/**
* fdt_alloc_phandle: Return next free phandle value
*
* @blob: ptr to device tree
*/
int fdt_alloc_phandle(void *blob)
{
int offset;
uint32_t phandle = 0;
for (offset = fdt_next_node(blob, -1, NULL); offset >= 0;
offset = fdt_next_node(blob, offset, NULL)) {
phandle = max(phandle, fdt_get_phandle(blob, offset));
}
return phandle + 1;
}
/* /*
* fdt_set_phandle: Create a phandle property for the given node * fdt_set_phandle: Create a phandle property for the given node
* *
@ -1530,13 +1512,19 @@ int fdt_set_phandle(void *fdt, int nodeoffset, uint32_t phandle)
unsigned int fdt_create_phandle(void *fdt, int nodeoffset) unsigned int fdt_create_phandle(void *fdt, int nodeoffset)
{ {
/* see if there is a phandle already */ /* see if there is a phandle already */
int phandle = fdt_get_phandle(fdt, nodeoffset); uint32_t phandle = fdt_get_phandle(fdt, nodeoffset);
/* if we got 0, means no phandle so create one */ /* if we got 0, means no phandle so create one */
if (phandle == 0) { if (phandle == 0) {
int ret; int ret;
phandle = fdt_alloc_phandle(fdt); ret = fdt_generate_phandle(fdt, &phandle);
if (ret < 0) {
printf("Can't generate phandle: %s\n",
fdt_strerror(ret));
return 0;
}
ret = fdt_set_phandle(fdt, nodeoffset, phandle); ret = fdt_set_phandle(fdt, nodeoffset, phandle);
if (ret < 0) { if (ret < 0) {
printf("Can't set phandle %u: %s\n", phandle, printf("Can't set phandle %u: %s\n", phandle,

1
include/fdt_support.h
View File

@ -285,7 +285,6 @@ int fdt_get_dma_range(const void *blob, int node_offset, phys_addr_t *cpu,
int fdt_node_offset_by_compat_reg(void *blob, const char *compat, int fdt_node_offset_by_compat_reg(void *blob, const char *compat,
phys_addr_t compat_off); phys_addr_t compat_off);
int fdt_alloc_phandle(void *blob);
int fdt_set_phandle(void *fdt, int nodeoffset, uint32_t phandle); int fdt_set_phandle(void *fdt, int nodeoffset, uint32_t phandle);
unsigned int fdt_create_phandle(void *fdt, int nodeoffset); unsigned int fdt_create_phandle(void *fdt, int nodeoffset);
int fdt_add_edid(void *blob, const char *compat, unsigned char *buf); int fdt_add_edid(void *blob, const char *compat, unsigned char *buf);