mxs_gpio: improve readability by using '(void *)' on right hand size of pointer initi...

[karo-tx-uboot.git] / drivers / i2c / i2c-uniphier.c

diff --git a/drivers/i2c/i2c-uniphier.c b/drivers/i2c/i2c-uniphier.c
index bdac1f90799910b56fc78cc73fb6c13196864fbc..85b9eff5f81e7fa7e4b22450418a24c4a755f41f 100644 (file)
--- a/drivers/i2c/i2c-uniphier.c
+++ b/drivers/i2c/i2c-uniphier.c
@@ -1,18 +1,18 @@
 /*
- * Copyright (C) 2014 Panasonic Corporation
- *   Author: Masahiro Yamada <yamada.m@jp.panasonic.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 <asm/errno.h>
 #include <dm/device.h>
 #include <dm/root.h>
 #include <i2c.h>
 #include <fdtdec.h>
+#include <mapmem.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
@@ -75,16 +75,6 @@ static int uniphier_i2c_remove(struct udevice *dev)
        return 0;
 }
 
-static int uniphier_i2c_child_pre_probe(struct udevice *dev)
-{
-       struct dm_i2c_chip *i2c_chip = dev_get_parentdata(dev);
-
-       if (dev->of_offset == -1)
-               return 0;
-       return i2c_chip_ofdata_to_platdata(gd->fdt_blob, dev->of_offset,
-                                          i2c_chip);
-}
-
 static int send_and_recv_byte(struct uniphier_i2c_dev *dev, u32 dtrm)
 {
        writel(dtrm, &dev->regs->dtrm);
@@ -222,8 +212,8 @@ static const struct dm_i2c_ops uniphier_i2c_ops = {
 };
 
 static const struct udevice_id uniphier_i2c_of_match[] = {
-       { .compatible = "panasonic,uniphier-i2c" },
-       {},
+       { .compatible = "socionext,uniphier-i2c" },
+       { /* sentinel */ }
 };
 
 U_BOOT_DRIVER(uniphier_i2c) = {
@@ -232,8 +222,6 @@ U_BOOT_DRIVER(uniphier_i2c) = {
        .of_match = uniphier_i2c_of_match,
        .probe = uniphier_i2c_probe,
        .remove = uniphier_i2c_remove,
-       .per_child_auto_alloc_size = sizeof(struct dm_i2c_chip),
-       .child_pre_probe = uniphier_i2c_child_pre_probe,
        .priv_auto_alloc_size = sizeof(struct uniphier_i2c_dev),
        .ops = &uniphier_i2c_ops,
 };