Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bc7235c9 authored by Tony Lindgren's avatar Tony Lindgren
Browse files

ARM: OMAP2+: Fix reboot for 81xx 



We are missing proper hooks for 81xx for reboot to work.

Cc: Brian Hutchinson <b.hutchman@gmail.com>
Reviewed-by: default avatarFelipe Balbi <balbi@ti.com>
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent 132754e4

arch/arm/mach-omap2/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -58,6 +58,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_TI81XX)		+= ti81xx-restart.o

obj-$(CONFIG_SOC_AM33XX)		+= am33xx-restart.o

obj-$(CONFIG_SOC_AM43XX)		+= omap4-restart.o

obj-$(CONFIG_ARCH_OMAP3)		+= omap3-restart.o

arch/arm/mach-omap2/common.h

+8 −0
Original line number Diff line number Diff line
@@ -164,6 +164,14 @@ static inline void omap3xxx_restart(enum reboot_mode mode, const char *cmd) 
}

#endif



#ifdef CONFIG_SOC_TI81XX

void ti81xx_restart(enum reboot_mode mode, const char *cmd);

#else

static inline void ti81xx_restart(enum reboot_mode mode, const char *cmd)

{

}

#endif



#if defined(CONFIG_ARCH_OMAP4) || defined(CONFIG_SOC_OMAP5) || \

	defined(CONFIG_SOC_DRA7XX) || defined(CONFIG_SOC_AM43XX)

void omap44xx_restart(enum reboot_mode mode, const char *cmd);

arch/arm/mach-omap2/ti81xx-restart.c

0 → 100644
+34 −0
Original line number Diff line number Diff line 
/*

 * 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 <linux/init.h>

#include <linux/reboot.h>



#include "iomap.h"

#include "common.h"

#include "control.h"

#include "prm3xxx.h"



#define TI81XX_PRM_DEVICE_RSTCTRL	0x00a0

#define TI81XX_GLOBAL_RST_COLD		BIT(1)



/**

 * ti81xx_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.

 *

 * NOTE: Warm reset does not seem to work, may require resetting

 * clocks to bypass mode.

 */

void ti81xx_restart(enum reboot_mode mode, const char *cmd)

{

	omap2_prm_set_mod_reg_bits(TI81XX_GLOBAL_RST_COLD, 0,

				   TI81XX_PRM_DEVICE_RSTCTRL);

	while (1);

}