rockchip: rv1126: clean arch_cpu_init() for SPL

Moving current configurations into SPL boot stage except
something belongs to USBPLUG.

Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: I64ec47f7c0c3cef57854a72af86e9ef1bebbcaed
This commit is contained in:
Joseph Chen 2020-09-11 15:19:59 +08:00 committed by Jon Lin
parent d30345d690
commit 1dd64bce5e
1 changed files with 7 additions and 7 deletions

View File

@ -508,10 +508,11 @@ void board_debug_uart_init(void)
int arch_cpu_init(void)
{
#if defined(CONFIG_SPL_BUILD) && !defined(CONFIG_TPL_BUILD) || defined(CONFIG_SUPPORT_USBPLUG)
#ifdef CONFIG_SPL_BUILD
int delay;
/* Just set region 0 to unsecure */
writel(0, FIREWALL_APB_BASE + FW_DDR_CON_REG);
#endif
/* disable force jtag mux route to both group0 and group1 */
writel(0x00300000, GRF_IOFUNC_CON3);
@ -520,9 +521,6 @@ int arch_cpu_init(void)
writel(0x00ff0055, CRU_BASE + CRU_CLKSEL_CON65);
writel(0x00ff0055, CRU_BASE + CRU_CLKSEL_CON67);
#if !defined(CONFIG_TPL_BUILD)
int delay;
/* enable all pd */
writel(0xffff0000, PMU_BASE_ADDR + PMU_PWR_GATE_SFTCON);
delay = 1000;
@ -592,9 +590,11 @@ int arch_cpu_init(void)
writel(0x101, CRYPTO_PRIORITY_REG);
/* enable dynamic priority */
writel(0x1, ISP_PRIORITY_EX_REG);
#endif
#if defined(CONFIG_SUPPORT_USBPLUG)
#elif defined(CONFIG_SUPPORT_USBPLUG)
/* Just set region 0 to unsecure */
writel(0, FIREWALL_APB_BASE + FW_DDR_CON_REG);
/* reset usbphy_otg usbphypor_otg */
writel(((0x1 << 6 | (1 << 8)) << 16) | (0x1 << 6) | (1 << 8), CRU_SOFTRST_CON11);
udelay(50);