Merge branch 'master' of git://git.denx.de/u-boot-spi

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

diff --git a/drivers/i2c/sandbox_i2c.c b/drivers/i2c/sandbox_i2c.c
index 2c84c41643c8b442dea3634ac36367b97903b917..66578510849dbb770059136fd8cddb50b068296b 100644 (file)
--- a/drivers/i2c/sandbox_i2c.c
+++ b/drivers/i2c/sandbox_i2c.c
@@ -1,22 +1,17 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Simulate an I2C port
  *
  * Copyright (c) 2014 Google, Inc
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #include <common.h>
 #include <dm.h>
 #include <errno.h>
-#include <fdtdec.h>
 #include <i2c.h>
 #include <asm/test.h>
 #include <dm/lists.h>
 #include <dm/device-internal.h>
-#include <dm/root.h>
-
-DECLARE_GLOBAL_DATA_PTR;
 
 struct sandbox_i2c_priv {
        bool test_mode;
@@ -33,8 +28,7 @@ static int get_emul(struct udevice *dev, struct udevice **devp,
        *opsp = NULL;
        plat = dev_get_parent_platdata(dev);
        if (!plat->emul) {
-               ret = dm_scan_fdt_node(dev, gd->fdt_blob, dev->of_offset,
-                                      false);
+               ret = dm_scan_fdt_dev(dev);
                if (ret)
                        return ret;