diff options
| author | Tom Rini <trini@konsulko.com> | 2017-05-10 17:40:11 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2017-05-10 17:40:11 -0400 |
| commit | 1f5541c8818d3ecd243f9bbf58db9ea5f55a3195 (patch) | |
| tree | 83053c0f224f8fe641550492e95818033e5af7e2 /arch/arm/mach-rockchip/rk3399/sdram_rk3399.c | |
| parent | 102d86552abc82818c22b39fdef4b3a280a60643 (diff) | |
| parent | 2085de57f3928d72b27338f68d4250d1fb302d04 (diff) | |
Merge git://git.denx.de/u-boot-rockchip
This adds a new firefly-rk3399 board, MIPI support for rk3399 and
rk3288, rk818 pmic support, mkimage improvements for rockchip and a few
other things.
Diffstat (limited to 'arch/arm/mach-rockchip/rk3399/sdram_rk3399.c')
| -rw-r--r-- | arch/arm/mach-rockchip/rk3399/sdram_rk3399.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/mach-rockchip/rk3399/sdram_rk3399.c b/arch/arm/mach-rockchip/rk3399/sdram_rk3399.c index 749b52c8e7..536879d65b 100644 --- a/arch/arm/mach-rockchip/rk3399/sdram_rk3399.c +++ b/arch/arm/mach-rockchip/rk3399/sdram_rk3399.c @@ -1280,6 +1280,8 @@ static int rk3399_dmc_probe(struct udevice *dev) priv->pmugrf = syscon_get_first_range(ROCKCHIP_SYSCON_PMUGRF); debug("%s: pmugrf=%p\n", __func__, priv->pmugrf); + priv->info.base = 0; + priv->info.size = sdram_size_mb(priv) << 20; #endif return 0; } @@ -1288,9 +1290,7 @@ static int rk3399_dmc_get_info(struct udevice *dev, struct ram_info *info) { struct dram_info *priv = dev_get_priv(dev); - info = &priv->info; - priv->info.base = 0; - priv->info.size = sdram_size_mb(priv) << 20; + *info = priv->info; return 0; } @@ -1314,8 +1314,8 @@ U_BOOT_DRIVER(dmc_rk3399) = { .ofdata_to_platdata = rk3399_dmc_ofdata_to_platdata, #endif .probe = rk3399_dmc_probe, -#ifdef CONFIG_SPL_BUILD .priv_auto_alloc_size = sizeof(struct dram_info), +#ifdef CONFIG_SPL_BUILD .platdata_auto_alloc_size = sizeof(struct rockchip_dmc_plat), #endif }; |