Skip to contentSkip to conversation

Use live-tree functions in some xilinx drivers

PATCH New Michal Simek 2 participants 9 messages May 18, 2018 – May 22, 2018

Subsystems (3)
MMC, SD and SDIO Arm/Zynq architecture Watchdog device drivers
lore
Share & tools
lore

Michal Simek

author
#0 lore raw

cover Use live-tree functions in some xilinx drivers

Hi,

this patchset is changing ttc, mmc, watchdog and serial to use live-tree functions. Others Xilinx drivers will be fixed later.

Thanks,
Michal

Michal Simek (4):
serial: zynq: Use live-tree functions
mmc: zynq: Use live-tree functions
watchdog: cadence: Use live-tree functions
timer: cadence: Use live-tree functions

 drivers/mmc/zynq_sdhci.c     | 22 +++++++++-------------
 drivers/serial/serial_zynq.c |  4 +++-
 drivers/timer/cadence-ttc.c  |  4 +++-
 drivers/watchdog/cdns_wdt.c  |  9 ++++-----
 4 files changed, 19 insertions(+), 20 deletions(-)
Signature · 1 line
2.17.0
author
#1 lore raw

PATCH 1/4 serial: zynq: Use live-tree functions

Use live-tree functions.

Signed-off-by Michal Simek <[email protected]>

---

 drivers/serial/serial_zynq.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/serial/serial_zynq.c +3 -1
index 06f0a48e6709..3650af215731 100644
@@ -175,7 +175,9 @@ static int zynq_serial_ofdata_to_platdata(struct udevice *dev)
 {
 	struct zynq_uart_priv *priv = dev_get_priv(dev);
 
-	priv->regs = (struct uart_zynq *)devfdt_get_addr(dev);
+	priv->regs = (struct uart_zynq *)dev_read_addr(dev);
+	if (IS_ERR(priv->regs))
+		return PTR_ERR(priv->regs);
 
 	return 0;
 }
Signature · 1 line
2.17.0
author
#3 lore raw

PATCH 2/4 mmc: zynq: Use live-tree functions

In reply to Michal Simek

Use live-tree functions.

Signed-off-by Michal Simek <[email protected]>

---

 drivers/mmc/zynq_sdhci.c | 22 +++++++++-------------
 1 file changed, 9 insertions(+), 13 deletions(-)
drivers/mmc/zynq_sdhci.c +9 -13
index f99731fb1ffe..1f6d053f96b3 100644
@@ -283,25 +283,21 @@ static int arasan_sdhci_ofdata_to_platdata(struct udevice *dev)
 		return -1;
 
 	priv->host->name = dev->name;
-	priv->host->ioaddr = (void *)devfdt_get_addr(dev);
-
-	priv->deviceid = fdtdec_get_int(gd->fdt_blob, dev_of_offset(dev),
-					"xlnx,device_id", -1);
-	priv->bank = fdtdec_get_int(gd->fdt_blob, dev_of_offset(dev),
-				    "xlnx,mio_bank", -1);
-	if (fdt_get_property(gd->fdt_blob, dev_of_offset(dev),
-			     "no-1-8-v", NULL))
-		priv->no_1p8 = 1;
-	else
-		priv->no_1p8 = 0;
 
 #if defined(CONFIG_DM_MMC) && defined(CONFIG_ARCH_ZYNQMP)
 	priv->host->ops = &arasan_ops;
 #endif
 
-	plat->f_max = fdtdec_get_int(gd->fdt_blob, dev_of_offset(dev),
-				"max-frequency", CONFIG_ZYNQ_SDHCI_MAX_FREQ);
+	priv->host->ioaddr = (void *)dev_read_addr(dev);
+	if (IS_ERR(priv->host->ioaddr))
+		return PTR_ERR(priv->host->ioaddr);
 
+	priv->deviceid = dev_read_u32_default(dev, "xlnx,device_id", -1);
+	priv->bank = dev_read_u32_default(dev, "xlnx,mio_bank", -1);
+	priv->no_1p8 = dev_read_bool(dev, "no-1-8-v");
+
+	plat->f_max = dev_read_u32_default(dev, "max-frequency",
+					   CONFIG_ZYNQ_SDHCI_MAX_FREQ);
 	return 0;
 }
Signature · 1 line
2.17.0
author
#5 lore raw

PATCH 3/4 watchdog: cadence: Use live-tree functions

In reply to Michal Simek

Use live-tree functions.

Signed-off-by Michal Simek <[email protected]>

---

 drivers/watchdog/cdns_wdt.c | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)
drivers/watchdog/cdns_wdt.c +4 -5
index 9a07fa10fd9b..f7618f86da15 100644
@@ -231,17 +231,16 @@ static int cdns_wdt_probe(struct udevice *dev)
 
 static int cdns_wdt_ofdata_to_platdata(struct udevice *dev)
 {
-	int node = dev_of_offset(dev);
 	struct cdns_wdt_priv *priv = dev_get_priv(dev);
 
-	priv->regs = devfdt_get_addr_ptr(dev);
+	priv->regs = (struct cdns_regs *)dev_read_addr(dev);
 	if (IS_ERR(priv->regs))
 		return PTR_ERR(priv->regs);
 
-	priv->timeout = fdtdec_get_int(gd->fdt_blob, node, "timeout-sec",
-				       CDNS_WDT_DEFAULT_TIMEOUT);
+	priv->timeout = dev_read_u32_default(dev, "timeout-sec",
+					     CDNS_WDT_DEFAULT_TIMEOUT);
 
-	priv->rst = fdtdec_get_bool(gd->fdt_blob, node, "reset-on-timeout");
+	priv->rst = dev_read_bool(dev, "reset-on-timeout");
 
 	debug("%s: timeout %d, reset %d\n", __func__, priv->timeout, priv->rst);
Signature · 1 line
2.17.0
author
#7 lore raw

PATCH 4/4 timer: cadence: Use live-tree functions

In reply to Michal Simek

Use live-tree functions.

Reported-by Simon Glass <[email protected]>
Signed-off-by Michal Simek <[email protected]>

---

 drivers/timer/cadence-ttc.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/timer/cadence-ttc.c +3 -1
index 5b91c8a90b34..3541e5c84127 100644
@@ -64,8 +64,10 @@ static int cadence_ttc_ofdata_to_platdata(struct udevice *dev)
 {
 	struct cadence_ttc_priv *priv = dev_get_priv(dev);
 
-	priv->regs = map_physmem(devfdt_get_addr(dev),
+	priv->regs = map_physmem(dev_read_addr(dev),
 				 sizeof(struct cadence_ttc_regs), MAP_NOCACHE);
+	if (IS_ERR(priv->regs))
+		return PTR_ERR(priv->regs);
 
 	return 0;
 }
Signature · 1 line
2.17.0