ARM: uniphier: add EHCI nodes for PH1-LD11

[oweals/u-boot.git] / drivers / i2c / i2c-uniphier.c

diff --git a/drivers/i2c/i2c-uniphier.c b/drivers/i2c/i2c-uniphier.c
index c4972ff5012bcc5110c1c15beaf0f010ce7d1796..f8221da82e4f76da198e9cf018e40f0ee4edb0dd 100644 (file)
--- a/drivers/i2c/i2c-uniphier.c
+++ b/drivers/i2c/i2c-uniphier.c
@@ -1,14 +1,13 @@
 /*
- * Copyright (C) 2014 Panasonic Corporation
- * Copyright (C) 2015 Socionext Inc.
- *   Author: Masahiro Yamada <yamada.masahiro@socionext.com>
+ * Copyright (C) 2014-2015 Masahiro Yamada <yamada.masahiro@socionext.com>
  *
  * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #include <common.h>
 #include <linux/types.h>
-#include <asm/io.h>
+#include <linux/io.h>
+#include <linux/sizes.h>
 #include <asm/errno.h>
 #include <dm/device.h>
 #include <dm/root.h>
@@ -16,8 +15,6 @@
 #include <fdtdec.h>
 #include <mapmem.h>
 
-DECLARE_GLOBAL_DATA_PTR;
-
 struct uniphier_i2c_regs {
        u32 dtrm;                       /* data transmission */
 #define I2C_DTRM_STA   (1 << 10)
@@ -50,13 +47,13 @@ struct uniphier_i2c_dev {
 static int uniphier_i2c_probe(struct udevice *dev)
 {
        fdt_addr_t addr;
-       fdt_size_t size;
        struct uniphier_i2c_dev *priv = dev_get_priv(dev);
 
-       addr = fdtdec_get_addr_size(gd->fdt_blob, dev->of_offset, "reg", &size);
-
-       priv->regs = map_sysmem(addr, size);
+       addr = dev_get_addr(dev);
+       if (addr == FDT_ADDR_T_NONE)
+               return -EINVAL;
 
+       priv->regs = map_sysmem(addr, SZ_64);
        if (!priv->regs)
                return -ENOMEM;