sravan/system76-coreboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rockchip/rk3399: Change copy_to_reg arg type

Browse Source 
This changes the src arg for copy_to_reg to a const u32 * instead of a
u32 * in sdram.c.

BRANCH=none
BUG=none
TEST=emerge-gru coreboot

Change-Id: I80f49258b2f8102f0d988fec85b8038a00e18a34
Signed-off-by: Martin Roth <martinroth@chromium.org>
Original-Commit-Id: e0342e5c0181bf65ae78aa9518b0d6bd6cb1d5ec
Original-Change-Id: I362727f1dbe6726bf3240f9219c394786162a1a0
Original-Signed-off-by: Derek Basehore <dbasehore@chromium.org>
Original-Reviewed-on: https://chromium-review.googlesource.com/354163
Original-Reviewed-by: Martin Roth <martinroth@chromium.org>
Original-Reviewed-by: Duncan Laurie <dlaurie@chromium.org>
Reviewed-on: https://review.coreboot.org/15656
Tested-by: build bot (Jenkins)
Reviewed-by: Furquan Shaikh <furquan@google.com>
This commit is contained in:
Derek Basehore
2016-06-17 23:29:18 -07:00
committed by Martin Roth
parent f3b3ccfe73
commit 5282fe62d4
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/soc/rockchip/rk3399/sdram.c
View File

@@ -100,7 +100,7 @@ static struct rk3399_msch_regs * const rk3399_msch[2] = {
#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)
static void copy_to_reg(u32 *dest, u32 *src, u32 n) static void copy_to_reg(u32 *dest, const u32 *src, u32 n)
{ {
int i; int i;
@@ -400,8 +400,8 @@ static void pctl_cfg(u32 channel,
u32 *denali_ctl = rk3399_ddr_pctl[channel]->denali_ctl; u32 *denali_ctl = rk3399_ddr_pctl[channel]->denali_ctl;
u32 *denali_pi = rk3399_ddr_pi[channel]->denali_pi; u32 *denali_pi = rk3399_ddr_pi[channel]->denali_pi;
u32 *denali_phy = rk3399_ddr_publ[channel]->denali_phy; u32 *denali_phy = rk3399_ddr_publ[channel]->denali_phy;
u32 *params_ctl = (u32 *)sdram_params->pctl_regs.denali_ctl; const u32 *params_ctl = sdram_params->pctl_regs.denali_ctl;
u32 *params_phy = (u32 *)sdram_params->phy_regs.denali_phy; const u32 *params_phy = sdram_params->phy_regs.denali_phy;
u32 tmp, tmp1, tmp2; u32 tmp, tmp1, tmp2;
u32 pwrup_srefresh_exit; u32 pwrup_srefresh_exit;
@@ -412,7 +412,7 @@ static void pctl_cfg(u32 channel,
copy_to_reg(&denali_ctl[1], &params_ctl[1], copy_to_reg(&denali_ctl[1], &params_ctl[1],
sizeof(struct rk3399_ddr_pctl_regs) - 4); sizeof(struct rk3399_ddr_pctl_regs) - 4);
write32(&denali_ctl[0], params_ctl[0]); write32(&denali_ctl[0], params_ctl[0]);
copy_to_reg(denali_pi, (u32 *)&sdram_params->pi_regs.denali_pi[0], copy_to_reg(denali_pi, &sdram_params->pi_regs.denali_pi[0],
sizeof(struct rk3399_ddr_pi_regs)); sizeof(struct rk3399_ddr_pi_regs));
/* rank count need to set for init */ /* rank count need to set for init */
set_memory_map(channel, sdram_params); set_memory_map(channel, sdram_params);