Merge git://git.denx.de/u-boot-fsl-qoriq

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

diff --git a/drivers/i2c/i2c-uniphier.c b/drivers/i2c/i2c-uniphier.c
index 85b9eff5f81e7fa7e4b22450418a24c4a755f41f..f391f11e93572ae6a947999566379c856acedca8 100644 (file)
--- a/drivers/i2c/i2c-uniphier.c
+++ b/drivers/i2c/i2c-uniphier.c
@@ -1,5 +1,7 @@
 /*
- * Copyright (C) 2014-2015 Masahiro Yamada <yamada.masahiro@socionext.com>
+ * Copyright (C) 2014      Panasonic Corporation
+ * Copyright (C) 2015-2016 Socionext Inc.
+ *   Author: Masahiro Yamada <yamada.masahiro@socionext.com>
  *
  * SPDX-License-Identifier:    GPL-2.0+
  */
@@ -7,14 +9,12 @@
 #include <common.h>
 #include <linux/types.h>
 #include <linux/io.h>
-#include <asm/errno.h>
+#include <linux/sizes.h>
+#include <linux/errno.h>
 #include <dm/device.h>
 #include <dm/root.h>
 #include <i2c.h>
 #include <fdtdec.h>
-#include <mapmem.h>
-
-DECLARE_GLOBAL_DATA_PTR;
 
 struct uniphier_i2c_regs {
        u32 dtrm;                       /* data transmission */
@@ -48,13 +48,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 = devm_ioremap(dev, addr, SZ_64);
        if (!priv->regs)
                return -ENOMEM;
 
@@ -66,15 +66,6 @@ static int uniphier_i2c_probe(struct udevice *dev)
        return 0;
 }
 
-static int uniphier_i2c_remove(struct udevice *dev)
-{
-       struct uniphier_i2c_dev *priv = dev_get_priv(dev);
-
-       unmap_sysmem(priv->regs);
-
-       return 0;
-}
-
 static int send_and_recv_byte(struct uniphier_i2c_dev *dev, u32 dtrm)
 {
        writel(dtrm, &dev->regs->dtrm);
@@ -221,7 +212,6 @@ U_BOOT_DRIVER(uniphier_i2c) = {
        .id = UCLASS_I2C,
        .of_match = uniphier_i2c_of_match,
        .probe = uniphier_i2c_probe,
-       .remove = uniphier_i2c_remove,
        .priv_auto_alloc_size = sizeof(struct uniphier_i2c_dev),
        .ops = &uniphier_i2c_ops,
 };