Merge branch '2020-05-18-reduce-size-of-common.h'

[oweals/u-boot.git] / drivers / video / tegra124 / dp.c

diff --git a/drivers/video/tegra124/dp.c b/drivers/video/tegra124/dp.c
index 5bf8524a5e8a7d315900aaec5e5f14f8c8ca9a06..59758eb93614f1717bddee5bee2e0f7736e5b6d3 100644 (file)
--- a/drivers/video/tegra124/dp.c
+++ b/drivers/video/tegra124/dp.c
@@ -1,8 +1,7 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Copyright (c) 2011-2013, NVIDIA Corporation.
  * Copyright 2014 Google Inc.
- *
- * SPDX-License-Identifier:     GPL-2.0
  */
 
 #include <common.h>
@@ -10,17 +9,16 @@
 #include <dm.h>
 #include <div64.h>
 #include <errno.h>
-#include <fdtdec.h>
+#include <log.h>
 #include <video_bridge.h>
 #include <asm/io.h>
 #include <asm/arch-tegra/dc.h>
+#include <linux/delay.h>
 #include "display.h"
 #include "edid.h"
 #include "sor.h"
 #include "displayport.h"
 
-DECLARE_GLOBAL_DATA_PTR;
-
 #define DO_FAST_LINK_TRAINING          1
 
 struct tegra_dp_plat {
@@ -1572,7 +1570,7 @@ static int tegra_dp_ofdata_to_platdata(struct udevice *dev)
 {
        struct tegra_dp_plat *plat = dev_get_platdata(dev);
 
-       plat->base = dev_get_addr(dev);
+       plat->base = dev_read_addr(dev);
 
        return 0;
 }