i2c: tegra_nvec: Use dev_read_addr_ptr/u32_default

Signed-off-by: Nicolas Chauvet <kwizart@gmail.com>
grate-driver · Nov 19, 2021 · e8ecf7b · e8ecf7b
1 parent 915de20
commit e8ecf7b
Showing 1 changed file with 8 additions and 12 deletions.
diff --git a/drivers/i2c/tegra_nvec.c b/drivers/i2c/tegra_nvec.c
@@ -384,8 +384,7 @@ static void nvec_init_i2c_slave(struct nvec_t *nvec)
  * @param config	structure to store fdt config into
  * @return 0 if ok, -ve on error
  */
-static int nvec_decode_fdt(const void *blob, int node,
-			      struct nvec_t *nvec)
+static int nvec_decode_fdt(const void *dev)
 {
 //	int ret;
 
@@ -396,22 +395,19 @@ static int nvec_decode_fdt(const void *blob, int node,
 //		return -ENOENT;
 //	}
 
-	nvec->base = (void __iomem *)fdtdec_get_addr(blob, node, "reg");
-	if (nvec->base == (void __iomem *)FDT_ADDR_T_NONE) {
-		error("No NVEC controller address");
-		return -ENOENT;
-	}
-	nvec->i2c_addr = fdtdec_get_int(blob, node, "slave-addr", -1);
-	nvec->i2c_clk = fdtdec_get_int(blob, node, "clock-frequency", -1);
+	dev->base = dev_read_addr_ptr(dev);
+	if (!dev->base)
+		return -ENOMEM;
+
+	dev->i2c_addr = dev_read_u32_default(dev, "slave-addr", -1);
+	dev->i2c_clk = dev_read_u32_default(dev, "clock-frequency", -1);
 
 	return 0;
 }
 
 static int nvec_probe(struct udevice *dev)
 {
 	struct nvec_t *nvec = dev_get_priv(dev);
-	const void *blob = gd->fdt_blob;
-	int node = dev->node_.of_offset;
 	int res;
 
 	TRACE();
@@ -425,7 +421,7 @@ static int nvec_probe(struct udevice *dev)
 
 	debug("NVEC initialization...\n");
 
-	if (nvec_decode_fdt(blob, node, nvec_data)) {
+	if (nvec_decode_fdt(nvec_data) {
 		error("Failed to decode fdt");
 		return -EBUSY;
 	}