Remove unnecessary instances of DECLARE_GLOBAL_DATA_PTR

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

diff --git a/drivers/i2c/i2c-cdns.c b/drivers/i2c/i2c-cdns.c
index dec18200cea225b9ac28415f5fd277a3c5c06768..a977a7fcbd3769ebd75ad2aa9efbc7f2b1054453 100644 (file)
--- a/drivers/i2c/i2c-cdns.c
+++ b/drivers/i2c/i2c-cdns.c
@@ -9,18 +9,16 @@
  */
 
 #include <common.h>
+#include <dm.h>
 #include <linux/types.h>
 #include <linux/io.h>
 #include <linux/errno.h>
-#include <dm/device.h>
 #include <dm/root.h>
 #include <i2c.h>
 #include <fdtdec.h>
 #include <mapmem.h>
 #include <wait_bit.h>
 
-DECLARE_GLOBAL_DATA_PTR;
-
 /* i2c register set */
 struct cdns_i2c_regs {
        u32 control;
@@ -419,7 +417,7 @@ static int cdns_i2c_ofdata_to_platdata(struct udevice *dev)
        struct cdns_i2c_platform_data *pdata =
                (struct cdns_i2c_platform_data *)dev_get_driver_data(dev);
 
-       i2c_bus->regs = (struct cdns_i2c_regs *)dev_get_addr(dev);
+       i2c_bus->regs = (struct cdns_i2c_regs *)devfdt_get_addr(dev);
        if (!i2c_bus->regs)
                return -ENOMEM;