Skip to contentSkip to conversation

gpio: bcm6345: convert to use live dt

PATCH New Álvaro Fernández Rojas 2 participants 2 messages Mar 17, 2018 – Mar 19, 2018 GPIO

lore
Share & tools
lore

Álvaro Fernández Rojas

author
#0 lore raw

PATCH 1/1 gpio: bcm6345: convert to use live dt

Signed-off-by Álvaro Fernández Rojas <[email protected]>
---
 drivers/gpio/bcm6345_gpio.c | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)
drivers/gpio/bcm6345_gpio.c +5 -9
index b9100cdc58..92541f6002 100644
@@ -14,8 +14,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;

@@ -92,21 +90,19 @@ 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);
+	dirout_addr = dev_read_addr_index(dev, 0);
 	if (dirout_addr == FDT_ADDR_T_NONE)
 		return -EINVAL;
 
-	data_addr = devfdt_get_addr_size_index(dev, 1, &data_size);
+	data_addr = dev_read_addr_index(dev, 1);
 	if (data_addr == FDT_ADDR_T_NONE)
 		return -EINVAL;
 
-	priv->reg_data = ioremap(data_addr, data_size);
-	priv->reg_dirout = ioremap(dirout_addr, dirout_size);
+	priv->reg_data = ioremap(data_addr, 0);
+	priv->reg_dirout = ioremap(dirout_addr, 0);
 
-	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;
Signature · 1 line
2.11.0