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

Commit 699fe145 authored by Colin Cross's avatar Colin Cross
Browse files

ARM: tegra: Allow overriding arch_reset 



Signed-off-by: default avatarColin Cross <ccross@android.com>
parent 1eb2ecf1

arch/arm/mach-tegra/board.h

+2 −0
Original line number Diff line number Diff line
@@ -23,6 +23,8 @@ 


#include <linux/types.h>



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



void __init tegra_common_init(void);

void __init tegra_map_common_io(void);

void __init tegra_init_irq(void);

arch/arm/mach-tegra/common.c

+13 −0
Original line number Diff line number Diff line
@@ -26,11 +26,24 @@ 


#include <mach/iomap.h>

#include <mach/dma.h>

#include <mach/system.h>



#include "board.h"

#include "clock.h"

#include "fuse.h"



void (*arch_reset)(char mode, const char *cmd) = tegra_assert_system_reset;



void tegra_assert_system_reset(char mode, const char *cmd)

{

	void __iomem *reset = IO_ADDRESS(TEGRA_CLK_RESET_BASE + 0x04);

	u32 reg;



	reg = readl(reset);

	reg |= 0x04;

	writel(reg, reset);

}



static __initdata struct tegra_clk_init_table common_clk_init_table[] = {

	/* name		parent		rate		enabled */

	{ "clk_m",	NULL,		0,		true },

arch/arm/mach-tegra/include/mach/system.h

+2 −8
Original line number Diff line number Diff line
@@ -24,16 +24,10 @@ 
#include <mach/hardware.h>

#include <mach/iomap.h>



static inline void arch_idle(void)

{

}

extern void (*arch_reset)(char mode, const char *cmd);



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

static inline void arch_idle(void)

{

	void __iomem *reset = IO_ADDRESS(TEGRA_CLK_RESET_BASE + 0x04);

	u32 reg = readl(reset);

	reg |= 0x04;

	writel(reg, reset);

}



#endif