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

Commit ab4c2e1b authored by Afzal Mohammed's avatar Afzal Mohammed Committed by Tony Lindgren
Browse files

ARM: OMAP2+: separate out OMAP4 restart 



Separate out OMAP4 restart and have it similar to other platforms, in
a different file. Main motive is to reuse omap4-common on platforms
other than OMAP4, like AM43x, even if OMAP4 is deselected (otherwise
would have caused build breakage).

Signed-off-by: default avatarAfzal Mohammed <afzal@ti.com>
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent a27b6da4

arch/arm/mach-omap2/Makefile

+2 −0
Original line number Original line Diff line number Diff line
@@ -58,6 +58,8 @@ obj-$(CONFIG_SOC_OMAP2420) += omap2-restart.o 
obj-$(CONFIG_SOC_OMAP2430)		+= omap2-restart.o

obj-$(CONFIG_SOC_OMAP2430)		+= omap2-restart.o

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

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

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

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

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

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





# Pin multiplexing

# Pin multiplexing

obj-$(CONFIG_SOC_OMAP2420)		+= mux2420.o

obj-$(CONFIG_SOC_OMAP2420)		+= mux2420.o

arch/arm/mach-omap2/omap4-common.c

+0 −16
Original line number Original line Diff line number Diff line
@@ -339,19 +339,3 @@ int __init omap4_twl6030_hsmmc_init(struct omap2_hsmmc_info *controllers) 
	return 0;

	return 0;

}

}

#endif
 
#endif
 


/**

 * omap44xx_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 omap44xx_restart(char mode, const char *cmd)

{

	/* XXX Should save 'cmd' into scratchpad for use after reboot */

	omap4_prminst_global_warm_sw_reset(); /* never returns */

	while (1);

}

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

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

 * omap4-restart.c - Common to OMAP4 and OMAP5

 *

 *

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

#include "prminst44xx.h"



/**

 * omap44xx_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 omap44xx_restart(char mode, const char *cmd)

{

	/* XXX Should save 'cmd' into scratchpad for use after reboot */

	omap4_prminst_global_warm_sw_reset(); /* never returns */

	while (1)

		;

}