projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
acpi: Specify U-Boot include path for ASL files
[oweals/u-boot.git]
/
drivers
/
i2c
/
i2c-uniphier.c
diff --git
a/drivers/i2c/i2c-uniphier.c
b/drivers/i2c/i2c-uniphier.c
index 64a9ed81d2530b601edd2b29b234f8461c107ac6..f8221da82e4f76da198e9cf018e40f0ee4edb0dd 100644
(file)
--- a/
drivers/i2c/i2c-uniphier.c
+++ b/
drivers/i2c/i2c-uniphier.c
@@
-1,20
+1,19
@@
/*
/*
- * 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>
*
* 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>
#include <i2c.h>
#include <fdtdec.h>
#include <asm/errno.h>
#include <dm/device.h>
#include <dm/root.h>
#include <i2c.h>
#include <fdtdec.h>
-
-DECLARE_GLOBAL_DATA_PTR;
+#include <mapmem.h>
struct uniphier_i2c_regs {
u32 dtrm; /* data transmission */
struct uniphier_i2c_regs {
u32 dtrm; /* data transmission */
@@
-48,13
+47,13
@@
struct uniphier_i2c_dev {
static int uniphier_i2c_probe(struct udevice *dev)
{
fdt_addr_t addr;
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);
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;
if (!priv->regs)
return -ENOMEM;
@@
-212,8
+211,8
@@
static const struct dm_i2c_ops uniphier_i2c_ops = {
};
static const struct udevice_id uniphier_i2c_of_match[] = {
};
static const struct udevice_id uniphier_i2c_of_match[] = {
- { .compatible = "
panasonic
,uniphier-i2c" },
- {
},
+ { .compatible = "
socionext
,uniphier-i2c" },
+ {
/* sentinel */ }
};
U_BOOT_DRIVER(uniphier_i2c) = {
};
U_BOOT_DRIVER(uniphier_i2c) = {