GitHub-Mirror/u-boot
2
0
Fork 0
mirror of https://github.com/Fishwaldo/u-boot.git synced 2025-03-21 14:41:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

arm: socfpga: system: Rework sysmgr_enable_warmrstcfgio()

Browse source 
Rework sysmgr_enable_warmrstcfgio() into sysmgr_config_warmrstcfgio(),
which allows both enabling and disabling the warm reset config I/O
functionality.

Signed-off-by: Marek Vasut <marex@denx.de>
This commit is contained in:
Marek Vasut 2015-07-09 04:40:11 +02:00
parent 575d741516
commit 40687b4f46
3 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
arch/arm/mach-socfpga/include/mach/system_manager.h
View file

@ -10,7 +10,7 @@
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLY__
void sysmgr_pinmux_init(void); void sysmgr_pinmux_init(void);
void sysmgr_enable_warmrstcfgio(void); void sysmgr_config_warmrstcfgio(int enable);
/* declaration for handoff table type */ /* declaration for handoff table type */
extern unsigned long sys_mgr_init_table[CONFIG_HPS_PINMUX_NUM]; extern unsigned long sys_mgr_init_table[CONFIG_HPS_PINMUX_NUM];

2
arch/arm/mach-socfpga/spl.c
View file

@ -78,7 +78,7 @@ void spl_board_init(void)
cm_basic_init(cm_default_cfg); cm_basic_init(cm_default_cfg);
/* Enable bootrom to configure IOs. */ /* Enable bootrom to configure IOs. */
sysmgr_enable_warmrstcfgio(); sysmgr_config_warmrstcfgio(1);
/* configure the IOCSR / IO buffer settings */ /* configure the IOCSR / IO buffer settings */
if (scan_mgr_configure_iocsr()) if (scan_mgr_configure_iocsr())

10
arch/arm/mach-socfpga/system_manager.c
View file

@ -70,8 +70,12 @@ void sysmgr_pinmux_init(void)
/* /*
* This bit allows the bootrom to configure the IOs after a warm reset. * This bit allows the bootrom to configure the IOs after a warm reset.
*/ */
void sysmgr_enable_warmrstcfgio(void) void sysmgr_config_warmrstcfgio(int enable)
{ {
setbits_le32(&sysmgr_regs->romcodegrp_ctrl, if (enable)
SYSMGR_ROMCODEGRP_CTRL_WARMRSTCFGIO); setbits_le32(&sysmgr_regs->romcodegrp_ctrl,
SYSMGR_ROMCODEGRP_CTRL_WARMRSTCFGIO);
else
clrbits_le32(&sysmgr_regs->romcodegrp_ctrl,
SYSMGR_ROMCODEGRP_CTRL_WARMRSTCFGIO);
} }