karo: tx6ul-8013: prevent stall of mxs_reset() of the LCDIF controller

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

diff --git a/drivers/i2c/i2c-uniphier-f.c b/drivers/i2c/i2c-uniphier-f.c
index 6707edd9ef498364f1493d5787adf914be2f53d6..b3349af9e184cc05477494be00e4dd1d566318ac 100644 (file)
--- a/drivers/i2c/i2c-uniphier-f.c
+++ b/drivers/i2c/i2c-uniphier-f.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;
 
@@ -352,8 +352,8 @@ static const struct dm_i2c_ops uniphier_fi2c_ops = {
 };
 
 static const struct udevice_id uniphier_fi2c_of_match[] = {
-       { .compatible = "panasonic,uniphier-fi2c" },
-       {},
+       { .compatible = "socionext,uniphier-fi2c" },
+       { /* sentinel */ }
 };
 
 U_BOOT_DRIVER(uniphier_fi2c) = {