Skip to contentSkip to conversation

spi: bcm63xx_spi: convert to use live dt

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

lore
Share & tools
lore

Álvaro Fernández Rojas

author
#0 lore raw

PATCH 1/2 spi: bcm63xx_spi: convert to use live dt

Signed-off-by Álvaro Fernández Rojas <[email protected]>
---
 drivers/spi/bcm63xx_spi.c | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)
drivers/spi/bcm63xx_spi.c +3 -7
index f0df6871d8..357b8ab6d7 100644
@@ -16,8 +16,6 @@
 #include <wait_bit.h>
 #include <asm/io.h>
 
-DECLARE_GLOBAL_DATA_PTR;
-
 /* BCM6348 SPI core */
 #define SPI_6348_CLK			0x06
 #define SPI_6348_CMD			0x00

@@ -375,17 +373,15 @@ static int bcm63xx_spi_probe(struct udevice *dev)
 	struct reset_ctl rst_ctl;
 	struct clk clk;
 	fdt_addr_t addr;
-	fdt_size_t size;
 	int ret;
 
-	addr = devfdt_get_addr_size_index(dev, 0, &size);
+	addr = dev_read_addr(dev);
 	if (addr == FDT_ADDR_T_NONE)
 		return -EINVAL;
 
 	priv->regs = regs;
-	priv->base = ioremap(addr, size);
-	priv->num_cs = fdtdec_get_uint(gd->fdt_blob, dev_of_offset(dev),
-				       "num-cs", 8);
+	priv->base = ioremap(addr, 0);
+	priv->num_cs = dev_read_u32_default(dev, "num-cs", 8);
 
 	/* enable clock */
 	ret = clk_get_by_index(dev, 0, &clk);
Signature · 1 line
2.11.0
author
#1 lore raw

PATCH 2/2 spi: bcm63xx_hsspi: convert to use live dt

Signed-off-by Álvaro Fernández Rojas <[email protected]>
---
 drivers/spi/bcm63xx_hsspi.c | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)
drivers/spi/bcm63xx_hsspi.c +3 -7
index 3393166a1e..ece1ed214c 100644
@@ -16,8 +16,6 @@
 #include <wait_bit.h>
 #include <asm/io.h>
 
-DECLARE_GLOBAL_DATA_PTR;
-
 #define HSSPI_PP			0
 
 #define SPI_MAX_SYNC_CLOCK		30000000

@@ -339,16 +337,14 @@ static int bcm63xx_hsspi_probe(struct udevice *dev)
 	struct reset_ctl rst_ctl;
 	struct clk clk;
 	fdt_addr_t addr;
-	fdt_size_t size;
 	int ret;
 
-	addr = devfdt_get_addr_size_index(dev, 0, &size);
+	addr = dev_read_addr(dev);
 	if (addr == FDT_ADDR_T_NONE)
 		return -EINVAL;
 
-	priv->regs = ioremap(addr, size);
-	priv->num_cs = fdtdec_get_uint(gd->fdt_blob, dev_of_offset(dev),
-				       "num-cs", 8);
+	priv->regs = ioremap(addr, 0);
+	priv->num_cs = dev_read_u32_default(dev, "num-cs", 8);
 
 	/* enable clock */
 	ret = clk_get_by_name(dev, "hsspi", &clk);
Signature · 1 line
2.11.0