diff options
| author | Tom Rini <trini@konsulko.com> | 2018-06-01 16:46:39 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2018-06-01 16:46:39 -0400 |
| commit | 2a046ff5e9ffc30025b698ea6751412e2a1f16ca (patch) | |
| tree | 2ee97df1e0bf4d6dcd1c01d64b3890cbb69f8d93 /drivers/gpio/bcm6345_gpio.c | |
| parent | 582d97b6d37ed1bfce575c32d3847a42fc633b8e (diff) | |
| parent | 9ca33ebf1c3a950d06cb50dba8d0a94e150bc0fd (diff) | |
Merge branch 'master' of git://git.denx.de/u-boot-mips
Diffstat (limited to 'drivers/gpio/bcm6345_gpio.c')
| -rw-r--r-- | drivers/gpio/bcm6345_gpio.c | 18 |
1 files changed, 5 insertions, 13 deletions
diff --git a/drivers/gpio/bcm6345_gpio.c b/drivers/gpio/bcm6345_gpio.c index 1a507fce8e7..d1f6cfa8405 100644 --- a/drivers/gpio/bcm6345_gpio.c +++ b/drivers/gpio/bcm6345_gpio.c @@ -13,8 +13,6 @@ #include <asm/gpio.h> #include <asm/io.h> -DECLARE_GLOBAL_DATA_PTR; - struct bcm6345_gpio_priv { void __iomem *reg_dirout; void __iomem *reg_data; @@ -90,22 +88,16 @@ static int bcm6345_gpio_probe(struct udevice *dev) { struct gpio_dev_priv *uc_priv = dev_get_uclass_priv(dev); struct bcm6345_gpio_priv *priv = dev_get_priv(dev); - fdt_addr_t data_addr, dirout_addr; - fdt_size_t data_size, dirout_size; - dirout_addr = devfdt_get_addr_size_index(dev, 0, &dirout_size); - if (dirout_addr == FDT_ADDR_T_NONE) + priv->reg_dirout = dev_remap_addr_index(dev, 0); + if (!priv->reg_dirout) return -EINVAL; - data_addr = devfdt_get_addr_size_index(dev, 1, &data_size); - if (data_addr == FDT_ADDR_T_NONE) + priv->reg_data = dev_remap_addr_index(dev, 1); + if (!priv->reg_data) return -EINVAL; - priv->reg_data = ioremap(data_addr, data_size); - priv->reg_dirout = ioremap(dirout_addr, dirout_size); - - uc_priv->gpio_count = fdtdec_get_uint(gd->fdt_blob, dev_of_offset(dev), - "ngpios", 32); + uc_priv->gpio_count = dev_read_u32_default(dev, "ngpios", 32); uc_priv->bank_name = dev->name; return 0; |