sysmo-bts
/
barebox
9
0
Fork 0
Code Releases Activity

ARM: OMAP: select correct reset_cpu function at runtime 

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
This commit is contained in:
Sascha Hauer 2013-11-21 15:04:35 +01:00
parent f6b399ef9b
commit f56a48471a
7 changed files with 23 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/mach-omap/am33xx_generic.c
View File

@ -30,7 +30,7 @@
#include <mach/am33xx-generic.h>
#include <mach/gpmc.h>
void __noreturn reset_cpu(unsigned long addr)
void __noreturn am33xx_reset_cpu(unsigned long addr)
{
writel(AM33XX_PRM_RSTCTRL_RESET, AM33XX_PRM_RSTCTRL);

2
arch/arm/mach-omap/include/mach/am33xx-generic.h
View File

@ -26,4 +26,6 @@ u32 am33xx_running_in_flash(void);
u32 am33xx_running_in_sram(void);
u32 am33xx_running_in_sdram(void);
void __noreturn am33xx_reset_cpu(unsigned long addr);
#endif /* __MACH_AM33XX_GENERIC_H */

2
arch/arm/mach-omap/include/mach/omap3-generic.h
View File

@ -23,4 +23,6 @@ u32 omap3_running_in_flash(void);
u32 omap3_running_in_sram(void);
u32 omap3_running_in_sdram(void);
void __noreturn omap3_reset_cpu(unsigned long addr);
#endif /* __MACH_OMAP3_GENERIC_H */

2
arch/arm/mach-omap/include/mach/omap4-generic.h
View File

@ -18,4 +18,6 @@ static inline void omap4_save_bootinfo(uint32_t *info)
omap_save_bootinfo(info);
}
void __noreturn omap4_reset_cpu(unsigned long addr);
#endif /* __MACH_OMAP4_GENERIC_H */

2
arch/arm/mach-omap/omap3_generic.c
View File

@ -52,7 +52,7 @@
*
* @return void
*/
void __noreturn reset_cpu(unsigned long addr)
void __noreturn omap3_reset_cpu(unsigned long addr)
{
writel(OMAP3_PRM_RSTCTRL_RESET, OMAP3_PRM_REG(RSTCTRL));

2
arch/arm/mach-omap/omap4_generic.c
View File

@ -34,7 +34,7 @@
#define EMIF_L3_CONFIG_VAL_SYS_10_LL_0 0x0A0000FF
#define EMIF_L3_CONFIG_VAL_SYS_10_MPU_3_LL_0 0x0A300000
void __noreturn reset_cpu(unsigned long addr)
void __noreturn omap4_reset_cpu(unsigned long addr)
{
writel(OMAP44XX_PRM_RSTCTRL_RESET, OMAP44XX_PRM_RSTCTRL);

14
arch/arm/mach-omap/omap_generic.c
View File

@ -25,6 +25,9 @@
#include <mach/am33xx-silicon.h>
#include <mach/omap3-silicon.h>
#include <mach/omap4-silicon.h>
#include <mach/am33xx-generic.h>
#include <mach/omap3-generic.h>
#include <mach/omap4-generic.h>
static void *omap_sram_start(void)
{
@ -130,3 +133,14 @@ static int omap_env_init(void)
}
late_initcall(omap_env_init);
#endif
void __noreturn reset_cpu(unsigned long addr)
{
if (cpu_is_omap34xx())
omap3_reset_cpu(addr);
if (cpu_is_omap4xxx())
omap4_reset_cpu(addr);
if (cpu_is_am33xx())
am33xx_reset_cpu(addr);
while (1);
}