Commit 86159a98 authored by Dmitry Baryshkov's avatar Dmitry Baryshkov Committed by Russell King
Browse files

[ARM] 5048/2: Clean up tosa and spitz resetting 



Use new reset_gpio to reset tosa and spitz PDAs.

Signed-off-by: default avatarDmitry Baryshkov <dbaryshkov@gmail.com>
Acked-by: default avatarEric Miao <eric.miao@marvell.com>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 4d1fe075

arch/arm/mach-pxa/spitz.c

+2 −5
Original line number Diff line number Diff line
@@ -530,11 +530,7 @@ static struct platform_device *devices[] __initdata = { 


static void spitz_poweroff(void)

{

	pxa_gpio_mode(SPITZ_GPIO_ON_RESET | GPIO_OUT);

	GPSR(SPITZ_GPIO_ON_RESET) = GPIO_bit(SPITZ_GPIO_ON_RESET);



	mdelay(1000);

	arm_machine_restart('h');

	arm_machine_restart('g');

}



static void spitz_restart(char mode)
@@ -548,6 +544,7 @@ static void spitz_restart(char mode) 


static void __init common_init(void)

{

	init_gpio_reset(SPITZ_GPIO_ON_RESET);

	pm_power_off = spitz_poweroff;

	arm_pm_restart = spitz_restart;

arch/arm/mach-pxa/tosa.c

+4 −5
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ 
#include <linux/gpio_keys.h>

#include <linux/input.h>

#include <linux/gpio.h>

#include <linux/reboot.h>



#include <asm/setup.h>

#include <asm/memory.h>
@@ -467,11 +468,7 @@ static struct platform_device *devices[] __initdata = { 


static void tosa_poweroff(void)

{

	pxa_gpio_mode(TOSA_GPIO_ON_RESET | GPIO_OUT);

	GPSR(TOSA_GPIO_ON_RESET) = GPIO_bit(TOSA_GPIO_ON_RESET);



	mdelay(1000);

	arm_machine_restart('h');

	arm_machine_restart('g');

}



static void tosa_restart(char mode)
@@ -489,6 +486,8 @@ static void __init tosa_init(void) 
	gpio_set_wake(MFP_PIN_GPIO1, 1);

	/* We can't pass to gpio-keys since it will drop the Reset altfunc */



	init_gpio_reset(TOSA_GPIO_ON_RESET);



	pm_power_off = tosa_poweroff;

	arm_pm_restart = tosa_restart;