kpriv/linux-hardened
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

ARM: iop32x: request and issue reset using gpio

Browse source 
As the IOP GPIO driver supports gpiolib we can use the standard
GPIO calls to issue a reset of the machine instead of using the
custom gpio_line_set/config calls. Also request the GPIO when
initializing the machine.

Cc: Lennert Buytenhek <kernel@wantstofly.org>
Cc: Dan Williams <dan.j.williams@intel.com>
Cc: Mikael Pettersson <mikpe@it.uu.se>
Tested-by: Aaro Koskinen <aaro.koskinen@iki.fi>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
This commit is contained in:
Linus Walleij 2013-09-09 14:45:47 +02:00
parent e9004f5039
commit 7111f8780f
1 changed files with 22 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
arch/arm/mach-iop32x/n2100.c
View file

@ -30,6 +30,7 @@
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <linux/reboot.h> #include <linux/reboot.h>
#include <linux/io.h> #include <linux/io.h>
#include <linux/gpio.h>
#include <mach/hardware.h> #include <mach/hardware.h>
#include <asm/irq.h> #include <asm/irq.h>
#include <asm/mach/arch.h> #include <asm/mach/arch.h>
@ -288,8 +289,14 @@ static void n2100_power_off(void)
static void n2100_restart(enum reboot_mode mode, const char *cmd) static void n2100_restart(enum reboot_mode mode, const char *cmd)
{ {
gpio_line_set(N2100_HARDWARE_RESET, GPIO_LOW); int ret;
gpio_line_config(N2100_HARDWARE_RESET, GPIO_OUT);
ret = gpio_direction_output(N2100_HARDWARE_RESET, 0);
if (ret) {
pr_crit("could not drive reset GPIO low\n");
return;
}
/* Wait for reset to happen */
while (1) while (1)
; ;
} }
@ -308,6 +315,19 @@ static void power_button_poll(unsigned long dummy)
add_timer(&power_button_poll_timer); add_timer(&power_button_poll_timer);
} }
static int __init n2100_request_gpios(void)
{
int ret;
if (!machine_is_n2100())
return 0;
ret = gpio_request(N2100_HARDWARE_RESET, "reset");
if (ret)
pr_err("could not request reset GPIO\n");
return 0;
}
device_initcall(n2100_request_gpios);
static void __init n2100_init_machine(void) static void __init n2100_init_machine(void)
{ {