diff mbox series

[U-Boot,v2,10/17] spi: bcm63xx_spi: convert to use live dt

Message ID 20180322183943.5466-11-noltari@gmail.com
State Accepted, archived
Commit 85e1ddbaf018e3d6a742278f9777b1c406e9ea71
Delegated to: Daniel Schwierzeck
Headers show
Series bmips: convert to use live-dt | expand

Commit Message

Álvaro Fernández Rojas March 22, 2018, 6:39 p.m. UTC 
Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
---
 v2: Introduce changes suggested by Daniel Schwierzeck and Simon Glass:
  - Use generic dev_remap_addr function.
  - Fix bcm63xx_spi conversion.

 drivers/spi/bcm63xx_spi.c | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

Comments

Daniel Schwierzeck March 23, 2018, 5:52 p.m. UTC | #1 
On 22.03.2018 19:39, Álvaro Fernández Rojas wrote:
> Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
> Reviewed-by: Simon Glass <sjg@chromium.org>
> ---
>  v2: Introduce changes suggested by Daniel Schwierzeck and Simon Glass:
>   - Use generic dev_remap_addr function.
>   - Fix bcm63xx_spi conversion.
> 
>  drivers/spi/bcm63xx_spi.c | 12 +++---------
>  1 file changed, 3 insertions(+), 9 deletions(-)
> 

Reviewed-by: Daniel Schwierzeck <daniel.schwierzeck@gmail.com>
diff mbox series

Patch

diff --git a/drivers/spi/bcm63xx_spi.c b/drivers/spi/bcm63xx_spi.c
index f0df6871d8..c61c5d49b4 100644
--- a/drivers/spi/bcm63xx_spi.c
+++ b/drivers/spi/bcm63xx_spi.c
@@ -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
@@ -374,18 +372,14 @@  static int bcm63xx_spi_probe(struct udevice *dev)
 		(const unsigned long *)dev_get_driver_data(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);
-	if (addr == FDT_ADDR_T_NONE)
+	priv->base = dev_remap_addr(dev);
+	if (!priv->base)
 		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->num_cs = dev_read_u32_default(dev, "num-cs", 8);
 
 	/* enable clock */
 	ret = clk_get_by_index(dev, 0, &clk);