diff options
Diffstat (limited to 'drivers/ram/rockchip/sdram_rk322x.c')
-rw-r--r-- | drivers/ram/rockchip/sdram_rk322x.c | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/drivers/ram/rockchip/sdram_rk322x.c b/drivers/ram/rockchip/sdram_rk322x.c index 094693ce24..66235bd420 100644 --- a/drivers/ram/rockchip/sdram_rk322x.c +++ b/drivers/ram/rockchip/sdram_rk322x.c @@ -713,10 +713,10 @@ out: return ret; } -static int rk322x_dmc_ofdata_to_platdata(struct udevice *dev) +static int rk322x_dmc_of_to_plat(struct udevice *dev) { #if !CONFIG_IS_ENABLED(OF_PLATDATA) - struct rk322x_sdram_params *params = dev_get_platdata(dev); + struct rk322x_sdram_params *params = dev_get_plat(dev); const void *blob = gd->fdt_blob; int node = dev_of_offset(dev); int ret; @@ -754,9 +754,9 @@ static int rk322x_dmc_ofdata_to_platdata(struct udevice *dev) #endif /* CONFIG_TPL_BUILD */ #if CONFIG_IS_ENABLED(OF_PLATDATA) -static int conv_of_platdata(struct udevice *dev) +static int conv_of_plat(struct udevice *dev) { - struct rk322x_sdram_params *plat = dev_get_platdata(dev); + struct rk322x_sdram_params *plat = dev_get_plat(dev); struct dtd_rockchip_rk322x_dmc *of_plat = &plat->of_plat; int ret; @@ -767,9 +767,8 @@ static int conv_of_platdata(struct udevice *dev) memcpy(&plat->base, of_plat->rockchip_sdram_params, sizeof(plat->base)); plat->num_channels = 1; - ret = regmap_init_mem_platdata(dev, of_plat->reg, - ARRAY_SIZE(of_plat->reg) / 2, - &plat->map); + ret = regmap_init_mem_plat(dev, of_plat->reg, + ARRAY_SIZE(of_plat->reg) / 2, &plat->map); if (ret) return ret; @@ -780,7 +779,7 @@ static int conv_of_platdata(struct udevice *dev) static int rk322x_dmc_probe(struct udevice *dev) { #ifdef CONFIG_TPL_BUILD - struct rk322x_sdram_params *plat = dev_get_platdata(dev); + struct rk322x_sdram_params *plat = dev_get_plat(dev); int ret; struct udevice *dev_clk; #endif @@ -789,7 +788,7 @@ static int rk322x_dmc_probe(struct udevice *dev) priv->grf = syscon_get_first_range(ROCKCHIP_SYSCON_GRF); #ifdef CONFIG_TPL_BUILD #if CONFIG_IS_ENABLED(OF_PLATDATA) - ret = conv_of_platdata(dev); + ret = conv_of_plat(dev); if (ret) return ret; #endif @@ -844,12 +843,12 @@ U_BOOT_DRIVER(dmc_rk322x) = { .of_match = rk322x_dmc_ids, .ops = &rk322x_dmc_ops, #ifdef CONFIG_TPL_BUILD - .ofdata_to_platdata = rk322x_dmc_ofdata_to_platdata, + .of_to_plat = rk322x_dmc_of_to_plat, #endif .probe = rk322x_dmc_probe, - .priv_auto_alloc_size = sizeof(struct dram_info), + .priv_auto = sizeof(struct dram_info), #ifdef CONFIG_TPL_BUILD - .platdata_auto_alloc_size = sizeof(struct rk322x_sdram_params), + .plat_auto = sizeof(struct rk322x_sdram_params), #endif }; |