Commit 2f334a38 authored by Paul Walmsley's avatar Paul Walmsley
Browse files

ARM: OMAP2+: PRCM: create SoC-specific chip restart functions 



Split omap_prcm_restart() from mach-omap2/prcm.c into SoC-specific
variants.  These functions need to be able to save the reboot reason
into the scratchpad RAM.  This implies a dependency on both the PRM
and SCM IP blocks, so they've been moved into their own file.  This
will eventually call functions in the PRM and SCM drivers, once those
are created.

Vaibhav Hiremath <hvaibhav@ti.com> identified an unused prototype in
the first version of this patch - now removed.  Tony Lindgren
<tony@atomide.com> noted a compile problem with some RMK Kconfigs;
resolved in this patch.

Signed-off-by: default avatarPaul Walmsley <paul@pwsan.com>
Cc: Vaibhav Hiremath <hvaibhav@ti.com>
Tested-by: default avatarVaibhav Hiremath <hvaibhav@ti.com>
Cc: Tony Lindgren <tony@atomide.com>
parent baa689b8

arch/arm/mach-omap2/Makefile

+5 −0
Original line number Diff line number Diff line
@@ -50,6 +50,11 @@ AFLAGS_sram242x.o :=-Wa,-march=armv6 
AFLAGS_sram243x.o			:=-Wa,-march=armv6

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_ARCH_OMAP3)		+= omap3-restart.o



# Pin multiplexing

obj-$(CONFIG_SOC_OMAP2420)		+= mux2420.o

obj-$(CONFIG_SOC_OMAP2430)		+= mux2430.o

arch/arm/mach-omap2/common.h

+24 −0
Original line number Diff line number Diff line
@@ -113,6 +113,30 @@ void omap4430_init_late(void); 
int omap2_common_pm_late_init(void);

void omap_prcm_restart(char, const char *);



#if defined(CONFIG_SOC_OMAP2420) || defined(CONFIG_SOC_OMAP2430)

void omap2xxx_restart(char mode, const char *cmd);

#else

static inline void omap2xxx_restart(char mode, const char *cmd)

{

}

#endif



#ifdef CONFIG_ARCH_OMAP3

void omap3xxx_restart(char mode, const char *cmd);

#else

static inline void omap3xxx_restart(char mode, const char *cmd)

{

}

#endif



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

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

#else

static inline void omap44xx_restart(char mode, const char *cmd)

{

}

#endif



/* This gets called from mach-omap2/io.c, do not call this */

void __init omap2_set_globals_tap(u32 class, void __iomem *tap);

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

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

 * omap2-restart.c - code common to all OMAP2xxx machines.

 *

 * Copyright (C) 2012 Texas Instruments

 * Paul Walmsley

 *

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

#include <linux/io.h>



#include "common.h"

#include "prm2xxx.h"



/*

 * reset_virt_prcm_set_ck, reset_sys_ck: pointers to the virt_prcm_set

 * clock and the sys_ck.  Used during the reset process

 */

static struct clk *reset_virt_prcm_set_ck, *reset_sys_ck;



/* Reboot handling */



/**

 * omap2xxx_restart - Set DPLL to bypass mode for reboot to work

 *

 * Set the DPLL to bypass so that reboot completes successfully.  No

 * return value.

 */

void omap2xxx_restart(char mode, const char *cmd)

{

	u32 rate;



	rate = clk_get_rate(reset_sys_ck);

	clk_set_rate(reset_virt_prcm_set_ck, rate);



	/* XXX Should save the cmd argument for use after the reboot */



	omap2xxx_prm_dpll_reset(); /* never returns */

	while (1);

}



/**

 * omap2xxx_common_look_up_clks_for_reset - look up clocks needed for restart

 *

 * Some clocks need to be looked up in advance for the SoC restart

 * operation to work - see omap2xxx_restart().  Returns -EINVAL upon

 * error or 0 upon success.

 */

static int __init omap2xxx_common_look_up_clks_for_reset(void)

{

	reset_virt_prcm_set_ck = clk_get(NULL, "virt_prcm_set");

	if (IS_ERR(reset_virt_prcm_set_ck))

		return -EINVAL;



	reset_sys_ck = clk_get(NULL, "sys_ck");

	if (IS_ERR(reset_sys_ck))

		return -EINVAL;



	return 0;

}

core_initcall(omap2xxx_common_look_up_clks_for_reset);

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

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

 * omap3-restart.c - Code common to all OMAP3xxx machines.

 *

 * Copyright (C) 2009, 2012 Texas Instruments

 * Copyright (C) 2010 Nokia Corporation

 * Tony Lindgren <tony@atomide.com>

 * Santosh Shilimkar <santosh.shilimkar@ti.com>

 *

 * 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 "iomap.h"

#include "common.h"

#include "control.h"

#include "prm3xxx.h"



/* Global address base setup code */



/**

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

{

	omap3_ctrl_write_boot_mode((cmd ? (u8)*cmd : 0));

	omap3xxx_prm_dpll3_reset(); /* never returns */

	while (1);

}

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

+17 −0
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ 
#include "common.h"

#include "mmc.h"

#include "hsmmc.h"

#include "prminst44xx.h"

#include "omap4-sar-layout.h"

#include "omap-secure.h"
@@ -281,3 +282,19 @@ int __init omap4_twl6030_hsmmc_init(struct omap2_hsmmc_info *controllers) 
	return 0;

}

#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);

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE