Merge tag 'dm-pull-14dec20' of git://git.denx.de/u-boot-dm into next

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

diff --git a/drivers/ram/rockchip/sdram_px30.c b/drivers/ram/rockchip/sdram_px30.c
index ac7d96540f8133b39b0779b1d3f35a820ab4c757..c024a0cd633771230d96f707a146daf708087fff 100644 (file)
--- a/drivers/ram/rockchip/sdram_px30.c
+++ b/drivers/ram/rockchip/sdram_px30.c
@@ -7,6 +7,7 @@
 #include <debug_uart.h>
 #include <dm.h>
 #include <init.h>
+#include <log.h>
 #include <ram.h>
 #include <syscon.h>
 #include <asm/io.h>
@@ -16,6 +17,7 @@
 #include <asm/arch-rockchip/hardware.h>
 #include <asm/arch-rockchip/sdram.h>
 #include <asm/arch-rockchip/sdram_px30.h>
+#include <linux/delay.h>
 
 struct dram_info {
 #ifdef CONFIG_TPL_BUILD
@@ -123,7 +125,15 @@ u32 addrmap[][8] = {
 struct dram_info dram_info;
 
 struct px30_sdram_params sdram_configs[] = {
+#if defined(CONFIG_RAM_PX30_DDR4)
+#include       "sdram-px30-ddr4-detect-333.inc"
+#elif defined(CONFIG_RAM_PX30_LPDDR2)
+#include       "sdram-px30-lpddr2-detect-333.inc"
+#elif defined(CONFIG_RAM_PX30_LPDDR3)
+#include       "sdram-px30-lpddr3-detect-333.inc"
+#else
 #include       "sdram-px30-ddr3-detect-333.inc"
+#endif
 };
 
 struct ddr_phy_skew skew = {
@@ -747,6 +757,6 @@ U_BOOT_DRIVER(dmc_px30) = {
        .of_match = px30_dmc_ids,
        .ops = &px30_dmc_ops,
        .probe = px30_dmc_probe,
-       .priv_auto_alloc_size = sizeof(struct dram_info),
+       .priv_auto      = sizeof(struct dram_info),
 };
 #endif /* CONFIG_TPL_BUILD */