From 50d4d812910309af01845d2592b4d14e86e71155 Mon Sep 17 00:00:00 2001
From: Johannes Weiner <jw@emlix.com>
Date: Mon, 11 May 2009 15:43:34 +0200
Subject: [PATCH] --- yaml --- r: 144920 b: refs/heads/master c:
 1fb137c1e33cd188b40b3c0d7283412efeeb783f h: refs/heads/master v: v3

---
 [refs]                                                  | 2 +-
 trunk/arch/xtensa/platforms/s6105/setup.c               | 3 +++
 trunk/arch/xtensa/variants/s6000/gpio.c                 | 3 +--
 trunk/arch/xtensa/variants/s6000/include/variant/gpio.h | 6 ++++++
 4 files changed, 11 insertions(+), 3 deletions(-)
 create mode 100644 trunk/arch/xtensa/variants/s6000/include/variant/gpio.h

diff --git a/[refs] b/[refs]
index 260661dc9da4..4107493e1eb8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 586411dcd1935f91796d5e8a29aa3cfdf01a01f4
+refs/heads/master: 1fb137c1e33cd188b40b3c0d7283412efeeb783f
diff --git a/trunk/arch/xtensa/platforms/s6105/setup.c b/trunk/arch/xtensa/platforms/s6105/setup.c
index ae041d5027a2..855ddeadc43d 100644
--- a/trunk/arch/xtensa/platforms/s6105/setup.c
+++ b/trunk/arch/xtensa/platforms/s6105/setup.c
@@ -10,6 +10,8 @@
 #include <asm/bootparam.h>
 
 #include <variant/hardware.h>
+#include <variant/gpio.h>
+
 #include <platform/gpio.h>
 
 void platform_halt(void)
@@ -47,6 +49,7 @@ void __init platform_setup(char **cmdline)
 
 void __init platform_init(bp_tag_t *first)
 {
+	s6_gpio_init();
 	gpio_request(GPIO_LED1_NGREEN, "led1_green");
 	gpio_request(GPIO_LED1_RED, "led1_red");
 	gpio_direction_output(GPIO_LED1_NGREEN, 1);
diff --git a/trunk/arch/xtensa/variants/s6000/gpio.c b/trunk/arch/xtensa/variants/s6000/gpio.c
index 33a8d952934c..79317fdcf14c 100644
--- a/trunk/arch/xtensa/variants/s6000/gpio.c
+++ b/trunk/arch/xtensa/variants/s6000/gpio.c
@@ -64,8 +64,7 @@ static struct gpio_chip gpiochip = {
 	.exported = 0, /* no exporting to userspace */
 };
 
-static int gpio_init(void)
+int s6_gpio_init(void)
 {
 	return gpiochip_add(&gpiochip);
 }
-device_initcall(gpio_init);
diff --git a/trunk/arch/xtensa/variants/s6000/include/variant/gpio.h b/trunk/arch/xtensa/variants/s6000/include/variant/gpio.h
new file mode 100644
index 000000000000..8327f62167eb
--- /dev/null
+++ b/trunk/arch/xtensa/variants/s6000/include/variant/gpio.h
@@ -0,0 +1,6 @@
+#ifndef _XTENSA_VARIANT_S6000_GPIO_H
+#define _XTENSA_VARIANT_S6000_GPIO_H
+
+extern int s6_gpio_init(void);
+
+#endif /* _XTENSA_VARIANT_S6000_GPIO_H */