From mboxrd@z Thu Jan 1 00:00:00 1970 From: Thomas Chou Date: Fri, 6 Nov 2015 09:30:06 +0800 Subject: [U-Boot] [PATCH] net: altera_tse: get numbers of fdt address and size cells In-Reply-To: <1446640121-4835-1-git-send-email-thomas@wytron.com.tw> References: <1446640121-4835-1-git-send-email-thomas@wytron.com.tw> Message-ID: <563C029E.2020002@wytron.com.tw> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de On 2015?11?04? 20:28, Thomas Chou wrote: > Get numbers of fdt address and size cells in altera_tse_probe(), > thereby remove the assumption of one address cell and one size > cell. > > Signed-off-by: Thomas Chou > --- > drivers/net/altera_tse.c | 14 ++++++++------ > 1 file changed, 8 insertions(+), 6 deletions(-) > Applied to u-boot-nios. > diff --git a/drivers/net/altera_tse.c b/drivers/net/altera_tse.c > index 394503f..b2002f4 100644 > --- a/drivers/net/altera_tse.c > +++ b/drivers/net/altera_tse.c > @@ -409,20 +409,22 @@ static int altera_tse_probe(struct udevice *dev) > { > struct eth_pdata *pdata = dev_get_platdata(dev); > struct altera_tse_priv *priv = dev_get_priv(dev); > - const void *blob = gd->fdt_blob; > + void *blob = (void *)gd->fdt_blob; > int node = dev->of_offset; > const char *list, *end; > const fdt32_t *cell; > void *base, *desc_mem = NULL; > unsigned long addr, size; > + int parent, addrc, sizec; > int len, idx; > int ret; > > /* > - * decode regs, assume address-cells and size-cells are both one. > - * there are multiple reg tuples, and they need to match with > - * reg-names. > + * decode regs. there are multiple reg tuples, and they need to > + * match with reg-names. > */ > + parent = fdt_parent_offset(blob, node); > + of_bus_default_count_cells(blob, parent, &addrc, &sizec); > list = fdt_getprop(blob, node, "reg-names", &len); > if (!list) > return -ENOENT; > @@ -434,7 +436,7 @@ static int altera_tse_probe(struct udevice *dev) > while (list < end) { > addr = fdt_translate_address((void *)blob, > node, cell + idx); > - size = fdt_addr_to_cpu(cell[idx + 1]); > + size = fdt_addr_to_cpu(cell[idx + addrc]); > base = ioremap(addr, size); > len = strlen(list); > if (strcmp(list, "control_port") == 0) > @@ -445,7 +447,7 @@ static int altera_tse_probe(struct udevice *dev) > priv->sgdma_tx = base; > else if (strcmp(list, "s1") == 0) > desc_mem = base; > - idx += 2; > + idx += addrc + sizec; > list += (len + 1); > } > /* decode fifo depth */ >