rockchip: ram: rk3399: update for TPL

Init the ddr sdram in TPL instead of SPL, update the code.

Signed-off-by: Kever Yang <kever.yang@rock-chips.com>
Tested-by: Andy Yan <andy.yan@rock-chips.com>
This commit is contained in:
Kever Yang 2019-04-01 17:20:53 +08:00
parent 6bbf5e1a94
commit 82763349a2

View file

@ -30,7 +30,8 @@ struct chan_info {
}; };
struct dram_info { struct dram_info {
#ifdef CONFIG_SPL_BUILD #if defined(CONFIG_TPL_BUILD) || \
(!defined(CONFIG_TPL) && defined(CONFIG_SPL_BUILD))
struct chan_info chan[2]; struct chan_info chan[2];
struct clk ddr_clk; struct clk ddr_clk;
struct rk3399_cru *cru; struct rk3399_cru *cru;
@ -55,7 +56,8 @@ struct dram_info {
#define PHY_DRV_ODT_40 0xe #define PHY_DRV_ODT_40 0xe
#define PHY_DRV_ODT_34_3 0xf #define PHY_DRV_ODT_34_3 0xf
#ifdef CONFIG_SPL_BUILD #if defined(CONFIG_TPL_BUILD) || \
(!defined(CONFIG_TPL) && defined(CONFIG_SPL_BUILD))
struct rockchip_dmc_plat { struct rockchip_dmc_plat {
#if CONFIG_IS_ENABLED(OF_PLATDATA) #if CONFIG_IS_ENABLED(OF_PLATDATA)
@ -1187,7 +1189,8 @@ static int rk3399_dmc_init(struct udevice *dev)
static int rk3399_dmc_probe(struct udevice *dev) static int rk3399_dmc_probe(struct udevice *dev)
{ {
#ifdef CONFIG_SPL_BUILD #if defined(CONFIG_TPL_BUILD) || \
(!defined(CONFIG_TPL) && defined(CONFIG_SPL_BUILD))
if (rk3399_dmc_init(dev)) if (rk3399_dmc_init(dev))
return 0; return 0;
#else #else
@ -1226,12 +1229,14 @@ U_BOOT_DRIVER(dmc_rk3399) = {
.id = UCLASS_RAM, .id = UCLASS_RAM,
.of_match = rk3399_dmc_ids, .of_match = rk3399_dmc_ids,
.ops = &rk3399_dmc_ops, .ops = &rk3399_dmc_ops,
#ifdef CONFIG_SPL_BUILD #if defined(CONFIG_TPL_BUILD) || \
(!defined(CONFIG_TPL) && defined(CONFIG_SPL_BUILD))
.ofdata_to_platdata = rk3399_dmc_ofdata_to_platdata, .ofdata_to_platdata = rk3399_dmc_ofdata_to_platdata,
#endif #endif
.probe = rk3399_dmc_probe, .probe = rk3399_dmc_probe,
.priv_auto_alloc_size = sizeof(struct dram_info), .priv_auto_alloc_size = sizeof(struct dram_info),
#ifdef CONFIG_SPL_BUILD #if defined(CONFIG_TPL_BUILD) || \
(!defined(CONFIG_TPL) && defined(CONFIG_SPL_BUILD))
.platdata_auto_alloc_size = sizeof(struct rockchip_dmc_plat), .platdata_auto_alloc_size = sizeof(struct rockchip_dmc_plat),
#endif #endif
}; };