diff options
| author | Tom Rini <trini@konsulko.com> | 2017-09-18 15:44:57 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2017-09-18 15:44:57 -0400 |
| commit | 975f97b43181694041f77ecd8118364afe588144 (patch) | |
| tree | 16500994985d434314427ea0033b5db1751e637f /drivers/ram | |
| parent | 45d19acb2f340a3a8092cedcdef01d3e9efb8342 (diff) | |
| parent | 60d7c50945d65185a5c86c4f52d4671fb59292e3 (diff) | |
Merge git://git.denx.de/u-boot-rockchip
Diffstat (limited to 'drivers/ram')
| -rw-r--r-- | drivers/ram/rockchip/dmc-rk3368.c | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/drivers/ram/rockchip/dmc-rk3368.c b/drivers/ram/rockchip/dmc-rk3368.c index ca7b1ff0c8..7577ff0363 100644 --- a/drivers/ram/rockchip/dmc-rk3368.c +++ b/drivers/ram/rockchip/dmc-rk3368.c @@ -893,18 +893,11 @@ static int conv_of_platdata(struct udevice *dev) { struct rk3368_sdram_params *plat = dev_get_platdata(dev); struct dtd_rockchip_rk3368_dmc *of_plat = &plat->of_plat; - int ret; plat->ddr_freq = of_plat->rockchip_ddr_frequency; plat->ddr_speed_bin = of_plat->rockchip_ddr_speed_bin; plat->memory_schedule = of_plat->rockchip_memory_schedule; - ret = regmap_init_mem_platdata(dev, of_plat->reg, - ARRAY_SIZE(of_plat->reg) / 2, - &plat->map); - if (ret) - return ret; - return 0; } #endif @@ -933,8 +926,8 @@ static int rk3368_dmc_probe(struct udevice *dev) debug("%s: pmugrf=%p\n", __func__, priv->pmugrf); #ifdef CONFIG_TPL_BUILD - pctl = regmap_get_range(plat->map, 0); - ddrphy = regmap_get_range(plat->map, 1); + pctl = (struct rk3368_ddr_pctl *)plat->of_plat.reg[0]; + ddrphy = (struct rk3368_ddrphy *)plat->of_plat.reg[2]; msch = syscon_get_first_range(ROCKCHIP_SYSCON_MSCH); grf = syscon_get_first_range(ROCKCHIP_SYSCON_GRF); |