Upgrade au1000 to 2.6.23

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@9243 3c298f89-4303-0410-b956-a3cf2f4a3e73

7 files changed, 35 insertions, 344 deletions

diff --git a/target/linux/au1000/patches/001-au1000_gpio_kconfig.patch b/target/linux/au1000/patches/001-au1000_gpio_kconfig.patch
new file mode 100644
index 0000000000..1e0ddef069
--- /dev/null
+++ b/target/linux/au1000/patches/001-au1000_gpio_kconfig.patch
@@ -0,0 +1,24 @@
+From 8dea23a2b6dae52267b3a969e715d3f0753acf47 Mon Sep 17 00:00:00 2001
+From: Florian Fainelli <florian.fainelli@telecomint.eu>
+Date: Wed, 10 Oct 2007 14:54:11 +0200
+Subject: [PATCH] [PATCH] Add missing generic GPIO support for au1000
+With the generic GPIO support for au1000, we do not
+select it in the kernel configuration.
+
+Signed-off-by: Florian Fainelli <florian.fainelli@telecomint.eu>
+---
+ arch/mips/au1000/Kconfig |    1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+diff --git a/arch/mips/au1000/Kconfig b/arch/mips/au1000/Kconfig
+index 29c95d9..f03b2eb 100644
+--- a/arch/mips/au1000/Kconfig
++++ b/arch/mips/au1000/Kconfig
+@@ -141,3 +141,4 @@ config SOC_AU1X00
+ 	select SYS_SUPPORTS_32BIT_KERNEL
+ 	select SYS_SUPPORTS_APM_EMULATION
+ 	select SYS_SUPPORTS_KGDB
++	select GENERIC_GPIO
+-- 
+1.5.2.4
+
diff --git a/target/linux/au1000/patches/001-au1x00_gpio.patch b/target/linux/au1000/patches/001-au1x00_gpio.patch
deleted file mode 100644
index d4339aec46..0000000000
--- a/target/linux/au1000/patches/001-au1x00_gpio.patch
+++ /dev/null
@@ -1,294 +0,0 @@
-diff -urN linux-2.6.21.1/arch/mips/au1000/common/gpio.c linux-2.6.21.1.new/arch/mips/au1000/common/gpio.c
---- linux-2.6.21.1/arch/mips/au1000/common/gpio.c	2007-04-27 23:49:26.000000000 +0200
-+++ linux-2.6.21.1.new/arch/mips/au1000/common/gpio.c	2007-05-22 21:41:55.000000000 +0200
-@@ -1,4 +1,7 @@
- /*
-+ *  Copyright (C) 2007, OpenWrt.org, Florian Fainelli <florian@openwrt.org>
-+ *  	Architecture specific GPIO support
-+ *
-  *  This program is free software; you can redistribute	 it and/or modify it
-  *  under  the terms of	 the GNU General  Public License as published by the
-  *  Free Software Foundation;  either version 2 of the	License, or (at your
-@@ -18,101 +21,133 @@
-  *  You should have received a copy of the  GNU General Public License along
-  *  with this program; if not, write  to the Free Software Foundation, Inc.,
-  *  675 Mass Ave, Cambridge, MA 02139, USA.
-+ *
-+ *  Notes :
-+ * 	au1000 SoC have only one GPIO line : GPIO1
-+ * 	others have a second one : GPIO2
-  */
-+
-+#include <linux/autoconf.h>
-+#include <linux/init.h>
-+#include <linux/types.h>
- #include <linux/module.h>
--#include <au1000.h>
--#include <au1xxx_gpio.h>
-+
-+#include <asm/addrspace.h>
-+#include <asm/io.h>
-+
-+#include <asm/mach-au1x00/au1000.h>
-+#include <asm/gpio.h>
- 
- #define gpio1 sys
- #if !defined(CONFIG_SOC_AU1000)
- static AU1X00_GPIO2 * const gpio2 = (AU1X00_GPIO2 *)GPIO2_BASE;
-+#define GPIO2_OUTPUT_ENABLE_MASK 	0x00010000
- 
--#define GPIO2_OUTPUT_ENABLE_MASK 0x00010000
--
--int au1xxx_gpio2_read(int signal)
-+static int au1xxx_gpio2_read(unsigned gpio)
- {
--	signal -= 200;
--/*	gpio2->dir &= ~(0x01 << signal);						//Set GPIO to input */
--	return ((gpio2->pinstate >> signal) & 0x01);
-+	gpio -= AU1XXX_GPIO_BASE;
-+	return ((gpio2->pinstate >> gpio) & 0x01);
- }
- 
--void au1xxx_gpio2_write(int signal, int value)
-+static void au1xxx_gpio2_write(unsigned gpio, int value)
- {
--	signal -= 200;
-+	gpio -= AU1XXX_GPIO_BASE;
- 
--	gpio2->output = (GPIO2_OUTPUT_ENABLE_MASK << signal) |
--		(value << signal);
-+	gpio2->output = (GPIO2_OUTPUT_ENABLE_MASK << gpio) |
-+	                (value << gpio);
- }
- 
--void au1xxx_gpio2_tristate(int signal)
-+static int au1xxx_gpio2_direction_input(unsigned gpio)
- {
--	signal -= 200;
--	gpio2->dir &= ~(0x01 << signal); 	/* Set GPIO to input */
-+	gpio -= AU1XXX_GPIO_BASE;
-+	gpio2->dir &= ~(0x01 << gpio);
-+	return 0;
- }
--#endif
- 
--int au1xxx_gpio1_read(int signal)
-+static int au1xxx_gpio2_direction_output(unsigned gpio, int value)
-+{
-+	gpio -= AU1XXX_GPIO_BASE;
-+	gpio2->dir = (0x01 << gpio) | (value << gpio);
-+	return 0;
-+}
-+
-+#endif /* !defined(CONFIG_SOC_AU1000) */
-+
-+static int au1xxx_gpio1_read(unsigned gpio)
- {
--/*	gpio1->trioutclr |= (0x01 << signal); */
--	return ((gpio1->pinstaterd >> signal) & 0x01);
-+	return ((gpio1->pinstaterd >> gpio) & 0x01);
- }
- 
--void au1xxx_gpio1_write(int signal, int value)
-+static void au1xxx_gpio1_write(unsigned gpio, int value)
- {
- 	if(value)
--		gpio1->outputset = (0x01 << signal);
-+		gpio1->outputset = (0x01 << gpio);
- 	else
--		gpio1->outputclr = (0x01 << signal);	/* Output a Zero */
-+		/* Output a zero */
-+		gpio1->outputclr = (0x01 << gpio);
- }
- 
--void au1xxx_gpio1_tristate(int signal)
-+static int au1xxx_gpio1_direction_input(unsigned gpio)
- {
--	gpio1->trioutclr = (0x01 << signal);		/* Tristate signal */
-+	gpio1->pininputen = (0x01 << gpio);
-+	return 0;
- }
- 
-+static int au1xxx_gpio1_direction_output(unsigned gpio, int value)
-+{
-+	gpio1->trioutclr = (0x01 & gpio);
-+	return 0;
-+}
- 
--int au1xxx_gpio_read(int signal)
-+int au1xxx_gpio_get_value(unsigned gpio)
- {
--	if(signal >= 200)
-+	if(gpio >= AU1XXX_GPIO_BASE)
- #if defined(CONFIG_SOC_AU1000)
- 		return 0;
- #else
--		return au1xxx_gpio2_read(signal);
-+		return au1xxx_gpio2_read(gpio);
- #endif
- 	else
--		return au1xxx_gpio1_read(signal);
-+		return au1xxx_gpio1_read(gpio);
- }
- 
--void au1xxx_gpio_write(int signal, int value)
-+void au1xxx_gpio_set_value(unsigned gpio, int value)
- {
--	if(signal >= 200)
-+	if(gpio >= AU1XXX_GPIO_BASE)
- #if defined(CONFIG_SOC_AU1000)
- 		;
- #else
--		au1xxx_gpio2_write(signal, value);
-+		au1xxx_gpio2_write(gpio, value);
- #endif
- 	else
--		au1xxx_gpio1_write(signal, value);
-+		au1xxx_gpio1_write(gpio, value);
- }
- 
--void au1xxx_gpio_tristate(int signal)
-+int au1xxx_gpio_direction_input(unsigned gpio)
- {
--	if(signal >= 200)
-+	if (gpio >= AU1XXX_GPIO_BASE)
- #if defined(CONFIG_SOC_AU1000)
- 		;
- #else
--		au1xxx_gpio2_tristate(signal);
-+		return au1xxx_gpio2_direction_input(gpio);
- #endif
- 	else
--		au1xxx_gpio1_tristate(signal);
-+		return au1xxx_gpio1_direction_input(gpio);
- }
- 
--void au1xxx_gpio1_set_inputs(void)
-+int au1xxx_gpio_direction_output(unsigned gpio, int value)
- {
--	gpio1->pininputen = 0;
-+	if (gpio >= AU1XXX_GPIO_BASE)
-+#if defined(CONFIG_SOC_AU1000)
-+		;
-+#else
-+		return au1xxx_gpio2_direction_output(gpio, value);
-+#endif
-+	else
-+		return au1xxx_gpio1_direction_output(gpio, value);
- }
- 
--EXPORT_SYMBOL(au1xxx_gpio1_set_inputs);
--EXPORT_SYMBOL(au1xxx_gpio_tristate);
--EXPORT_SYMBOL(au1xxx_gpio_write);
--EXPORT_SYMBOL(au1xxx_gpio_read);
-+EXPORT_SYMBOL(au1xxx_gpio_direction_output);
-+EXPORT_SYMBOL(au1xxx_gpio_direction_input);
-+EXPORT_SYMBOL(au1xxx_gpio_get_value);
-+EXPORT_SYMBOL(au1xxx_gpio_set_value);
---- linux-2.6.21.1/arch/mips/Kconfig	2007-04-27 23:49:26.000000000 +0200
-+++ linux-2.6.21.1.new/arch/mips/Kconfig	2007-05-21 08:04:42.000000000 +0200
-@@ -1044,6 +1044,7 @@
- 	select SYS_SUPPORTS_32BIT_KERNEL
- 	select SYS_SUPPORTS_APM_EMULATION
- 	select SYS_SUPPORTS_KGDB
-+	select GENERIC_GPIO
- 
- config PNX8550
- 	bool
-diff -urN linux-2.6.21.1/include/asm-mips/mach-au1x00/au1xxx_gpio.h linux-2.6.21.1.new/include/asm-mips/mach-au1x00/au1xxx_gpio.h
---- linux-2.6.21.1/include/asm-mips/mach-au1x00/au1xxx_gpio.h	2007-04-27 23:49:26.000000000 +0200
-+++ linux-2.6.21.1.new/include/asm-mips/mach-au1x00/au1xxx_gpio.h	1970-01-01 01:00:00.000000000 +0100
-@@ -1,20 +0,0 @@
--#ifndef __AU1XXX_GPIO_H
--#define __AU1XXX_GPIO_H
--
--void au1xxx_gpio1_set_inputs(void);
--void au1xxx_gpio_tristate(int signal);
--void au1xxx_gpio_write(int signal, int value);
--int  au1xxx_gpio_read(int signal);
--
--typedef volatile struct
--{
--	u32 dir;
--	u32 reserved;
--	u32 output;
--	u32 pinstate;
--	u32 inten;
--	u32 enable;
--
--} AU1X00_GPIO2;
--
--#endif //__AU1XXX_GPIO_H
-diff -urN linux-2.6.21.1/include/asm-mips/mach-au1x00/gpio.h linux-2.6.21.1.new/include/asm-mips/mach-au1x00/gpio.h
---- linux-2.6.21.1/include/asm-mips/mach-au1x00/gpio.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.21.1.new/include/asm-mips/mach-au1x00/gpio.h	2007-05-21 01:10:22.000000000 +0200
-@@ -0,0 +1,69 @@
-+#ifndef _AU1XXX_GPIO_H_
-+#define _AU1XXX_GPIO_H_
-+
-+#define AU1XXX_GPIO_BASE	200
-+
-+typedef volatile struct
-+{
-+	u32 dir;
-+	u32 reserved;
-+	u32 output;
-+	u32 pinstate;
-+	u32 inten;
-+	u32 enable;
-+
-+} AU1X00_GPIO2;
-+
-+extern int au1xxx_gpio_get_value(unsigned gpio);
-+extern void au1xxx_gpio_set_value(unsigned gpio, int value);
-+extern int au1xxx_gpio_direction_input(unsigned gpio);
-+extern int au1xxx_gpio_direction_output(unsigned gpio, int value);
-+
-+
-+/* Wrappers for the arch-neutral GPIO API */
-+
-+static inline int gpio_request(unsigned gpio, const char *label)
-+{
-+	/* Not yet implemented */
-+	return 0;
-+}
-+
-+static inline void gpio_free(unsigned gpio)
-+{
-+	/* Not yet implemented */
-+}
-+
-+static inline int gpio_direction_input(unsigned gpio)
-+{
-+	return au1xxx_gpio_direction_input(gpio);
-+}
-+
-+static inline int gpio_direction_output(unsigned gpio, int value)
-+{
-+	return au1xxx_gpio_direction_output(gpio, value);
-+}
-+
-+static inline int gpio_get_value(unsigned gpio)
-+{
-+	return au1xxx_gpio_get_value(gpio);
-+}
-+
-+static inline void gpio_set_value(unsigned gpio, int value)
-+{
-+	au1xxx_gpio_set_value(gpio, value);
-+}
-+
-+static inline int gpio_to_irq(unsigned gpio)
-+{
-+	return gpio;
-+}
-+
-+static inline int irq_to_gpio(unsigned irq)
-+{
-+	return irq;
-+}
-+
-+/* For cansleep */
-+#include <asm-generic/gpio.h>
-+
-+#endif /* _AU1XXX_GPIO_H_ */
diff --git a/target/linux/au1000/patches/002-platform_devices.patch b/target/linux/au1000/patches/002-platform_devices.patch
new file mode 100644
index 0000000000..193b5001dc
--- /dev/null
+++ b/target/linux/au1000/patches/002-platform_devices.patch
@@ -0,0 +1,10 @@
+diff --git a/arch/mips/au1000/mtx-1/Makefile b/arch/mips/au1000/mtx-1/Makefile
+index 764bf9f..4d1b8d2 100644
+--- a/arch/mips/au1000/mtx-1/Makefile
++++ b/arch/mips/au1000/mtx-1/Makefile
+@@ -7,4 +7,4 @@
+ # Makefile for 4G Systems MTX-1 board.
+ #
+
+-lib-y := init.o board_setup.o irqmap.o
++lib-y := init.o board_setup.o irqmap.o platform.o
diff --git a/target/linux/au1000/patches/006-mtx1_system_button.patch b/target/linux/au1000/patches/006-mtx1_system_button.patch
index f4d380c729..4364a54329 100644
--- a/target/linux/au1000/patches/006-mtx1_system_button.patch
+++ b/target/linux/au1000/patches/006-mtx1_system_button.patch
@@ -15,7 +15,7 @@ diff -urN linux-2.6.16.7/arch/mips/au1000/mtx-1/Makefile linux-2.6.16.7.new/arch
 @@ -8,3 +8,4 @@
  #
  
- lib-y := init.o board_setup.o irqmap.o
+ lib-y := init.o board_setup.o irqmap.o platform.o
 +obj-y := mtx-1_sysbtn.o
 diff -urN linux-2.6.16.7/arch/mips/au1000/mtx-1/mtx-1_sysbtn.c linux-2.6.16.7.new/arch/mips/au1000/mtx-1/mtx-1_sysbtn.c
 --- linux-2.6.16.7/arch/mips/au1000/mtx-1/mtx-1_sysbtn.c	1970-01-01 01:00:00.000000000 +0100
diff --git a/target/linux/au1000/patches/011-mtx1_leds.patch b/target/linux/au1000/patches/011-mtx1_leds.patch
deleted file mode 100644
index 93c681e964..0000000000
--- a/target/linux/au1000/patches/011-mtx1_leds.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff -urN linux-2.6.19.2/drivers/leds/Kconfig linux-2.6.19.2.new/drivers/leds/Kconfig
---- linux-2.6.19.2/drivers/leds/Kconfig	2007-01-10 20:10:37.000000000 +0100
-+++ linux-2.6.19.2.new/drivers/leds/Kconfig	2007-03-02 13:50:28.000000000 +0100
-@@ -76,6 +76,13 @@
- 	  This option enables support for the Soekris net4801 and net4826 error
- 	  LED.
- 
-+config LEDS_MTX1
-+	tristate "LED Support for MTX-1 boards"
-+	depends on LEDS_CLASS && MIPS_MTX1
-+	help
-+	  This option enables support for the MTX-1 power and status LED.
-+
-+
- comment "LED Triggers"
- 
- config LEDS_TRIGGERS
-diff -urN linux-2.6.21.1/drivers/leds/Makefile linux-2.6.21.1.new/drivers/leds/Makefile
---- linux-2.6.21.1/drivers/leds/Makefile	2007-04-27 23:49:26.000000000 +0200
-+++ linux-2.6.21.1.new/drivers/leds/Makefile	2007-05-24 23:39:18.000000000 +0200
-@@ -16,6 +16,7 @@
- obj-$(CONFIG_LEDS_WRAP)			+= leds-wrap.o
- obj-$(CONFIG_LEDS_H1940)		+= leds-h1940.o
- obj-$(CONFIG_LEDS_COBALT)		+= leds-cobalt.o
-+obj-$(CONFIG_LEDS_MTX1)			+= leds-mtx1.o
- 
- # LED Triggers
- obj-$(CONFIG_LEDS_TRIGGER_TIMER)	+= ledtrig-timer.o
diff --git a/target/linux/au1000/patches/016-pci-io_map.patch b/target/linux/au1000/patches/016-pci-io_map.patch
deleted file mode 100644
index 6a80f7cb44..0000000000
--- a/target/linux/au1000/patches/016-pci-io_map.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- linux-2.6.22.1.orig/arch/mips/au1000/common/pci.c	2007-07-24 18:42:21.031908123 +0200
-+++ linux-2.6.22.1/arch/mips/au1000/common/pci.c	2007-07-24 22:12:07.373162835 +0200
-@@ -74,6 +74,7 @@
- 		printk(KERN_ERR "Unable to ioremap pci space\n");
- 		return 1;
- 	}
-+	au1x_controller.io_map_base = virt_io_addr;
- 
- #ifdef CONFIG_DMA_NONCOHERENT
- 	{
diff --git a/target/linux/au1000/patches/017-usb-power.patch b/target/linux/au1000/patches/017-usb-power.patch
deleted file mode 100644
index 7f7fac85bf..0000000000
--- a/target/linux/au1000/patches/017-usb-power.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- linux-2.6.22.1.orig/arch/mips/au1000/mtx-1/board_setup.c	2007-07-29 18:57:35.000000000 +0200
-+++ linux-2.6.22.1/arch/mips/au1000/mtx-1/board_setup.c	2007-07-29 18:59:48.000000000 +0200
-@@ -54,7 +54,7 @@
- 
- void __init board_setup(void)
- {
--#ifdef CONFIG_USB_OHCI
-+#if defined(CONFIG_USB_OHCI_HCD) || defined(CONFIG_USB_OHCI_HCD_MODULE) 
- 	// enable USB power switch
- 	au_writel( au_readl(GPIO2_DIR) | 0x10, GPIO2_DIR );
- 	au_writel( 0x100000, GPIO2_OUTPUT );