leandrof/u-boot
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ARM: rmobile: Drop CPU type ifdef from salvator-x

Browse Source 
We can now use rmobile_get_cpu_type() to check the CPU ID rather
than using a macro, make it so.

Signed-off-by: Marek Vasut <marek.vasut+renesas@gmail.com>
Cc: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
This commit is contained in:
Marek Vasut 2017-11-26 00:01:32 +01:00
parent f2b2bd6660
commit bee22aa822
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
board/renesas/salvator-x/salvator-x.c
View File

@ -79,17 +79,19 @@ int board_early_init_f(void)
int board_init(void) int board_init(void)
{ {
u32 cpu_type = rmobile_get_cpu_type();
/* adress of boot parameters */ /* adress of boot parameters */
gd->bd->bi_boot_params = CONFIG_SYS_TEXT_BASE + 0x50000; gd->bd->bi_boot_params = CONFIG_SYS_TEXT_BASE + 0x50000;
#if defined(CONFIG_R8A7795) if (cpu_type == RMOBILE_CPU_TYPE_R8A7795) {
/* GSX: force power and clock supply */ /* GSX: force power and clock supply */
writel(0x0000001F, SYSC_PWRONCR2); writel(0x0000001F, SYSC_PWRONCR2);
while (readl(SYSC_PWRSR2) != 0x000003E0) while (readl(SYSC_PWRSR2) != 0x000003E0)
mdelay(20); mdelay(20);
mstp_clrbits_le32(MSTPSR1, SMSTPCR1, GSX_MSTP112); mstp_clrbits_le32(MSTPSR1, SMSTPCR1, GSX_MSTP112);
#endif }
/* USB1 pull-up */ /* USB1 pull-up */
setbits_le32(PFC_PUEN6, PUEN_USB1_OVC | PUEN_USB1_PWEN); setbits_le32(PFC_PUEN6, PUEN_USB1_OVC | PUEN_USB1_PWEN);