ram: rockchip: rename sdram.h to sdram_rk3288.h

[oweals/u-boot.git] / drivers / ram / rockchip / sdram_rk3188.c

diff --git a/drivers/ram/rockchip/sdram_rk3188.c b/drivers/ram/rockchip/sdram_rk3188.c
index 365d00ef542440796f65b38bde0ab7360d37170e..03e34331e12ebb1d5f0d2fe992e57b06750fe7a4 100644 (file)
--- a/drivers/ram/rockchip/sdram_rk3188.c
+++ b/drivers/ram/rockchip/sdram_rk3188.c
@@ -1,9 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0+ OR BSD-3-Clause
 /*
  * (C) Copyright 2015 Google, Inc
  * Copyright 2014 Rockchip Inc.
  *
- * SPDX-License-Identifier:     GPL-2.0
- *
  * Adapted from the very similar rk3288 ddr init.
  */
 
@@ -16,17 +15,15 @@
 #include <regmap.h>
 #include <syscon.h>
 #include <asm/io.h>
-#include <asm/arch/clock.h>
-#include <asm/arch/cru_rk3188.h>
-#include <asm/arch/ddr_rk3188.h>
-#include <asm/arch/grf_rk3188.h>
-#include <asm/arch/pmu_rk3188.h>
-#include <asm/arch/sdram.h>
-#include <asm/arch/sdram_common.h>
+#include <asm/arch-rockchip/clock.h>
+#include <asm/arch-rockchip/cru_rk3188.h>
+#include <asm/arch-rockchip/ddr_rk3188.h>
+#include <asm/arch-rockchip/grf_rk3188.h>
+#include <asm/arch-rockchip/pmu_rk3188.h>
+#include <asm/arch-rockchip/sdram_rk3288.h>
+#include <asm/arch-rockchip/sdram_common.h>
 #include <linux/err.h>
 
-DECLARE_GLOBAL_DATA_PTR;
-
 struct chan_info {
        struct rk3288_ddr_pctl *pctl;
        struct rk3288_ddr_publ *publ;
@@ -842,7 +839,7 @@ static int rk3188_dmc_ofdata_to_platdata(struct udevice *dev)
                printf("%s: Cannot read rockchip,sdram-params\n", __func__);
                return -EINVAL;
        }
-       ret = regmap_init_mem(dev, &params->map);
+       ret = regmap_init_mem(dev_ofnode(dev), &params->map);
        if (ret)
                return ret;
 #endif