ARM: AM33xx: Add SoC specific restart hook
Subsystems (3)
PATCH 1/1 ARM: AM33xx: Add SoC specific restart hook
From: "Jean-Sebastien A. Beaudry" <[email protected]>
Add restart hook so that DTS based AM33xx builds can restart the platform.
Tested-by Nishanth Menon <[email protected]>
Signed-off-by Jean-Sebastien A. Beaudry <[email protected]>
--- arch/arm/mach-omap2/Makefile | 1 + arch/arm/mach-omap2/am33xx-restart.c | 34 ++++++++++++++++++++++++++++++++++ arch/arm/mach-omap2/board-generic.c | 1 + arch/arm/mach-omap2/common.h | 8 ++++++++ 4 files changed, 44 insertions(+) create mode 100644 arch/arm/mach-omap2/am33xx-restart.c
arch/arm/mach-omap2/Makefile +1 -0
@@ -53,6 +53,7 @@ AFLAGS_sram34xx.o :=-Wa,-march=armv7-a # Restart code (OMAP4/5 currently in omap4-common.c) obj-$(CONFIG_SOC_OMAP2420) += omap2-restart.o obj-$(CONFIG_SOC_OMAP2430) += omap2-restart.o +obj-$(CONFIG_SOC_AM33XX) += am33xx-restart.o obj-$(CONFIG_ARCH_OMAP3) += omap3-restart.o # Pin multiplexing
arch/arm/mach-omap2/am33xx-restart.c new file +34 -0
@@ -0,0 +1,34 @@ +/* +* am33xx-restart.c - Code common to all AM33xx machines. +* +* This program is free software; you can redistribute it and/or modify +* it under the terms of the GNU General Public License version 2 as +* published by the Free Software Foundation. +*/ +#include <linux/kernel.h> + +#include "common.h" +#include "prm-regbits-33xx.h" +#include "prm33xx.h" + +/** +* am3xx_restart - trigger a software restart of the SoC +* @mode: the "reboot mode", see arch/arm/kernel/{setup,process}.c +* @cmd: passed from the userspace program rebooting the system (if provided) +* +* Resets the SoC. For @cmd, see the 'reboot' syscall in +* kernel/sys.c. No return value. +*/ +void am33xx_restart (char mode,const char *cmd) +{ +/* TODO: Handle mode and cmd if necessary */ + +am33xx_prm_rmw_reg_bits (AM33XX_GLOBAL_WARM_SW_RST_MASK , +AM33XX_GLOBAL_WARM_SW_RST_MASK , +AM33XX_PRM_DEVICE_MOD , +AM33XX_PRM_RSTCTRL_OFFSET ); + +/* OCP barrier */ + (void )am33xx_prm_read_reg (AM33XX_PRM_DEVICE_MOD , +AM33XX_PRM_RSTCTRL_OFFSET ); +}
arch/arm/mach-omap2/board-generic.c +1 -0
@@ -141,6 +141,7 @@ DT_MACHINE_START(AM33XX_DT, "Generic AM33XX (Flattened Device Tree)") .init_machine = omap_generic_init, .timer = &omap3_am33xx_timer, .dt_compat = am33xx_boards_compat, + .restart = am33xx_restart, MACHINE_END#endif
arch/arm/mach-omap2/common.h +8 -0
@@ -119,6 +119,14 @@ static inline void omap2xxx_restart(char mode, const char *cmd) }#endif +#ifdef CONFIG_SOC_AM33XX +void am33xx_restart (char mode,const char *cmd); +#else +static inline void am33xx_restart (char mode,const char *cmd) +{ +} +#endif +#ifdef CONFIG_ARCH_OMAP3 void omap3xxx_restart (char mode,const char *cmd);#else
Signature · 1 line
1.7.9.5
Tony Lindgren
maintainerPATCH 1/1 ARM: AM33xx: Add SoC specific restart hook
Quoted 4 lines · Jean-Sebastien A. Beaudry
From: "Jean-Sebastien A. Beaudry" <[email protected]>
Add restart hook so that DTS based AM33xx builds can restart the platform.
Thanks applying into omap-for-v3.9/soc.
Regards,
Tony