ARM: UniPhier: replace <asm/io.h> with <linux/io.h>

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

diff --git a/drivers/i2c/i2c-uniphier.c b/drivers/i2c/i2c-uniphier.c
index 64a9ed81d2530b601edd2b29b234f8461c107ac6..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;
 
@@ -212,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) = {