mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2025-04-21 12:27:27 +03:00
[kernel] update to 2.6.25.12
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@11933 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
@@ -11,7 +11,7 @@ BOARD:=at91
|
||||
BOARDNAME:=Atmel AT91
|
||||
FEATURES:=squashfs usb
|
||||
|
||||
LINUX_VERSION:=2.6.25.10
|
||||
LINUX_VERSION:=2.6.25.12
|
||||
|
||||
include $(INCLUDE_DIR)/target.mk
|
||||
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -1,5 +1,5 @@
|
||||
--- linux-2.6.25.10.n/arch/arm/mach-at91/Kconfig 2008-07-04 13:07:01.000000000 +0200
|
||||
+++ linux-2.6.25.10/arch/arm/mach-at91/Kconfig 2008-07-03 13:44:35.000000000 +0200
|
||||
--- a/arch/arm/mach-at91/Kconfig
|
||||
+++ b/arch/arm/mach-at91/Kconfig
|
||||
@@ -151,6 +151,12 @@
|
||||
help
|
||||
Select this if you are using Toptech's TT9200 board.
|
||||
@@ -13,8 +13,8 @@
|
||||
endif
|
||||
|
||||
# ----------------------------------------------------------
|
||||
--- linux-2.6.25.10.n/arch/arm/mach-at91/Makefile 2008-07-04 13:05:05.000000000 +0200
|
||||
+++ linux-2.6.25.10/arch/arm/mach-at91/Makefile 2008-07-03 13:44:35.000000000 +0200
|
||||
--- a/arch/arm/mach-at91/Makefile
|
||||
+++ b/arch/arm/mach-at91/Makefile
|
||||
@@ -29,6 +29,7 @@
|
||||
obj-$(CONFIG_MACH_ATEB9200) += board-eb9200.o
|
||||
obj-$(CONFIG_MACH_KAFA) += board-kafa.o
|
||||
@@ -23,8 +23,8 @@
|
||||
obj-$(CONFIG_MACH_PICOTUX2XX) += board-picotux200.o
|
||||
obj-$(CONFIG_MACH_HOMEMATIC) += board-homematic.o
|
||||
obj-$(CONFIG_MACH_ECBAT91) += board-ecbat91.o
|
||||
--- linux-2.6.25.10.n/arch/arm/mach-at91/board-vlink.c 2008-07-04 13:06:19.000000000 +0200
|
||||
+++ linux-2.6.25.10/arch/arm/mach-at91/board-vlink.c 2008-07-04 12:45:48.000000000 +0200
|
||||
--- /dev/null
|
||||
+++ b/arch/arm/mach-at91/board-vlink.c
|
||||
@@ -0,0 +1,201 @@
|
||||
+/*
|
||||
+ * linux/arch/arm/mach-at91/board-vlink.c
|
||||
|
||||
@@ -1,6 +1,5 @@
|
||||
diff -urN linux-2.6.25.10.old/arch/arm/mach-at91/at91rm9200_devices.c linux-2.6.25.10/arch/arm/mach-at91/at91rm9200_devices.c
|
||||
--- linux-2.6.25.10.old/arch/arm/mach-at91/at91rm9200_devices.c 2008-07-06 09:01:53.000000000 +0200
|
||||
+++ linux-2.6.25.10/arch/arm/mach-at91/at91rm9200_devices.c 2008-07-06 09:47:54.000000000 +0200
|
||||
--- a/arch/arm/mach-at91/at91rm9200_devices.c
|
||||
+++ b/arch/arm/mach-at91/at91rm9200_devices.c
|
||||
@@ -717,6 +717,26 @@
|
||||
static void __init at91_add_device_watchdog(void) {}
|
||||
#endif
|
||||
@@ -28,9 +27,8 @@ diff -urN linux-2.6.25.10.old/arch/arm/mach-at91/at91rm9200_devices.c linux-2.6.
|
||||
|
||||
/* --------------------------------------------------------------------
|
||||
* SSC -- Synchronous Serial Controller
|
||||
diff -urN linux-2.6.25.10.old/arch/arm/mach-at91/Makefile linux-2.6.25.10/arch/arm/mach-at91/Makefile
|
||||
--- linux-2.6.25.10.old/arch/arm/mach-at91/Makefile 2008-07-06 09:01:54.000000000 +0200
|
||||
+++ linux-2.6.25.10/arch/arm/mach-at91/Makefile 2008-07-06 09:45:08.000000000 +0200
|
||||
--- a/arch/arm/mach-at91/Makefile
|
||||
+++ b/arch/arm/mach-at91/Makefile
|
||||
@@ -60,7 +60,12 @@
|
||||
obj-$(CONFIG_MACH_AT91EB01) += board-eb01.o
|
||||
|
||||
@@ -45,9 +43,8 @@ diff -urN linux-2.6.25.10.old/arch/arm/mach-at91/Makefile linux-2.6.25.10/arch/a
|
||||
obj-$(CONFIG_FB_S1D13XXX) += ics1523.o
|
||||
|
||||
# Power Management
|
||||
diff -urN linux-2.6.25.10.old/arch/arm/mach-at91/vlink_leds.c linux-2.6.25.10/arch/arm/mach-at91/vlink_leds.c
|
||||
--- linux-2.6.25.10.old/arch/arm/mach-at91/vlink_leds.c 1970-01-01 01:00:00.000000000 +0100
|
||||
+++ linux-2.6.25.10/arch/arm/mach-at91/vlink_leds.c 2008-07-06 09:40:37.000000000 +0200
|
||||
--- /dev/null
|
||||
+++ b/arch/arm/mach-at91/vlink_leds.c
|
||||
@@ -0,0 +1,105 @@
|
||||
+/*
|
||||
+ * LED driver for Atmel AT91-based boards.
|
||||
@@ -154,9 +151,8 @@ diff -urN linux-2.6.25.10.old/arch/arm/mach-at91/vlink_leds.c linux-2.6.25.10/ar
|
||||
+}
|
||||
+
|
||||
+__initcall(leds_init);
|
||||
diff -urN linux-2.6.25.10.old/include/asm-arm/arch-at91/board.h linux-2.6.25.10/include/asm-arm/arch-at91/board.h
|
||||
--- linux-2.6.25.10.old/include/asm-arm/arch-at91/board.h 2008-07-06 09:01:54.000000000 +0200
|
||||
+++ linux-2.6.25.10/include/asm-arm/arch-at91/board.h 2008-07-06 09:56:31.000000000 +0200
|
||||
--- a/include/asm-arm/arch-at91/board.h
|
||||
+++ b/include/asm-arm/arch-at91/board.h
|
||||
@@ -162,6 +162,11 @@
|
||||
/* ISI */
|
||||
extern void __init at91_add_device_isi(void);
|
||||
|
||||
@@ -1,6 +1,5 @@
|
||||
diff -urN linux-2.6.25.10.old/arch/arm/mach-at91/board-vlink.c linux-2.6.25.10/arch/arm/mach-at91/board-vlink.c
|
||||
--- linux-2.6.25.10.old/arch/arm/mach-at91/board-vlink.c 2008-07-07 11:20:21.000000000 +0200
|
||||
+++ linux-2.6.25.10/arch/arm/mach-at91/board-vlink.c 2008-07-07 12:11:40.000000000 +0200
|
||||
--- a/arch/arm/mach-at91/board-vlink.c
|
||||
+++ b/arch/arm/mach-at91/board-vlink.c
|
||||
@@ -99,7 +99,7 @@
|
||||
*/
|
||||
|
||||
@@ -103,9 +102,8 @@ diff -urN linux-2.6.25.10.old/arch/arm/mach-at91/board-vlink.c linux-2.6.25.10/a
|
||||
}
|
||||
|
||||
MACHINE_START(VLINK, "FDL VersaLink")
|
||||
diff -urN linux-2.6.25.10.old/arch/arm/mach-at91/gpio.c linux-2.6.25.10/arch/arm/mach-at91/gpio.c
|
||||
--- linux-2.6.25.10.old/arch/arm/mach-at91/gpio.c 2008-07-07 11:20:21.000000000 +0200
|
||||
+++ linux-2.6.25.10/arch/arm/mach-at91/gpio.c 2008-07-07 11:42:33.000000000 +0200
|
||||
--- a/arch/arm/mach-at91/gpio.c
|
||||
+++ b/arch/arm/mach-at91/gpio.c
|
||||
@@ -29,6 +29,7 @@
|
||||
|
||||
static struct at91_gpio_bank *gpio;
|
||||
@@ -175,9 +173,8 @@ diff -urN linux-2.6.25.10.old/arch/arm/mach-at91/gpio.c linux-2.6.25.10/arch/arm
|
||||
/*--------------------------------------------------------------------------*/
|
||||
|
||||
#ifdef CONFIG_PM
|
||||
diff -urN linux-2.6.25.10.old/drivers/char/Kconfig linux-2.6.25.10/drivers/char/Kconfig
|
||||
--- linux-2.6.25.10.old/drivers/char/Kconfig 2008-07-07 11:20:21.000000000 +0200
|
||||
+++ linux-2.6.25.10/drivers/char/Kconfig 2008-07-07 11:42:33.000000000 +0200
|
||||
--- a/drivers/char/Kconfig
|
||||
+++ b/drivers/char/Kconfig
|
||||
@@ -1072,5 +1072,12 @@
|
||||
The SPI driver gives user mode access to this serial
|
||||
bus on the AT91RM9200 processor.
|
||||
@@ -191,9 +188,8 @@ diff -urN linux-2.6.25.10.old/drivers/char/Kconfig linux-2.6.25.10/drivers/char/
|
||||
+
|
||||
endmenu
|
||||
|
||||
diff -urN linux-2.6.25.10.old/drivers/char/Makefile linux-2.6.25.10/drivers/char/Makefile
|
||||
--- linux-2.6.25.10.old/drivers/char/Makefile 2008-07-07 11:20:21.000000000 +0200
|
||||
+++ linux-2.6.25.10/drivers/char/Makefile 2008-07-07 11:42:33.000000000 +0200
|
||||
--- a/drivers/char/Makefile
|
||||
+++ b/drivers/char/Makefile
|
||||
@@ -100,6 +100,7 @@
|
||||
obj-$(CONFIG_TELCLOCK) += tlclk.o
|
||||
obj-$(CONFIG_AT91_SPI) += at91_spi.o
|
||||
@@ -202,9 +198,8 @@ diff -urN linux-2.6.25.10.old/drivers/char/Makefile linux-2.6.25.10/drivers/char
|
||||
|
||||
obj-$(CONFIG_MWAVE) += mwave/
|
||||
obj-$(CONFIG_AGP) += agp/
|
||||
diff -urN linux-2.6.25.10.old/drivers/char/vlink_giu.c linux-2.6.25.10/drivers/char/vlink_giu.c
|
||||
--- linux-2.6.25.10.old/drivers/char/vlink_giu.c 1970-01-01 01:00:00.000000000 +0100
|
||||
+++ linux-2.6.25.10/drivers/char/vlink_giu.c 2008-07-07 13:41:51.000000000 +0200
|
||||
--- /dev/null
|
||||
+++ b/drivers/char/vlink_giu.c
|
||||
@@ -0,0 +1,333 @@
|
||||
+/*
|
||||
+ * Driver for FDL Versalink GPIO
|
||||
@@ -539,9 +534,8 @@ diff -urN linux-2.6.25.10.old/drivers/char/vlink_giu.c linux-2.6.25.10/drivers/c
|
||||
+
|
||||
+MODULE_AUTHOR("Hamish Guthrie <hamish@prodigi.ch>");
|
||||
+MODULE_DESCRIPTION("FDL Versalink GPIO Driver");
|
||||
+MODULE_LICENSE("GPL");
|
||||
--- linux-2.6.25.10.old/include/asm-arm/arch-at91/gpio.h 2008-07-03 05:46:47.000000000 +0200
|
||||
+++ linux-2.6.25.10/include/asm-arm/arch-at91/gpio.h 2008-07-07 17:03:03.000000000 +0200
|
||||
--- a/include/asm-arm/arch-at91/gpio.h
|
||||
+++ b/include/asm-arm/arch-at91/gpio.h
|
||||
@@ -199,6 +199,7 @@
|
||||
/* callable at any time */
|
||||
extern int at91_set_gpio_value(unsigned pin, int value);
|
||||
|
||||
@@ -1,8 +1,6 @@
|
||||
Index: linux-2.6.22.19/drivers/mtd/devices/at91_dataflash.c
|
||||
===================================================================
|
||||
--- linux-2.6.22.19.orig/drivers/mtd/devices/at91_dataflash.c
|
||||
+++ linux-2.6.22.19/drivers/mtd/devices/at91_dataflash.c
|
||||
@@ -175,7 +175,7 @@ static struct mtd_partition static_parti
|
||||
--- a/drivers/mtd/devices/at91_dataflash.c
|
||||
+++ b/drivers/mtd/devices/at91_dataflash.c
|
||||
@@ -175,7 +175,7 @@
|
||||
};
|
||||
#endif
|
||||
|
||||
@@ -11,13 +9,11 @@ Index: linux-2.6.22.19/drivers/mtd/devices/at91_dataflash.c
|
||||
|
||||
#endif
|
||||
|
||||
Index: linux-2.6.22.19/drivers/mtd/Kconfig
|
||||
===================================================================
|
||||
--- linux-2.6.22.19.orig/drivers/mtd/Kconfig
|
||||
+++ linux-2.6.22.19/drivers/mtd/Kconfig
|
||||
@@ -168,6 +168,12 @@ config MTD_AFS_PARTS
|
||||
the partition map from the children of the flash node,
|
||||
as described in Documentation/powerpc/booting-without-of.txt.
|
||||
--- a/drivers/mtd/Kconfig
|
||||
+++ b/drivers/mtd/Kconfig
|
||||
@@ -168,6 +168,12 @@
|
||||
the partition map from the children of the flash node,
|
||||
as described in Documentation/powerpc/booting-without-of.txt.
|
||||
|
||||
+config MTD_AT91_PARTS
|
||||
+ tristate "Atmel AT91 partitioning support"
|
||||
@@ -28,11 +24,9 @@ Index: linux-2.6.22.19/drivers/mtd/Kconfig
|
||||
comment "User Modules And Translation Layers"
|
||||
|
||||
config MTD_CHAR
|
||||
Index: linux-2.6.22.19/drivers/mtd/Makefile
|
||||
===================================================================
|
||||
--- linux-2.6.22.19.orig/drivers/mtd/Makefile
|
||||
+++ linux-2.6.22.19/drivers/mtd/Makefile
|
||||
@@ -12,6 +12,7 @@ obj-$(CONFIG_MTD_CONCAT) += mtdconcat.o
|
||||
--- a/drivers/mtd/Makefile
|
||||
+++ b/drivers/mtd/Makefile
|
||||
@@ -12,6 +12,7 @@
|
||||
obj-$(CONFIG_MTD_CMDLINE_PARTS) += cmdlinepart.o
|
||||
obj-$(CONFIG_MTD_AFS_PARTS) += afs.o
|
||||
obj-$(CONFIG_MTD_OF_PARTS) += ofpart.o
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
--- linux-2.6.25.10.old/drivers/serial/atmel_serial.c 2008-07-04 14:21:12.000000000 +0200
|
||||
+++ linux-2.6.25.10/drivers/serial/atmel_serial.c 2008-07-04 14:55:37.000000000 +0200
|
||||
--- a/drivers/serial/atmel_serial.c
|
||||
+++ b/drivers/serial/atmel_serial.c
|
||||
@@ -214,6 +214,34 @@
|
||||
at91_set_gpio_value(AT91_PIN_PA21, 0);
|
||||
else
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
--- linux-2.6.25.10.old/arch/arm/mach-at91/at91rm9200_devices.c 2008-07-04 15:04:13.000000000 +0200
|
||||
+++ linux-2.6.25.10/arch/arm/mach-at91/at91rm9200_devices.c 2008-07-04 15:11:44.000000000 +0200
|
||||
@@ -981,7 +981,15 @@
|
||||
--- a/arch/arm/mach-at91/at91rm9200_devices.c
|
||||
+++ b/arch/arm/mach-at91/at91rm9200_devices.c
|
||||
@@ -1001,7 +1001,15 @@
|
||||
* We need to drive the pin manually. Default is off (RTS is active low).
|
||||
*/
|
||||
at91_set_gpio_output(AT91_PIN_PA21, 1);
|
||||
@@ -17,7 +17,7 @@
|
||||
}
|
||||
|
||||
static struct resource uart1_resources[] = {
|
||||
@@ -1119,6 +1127,14 @@
|
||||
@@ -1139,6 +1147,14 @@
|
||||
at91_set_B_periph(AT91_PIN_PB1, 0); /* CTS3 */
|
||||
if (pins & ATMEL_UART_RTS)
|
||||
at91_set_B_periph(AT91_PIN_PB0, 0); /* RTS3 */
|
||||
|
||||
@@ -1,8 +1,6 @@
|
||||
Index: linux-2.6.22.19/drivers/net/arm/at91_ether.c
|
||||
===================================================================
|
||||
--- linux-2.6.22.19.orig/drivers/net/arm/at91_ether.c
|
||||
+++ linux-2.6.22.19/drivers/net/arm/at91_ether.c
|
||||
@@ -146,6 +146,7 @@ static void update_linkspeed(struct net_
|
||||
--- a/drivers/net/arm/at91_ether.c
|
||||
+++ b/drivers/net/arm/at91_ether.c
|
||||
@@ -146,6 +146,7 @@
|
||||
struct at91_private *lp = netdev_priv(dev);
|
||||
unsigned int bmsr, bmcr, lpa, mac_cfg;
|
||||
unsigned int speed, duplex;
|
||||
@@ -10,7 +8,7 @@ Index: linux-2.6.22.19/drivers/net/arm/at91_ether.c
|
||||
|
||||
if (!mii_link_ok(&lp->mii)) { /* no link */
|
||||
netif_carrier_off(dev);
|
||||
@@ -158,8 +159,15 @@ static void update_linkspeed(struct net_
|
||||
@@ -158,8 +159,15 @@
|
||||
read_phy(lp->phy_address, MII_BMSR, &bmsr);
|
||||
read_phy(lp->phy_address, MII_BMCR, &bmcr);
|
||||
if (bmcr & BMCR_ANENABLE) { /* AutoNegotiation is enabled */
|
||||
|
||||
@@ -1,8 +1,6 @@
|
||||
Index: linux-2.6.22.19/drivers/mtd/devices/at91_dataflash.c
|
||||
===================================================================
|
||||
--- linux-2.6.22.19.orig/drivers/mtd/devices/at91_dataflash.c
|
||||
+++ linux-2.6.22.19/drivers/mtd/devices/at91_dataflash.c
|
||||
@@ -163,12 +163,12 @@ static struct mtd_partition static_parti
|
||||
--- a/drivers/mtd/devices/at91_dataflash.c
|
||||
+++ b/drivers/mtd/devices/at91_dataflash.c
|
||||
@@ -163,12 +163,12 @@
|
||||
.mask_flags = MTD_WRITEABLE, /* read-only */
|
||||
},
|
||||
{
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
--- linux-2.6.25.10.old/drivers/usb/serial/usb-serial.c 2008-07-08 07:42:24.000000000 +0200
|
||||
+++ linux-2.6.25.10/drivers/usb/serial/usb-serial.c 2008-07-08 14:07:39.000000000 +0200
|
||||
--- a/drivers/usb/serial/usb-serial.c
|
||||
+++ b/drivers/usb/serial/usb-serial.c
|
||||
@@ -905,7 +905,7 @@
|
||||
dev_err(&interface->dev, "No free urbs available\n");
|
||||
goto probe_error;
|
||||
|
||||
Reference in New Issue
Block a user