diff options
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/renesas/rcar/watchdog/swdt.c | 4 | ||||
| -rw-r--r-- | drivers/staging/renesas/rcar/ddr/ddr_a/ddr_init_e3.c | 6 | ||||
| -rw-r--r-- | drivers/staging/renesas/rcar/ddr/ddr_a/ddr_init_e3.h | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/drivers/renesas/rcar/watchdog/swdt.c b/drivers/renesas/rcar/watchdog/swdt.c index 6df47b9b6..f9dbf86fe 100644 --- a/drivers/renesas/rcar/watchdog/swdt.c +++ b/drivers/renesas/rcar/watchdog/swdt.c @@ -72,9 +72,9 @@ static void swdt_disable(void) void rcar_swdt_init(void) { - uint32_t rmsk, val, sr; + uint32_t rmsk, sr; #if (RCAR_LSI != RCAR_E3) - uint32_t reg, product_cut, chk_data; + uint32_t reg, val, product_cut, chk_data; reg = mmio_read_32(RCAR_PRR); product_cut = reg & (RCAR_PRODUCT_MASK | RCAR_CUT_MASK); diff --git a/drivers/staging/renesas/rcar/ddr/ddr_a/ddr_init_e3.c b/drivers/staging/renesas/rcar/ddr/ddr_a/ddr_init_e3.c index 800105ee8..716d15d18 100644 --- a/drivers/staging/renesas/rcar/ddr/ddr_a/ddr_init_e3.c +++ b/drivers/staging/renesas/rcar/ddr/ddr_a/ddr_init_e3.c @@ -1046,7 +1046,7 @@ uint32_t recovery_from_backup_mode(void) } else { NOTICE("[COLD_BOOT]"); } /* ddrBackup */ - err=dram_update_boot_status(ddrBackup); + err=rcar_dram_update_boot_status(ddrBackup); if(err){ NOTICE("[BOOT_STATUS_UPDATE_ERROR]"); return INITDRAM_ERR_I; @@ -1500,7 +1500,7 @@ if (pdqsr_ctl == 1){ /******************************************************************************* * DDR Initialize entry for IPL ******************************************************************************/ -int32_t InitDram(void) +int32_t rcar_dram_init(void) { uint32_t dataL; uint32_t failcount; @@ -1516,7 +1516,7 @@ int32_t InitDram(void) NOTICE("BL2: DDR1856(%s)", RCAR_E3_DDR_VERSION); } /* ddr */ - dram_get_boot_status(&ddrBackup); + rcar_dram_get_boot_status(&ddrBackup); if(ddrBackup==DRAM_BOOT_STATUS_WARM){ dataL=recovery_from_backup_mode(); /* WARM boot */ diff --git a/drivers/staging/renesas/rcar/ddr/ddr_a/ddr_init_e3.h b/drivers/staging/renesas/rcar/ddr/ddr_a/ddr_init_e3.h index b202b0280..115765b13 100644 --- a/drivers/staging/renesas/rcar/ddr/ddr_a/ddr_init_e3.h +++ b/drivers/staging/renesas/rcar/ddr/ddr_a/ddr_init_e3.h @@ -24,7 +24,7 @@ #endif #endif -extern int32_t InitDram(void); +extern int32_t rcar_dram_init(void); #define INITDRAM_OK (0) #define INITDRAM_NG (0xffffffff) #define INITDRAM_ERR_I (0xffffffff) |