[at91] refresh kernel patches

author juhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73>

Mon, 19 May 2008 06:35:41 +0000 (06:35 +0000)

committer juhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73>

Mon, 19 May 2008 06:35:41 +0000 (06:35 +0000)
author juhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Mon, 19 May 2008 06:35:41 +0000 (06:35 +0000)
committer juhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Mon, 19 May 2008 06:35:41 +0000 (06:35 +0000)
diff --git a/target/linux/at91/patches-2.6.21/000-at91patches.patch b/target/linux/at91/patches-2.6.21/000-at91patches.patch

index 93fa2cf..09cdcf7 100644 (file)
--- a/target/linux/at91/patches-2.6.21/000-at91patches.patch
+++ b/target/linux/at91/patches-2.6.21/000-at91patches.patch
@@ -1,6 +1,7 @@
-diff -urN -x CVS linux-2.6.21/arch/arm/boot/compressed/head-at91rm9200.S linux-2.6-stable/arch/arm/boot/compressed/head-at91rm9200.S
---- linux-2.6.21/arch/arm/boot/compressed/head-at91rm9200.S    Thu Apr 26 05:08:32 2007
-+++ linux-2.6-stable/arch/arm/boot/compressed/head-at91rm9200.S        Tue May  8 12:13:30 2007
+Index: linux-2.6.21.7/arch/arm/boot/compressed/head-at91rm9200.S
+===================================================================
+--- linux-2.6.21.7.orig/arch/arm/boot/compressed/head-at91rm9200.S
++++ linux-2.6.21.7/arch/arm/boot/compressed/head-at91rm9200.S
  @@ -67,6 +67,12 @@
                 cmp     r7, r3
                 beq     99f
  @@ -67,6 +67,12 @@
                 cmp     r7, r3
                 beq     99f
@@ -14,10 +15,11 @@ diff -urN -x CVS linux-2.6.21/arch/arm/boot/compressed/head-at91rm9200.S linux-2
                 @ Unknown board, use the AT91RM9200DK board
                 @ mov   r7, #MACH_TYPE_AT91RM9200
                 mov     r7,     #(MACH_TYPE_AT91RM9200DK & 0xff)
                 @ Unknown board, use the AT91RM9200DK board
                 @ mov   r7, #MACH_TYPE_AT91RM9200
                 mov     r7,     #(MACH_TYPE_AT91RM9200DK & 0xff)
-diff -urN -x CVS linux-2.6.21/arch/arm/mach-at91/Kconfig linux-2.6-stable/arch/arm/mach-at91/Kconfig
---- linux-2.6.21/arch/arm/mach-at91/Kconfig    Thu Apr 26 05:08:32 2007
-+++ linux-2.6-stable/arch/arm/mach-at91/Kconfig        Wed May  9 10:20:54 2007
-@@ -17,6 +17,9 @@
+Index: linux-2.6.21.7/arch/arm/mach-at91/Kconfig
+===================================================================
+--- linux-2.6.21.7.orig/arch/arm/mach-at91/Kconfig
++++ linux-2.6.21.7/arch/arm/mach-at91/Kconfig
+@@ -17,6 +17,9 @@ config ARCH_AT91SAM9261
   config ARCH_AT91SAM9263
         bool "AT91SAM9263"
   
   config ARCH_AT91SAM9263
         bool "AT91SAM9263"
   
@@ -27,7 +29,7 @@ diff -urN -x CVS linux-2.6.21/arch/arm/mach-at91/Kconfig linux-2.6-stable/arch/a
   endchoice
   
   # ----------------------------------------------------------
   endchoice
   
   # ----------------------------------------------------------
-@@ -87,6 +90,12 @@
+@@ -87,6 +90,12 @@ config MACH_KAFA
         help
           Select this if you are using Sperry-Sun's KAFA board.
   
         help
           Select this if you are using Sperry-Sun's KAFA board.
   
@@ -40,7 +42,7 @@ diff -urN -x CVS linux-2.6.21/arch/arm/mach-at91/Kconfig linux-2.6-stable/arch/a
   endif
   
   # ----------------------------------------------------------
   endif
   
   # ----------------------------------------------------------
-@@ -111,6 +120,13 @@
+@@ -111,6 +120,13 @@ config MACH_AT91SAM9260EK
           Select this if you are using Atmel's AT91SAM9260-EK or AT91SAM9XE Evaluation Kit
           <http://www.atmel.com/dyn/products/tools_card.asp?tool_id=3933>
   
           Select this if you are using Atmel's AT91SAM9260-EK or AT91SAM9XE Evaluation Kit
           <http://www.atmel.com/dyn/products/tools_card.asp?tool_id=3933>
   
@@ -54,7 +56,7 @@ diff -urN -x CVS linux-2.6.21/arch/arm/mach-at91/Kconfig linux-2.6-stable/arch/a
   endif
   
   # ----------------------------------------------------------
   endif
   
   # ----------------------------------------------------------
-@@ -145,6 +161,20 @@
+@@ -145,6 +161,20 @@ endif
   
   # ----------------------------------------------------------
   
   
   # ----------------------------------------------------------
   
@@ -75,7 +77,7 @@ diff -urN -x CVS linux-2.6.21/arch/arm/mach-at91/Kconfig linux-2.6-stable/arch/a
   comment "AT91 Board Options"
   
   config MTD_AT91_DATAFLASH_CARD
   comment "AT91 Board Options"
   
   config MTD_AT91_DATAFLASH_CARD
-@@ -160,6 +190,20 @@
+@@ -160,6 +190,20 @@ config MTD_NAND_AT91_BUSWIDTH_16
           On AT91SAM926x boards both types of NAND flash can be present
           (8 and 16 bit data bus width).
   
           On AT91SAM926x boards both types of NAND flash can be present
           (8 and 16 bit data bus width).
   
@@ -96,7 +98,7 @@ diff -urN -x CVS linux-2.6.21/arch/arm/mach-at91/Kconfig linux-2.6-stable/arch/a
   # ----------------------------------------------------------
   
   comment "AT91 Feature Selections"
   # ----------------------------------------------------------
   
   comment "AT91 Feature Selections"
-@@ -170,6 +214,20 @@
+@@ -170,6 +214,20 @@ config AT91_PROGRAMMABLE_CLOCKS
           Select this if you need to program one or more of the PCK0..PCK3
           programmable clock outputs.
   
           Select this if you need to program one or more of the PCK0..PCK3
           programmable clock outputs.
   
@@ -117,10 +119,11 @@ diff -urN -x CVS linux-2.6.21/arch/arm/mach-at91/Kconfig linux-2.6-stable/arch/a
   endmenu
   
   endif
   endmenu
   
   endif
-diff -urN -x CVS linux-2.6.21/arch/arm/mach-at91/Makefile linux-2.6-stable/arch/arm/mach-at91/Makefile
---- linux-2.6.21/arch/arm/mach-at91/Makefile   Thu Apr 26 05:08:32 2007
-+++ linux-2.6-stable/arch/arm/mach-at91/Makefile       Wed May  9 12:37:19 2007
-@@ -8,12 +8,15 @@
+Index: linux-2.6.21.7/arch/arm/mach-at91/Makefile
+===================================================================
+--- linux-2.6.21.7.orig/arch/arm/mach-at91/Makefile
++++ linux-2.6.21.7/arch/arm/mach-at91/Makefile
+@@ -8,12 +8,15 @@ obj-n                :=
   obj-          :=
   
   obj-$(CONFIG_PM)              += pm.o
   obj-          :=
   
   obj-$(CONFIG_PM)              += pm.o
@@ -136,7 +139,7 @@ diff -urN -x CVS linux-2.6.21/arch/arm/mach-at91/Makefile linux-2.6-stable/arch/
   
   # AT91RM9200 board-specific support
   obj-$(CONFIG_MACH_ONEARM)     += board-1arm.o
   
   # AT91RM9200 board-specific support
   obj-$(CONFIG_MACH_ONEARM)     += board-1arm.o
-@@ -25,9 +28,11 @@
+@@ -25,9 +28,11 @@ obj-$(CONFIG_MACH_CARMEVA)  += board-carm
   obj-$(CONFIG_MACH_KB9200)     += board-kb9202.o
   obj-$(CONFIG_MACH_ATEB9200)   += board-eb9200.o
   obj-$(CONFIG_MACH_KAFA)               += board-kafa.o
   obj-$(CONFIG_MACH_KB9200)     += board-kb9202.o
   obj-$(CONFIG_MACH_ATEB9200)   += board-eb9200.o
   obj-$(CONFIG_MACH_KAFA)               += board-kafa.o
@@ -148,7 +151,7 @@ diff -urN -x CVS linux-2.6.21/arch/arm/mach-at91/Makefile linux-2.6-stable/arch/
   
   # AT91SAM9261 board-specific support
   obj-$(CONFIG_MACH_AT91SAM9261EK) += board-sam9261ek.o
   
   # AT91SAM9261 board-specific support
   obj-$(CONFIG_MACH_AT91SAM9261EK) += board-sam9261ek.o
-@@ -35,9 +40,13 @@
+@@ -35,9 +40,13 @@ obj-$(CONFIG_MACH_AT91SAM9261EK) += boar
   # AT91SAM9263 board-specific support
   obj-$(CONFIG_MACH_AT91SAM9263EK) += board-sam9263ek.o
   
   # AT91SAM9263 board-specific support
   obj-$(CONFIG_MACH_AT91SAM9263EK) += board-sam9263ek.o
   
@@ -162,7 +165,7 @@ diff -urN -x CVS linux-2.6.21/arch/arm/mach-at91/Makefile linux-2.6-stable/arch/
   led-$(CONFIG_MACH_CSB337)     += leds.o
   led-$(CONFIG_MACH_CSB637)     += leds.o
   led-$(CONFIG_MACH_KB9200)     += leds.o
   led-$(CONFIG_MACH_CSB337)     += leds.o
   led-$(CONFIG_MACH_CSB637)     += leds.o
   led-$(CONFIG_MACH_KB9200)     += leds.o
-@@ -45,7 +54,7 @@
+@@ -45,7 +54,7 @@ led-$(CONFIG_MACH_KAFA)              += leds.o
   obj-$(CONFIG_LEDS) += $(led-y)
   
   # VGA support
   obj-$(CONFIG_LEDS) += $(led-y)
   
   # VGA support
@@ -171,10 +174,11 @@ diff -urN -x CVS linux-2.6.21/arch/arm/mach-at91/Makefile linux-2.6-stable/arch/
   
   
   ifeq ($(CONFIG_PM_DEBUG),y)
   
   
   ifeq ($(CONFIG_PM_DEBUG),y)
-diff -urN -x CVS linux-2.6.21/arch/arm/mach-at91/at91rm9200.c linux-2.6-stable/arch/arm/mach-at91/at91rm9200.c
---- linux-2.6.21/arch/arm/mach-at91/at91rm9200.c       Thu Apr 26 05:08:32 2007
-+++ linux-2.6-stable/arch/arm/mach-at91/at91rm9200.c   Tue May  8 12:13:30 2007
-@@ -117,6 +117,21 @@
+Index: linux-2.6.21.7/arch/arm/mach-at91/at91rm9200.c
+===================================================================
+--- linux-2.6.21.7.orig/arch/arm/mach-at91/at91rm9200.c
++++ linux-2.6.21.7/arch/arm/mach-at91/at91rm9200.c
+@@ -117,6 +117,21 @@ static struct clk pioD_clk = {
         .pmc_mask       = 1 << AT91RM9200_ID_PIOD,
         .type           = CLK_TYPE_PERIPHERAL,
   };
         .pmc_mask       = 1 << AT91RM9200_ID_PIOD,
         .type           = CLK_TYPE_PERIPHERAL,
   };
@@ -196,7 +200,7 @@ diff -urN -x CVS linux-2.6.21/arch/arm/mach-at91/at91rm9200.c linux-2.6-stable/a
   static struct clk tc0_clk = {
         .name           = "tc0_clk",
         .pmc_mask       = 1 << AT91RM9200_ID_TC0,
   static struct clk tc0_clk = {
         .name           = "tc0_clk",
         .pmc_mask       = 1 << AT91RM9200_ID_TC0,
-@@ -161,7 +176,9 @@
+@@ -161,7 +176,9 @@ static struct clk *periph_clocks[] __ini
         &udc_clk,
         &twi_clk,
         &spi_clk,
         &udc_clk,
         &twi_clk,
         &spi_clk,
@@ -207,7 +211,7 @@ diff -urN -x CVS linux-2.6.21/arch/arm/mach-at91/at91rm9200.c linux-2.6-stable/a
         &tc0_clk,
         &tc1_clk,
         &tc2_clk,
         &tc0_clk,
         &tc1_clk,
         &tc2_clk,
-@@ -250,6 +267,33 @@
+@@ -250,6 +267,33 @@ static void at91rm9200_reset(void)
   
   
   /* --------------------------------------------------------------------
   
   
   /* --------------------------------------------------------------------
@@ -241,7 +245,7 @@ diff -urN -x CVS linux-2.6.21/arch/arm/mach-at91/at91rm9200.c linux-2.6-stable/a
    *  AT91RM9200 processor initialization
    * -------------------------------------------------------------------- */
   void __init at91rm9200_initialize(unsigned long main_clock, unsigned short banks)
    *  AT91RM9200 processor initialization
    * -------------------------------------------------------------------- */
   void __init at91rm9200_initialize(unsigned long main_clock, unsigned short banks)
-@@ -271,6 +315,9 @@
+@@ -271,6 +315,9 @@ void __init at91rm9200_initialize(unsign
   
         /* Initialize GPIO subsystem */
         at91_gpio_init(at91rm9200_gpio, banks);
   
         /* Initialize GPIO subsystem */
         at91_gpio_init(at91rm9200_gpio, banks);
@@ -251,7 +255,7 @@ diff -urN -x CVS linux-2.6.21/arch/arm/mach-at91/at91rm9200.c linux-2.6-stable/a
   }
   
   
   }
   
   
-@@ -284,28 +331,28 @@
+@@ -284,28 +331,28 @@ void __init at91rm9200_initialize(unsign
   static unsigned int at91rm9200_default_irq_priority[NR_AIC_IRQS] __initdata = {
         7,      /* Advanced Interrupt Controller (FIQ) */
         7,      /* System Peripherals */
   static unsigned int at91rm9200_default_irq_priority[NR_AIC_IRQS] __initdata = {
         7,      /* Advanced Interrupt Controller (FIQ) */
         7,      /* System Peripherals */
@@ -295,10 +299,11 @@ diff -urN -x CVS linux-2.6.21/arch/arm/mach-at91/at91rm9200.c linux-2.6-stable/a
         3,      /* Ethernet MAC */
         0,      /* Advanced Interrupt Controller (IRQ0) */
         0,      /* Advanced Interrupt Controller (IRQ1) */
         3,      /* Ethernet MAC */
         0,      /* Advanced Interrupt Controller (IRQ0) */
         0,      /* Advanced Interrupt Controller (IRQ1) */
-diff -urN -x CVS linux-2.6.21/arch/arm/mach-at91/at91rm9200_devices.c linux-2.6-stable/arch/arm/mach-at91/at91rm9200_devices.c
---- linux-2.6.21/arch/arm/mach-at91/at91rm9200_devices.c       Thu Apr 26 05:08:32 2007
-+++ linux-2.6-stable/arch/arm/mach-at91/at91rm9200_devices.c   Tue May  8 12:13:30 2007
-@@ -480,7 +480,18 @@
+Index: linux-2.6.21.7/arch/arm/mach-at91/at91rm9200_devices.c
+===================================================================
+--- linux-2.6.21.7.orig/arch/arm/mach-at91/at91rm9200_devices.c
++++ linux-2.6.21.7/arch/arm/mach-at91/at91rm9200_devices.c
+@@ -480,7 +480,18 @@ void __init at91_add_device_i2c(void) {}
    *  SPI
    * -------------------------------------------------------------------- */
   
    *  SPI
    * -------------------------------------------------------------------- */
   
@@ -318,7 +323,7 @@ diff -urN -x CVS linux-2.6.21/arch/arm/mach-at91/at91rm9200_devices.c linux-2.6-
   static u64 spi_dmamask = 0xffffffffUL;
   
   static struct resource spi_resources[] = {
   static u64 spi_dmamask = 0xffffffffUL;
   
   static struct resource spi_resources[] = {
-@@ -497,7 +508,7 @@
+@@ -497,7 +508,7 @@ static struct resource spi_resources[] =
   };
   
   static struct platform_device at91rm9200_spi_device = {
   };
   
   static struct platform_device at91rm9200_spi_device = {
@@ -327,7 +332,7 @@ diff -urN -x CVS linux-2.6.21/arch/arm/mach-at91/at91rm9200_devices.c linux-2.6-
         .id             = 0,
         .dev            = {
                                 .dma_mask               = &spi_dmamask,
         .id             = 0,
         .dev            = {
                                 .dma_mask               = &spi_dmamask,
-@@ -606,6 +617,32 @@
+@@ -606,6 +617,32 @@ void __init at91_init_leds(u8 cpu_led, u
   #endif
   
   
   #endif
   
   
@@ -360,10 +365,11 @@ diff -urN -x CVS linux-2.6.21/arch/arm/mach-at91/at91rm9200_devices.c linux-2.6-
   /* --------------------------------------------------------------------
    *  UART
    * -------------------------------------------------------------------- */
   /* --------------------------------------------------------------------
    *  UART
    * -------------------------------------------------------------------- */
-diff -urN -x CVS linux-2.6.21/arch/arm/mach-at91/at91sam9260.c linux-2.6-stable/arch/arm/mach-at91/at91sam9260.c
---- linux-2.6.21/arch/arm/mach-at91/at91sam9260.c      Thu Apr 26 05:08:32 2007
-+++ linux-2.6-stable/arch/arm/mach-at91/at91sam9260.c  Tue May  8 12:13:30 2007
-@@ -119,6 +119,11 @@
+Index: linux-2.6.21.7/arch/arm/mach-at91/at91sam9260.c
+===================================================================
+--- linux-2.6.21.7.orig/arch/arm/mach-at91/at91sam9260.c
++++ linux-2.6.21.7/arch/arm/mach-at91/at91sam9260.c
+@@ -119,6 +119,11 @@ static struct clk spi1_clk = {
         .pmc_mask       = 1 << AT91SAM9260_ID_SPI1,
         .type           = CLK_TYPE_PERIPHERAL,
   };
         .pmc_mask       = 1 << AT91SAM9260_ID_SPI1,
         .type           = CLK_TYPE_PERIPHERAL,
   };
@@ -375,7 +381,7 @@ diff -urN -x CVS linux-2.6.21/arch/arm/mach-at91/at91sam9260.c linux-2.6-stable/
   static struct clk tc0_clk = {
         .name           = "tc0_clk",
         .pmc_mask       = 1 << AT91SAM9260_ID_TC0,
   static struct clk tc0_clk = {
         .name           = "tc0_clk",
         .pmc_mask       = 1 << AT91SAM9260_ID_TC0,
-@@ -193,7 +198,7 @@
+@@ -193,7 +198,7 @@ static struct clk *periph_clocks[] __ini
         &twi_clk,
         &spi0_clk,
         &spi1_clk,
         &twi_clk,
         &spi0_clk,
         &spi1_clk,
@@ -384,7 +390,7 @@ diff -urN -x CVS linux-2.6.21/arch/arm/mach-at91/at91sam9260.c linux-2.6-stable/
         &tc0_clk,
         &tc1_clk,
         &tc2_clk,
         &tc0_clk,
         &tc1_clk,
         &tc2_clk,
-@@ -264,6 +269,33 @@
+@@ -264,6 +269,33 @@ static void at91sam9260_reset(void)
   
   
   /* --------------------------------------------------------------------
   
   
   /* --------------------------------------------------------------------
@@ -418,7 +424,7 @@ diff -urN -x CVS linux-2.6.21/arch/arm/mach-at91/at91sam9260.c linux-2.6-stable/
    *  AT91SAM9260 processor initialization
    * -------------------------------------------------------------------- */
   
    *  AT91SAM9260 processor initialization
    * -------------------------------------------------------------------- */
   
-@@ -310,6 +342,9 @@
+@@ -310,6 +342,9 @@ void __init at91sam9260_initialize(unsig
   
         /* Register GPIO subsystem */
         at91_gpio_init(at91sam9260_gpio, 3);
   
         /* Register GPIO subsystem */
         at91_gpio_init(at91sam9260_gpio, 3);
@@ -428,7 +434,7 @@ diff -urN -x CVS linux-2.6.21/arch/arm/mach-at91/at91sam9260.c linux-2.6-stable/
   }
   
   /* --------------------------------------------------------------------
   }
   
   /* --------------------------------------------------------------------
-@@ -322,30 +357,30 @@
+@@ -322,30 +357,30 @@ void __init at91sam9260_initialize(unsig
   static unsigned int at91sam9260_default_irq_priority[NR_AIC_IRQS] __initdata = {
         7,      /* Advanced Interrupt Controller */
         7,      /* System Peripherals */
   static unsigned int at91sam9260_default_irq_priority[NR_AIC_IRQS] __initdata = {
         7,      /* Advanced Interrupt Controller */
         7,      /* System Peripherals */
@@ -473,10 +479,11 @@ diff -urN -x CVS linux-2.6.21/arch/arm/mach-at91/at91sam9260.c linux-2.6-stable/
         0,      /* Timer Counter 3 */
         0,      /* Timer Counter 4 */
         0,      /* Timer Counter 5 */
         0,      /* Timer Counter 3 */
         0,      /* Timer Counter 4 */
         0,      /* Timer Counter 5 */
-diff -urN -x CVS linux-2.6.21/arch/arm/mach-at91/at91sam9260_devices.c linux-2.6-stable/arch/arm/mach-at91/at91sam9260_devices.c
---- linux-2.6.21/arch/arm/mach-at91/at91sam9260_devices.c      Thu Apr 26 05:08:32 2007
-+++ linux-2.6-stable/arch/arm/mach-at91/at91sam9260_devices.c  Tue May  8 12:13:30 2007
-@@ -527,6 +527,32 @@
+Index: linux-2.6.21.7/arch/arm/mach-at91/at91sam9260_devices.c
+===================================================================
+--- linux-2.6.21.7.orig/arch/arm/mach-at91/at91sam9260_devices.c
++++ linux-2.6.21.7/arch/arm/mach-at91/at91sam9260_devices.c
+@@ -527,6 +527,32 @@ void __init at91_init_leds(u8 cpu_led, u
   #endif
   
   
   #endif
   
   
@@ -509,10 +516,11 @@ diff -urN -x CVS linux-2.6.21/arch/arm/mach-at91/at91sam9260_devices.c linux-2.6
   /* --------------------------------------------------------------------
    *  UART
    * -------------------------------------------------------------------- */
   /* --------------------------------------------------------------------
    *  UART
    * -------------------------------------------------------------------- */
-diff -urN -x CVS linux-2.6.21/arch/arm/mach-at91/at91sam9261.c linux-2.6-stable/arch/arm/mach-at91/at91sam9261.c
---- linux-2.6.21/arch/arm/mach-at91/at91sam9261.c      Thu Apr 26 05:08:32 2007
-+++ linux-2.6-stable/arch/arm/mach-at91/at91sam9261.c  Tue May  8 12:13:30 2007
-@@ -97,6 +97,21 @@
+Index: linux-2.6.21.7/arch/arm/mach-at91/at91sam9261.c
+===================================================================
+--- linux-2.6.21.7.orig/arch/arm/mach-at91/at91sam9261.c
++++ linux-2.6.21.7/arch/arm/mach-at91/at91sam9261.c
+@@ -97,6 +97,21 @@ static struct clk spi1_clk = {
         .pmc_mask       = 1 << AT91SAM9261_ID_SPI1,
         .type           = CLK_TYPE_PERIPHERAL,
   };
         .pmc_mask       = 1 << AT91SAM9261_ID_SPI1,
         .type           = CLK_TYPE_PERIPHERAL,
   };
@@ -534,7 +542,7 @@ diff -urN -x CVS linux-2.6.21/arch/arm/mach-at91/at91sam9261.c linux-2.6-stable/
   static struct clk tc0_clk = {
         .name           = "tc0_clk",
         .pmc_mask       = 1 << AT91SAM9261_ID_TC0,
   static struct clk tc0_clk = {
         .name           = "tc0_clk",
         .pmc_mask       = 1 << AT91SAM9261_ID_TC0,
-@@ -135,7 +150,9 @@
+@@ -135,7 +150,9 @@ static struct clk *periph_clocks[] __ini
         &twi_clk,
         &spi0_clk,
         &spi1_clk,
         &twi_clk,
         &spi0_clk,
         &spi1_clk,
@@ -545,7 +553,7 @@ diff -urN -x CVS linux-2.6.21/arch/arm/mach-at91/at91sam9261.c linux-2.6-stable/
         &tc0_clk,
         &tc1_clk,
         &tc2_clk,
         &tc0_clk,
         &tc1_clk,
         &tc2_clk,
-@@ -230,6 +247,28 @@
+@@ -230,6 +247,28 @@ static void at91sam9261_reset(void)
   
   
   /* --------------------------------------------------------------------
   
   
   /* --------------------------------------------------------------------
@@ -574,7 +582,7 @@ diff -urN -x CVS linux-2.6.21/arch/arm/mach-at91/at91sam9261.c linux-2.6-stable/
    *  AT91SAM9261 processor initialization
    * -------------------------------------------------------------------- */
   
    *  AT91SAM9261 processor initialization
    * -------------------------------------------------------------------- */
   
-@@ -250,6 +289,9 @@
+@@ -250,6 +289,9 @@ void __init at91sam9261_initialize(unsig
   
         /* Register GPIO subsystem */
         at91_gpio_init(at91sam9261_gpio, 3);
   
         /* Register GPIO subsystem */
         at91_gpio_init(at91sam9261_gpio, 3);
@@ -584,20 +592,21 @@ diff -urN -x CVS linux-2.6.21/arch/arm/mach-at91/at91sam9261.c linux-2.6-stable/
   }
   
   /* --------------------------------------------------------------------
   }
   
   /* --------------------------------------------------------------------
-@@ -262,25 +304,25 @@
+@@ -262,25 +304,25 @@ void __init at91sam9261_initialize(unsig
   static unsigned int at91sam9261_default_irq_priority[NR_AIC_IRQS] __initdata = {
         7,      /* Advanced Interrupt Controller */
         7,      /* System Peripherals */
  -      0,      /* Parallel IO Controller A */
  -      0,      /* Parallel IO Controller B */
  -      0,      /* Parallel IO Controller C */
   static unsigned int at91sam9261_default_irq_priority[NR_AIC_IRQS] __initdata = {
         7,      /* Advanced Interrupt Controller */
         7,      /* System Peripherals */
  -      0,      /* Parallel IO Controller A */
  -      0,      /* Parallel IO Controller B */
  -      0,      /* Parallel IO Controller C */
-+      1,      /* Parallel IO Controller A */
-+      1,      /* Parallel IO Controller B */
-+      1,      /* Parallel IO Controller C */
-       0,
+-      0,
  -      6,      /* USART 0 */
  -      6,      /* USART 1 */
  -      6,      /* USART 2 */
  -      6,      /* USART 0 */
  -      6,      /* USART 1 */
  -      6,      /* USART 2 */
++      1,      /* Parallel IO Controller A */
++      1,      /* Parallel IO Controller B */
++      1,      /* Parallel IO Controller C */
++      0,
  +      5,      /* USART 0 */
  +      5,      /* USART 1 */
  +      5,      /* USART 2 */
  +      5,      /* USART 0 */
  +      5,      /* USART 1 */
  +      5,      /* USART 2 */
@@ -624,9 +633,10 @@ diff -urN -x CVS linux-2.6.21/arch/arm/mach-at91/at91sam9261.c linux-2.6-stable/
         3,      /* LCD Controller */
         0,
         0,
         3,      /* LCD Controller */
         0,
         0,
-diff -urN -x CVS linux-2.6.21/arch/arm/mach-at91/at91sam9261_devices.c linux-2.6-stable/arch/arm/mach-at91/at91sam9261_devices.c
---- linux-2.6.21/arch/arm/mach-at91/at91sam9261_devices.c      Thu Apr 26 05:08:32 2007
-+++ linux-2.6-stable/arch/arm/mach-at91/at91sam9261_devices.c  Tue May  8 12:56:33 2007
+Index: linux-2.6.21.7/arch/arm/mach-at91/at91sam9261_devices.c
+===================================================================
+--- linux-2.6.21.7.orig/arch/arm/mach-at91/at91sam9261_devices.c
++++ linux-2.6.21.7/arch/arm/mach-at91/at91sam9261_devices.c
  @@ -14,6 +14,9 @@
   #include <asm/mach/map.h>
   
  @@ -14,6 +14,9 @@
   #include <asm/mach/map.h>
   
@@ -637,7 +647,7 @@ diff -urN -x CVS linux-2.6.21/arch/arm/mach-at91/at91sam9261_devices.c linux-2.6
   
   #include <asm/arch/board.h>
   #include <asm/arch/gpio.h>
   
   #include <asm/arch/board.h>
   #include <asm/arch/gpio.h>
-@@ -430,9 +433,9 @@
+@@ -430,9 +433,9 @@ void __init at91_add_device_spi(struct s
    *  LCD Controller
    * -------------------------------------------------------------------- */
   
    *  LCD Controller
    * -------------------------------------------------------------------- */
   
@@ -649,7 +659,7 @@ diff -urN -x CVS linux-2.6.21/arch/arm/mach-at91/at91sam9261_devices.c linux-2.6
   
   static struct resource lcdc_resources[] = {
         [0] = {
   
   static struct resource lcdc_resources[] = {
         [0] = {
-@@ -455,7 +458,7 @@
+@@ -455,7 +458,7 @@ static struct resource lcdc_resources[] 
   };
   
   static struct platform_device at91_lcdc_device = {
   };
   
   static struct platform_device at91_lcdc_device = {
@@ -658,7 +668,7 @@ diff -urN -x CVS linux-2.6.21/arch/arm/mach-at91/at91sam9261_devices.c linux-2.6
         .id             = 0,
         .dev            = {
                                 .dma_mask               = &lcdc_dmamask,
         .id             = 0,
         .dev            = {
                                 .dma_mask               = &lcdc_dmamask,
-@@ -466,7 +469,7 @@
+@@ -466,7 +469,7 @@ static struct platform_device at91_lcdc_
         .num_resources  = ARRAY_SIZE(lcdc_resources),
   };
   
         .num_resources  = ARRAY_SIZE(lcdc_resources),
   };
   
@@ -667,7 +677,7 @@ diff -urN -x CVS linux-2.6.21/arch/arm/mach-at91/at91sam9261_devices.c linux-2.6
   {
         if (!data) {
                 return;
   {
         if (!data) {
                 return;
-@@ -499,7 +502,7 @@
+@@ -499,7 +502,7 @@ void __init at91_add_device_lcdc(struct 
         platform_device_register(&at91_lcdc_device);
   }
   #else
         platform_device_register(&at91_lcdc_device);
   }
   #else
@@ -676,7 +686,7 @@ diff -urN -x CVS linux-2.6.21/arch/arm/mach-at91/at91sam9261_devices.c linux-2.6
   #endif
   
   
   #endif
   
   
-@@ -525,6 +528,32 @@
+@@ -525,6 +528,32 @@ void __init at91_init_leds(u8 cpu_led, u
   #endif
   
   
   #endif
   
   
@@ -709,10 +719,11 @@ diff -urN -x CVS linux-2.6.21/arch/arm/mach-at91/at91sam9261_devices.c linux-2.6
   /* --------------------------------------------------------------------
    *  UART
    * -------------------------------------------------------------------- */
   /* --------------------------------------------------------------------
    *  UART
    * -------------------------------------------------------------------- */
-diff -urN -x CVS linux-2.6.21/arch/arm/mach-at91/at91sam9263.c linux-2.6-stable/arch/arm/mach-at91/at91sam9263.c
---- linux-2.6.21/arch/arm/mach-at91/at91sam9263.c      Thu Apr 26 05:08:32 2007
-+++ linux-2.6-stable/arch/arm/mach-at91/at91sam9263.c  Tue May  8 12:13:30 2007
-@@ -87,6 +87,11 @@
+Index: linux-2.6.21.7/arch/arm/mach-at91/at91sam9263.c
+===================================================================
+--- linux-2.6.21.7.orig/arch/arm/mach-at91/at91sam9263.c
++++ linux-2.6.21.7/arch/arm/mach-at91/at91sam9263.c
+@@ -87,6 +87,11 @@ static struct clk mmc1_clk = {
         .pmc_mask       = 1 << AT91SAM9263_ID_MCI1,
         .type           = CLK_TYPE_PERIPHERAL,
   };
         .pmc_mask       = 1 << AT91SAM9263_ID_MCI1,
         .type           = CLK_TYPE_PERIPHERAL,
   };
@@ -724,7 +735,7 @@ diff -urN -x CVS linux-2.6.21/arch/arm/mach-at91/at91sam9263.c linux-2.6-stable/
   static struct clk twi_clk = {
         .name           = "twi_clk",
         .pmc_mask       = 1 << AT91SAM9263_ID_TWI,
   static struct clk twi_clk = {
         .name           = "twi_clk",
         .pmc_mask       = 1 << AT91SAM9263_ID_TWI,
-@@ -102,16 +107,46 @@
+@@ -102,16 +107,46 @@ static struct clk spi1_clk = {
         .pmc_mask       = 1 << AT91SAM9263_ID_SPI1,
         .type           = CLK_TYPE_PERIPHERAL,
   };
         .pmc_mask       = 1 << AT91SAM9263_ID_SPI1,
         .type           = CLK_TYPE_PERIPHERAL,
   };
@@ -771,7 +782,7 @@ diff -urN -x CVS linux-2.6.21/arch/arm/mach-at91/at91sam9263.c linux-2.6-stable/
   static struct clk udc_clk = {
         .name           = "udc_clk",
         .pmc_mask       = 1 << AT91SAM9263_ID_UDP,
   static struct clk udc_clk = {
         .name           = "udc_clk",
         .pmc_mask       = 1 << AT91SAM9263_ID_UDP,
-@@ -142,20 +177,21 @@
+@@ -142,20 +177,21 @@ static struct clk *periph_clocks[] __ini
         &usart2_clk,
         &mmc0_clk,
         &mmc1_clk,
         &usart2_clk,
         &mmc0_clk,
         &mmc1_clk,
@@ -799,7 +810,7 @@ diff -urN -x CVS linux-2.6.21/arch/arm/mach-at91/at91sam9263.c linux-2.6-stable/
         &ohci_clk,
         // irq0 .. irq1
   };
         &ohci_clk,
         // irq0 .. irq1
   };
-@@ -237,6 +273,28 @@
+@@ -237,6 +273,28 @@ static void at91sam9263_reset(void)
   
   
   /* --------------------------------------------------------------------
   
   
   /* --------------------------------------------------------------------
@@ -828,7 +839,7 @@ diff -urN -x CVS linux-2.6.21/arch/arm/mach-at91/at91sam9263.c linux-2.6-stable/
    *  AT91SAM9263 processor initialization
    * -------------------------------------------------------------------- */
   
    *  AT91SAM9263 processor initialization
    * -------------------------------------------------------------------- */
   
-@@ -256,6 +314,9 @@
+@@ -256,6 +314,9 @@ void __init at91sam9263_initialize(unsig
   
         /* Register GPIO subsystem */
         at91_gpio_init(at91sam9263_gpio, 5);
   
         /* Register GPIO subsystem */
         at91_gpio_init(at91sam9263_gpio, 5);
@@ -838,7 +849,7 @@ diff -urN -x CVS linux-2.6.21/arch/arm/mach-at91/at91sam9263.c linux-2.6-stable/
   }
   
   /* --------------------------------------------------------------------
   }
   
   /* --------------------------------------------------------------------
-@@ -268,34 +329,34 @@
+@@ -268,34 +329,34 @@ void __init at91sam9263_initialize(unsig
   static unsigned int at91sam9263_default_irq_priority[NR_AIC_IRQS] __initdata = {
         7,      /* Advanced Interrupt Controller (FIQ) */
         7,      /* System Peripherals */
   static unsigned int at91sam9263_default_irq_priority[NR_AIC_IRQS] __initdata = {
         7,      /* Advanced Interrupt Controller (FIQ) */
         7,      /* System Peripherals */
@@ -888,9 +899,10 @@ diff -urN -x CVS linux-2.6.21/arch/arm/mach-at91/at91sam9263.c linux-2.6-stable/
         0,      /* Advanced Interrupt Controller (IRQ0) */
         0,      /* Advanced Interrupt Controller (IRQ1) */
   };
         0,      /* Advanced Interrupt Controller (IRQ0) */
         0,      /* Advanced Interrupt Controller (IRQ1) */
   };
-diff -urN -x CVS linux-2.6.21/arch/arm/mach-at91/at91sam9263_devices.c linux-2.6-stable/arch/arm/mach-at91/at91sam9263_devices.c
---- linux-2.6.21/arch/arm/mach-at91/at91sam9263_devices.c      Thu Apr 26 05:08:32 2007
-+++ linux-2.6-stable/arch/arm/mach-at91/at91sam9263_devices.c  Thu May 10 12:23:46 2007
+Index: linux-2.6.21.7/arch/arm/mach-at91/at91sam9263_devices.c
+===================================================================
+--- linux-2.6.21.7.orig/arch/arm/mach-at91/at91sam9263_devices.c
++++ linux-2.6.21.7/arch/arm/mach-at91/at91sam9263_devices.c
  @@ -13,6 +13,9 @@
   #include <asm/mach/map.h>
   
  @@ -13,6 +13,9 @@
   #include <asm/mach/map.h>
   
@@ -901,7 +913,7 @@ diff -urN -x CVS linux-2.6.21/arch/arm/mach-at91/at91sam9263_devices.c linux-2.6
   
   #include <asm/arch/board.h>
   #include <asm/arch/gpio.h>
   
   #include <asm/arch/board.h>
   #include <asm/arch/gpio.h>
-@@ -573,6 +576,180 @@
+@@ -573,6 +576,180 @@ void __init at91_add_device_spi(struct s
   
   
   /* --------------------------------------------------------------------
   
   
   /* --------------------------------------------------------------------
@@ -1082,7 +1094,7 @@ diff -urN -x CVS linux-2.6.21/arch/arm/mach-at91/at91sam9263_devices.c linux-2.6
    *  LEDs
    * -------------------------------------------------------------------- */
   
    *  LEDs
    * -------------------------------------------------------------------- */
   
-@@ -594,6 +771,32 @@
+@@ -594,6 +771,32 @@ void __init at91_init_leds(u8 cpu_led, u
   #endif
   
   
   #endif
   
   
@@ -1115,9 +1127,10 @@ diff -urN -x CVS linux-2.6.21/arch/arm/mach-at91/at91sam9263_devices.c linux-2.6
   /* --------------------------------------------------------------------
    *  UART
    * -------------------------------------------------------------------- */
   /* --------------------------------------------------------------------
    *  UART
    * -------------------------------------------------------------------- */
-diff -urN -x CVS linux-2.6.21/arch/arm/mach-at91/at91sam9rl.c linux-2.6-stable/arch/arm/mach-at91/at91sam9rl.c
---- linux-2.6.21/arch/arm/mach-at91/at91sam9rl.c       Thu Jan  1 02:00:00 1970
-+++ linux-2.6-stable/arch/arm/mach-at91/at91sam9rl.c   Fri May 11 15:48:14 2007
+Index: linux-2.6.21.7/arch/arm/mach-at91/at91sam9rl.c
+===================================================================
+--- /dev/null
++++ linux-2.6.21.7/arch/arm/mach-at91/at91sam9rl.c
  @@ -0,0 +1,366 @@
  +/*
  + * arch/arm/mach-at91/at91sam9rl.c
  @@ -0,0 +1,366 @@
  +/*
  + * arch/arm/mach-at91/at91sam9rl.c
@@ -1485,9 +1498,10 @@ diff -urN -x CVS linux-2.6.21/arch/arm/mach-at91/at91sam9rl.c linux-2.6-stable/a
  +      /* Enable GPIO interrupts */
  +      at91_gpio_irq_setup();
  +}
  +      /* Enable GPIO interrupts */
  +      at91_gpio_irq_setup();
  +}
-diff -urN -x CVS linux-2.6.21/arch/arm/mach-at91/at91sam9rl_devices.c linux-2.6-stable/arch/arm/mach-at91/at91sam9rl_devices.c
---- linux-2.6.21/arch/arm/mach-at91/at91sam9rl_devices.c       Thu Jan  1 02:00:00 1970
-+++ linux-2.6-stable/arch/arm/mach-at91/at91sam9rl_devices.c   Fri May 11 16:03:25 2007
+Index: linux-2.6.21.7/arch/arm/mach-at91/at91sam9rl_devices.c
+===================================================================
+--- /dev/null
++++ linux-2.6.21.7/arch/arm/mach-at91/at91sam9rl_devices.c
  @@ -0,0 +1,660 @@
  +/*
  + *  Copyright (C) 2007 Atmel Corporation
  @@ -0,0 +1,660 @@
  +/*
  + *  Copyright (C) 2007 Atmel Corporation
@@ -2149,9 +2163,10 @@ diff -urN -x CVS linux-2.6.21/arch/arm/mach-at91/at91sam9rl_devices.c linux-2.6-
  +}
  +
  +arch_initcall(at91_add_standard_devices);
  +}
  +
  +arch_initcall(at91_add_standard_devices);
-diff -urN -x CVS linux-2.6.21/arch/arm/mach-at91/board-cam60.c linux-2.6-stable/arch/arm/mach-at91/board-cam60.c
---- linux-2.6.21/arch/arm/mach-at91/board-cam60.c      Thu Jan  1 02:00:00 1970
-+++ linux-2.6-stable/arch/arm/mach-at91/board-cam60.c  Tue May  8 12:13:30 2007
+Index: linux-2.6.21.7/arch/arm/mach-at91/board-cam60.c
+===================================================================
+--- /dev/null
++++ linux-2.6.21.7/arch/arm/mach-at91/board-cam60.c
  @@ -0,0 +1,148 @@
  +/*
  + * KwikByte CAM60
  @@ -0,0 +1,148 @@
  +/*
  + * KwikByte CAM60
@@ -2301,9 +2316,10 @@ diff -urN -x CVS linux-2.6.21/arch/arm/mach-at91/board-cam60.c linux-2.6-stable/
  +      .init_irq       = cam60_init_irq,
  +      .init_machine   = cam60_board_init,
  +MACHINE_END
  +      .init_irq       = cam60_init_irq,
  +      .init_machine   = cam60_board_init,
  +MACHINE_END
-diff -urN -x CVS linux-2.6.21/arch/arm/mach-at91/board-chub.c linux-2.6-stable/arch/arm/mach-at91/board-chub.c
---- linux-2.6.21/arch/arm/mach-at91/board-chub.c       Thu Jan  1 02:00:00 1970
-+++ linux-2.6-stable/arch/arm/mach-at91/board-chub.c   Tue May  8 12:13:30 2007
+Index: linux-2.6.21.7/arch/arm/mach-at91/board-chub.c
+===================================================================
+--- /dev/null
++++ linux-2.6.21.7/arch/arm/mach-at91/board-chub.c
  @@ -0,0 +1,132 @@
  +/*
  + * linux/arch/arm/mach-at91/board-chub.c
  @@ -0,0 +1,132 @@
  +/*
  + * linux/arch/arm/mach-at91/board-chub.c
@@ -2437,9 +2453,10 @@ diff -urN -x CVS linux-2.6.21/arch/arm/mach-at91/board-chub.c linux-2.6-stable/a
  +      .init_irq       = chub_init_irq,
  +      .init_machine   = chub_board_init,
  +MACHINE_END
  +      .init_irq       = chub_init_irq,
  +      .init_machine   = chub_board_init,
  +MACHINE_END
-diff -urN -x CVS linux-2.6.21/arch/arm/mach-at91/board-csb337.c linux-2.6-stable/arch/arm/mach-at91/board-csb337.c
---- linux-2.6.21/arch/arm/mach-at91/board-csb337.c     Thu Apr 26 05:08:32 2007
-+++ linux-2.6-stable/arch/arm/mach-at91/board-csb337.c Tue May  8 12:13:30 2007
+Index: linux-2.6.21.7/arch/arm/mach-at91/board-csb337.c
+===================================================================
+--- linux-2.6.21.7.orig/arch/arm/mach-at91/board-csb337.c
++++ linux-2.6.21.7/arch/arm/mach-at91/board-csb337.c
  @@ -24,6 +24,7 @@
   #include <linux/module.h>
   #include <linux/platform_device.h>
  @@ -24,6 +24,7 @@
   #include <linux/module.h>
   #include <linux/platform_device.h>
@@ -2448,7 +2465,7 @@ diff -urN -x CVS linux-2.6.21/arch/arm/mach-at91/board-csb337.c linux-2.6-stable
   #include <linux/mtd/physmap.h>
   
   #include <asm/hardware.h>
   #include <linux/mtd/physmap.h>
   
   #include <asm/hardware.h>
-@@ -59,6 +60,7 @@
+@@ -59,6 +60,7 @@ static void __init csb337_map_io(void)
   
         /* Setup the LEDs */
         at91_init_leds(AT91_PIN_PB0, AT91_PIN_PB1);
   
         /* Setup the LEDs */
         at91_init_leds(AT91_PIN_PB0, AT91_PIN_PB1);
@@ -2456,7 +2473,7 @@ diff -urN -x CVS linux-2.6.21/arch/arm/mach-at91/board-csb337.c linux-2.6-stable
   
         /* Setup the serial ports and console */
         at91_init_serial(&csb337_uart_config);
   
         /* Setup the serial ports and console */
         at91_init_serial(&csb337_uart_config);
-@@ -149,6 +151,55 @@
+@@ -149,6 +151,55 @@ static struct platform_device csb_flash 
         .num_resources  = ARRAY_SIZE(csb_flash_resources),
   };
   
         .num_resources  = ARRAY_SIZE(csb_flash_resources),
   };
   
@@ -2512,7 +2529,7 @@ diff -urN -x CVS linux-2.6.21/arch/arm/mach-at91/board-csb337.c linux-2.6-stable
   static void __init csb337_board_init(void)
   {
         /* Serial */
   static void __init csb337_board_init(void)
   {
         /* Serial */
-@@ -168,8 +219,12 @@
+@@ -168,8 +219,12 @@ static void __init csb337_board_init(voi
         at91_add_device_spi(csb337_spi_devices, ARRAY_SIZE(csb337_spi_devices));
         /* MMC */
         at91_add_device_mmc(0, &csb337_mmc_data);
         at91_add_device_spi(csb337_spi_devices, ARRAY_SIZE(csb337_spi_devices));
         /* MMC */
         at91_add_device_mmc(0, &csb337_mmc_data);
@@ -2525,10 +2542,11 @@ diff -urN -x CVS linux-2.6.21/arch/arm/mach-at91/board-csb337.c linux-2.6-stable
   }
   
   MACHINE_START(CSB337, "Cogent CSB337")
   }
   
   MACHINE_START(CSB337, "Cogent CSB337")
-diff -urN -x CVS linux-2.6.21/arch/arm/mach-at91/board-dk.c linux-2.6-stable/arch/arm/mach-at91/board-dk.c
---- linux-2.6.21/arch/arm/mach-at91/board-dk.c Thu Apr 26 05:08:32 2007
-+++ linux-2.6-stable/arch/arm/mach-at91/board-dk.c     Tue May  8 14:29:12 2007
-@@ -73,6 +73,185 @@
+Index: linux-2.6.21.7/arch/arm/mach-at91/board-dk.c
+===================================================================
+--- linux-2.6.21.7.orig/arch/arm/mach-at91/board-dk.c
++++ linux-2.6.21.7/arch/arm/mach-at91/board-dk.c
+@@ -73,6 +73,185 @@ static void __init dk_init_irq(void)
         at91rm9200_init_interrupts(NULL);
   }
   
         at91rm9200_init_interrupts(NULL);
   }
   
@@ -2714,7 +2732,7 @@ diff -urN -x CVS linux-2.6.21/arch/arm/mach-at91/board-dk.c linux-2.6-stable/arc
   static struct at91_eth_data __initdata dk_eth_data = {
         .phy_irq_pin    = AT91_PIN_PC4,
         .is_rmii        = 1,
   static struct at91_eth_data __initdata dk_eth_data = {
         .phy_irq_pin    = AT91_PIN_PC4,
         .is_rmii        = 1,
-@@ -151,7 +330,7 @@
+@@ -151,7 +330,7 @@ static struct at91_nand_data __initdata 
   #define DK_FLASH_SIZE 0x200000
   
   static struct physmap_flash_data dk_flash_data = {
   #define DK_FLASH_SIZE 0x200000
   
   static struct physmap_flash_data dk_flash_data = {
@@ -2723,7 +2741,7 @@ diff -urN -x CVS linux-2.6.21/arch/arm/mach-at91/board-dk.c linux-2.6-stable/arc
   };
   
   static struct resource dk_flash_resource = {
   };
   
   static struct resource dk_flash_resource = {
-@@ -170,6 +349,13 @@
+@@ -170,6 +349,13 @@ static struct platform_device dk_flash =
         .num_resources  = 1,
   };
   
         .num_resources  = 1,
   };
   
@@ -2737,7 +2755,7 @@ diff -urN -x CVS linux-2.6.21/arch/arm/mach-at91/board-dk.c linux-2.6-stable/arc
   
   static void __init dk_board_init(void)
   {
   
   static void __init dk_board_init(void)
   {
-@@ -200,8 +386,10 @@
+@@ -200,8 +386,10 @@ static void __init dk_board_init(void)
         at91_add_device_nand(&dk_nand_data);
         /* NOR Flash */
         platform_device_register(&dk_flash);
         at91_add_device_nand(&dk_nand_data);
         /* NOR Flash */
         platform_device_register(&dk_flash);
@@ -2749,10 +2767,11 @@ diff -urN -x CVS linux-2.6.21/arch/arm/mach-at91/board-dk.c linux-2.6-stable/arc
   }
   
   MACHINE_START(AT91RM9200DK, "Atmel AT91RM9200-DK")
   }
   
   MACHINE_START(AT91RM9200DK, "Atmel AT91RM9200-DK")
-diff -urN -x CVS linux-2.6.21/arch/arm/mach-at91/board-ek.c linux-2.6-stable/arch/arm/mach-at91/board-ek.c
---- linux-2.6.21/arch/arm/mach-at91/board-ek.c Thu Apr 26 05:08:32 2007
-+++ linux-2.6-stable/arch/arm/mach-at91/board-ek.c     Tue May  8 14:29:22 2007
-@@ -73,6 +73,187 @@
+Index: linux-2.6.21.7/arch/arm/mach-at91/board-ek.c
+===================================================================
+--- linux-2.6.21.7.orig/arch/arm/mach-at91/board-ek.c
++++ linux-2.6.21.7/arch/arm/mach-at91/board-ek.c
+@@ -73,6 +73,187 @@ static void __init ek_init_irq(void)
         at91rm9200_init_interrupts(NULL);
   }
   
         at91rm9200_init_interrupts(NULL);
   }
   
@@ -2940,7 +2959,7 @@ diff -urN -x CVS linux-2.6.21/arch/arm/mach-at91/board-ek.c linux-2.6-stable/arc
   static struct at91_eth_data __initdata ek_eth_data = {
         .phy_irq_pin    = AT91_PIN_PC4,
         .is_rmii        = 1,
   static struct at91_eth_data __initdata ek_eth_data = {
         .phy_irq_pin    = AT91_PIN_PC4,
         .is_rmii        = 1,
-@@ -113,7 +294,7 @@
+@@ -113,7 +294,7 @@ static struct spi_board_info ek_spi_devi
   #define EK_FLASH_SIZE 0x200000
   
   static struct physmap_flash_data ek_flash_data = {
   #define EK_FLASH_SIZE 0x200000
   
   static struct physmap_flash_data ek_flash_data = {
@@ -2949,7 +2968,7 @@ diff -urN -x CVS linux-2.6.21/arch/arm/mach-at91/board-ek.c linux-2.6-stable/arc
   };
   
   static struct resource ek_flash_resource = {
   };
   
   static struct resource ek_flash_resource = {
-@@ -132,6 +313,18 @@
+@@ -132,6 +313,18 @@ static struct platform_device ek_flash =
         .num_resources  = 1,
   };
   
         .num_resources  = 1,
   };
   
@@ -2968,7 +2987,7 @@ diff -urN -x CVS linux-2.6.21/arch/arm/mach-at91/board-ek.c linux-2.6-stable/arc
   
   static void __init ek_board_init(void)
   {
   
   static void __init ek_board_init(void)
   {
-@@ -158,8 +351,10 @@
+@@ -158,8 +351,10 @@ static void __init ek_board_init(void)
   #endif
         /* NOR Flash */
         platform_device_register(&ek_flash);
   #endif
         /* NOR Flash */
         platform_device_register(&ek_flash);
@@ -2980,9 +2999,10 @@ diff -urN -x CVS linux-2.6.21/arch/arm/mach-at91/board-ek.c linux-2.6-stable/arc
   }
   
   MACHINE_START(AT91RM9200EK, "Atmel AT91RM9200-EK")
   }
   
   MACHINE_START(AT91RM9200EK, "Atmel AT91RM9200-EK")
-diff -urN -x CVS linux-2.6.21/arch/arm/mach-at91/board-kb9202.c linux-2.6-stable/arch/arm/mach-at91/board-kb9202.c
---- linux-2.6.21/arch/arm/mach-at91/board-kb9202.c     Thu Apr 26 05:08:32 2007
-+++ linux-2.6-stable/arch/arm/mach-at91/board-kb9202.c Tue May  8 12:21:31 2007
+Index: linux-2.6.21.7/arch/arm/mach-at91/board-kb9202.c
+===================================================================
+--- linux-2.6.21.7.orig/arch/arm/mach-at91/board-kb9202.c
++++ linux-2.6.21.7/arch/arm/mach-at91/board-kb9202.c
  @@ -37,6 +37,8 @@
   #include <asm/arch/board.h>
   #include <asm/arch/gpio.h>
  @@ -37,6 +37,8 @@
   #include <asm/arch/board.h>
   #include <asm/arch/gpio.h>
@@ -2992,7 +3012,7 @@ diff -urN -x CVS linux-2.6.21/arch/arm/mach-at91/board-kb9202.c linux-2.6-stable
   #include "generic.h"
   
   
   #include "generic.h"
   
   
-@@ -111,6 +113,48 @@
+@@ -111,6 +113,48 @@ static struct at91_nand_data __initdata 
         .partition_info = nand_partitions,
   };
   
         .partition_info = nand_partitions,
   };
   
@@ -3041,7 +3061,7 @@ diff -urN -x CVS linux-2.6.21/arch/arm/mach-at91/board-kb9202.c linux-2.6-stable
   static void __init kb9202_board_init(void)
   {
         /* Serial */
   static void __init kb9202_board_init(void)
   {
         /* Serial */
-@@ -129,6 +173,8 @@
+@@ -129,6 +173,8 @@ static void __init kb9202_board_init(voi
         at91_add_device_spi(NULL, 0);
         /* NAND */
         at91_add_device_nand(&kb9202_nand_data);
         at91_add_device_spi(NULL, 0);
         /* NAND */
         at91_add_device_nand(&kb9202_nand_data);
@@ -3050,10 +3070,11 @@ diff -urN -x CVS linux-2.6.21/arch/arm/mach-at91/board-kb9202.c linux-2.6-stable
   }
   
   MACHINE_START(KB9200, "KB920x")
   }
   
   MACHINE_START(KB9200, "KB920x")
-diff -urN -x CVS linux-2.6.21/arch/arm/mach-at91/board-sam9260ek.c linux-2.6-stable/arch/arm/mach-at91/board-sam9260ek.c
---- linux-2.6.21/arch/arm/mach-at91/board-sam9260ek.c  Thu Apr 26 05:08:32 2007
-+++ linux-2.6-stable/arch/arm/mach-at91/board-sam9260ek.c      Tue May  8 12:13:30 2007
-@@ -104,9 +104,9 @@
+Index: linux-2.6.21.7/arch/arm/mach-at91/board-sam9260ek.c
+===================================================================
+--- linux-2.6.21.7.orig/arch/arm/mach-at91/board-sam9260ek.c
++++ linux-2.6.21.7/arch/arm/mach-at91/board-sam9260ek.c
+@@ -104,9 +104,9 @@ static struct spi_board_info ek_spi_devi
         },
   #endif
   #endif
         },
   #endif
   #endif
@@ -3065,7 +3086,7 @@ diff -urN -x CVS linux-2.6.21/arch/arm/mach-at91/board-sam9260ek.c linux-2.6-sta
                 .chip_select    = 0,
                 .max_speed_hz   = 10 * 1000 * 1000,
                 .bus_num        = 1,
                 .chip_select    = 0,
                 .max_speed_hz   = 10 * 1000 * 1000,
                 .bus_num        = 1,
-@@ -118,7 +118,7 @@
+@@ -118,7 +118,7 @@ static struct spi_board_info ek_spi_devi
   /*
    * MACB Ethernet device
    */
   /*
    * MACB Ethernet device
    */
@@ -3074,7 +3095,7 @@ diff -urN -x CVS linux-2.6.21/arch/arm/mach-at91/board-sam9260ek.c linux-2.6-sta
         .phy_irq_pin    = AT91_PIN_PA7,
         .is_rmii        = 1,
   };
         .phy_irq_pin    = AT91_PIN_PA7,
         .is_rmii        = 1,
   };
-@@ -188,6 +188,8 @@
+@@ -188,6 +188,8 @@ static void __init ek_board_init(void)
         at91_add_device_eth(&ek_macb_data);
         /* MMC */
         at91_add_device_mmc(0, &ek_mmc_data);
         at91_add_device_eth(&ek_macb_data);
         /* MMC */
         at91_add_device_mmc(0, &ek_mmc_data);
@@ -3083,9 +3104,10 @@ diff -urN -x CVS linux-2.6.21/arch/arm/mach-at91/board-sam9260ek.c linux-2.6-sta
   }
   
   MACHINE_START(AT91SAM9260EK, "Atmel AT91SAM9260-EK")
   }
   
   MACHINE_START(AT91SAM9260EK, "Atmel AT91SAM9260-EK")
-diff -urN -x CVS linux-2.6.21/arch/arm/mach-at91/board-sam9261ek.c linux-2.6-stable/arch/arm/mach-at91/board-sam9261ek.c
---- linux-2.6.21/arch/arm/mach-at91/board-sam9261ek.c  Thu Apr 26 05:08:32 2007
-+++ linux-2.6-stable/arch/arm/mach-at91/board-sam9261ek.c      Wed May  9 12:37:19 2007
+Index: linux-2.6.21.7/arch/arm/mach-at91/board-sam9261ek.c
+===================================================================
+--- linux-2.6.21.7.orig/arch/arm/mach-at91/board-sam9261ek.c
++++ linux-2.6.21.7/arch/arm/mach-at91/board-sam9261ek.c
  @@ -25,7 +25,11 @@
   #include <linux/module.h>
   #include <linux/platform_device.h>
  @@ -25,7 +25,11 @@
   #include <linux/module.h>
   #include <linux/platform_device.h>
@@ -3098,7 +3120,7 @@ diff -urN -x CVS linux-2.6.21/arch/arm/mach-at91/board-sam9261ek.c linux-2.6-sta
   
   #include <asm/hardware.h>
   #include <asm/setup.h>
   
   #include <asm/hardware.h>
   #include <asm/setup.h>
-@@ -59,6 +63,9 @@
+@@ -59,6 +63,9 @@ static void __init ek_map_io(void)
         /* Initialize processor: 18.432 MHz crystal */
         at91sam9261_initialize(18432000);
   
         /* Initialize processor: 18.432 MHz crystal */
         at91sam9261_initialize(18432000);
   
@@ -3108,7 +3130,7 @@ diff -urN -x CVS linux-2.6.21/arch/arm/mach-at91/board-sam9261ek.c linux-2.6-sta
         /* Setup the serial ports and console */
         at91_init_serial(&ek_uart_config);
   }
         /* Setup the serial ports and console */
         at91_init_serial(&ek_uart_config);
   }
-@@ -195,6 +202,41 @@
+@@ -195,6 +202,41 @@ static struct at91_nand_data __initdata 
   };
   
   /*
   };
   
   /*
@@ -3150,7 +3172,7 @@ diff -urN -x CVS linux-2.6.21/arch/arm/mach-at91/board-sam9261ek.c linux-2.6-sta
    * SPI devices
    */
   static struct spi_board_info ek_spi_devices[] = {
    * SPI devices
    */
   static struct spi_board_info ek_spi_devices[] = {
-@@ -204,6 +246,17 @@
+@@ -204,6 +246,17 @@ static struct spi_board_info ek_spi_devi
                 .max_speed_hz   = 15 * 1000 * 1000,
                 .bus_num        = 0,
         },
                 .max_speed_hz   = 15 * 1000 * 1000,
                 .bus_num        = 0,
         },
@@ -3168,7 +3190,7 @@ diff -urN -x CVS linux-2.6.21/arch/arm/mach-at91/board-sam9261ek.c linux-2.6-sta
   #if defined(CONFIG_MTD_AT91_DATAFLASH_CARD)
         {       /* DataFlash card - jumper (J12) configurable to CS3 or CS0 */
                 .modalias       = "mtd_dataflash",
   #if defined(CONFIG_MTD_AT91_DATAFLASH_CARD)
         {       /* DataFlash card - jumper (J12) configurable to CS3 or CS0 */
                 .modalias       = "mtd_dataflash",
-@@ -211,9 +264,9 @@
+@@ -211,9 +264,9 @@ static struct spi_board_info ek_spi_devi
                 .max_speed_hz   = 15 * 1000 * 1000,
                 .bus_num        = 0,
         },
                 .max_speed_hz   = 15 * 1000 * 1000,
                 .bus_num        = 0,
         },
@@ -3180,7 +3202,7 @@ diff -urN -x CVS linux-2.6.21/arch/arm/mach-at91/board-sam9261ek.c linux-2.6-sta
                 .chip_select    = 3,
                 .max_speed_hz   = 10 * 1000 * 1000,
                 .bus_num        = 0,
                 .chip_select    = 3,
                 .max_speed_hz   = 10 * 1000 * 1000,
                 .bus_num        = 0,
-@@ -222,6 +275,65 @@
+@@ -222,6 +275,65 @@ static struct spi_board_info ek_spi_devi
   };
   
   
   };
   
   
@@ -3246,7 +3268,7 @@ diff -urN -x CVS linux-2.6.21/arch/arm/mach-at91/board-sam9261ek.c linux-2.6-sta
   static void __init ek_board_init(void)
   {
         /* Serial */
   static void __init ek_board_init(void)
   {
         /* Serial */
-@@ -241,10 +353,14 @@
+@@ -241,10 +353,14 @@ static void __init ek_board_init(void)
   #if defined(CONFIG_SPI_ATMEL) || defined(CONFIG_SPI_ATMEL_MODULE)
         /* SPI */
         at91_add_device_spi(ek_spi_devices, ARRAY_SIZE(ek_spi_devices));
   #if defined(CONFIG_SPI_ATMEL) || defined(CONFIG_SPI_ATMEL_MODULE)
         /* SPI */
         at91_add_device_spi(ek_spi_devices, ARRAY_SIZE(ek_spi_devices));
@@ -3261,9 +3283,10 @@ diff -urN -x CVS linux-2.6.21/arch/arm/mach-at91/board-sam9261ek.c linux-2.6-sta
   }
   
   MACHINE_START(AT91SAM9261EK, "Atmel AT91SAM9261-EK")
   }
   
   MACHINE_START(AT91SAM9261EK, "Atmel AT91SAM9261-EK")
-diff -urN -x CVS linux-2.6.21/arch/arm/mach-at91/board-sam9263ek.c linux-2.6-stable/arch/arm/mach-at91/board-sam9263ek.c
---- linux-2.6.21/arch/arm/mach-at91/board-sam9263ek.c  Thu Apr 26 05:08:32 2007
-+++ linux-2.6-stable/arch/arm/mach-at91/board-sam9263ek.c      Tue May  8 12:56:33 2007
+Index: linux-2.6.21.7/arch/arm/mach-at91/board-sam9263ek.c
+===================================================================
+--- linux-2.6.21.7.orig/arch/arm/mach-at91/board-sam9263ek.c
++++ linux-2.6.21.7/arch/arm/mach-at91/board-sam9263ek.c
  @@ -25,6 +25,10 @@
   #include <linux/module.h>
   #include <linux/platform_device.h>
  @@ -25,6 +25,10 @@
   #include <linux/module.h>
   #include <linux/platform_device.h>
@@ -3275,7 +3298,7 @@ diff -urN -x CVS linux-2.6.21/arch/arm/mach-at91/board-sam9263ek.c linux-2.6-sta
   
   #include <asm/hardware.h>
   #include <asm/setup.h>
   
   #include <asm/hardware.h>
   #include <asm/setup.h>
-@@ -86,6 +90,40 @@
+@@ -86,6 +90,40 @@ static struct at91_udc_data __initdata e
   
   
   /*
   
   
   /*
@@ -3316,7 +3339,7 @@ diff -urN -x CVS linux-2.6.21/arch/arm/mach-at91/board-sam9263ek.c linux-2.6-sta
    * SPI devices.
    */
   static struct spi_board_info ek_spi_devices[] = {
    * SPI devices.
    */
   static struct spi_board_info ek_spi_devices[] = {
-@@ -97,6 +135,16 @@
+@@ -97,6 +135,16 @@ static struct spi_board_info ek_spi_devi
                 .bus_num        = 0,
         },
   #endif
                 .bus_num        = 0,
         },
   #endif
@@ -3333,7 +3356,7 @@ diff -urN -x CVS linux-2.6.21/arch/arm/mach-at91/board-sam9263ek.c linux-2.6-sta
   };
   
   
   };
   
   
-@@ -112,6 +160,14 @@
+@@ -112,6 +160,14 @@ static struct at91_mmc_data __initdata e
   
   
   /*
   
   
   /*
@@ -3348,7 +3371,7 @@ diff -urN -x CVS linux-2.6.21/arch/arm/mach-at91/board-sam9263ek.c linux-2.6-sta
    * NAND flash
    */
   static struct mtd_partition __initdata ek_nand_partition[] = {
    * NAND flash
    */
   static struct mtd_partition __initdata ek_nand_partition[] = {
-@@ -148,6 +204,73 @@
+@@ -148,6 +204,73 @@ static struct at91_nand_data __initdata 
   };
   
   
   };
   
   
@@ -3422,7 +3445,7 @@ diff -urN -x CVS linux-2.6.21/arch/arm/mach-at91/board-sam9263ek.c linux-2.6-sta
   static void __init ek_board_init(void)
   {
         /* Serial */
   static void __init ek_board_init(void)
   {
         /* Serial */
-@@ -157,11 +280,22 @@
+@@ -157,11 +280,22 @@ static void __init ek_board_init(void)
         /* USB Device */
         at91_add_device_udc(&ek_udc_data);
         /* SPI */
         /* USB Device */
         at91_add_device_udc(&ek_udc_data);
         /* SPI */
@@ -3445,9 +3468,10 @@ diff -urN -x CVS linux-2.6.21/arch/arm/mach-at91/board-sam9263ek.c linux-2.6-sta
   }
   
   MACHINE_START(AT91SAM9263EK, "Atmel AT91SAM9263-EK")
   }
   
   MACHINE_START(AT91SAM9263EK, "Atmel AT91SAM9263-EK")
-diff -urN -x CVS linux-2.6.21/arch/arm/mach-at91/board-sam9rlek.c linux-2.6-stable/arch/arm/mach-at91/board-sam9rlek.c
---- linux-2.6.21/arch/arm/mach-at91/board-sam9rlek.c   Thu Jan  1 02:00:00 1970
-+++ linux-2.6-stable/arch/arm/mach-at91/board-sam9rlek.c       Wed May  9 10:58:34 2007
+Index: linux-2.6.21.7/arch/arm/mach-at91/board-sam9rlek.c
+===================================================================
+--- /dev/null
++++ linux-2.6.21.7/arch/arm/mach-at91/board-sam9rlek.c
  @@ -0,0 +1,204 @@
  +/*
  + *  Copyright (C) 2005 SAN People
  @@ -0,0 +1,204 @@
  +/*
  + *  Copyright (C) 2005 SAN People
@@ -3653,9 +3677,10 @@ diff -urN -x CVS linux-2.6.21/arch/arm/mach-at91/board-sam9rlek.c linux-2.6-stab
  +      .init_irq       = ek_init_irq,
  +      .init_machine   = ek_board_init,
  +MACHINE_END
  +      .init_irq       = ek_init_irq,
  +      .init_machine   = ek_board_init,
  +MACHINE_END
-diff -urN -x CVS linux-2.6.21/arch/arm/mach-at91/clock.c linux-2.6-stable/arch/arm/mach-at91/clock.c
---- linux-2.6.21/arch/arm/mach-at91/clock.c    Thu Apr 26 05:08:32 2007
-+++ linux-2.6-stable/arch/arm/mach-at91/clock.c        Tue May  8 12:13:30 2007
+Index: linux-2.6.21.7/arch/arm/mach-at91/clock.c
+===================================================================
+--- linux-2.6.21.7.orig/arch/arm/mach-at91/clock.c
++++ linux-2.6.21.7/arch/arm/mach-at91/clock.c
  @@ -32,6 +32,7 @@
   #include <asm/arch/cpu.h>
   
  @@ -32,6 +32,7 @@
   #include <asm/arch/cpu.h>
   
@@ -3664,7 +3689,7 @@ diff -urN -x CVS linux-2.6.21/arch/arm/mach-at91/clock.c linux-2.6-stable/arch/a
   
   
   /*
   
   
   /*
-@@ -254,6 +255,23 @@
+@@ -254,6 +255,23 @@ EXPORT_SYMBOL(clk_get_rate);
   
   /*------------------------------------------------------------------------*/
   
   
   /*------------------------------------------------------------------------*/
   
@@ -3688,7 +3713,7 @@ diff -urN -x CVS linux-2.6.21/arch/arm/mach-at91/clock.c linux-2.6-stable/arch/a
   #ifdef CONFIG_AT91_PROGRAMMABLE_CLOCKS
   
   /*
   #ifdef CONFIG_AT91_PROGRAMMABLE_CLOCKS
   
   /*
-@@ -375,6 +393,7 @@
+@@ -375,6 +393,7 @@ static int at91_clk_show(struct seq_file
         seq_printf(s, "PLLB = %8x\n", at91_sys_read(AT91_CKGR_PLLBR));
   
         seq_printf(s, "MCKR = %8x\n", at91_sys_read(AT91_PMC_MCKR));
         seq_printf(s, "PLLB = %8x\n", at91_sys_read(AT91_CKGR_PLLBR));
   
         seq_printf(s, "MCKR = %8x\n", at91_sys_read(AT91_PMC_MCKR));
@@ -3696,10 +3721,11 @@ diff -urN -x CVS linux-2.6.21/arch/arm/mach-at91/clock.c linux-2.6-stable/arch/a
         for (i = 0; i < 4; i++)
                 seq_printf(s, "PCK%d = %8x\n", i, at91_sys_read(AT91_PMC_PCKR(i)));
         seq_printf(s, "SR   = %8x\n", sr = at91_sys_read(AT91_PMC_SR));
         for (i = 0; i < 4; i++)
                 seq_printf(s, "PCK%d = %8x\n", i, at91_sys_read(AT91_PMC_PCKR(i)));
         seq_printf(s, "SR   = %8x\n", sr = at91_sys_read(AT91_PMC_SR));
-diff -urN -x CVS linux-2.6.21/arch/arm/mach-at91/generic.h linux-2.6-stable/arch/arm/mach-at91/generic.h
---- linux-2.6.21/arch/arm/mach-at91/generic.h  Thu Apr 26 05:08:32 2007
-+++ linux-2.6-stable/arch/arm/mach-at91/generic.h      Wed May  9 10:20:54 2007
-@@ -13,12 +13,14 @@
+Index: linux-2.6.21.7/arch/arm/mach-at91/generic.h
+===================================================================
+--- linux-2.6.21.7.orig/arch/arm/mach-at91/generic.h
++++ linux-2.6.21.7/arch/arm/mach-at91/generic.h
+@@ -13,12 +13,14 @@ extern void __init at91rm9200_initialize
   extern void __init at91sam9260_initialize(unsigned long main_clock);
   extern void __init at91sam9261_initialize(unsigned long main_clock);
   extern void __init at91sam9263_initialize(unsigned long main_clock);
   extern void __init at91sam9260_initialize(unsigned long main_clock);
   extern void __init at91sam9261_initialize(unsigned long main_clock);
   extern void __init at91sam9263_initialize(unsigned long main_clock);
@@ -3714,7 +3740,7 @@ diff -urN -x CVS linux-2.6.21/arch/arm/mach-at91/generic.h linux-2.6-stable/arch
   extern void __init at91_aic_init(unsigned int priority[]);
   
    /* Timer */
   extern void __init at91_aic_init(unsigned int priority[]);
   
    /* Timer */
-@@ -34,6 +36,7 @@
+@@ -34,6 +36,7 @@ extern void __init at91_clock_associate(
    /* Power Management */
   extern void at91_irq_suspend(void);
   extern void at91_irq_resume(void);
    /* Power Management */
   extern void at91_irq_suspend(void);
   extern void at91_irq_resume(void);
@@ -3722,9 +3748,10 @@ diff -urN -x CVS linux-2.6.21/arch/arm/mach-at91/generic.h linux-2.6-stable/arch
   
    /* GPIO */
   #define AT91RM9200_PQFP               3       /* AT91RM9200 PQFP package has 3 banks */
   
    /* GPIO */
   #define AT91RM9200_PQFP               3       /* AT91RM9200 PQFP package has 3 banks */
-diff -urN -x CVS linux-2.6.21/arch/arm/mach-at91/ics1523.c linux-2.6-stable/arch/arm/mach-at91/ics1523.c
---- linux-2.6.21/arch/arm/mach-at91/ics1523.c  Thu Jan  1 02:00:00 1970
-+++ linux-2.6-stable/arch/arm/mach-at91/ics1523.c      Tue May  8 12:13:30 2007
+Index: linux-2.6.21.7/arch/arm/mach-at91/ics1523.c
+===================================================================
+--- /dev/null
++++ linux-2.6.21.7/arch/arm/mach-at91/ics1523.c
  @@ -0,0 +1,207 @@
  +/*
  + * arch/arm/mach-at91rm9200/ics1523.c
  @@ -0,0 +1,207 @@
  +/*
  + * arch/arm/mach-at91rm9200/ics1523.c
@@ -3933,10 +3960,11 @@ diff -urN -x CVS linux-2.6.21/arch/arm/mach-at91/ics1523.c linux-2.6-stable/arch
  +
  +      return ack;
  +}
  +
  +      return ack;
  +}
-diff -urN -x CVS linux-2.6.21/arch/arm/mach-at91/pm.c linux-2.6-stable/arch/arm/mach-at91/pm.c
---- linux-2.6.21/arch/arm/mach-at91/pm.c       Thu Apr 26 05:08:32 2007
-+++ linux-2.6-stable/arch/arm/mach-at91/pm.c   Tue May  8 12:13:31 2007
-@@ -63,6 +63,7 @@
+Index: linux-2.6.21.7/arch/arm/mach-at91/pm.c
+===================================================================
+--- linux-2.6.21.7.orig/arch/arm/mach-at91/pm.c
++++ linux-2.6.21.7/arch/arm/mach-at91/pm.c
+@@ -63,6 +63,7 @@ static int at91_pm_prepare(suspend_state
    * Verify that all the clocks are correct before entering
    * slow-clock mode.
    */
    * Verify that all the clocks are correct before entering
    * slow-clock mode.
    */
@@ -3944,7 +3972,7 @@ diff -urN -x CVS linux-2.6.21/arch/arm/mach-at91/pm.c linux-2.6-stable/arch/arm/
   static int at91_pm_verify_clocks(void)
   {
         unsigned long scsr;
   static int at91_pm_verify_clocks(void)
   {
         unsigned long scsr;
-@@ -104,20 +105,15 @@
+@@ -104,20 +105,15 @@ static int at91_pm_verify_clocks(void)
   }
   
   /*
   }
   
   /*
@@ -3966,7 +3994,7 @@ diff -urN -x CVS linux-2.6.21/arch/arm/mach-at91/pm.c linux-2.6-stable/arch/arm/
   
   
   static void (*slow_clock)(void);
   
   
   static void (*slow_clock)(void);
-@@ -207,16 +203,23 @@
+@@ -207,16 +203,23 @@ static struct pm_ops at91_pm_ops ={
         .enter          = at91_pm_enter,
   };
   
         .enter          = at91_pm_enter,
   };
   
@@ -3995,9 +4023,10 @@ diff -urN -x CVS linux-2.6.21/arch/arm/mach-at91/pm.c linux-2.6-stable/arch/arm/
   #endif
   
         /* Disable SDRAM low-power mode.  Cannot be used with self-refresh. */
   #endif
   
         /* Disable SDRAM low-power mode.  Cannot be used with self-refresh. */
-diff -urN -x CVS linux-2.6.21/arch/arm/mach-at91/pm_slowclock.S linux-2.6-stable/arch/arm/mach-at91/pm_slowclock.S
---- linux-2.6.21/arch/arm/mach-at91/pm_slowclock.S     Thu Jan  1 02:00:00 1970
-+++ linux-2.6-stable/arch/arm/mach-at91/pm_slowclock.S Tue May  8 12:13:31 2007
+Index: linux-2.6.21.7/arch/arm/mach-at91/pm_slowclock.S
+===================================================================
+--- /dev/null
++++ linux-2.6.21.7/arch/arm/mach-at91/pm_slowclock.S
  @@ -0,0 +1,172 @@
  +/*
  + * arch/arm/mach-at91/pm_slow_clock.S
  @@ -0,0 +1,172 @@
  +/*
  + * arch/arm/mach-at91/pm_slow_clock.S
@@ -4171,9 +4200,10 @@ diff -urN -x CVS linux-2.6.21/arch/arm/mach-at91/pm_slowclock.S linux-2.6-stable
  +
  +ENTRY(at91rm9200_slow_clock_sz)
  +      .word .-at91rm9200_slow_clock
  +
  +ENTRY(at91rm9200_slow_clock_sz)
  +      .word .-at91rm9200_slow_clock
-diff -urN -x CVS linux-2.6.21/arch/arm/mach-at91/tclib.c linux-2.6-stable/arch/arm/mach-at91/tclib.c
---- linux-2.6.21/arch/arm/mach-at91/tclib.c    Thu Jan  1 02:00:00 1970
-+++ linux-2.6-stable/arch/arm/mach-at91/tclib.c        Tue May  8 12:13:31 2007
+Index: linux-2.6.21.7/arch/arm/mach-at91/tclib.c
+===================================================================
+--- /dev/null
++++ linux-2.6.21.7/arch/arm/mach-at91/tclib.c
  @@ -0,0 +1,17 @@
  +#include <linux/clk.h>
  +#include <linux/kernel.h>
  @@ -0,0 +1,17 @@
  +#include <linux/clk.h>
  +#include <linux/kernel.h>
@@ -4192,9 +4222,10 @@ diff -urN -x CVS linux-2.6.21/arch/arm/mach-at91/tclib.c linux-2.6-stable/arch/a
  +      blocks = tcblocks;
  +      nblocks = n;
  +}
  +      blocks = tcblocks;
  +      nblocks = n;
  +}
-diff -urN -x CVS linux-2.6.21/arch/arm/mach-at91/tclib.h linux-2.6-stable/arch/arm/mach-at91/tclib.h
---- linux-2.6.21/arch/arm/mach-at91/tclib.h    Thu Jan  1 02:00:00 1970
-+++ linux-2.6-stable/arch/arm/mach-at91/tclib.h        Tue May  8 12:13:31 2007
+Index: linux-2.6.21.7/arch/arm/mach-at91/tclib.h
+===================================================================
+--- /dev/null
++++ linux-2.6.21.7/arch/arm/mach-at91/tclib.h
  @@ -0,0 +1,11 @@
  +
  +#define TC_PER_TCB    3
  @@ -0,0 +1,11 @@
  +
  +#define TC_PER_TCB    3
@@ -4207,10 +4238,11 @@ diff -urN -x CVS linux-2.6.21/arch/arm/mach-at91/tclib.h linux-2.6-stable/arch/a
  +};
  +
  +extern void __init atmel_tc_init(struct atmel_tcblock *tcblocks, int n);
  +};
  +
  +extern void __init atmel_tc_init(struct atmel_tcblock *tcblocks, int n);
-diff -urN -x CVS linux-2.6.21/arch/arm/mm/Kconfig linux-2.6-stable/arch/arm/mm/Kconfig
---- linux-2.6.21/arch/arm/mm/Kconfig   Thu Apr 26 05:08:32 2007
-+++ linux-2.6-stable/arch/arm/mm/Kconfig       Wed May  9 10:20:54 2007
-@@ -171,8 +171,8 @@
+Index: linux-2.6.21.7/arch/arm/mm/Kconfig
+===================================================================
+--- linux-2.6.21.7.orig/arch/arm/mm/Kconfig
++++ linux-2.6.21.7/arch/arm/mm/Kconfig
+@@ -171,8 +171,8 @@ config CPU_ARM925T
   # ARM926T
   config CPU_ARM926T
         bool "Support ARM926T processor"
   # ARM926T
   config CPU_ARM926T
         bool "Support ARM926T processor"
@@ -4221,10 +4253,11 @@ diff -urN -x CVS linux-2.6.21/arch/arm/mm/Kconfig linux-2.6-stable/arch/arm/mm/K
         select CPU_32v5
         select CPU_ABRT_EV5TJ
         select CPU_CACHE_VIVT
         select CPU_32v5
         select CPU_ABRT_EV5TJ
         select CPU_CACHE_VIVT
-diff -urN -x CVS linux-2.6.21/arch/arm/tools/mach-types linux-2.6-stable/arch/arm/tools/mach-types
---- linux-2.6.21/arch/arm/tools/mach-types     Thu Apr 26 05:08:32 2007
-+++ linux-2.6-stable/arch/arm/tools/mach-types Tue May  8 12:13:31 2007
-@@ -1335,3 +1335,32 @@
+Index: linux-2.6.21.7/arch/arm/tools/mach-types
+===================================================================
+--- linux-2.6.21.7.orig/arch/arm/tools/mach-types
++++ linux-2.6.21.7/arch/arm/tools/mach-types
+@@ -1335,3 +1335,32 @@ at91sam9rlek            MACH_AT91SAM9RLEK       AT91SAM9
   comtech_router                MACH_COMTECH_ROUTER     COMTECH_ROUTER          1327
   sbc2410x              MACH_SBC2410X           SBC2410X                1328
   at4x0bd                       MACH_AT4X0BD            AT4X0BD                 1329
   comtech_router                MACH_COMTECH_ROUTER     COMTECH_ROUTER          1327
   sbc2410x              MACH_SBC2410X           SBC2410X                1328
   at4x0bd                       MACH_AT4X0BD            AT4X0BD                 1329
@@ -4257,10 +4290,11 @@ diff -urN -x CVS linux-2.6.21/arch/arm/tools/mach-types linux-2.6-stable/arch/ar
  +dwl2100                       MACH_DWL2100            DWL2100                 1356
  +vinsi                 MACH_VINSI              VINSI                   1357
  +db88f5281             MACH_DB88F5281          DB88F5281               1358
  +dwl2100                       MACH_DWL2100            DWL2100                 1356
  +vinsi                 MACH_VINSI              VINSI                   1357
  +db88f5281             MACH_DB88F5281          DB88F5281               1358
-diff -urN -x CVS linux-2.6.21/drivers/char/Kconfig linux-2.6-stable/drivers/char/Kconfig
---- linux-2.6.21/drivers/char/Kconfig  Thu Apr 26 05:08:32 2007
-+++ linux-2.6-stable/drivers/char/Kconfig      Tue May  8 14:31:24 2007
-@@ -1071,5 +1071,21 @@
+Index: linux-2.6.21.7/drivers/char/Kconfig
+===================================================================
+--- linux-2.6.21.7.orig/drivers/char/Kconfig
++++ linux-2.6.21.7/drivers/char/Kconfig
+@@ -1071,5 +1071,21 @@ config TELCLOCK
           /sys/devices/platform/telco_clock, with a number of files for
           controlling the behavior of this hardware.
   
           /sys/devices/platform/telco_clock, with a number of files for
           controlling the behavior of this hardware.
   
@@ -4282,10 +4316,11 @@ diff -urN -x CVS linux-2.6.21/drivers/char/Kconfig linux-2.6-stable/drivers/char
  +
   endmenu
   
  +
   endmenu
   
-diff -urN -x CVS linux-2.6.21/drivers/char/Makefile linux-2.6-stable/drivers/char/Makefile
---- linux-2.6.21/drivers/char/Makefile Thu Apr 26 05:08:32 2007
-+++ linux-2.6-stable/drivers/char/Makefile     Tue May  8 14:31:24 2007
-@@ -93,6 +93,8 @@
+Index: linux-2.6.21.7/drivers/char/Makefile
+===================================================================
+--- linux-2.6.21.7.orig/drivers/char/Makefile
++++ linux-2.6.21.7/drivers/char/Makefile
+@@ -93,6 +93,8 @@ obj-$(CONFIG_CS5535_GPIO)    += cs5535_gpio
   obj-$(CONFIG_GPIO_VR41XX)     += vr41xx_giu.o
   obj-$(CONFIG_TANBAC_TB0219)   += tb0219.o
   obj-$(CONFIG_TELCLOCK)                += tlclk.o
   obj-$(CONFIG_GPIO_VR41XX)     += vr41xx_giu.o
   obj-$(CONFIG_TANBAC_TB0219)   += tb0219.o
   obj-$(CONFIG_TELCLOCK)                += tlclk.o
@@ -4294,9 +4329,10 @@ diff -urN -x CVS linux-2.6.21/drivers/char/Makefile linux-2.6-stable/drivers/cha
   
   obj-$(CONFIG_WATCHDOG)                += watchdog/
   obj-$(CONFIG_MWAVE)           += mwave/
   
   obj-$(CONFIG_WATCHDOG)                += watchdog/
   obj-$(CONFIG_MWAVE)           += mwave/
-diff -urN -x CVS linux-2.6.21/drivers/char/at91_spi.c linux-2.6-stable/drivers/char/at91_spi.c
---- linux-2.6.21/drivers/char/at91_spi.c       Thu Jan  1 02:00:00 1970
-+++ linux-2.6-stable/drivers/char/at91_spi.c   Tue May  8 14:31:24 2007
+Index: linux-2.6.21.7/drivers/char/at91_spi.c
+===================================================================
+--- /dev/null
++++ linux-2.6.21.7/drivers/char/at91_spi.c
  @@ -0,0 +1,336 @@
  +/*
  + * Serial Peripheral Interface (SPI) driver for the Atmel AT91RM9200 (Thunder)
  @@ -0,0 +1,336 @@
  +/*
  + * Serial Peripheral Interface (SPI) driver for the Atmel AT91RM9200 (Thunder)
@@ -4634,9 +4670,10 @@ diff -urN -x CVS linux-2.6.21/drivers/char/at91_spi.c linux-2.6-stable/drivers/c
  +MODULE_LICENSE("GPL")
  +MODULE_AUTHOR("Andrew Victor")
  +MODULE_DESCRIPTION("SPI driver for Atmel AT91RM9200")
  +MODULE_LICENSE("GPL")
  +MODULE_AUTHOR("Andrew Victor")
  +MODULE_DESCRIPTION("SPI driver for Atmel AT91RM9200")
-diff -urN -x CVS linux-2.6.21/drivers/char/at91_spidev.c linux-2.6-stable/drivers/char/at91_spidev.c
---- linux-2.6.21/drivers/char/at91_spidev.c    Thu Jan  1 02:00:00 1970
-+++ linux-2.6-stable/drivers/char/at91_spidev.c        Tue May  8 14:31:24 2007
+Index: linux-2.6.21.7/drivers/char/at91_spidev.c
+===================================================================
+--- /dev/null
++++ linux-2.6.21.7/drivers/char/at91_spidev.c
  @@ -0,0 +1,236 @@
  +/*
  + * User-space interface to the SPI bus on Atmel AT91RM9200
  @@ -0,0 +1,236 @@
  +/*
  + * User-space interface to the SPI bus on Atmel AT91RM9200
@@ -4874,10 +4911,11 @@ diff -urN -x CVS linux-2.6.21/drivers/char/at91_spidev.c linux-2.6-stable/driver
  +MODULE_LICENSE("GPL")
  +MODULE_AUTHOR("Andrew Victor")
  +MODULE_DESCRIPTION("SPI /dev interface for Atmel AT91RM9200")
  +MODULE_LICENSE("GPL")
  +MODULE_AUTHOR("Andrew Victor")
  +MODULE_DESCRIPTION("SPI /dev interface for Atmel AT91RM9200")
-diff -urN -x CVS linux-2.6.21/drivers/i2c/busses/Kconfig linux-2.6-stable/drivers/i2c/busses/Kconfig
---- linux-2.6.21/drivers/i2c/busses/Kconfig    Thu Apr 26 05:08:32 2007
-+++ linux-2.6-stable/drivers/i2c/busses/Kconfig        Tue May  8 12:13:31 2007
-@@ -81,6 +81,14 @@
+Index: linux-2.6.21.7/drivers/i2c/busses/Kconfig
+===================================================================
+--- linux-2.6.21.7.orig/drivers/i2c/busses/Kconfig
++++ linux-2.6.21.7/drivers/i2c/busses/Kconfig
+@@ -81,6 +81,14 @@ config I2C_AT91
           This supports the use of the I2C interface on Atmel AT91
           processors.
   
           This supports the use of the I2C interface on Atmel AT91
           processors.
   
@@ -4892,7 +4930,7 @@ diff -urN -x CVS linux-2.6.21/drivers/i2c/busses/Kconfig linux-2.6-stable/driver
   config I2C_AU1550
         tristate "Au1550/Au1200 SMBus interface"
         depends on I2C && (SOC_AU1550 || SOC_AU1200)
   config I2C_AU1550
         tristate "Au1550/Au1200 SMBus interface"
         depends on I2C && (SOC_AU1550 || SOC_AU1200)
-@@ -545,6 +553,14 @@
+@@ -545,6 +553,14 @@ config I2C_VOODOO3
           This driver can also be built as a module.  If so, the module
           will be called i2c-voodoo3.
   
           This driver can also be built as a module.  If so, the module
           will be called i2c-voodoo3.
   
@@ -4907,10 +4945,11 @@ diff -urN -x CVS linux-2.6.21/drivers/i2c/busses/Kconfig linux-2.6-stable/driver
   config I2C_PCA_ISA
         tristate "PCA9564 on an ISA bus"
         depends on I2C
   config I2C_PCA_ISA
         tristate "PCA9564 on an ISA bus"
         depends on I2C
-diff -urN -x CVS linux-2.6.21/drivers/i2c/busses/Makefile linux-2.6-stable/drivers/i2c/busses/Makefile
---- linux-2.6.21/drivers/i2c/busses/Makefile   Thu Apr 26 05:08:32 2007
-+++ linux-2.6-stable/drivers/i2c/busses/Makefile       Tue May  8 12:13:31 2007
-@@ -28,6 +28,7 @@
+Index: linux-2.6.21.7/drivers/i2c/busses/Makefile
+===================================================================
+--- linux-2.6.21.7.orig/drivers/i2c/busses/Makefile
++++ linux-2.6.21.7/drivers/i2c/busses/Makefile
+@@ -28,6 +28,7 @@ obj-$(CONFIG_I2C_OMAP)               += i2c-omap.o
   obj-$(CONFIG_I2C_PARPORT)     += i2c-parport.o
   obj-$(CONFIG_I2C_PARPORT_LIGHT)       += i2c-parport-light.o
   obj-$(CONFIG_I2C_PASEMI)      += i2c-pasemi.o
   obj-$(CONFIG_I2C_PARPORT)     += i2c-parport.o
   obj-$(CONFIG_I2C_PARPORT_LIGHT)       += i2c-parport-light.o
   obj-$(CONFIG_I2C_PASEMI)      += i2c-pasemi.o
@@ -4918,9 +4957,10 @@ diff -urN -x CVS linux-2.6.21/drivers/i2c/busses/Makefile linux-2.6-stable/drive
   obj-$(CONFIG_I2C_PCA_ISA)     += i2c-pca-isa.o
   obj-$(CONFIG_I2C_PIIX4)               += i2c-piix4.o
   obj-$(CONFIG_I2C_PNX)         += i2c-pnx.o
   obj-$(CONFIG_I2C_PCA_ISA)     += i2c-pca-isa.o
   obj-$(CONFIG_I2C_PIIX4)               += i2c-piix4.o
   obj-$(CONFIG_I2C_PNX)         += i2c-pnx.o
-diff -urN -x CVS linux-2.6.21/drivers/i2c/busses/i2c-at91.c linux-2.6-stable/drivers/i2c/busses/i2c-at91.c
---- linux-2.6.21/drivers/i2c/busses/i2c-at91.c Thu Apr 26 05:08:32 2007
-+++ linux-2.6-stable/drivers/i2c/busses/i2c-at91.c     Tue May  8 12:13:31 2007
+Index: linux-2.6.21.7/drivers/i2c/busses/i2c-at91.c
+===================================================================
+--- linux-2.6.21.7.orig/drivers/i2c/busses/i2c-at91.c
++++ linux-2.6.21.7/drivers/i2c/busses/i2c-at91.c
  @@ -31,8 +31,11 @@
   #include <asm/arch/board.h>
   #include <asm/arch/cpu.h>
  @@ -31,8 +31,11 @@
   #include <asm/arch/board.h>
   #include <asm/arch/cpu.h>
@@ -4934,7 +4974,7 @@ diff -urN -x CVS linux-2.6.21/drivers/i2c/busses/i2c-at91.c linux-2.6-stable/dri
   
   static struct clk *twi_clk;
   static void __iomem *twi_base;
   
   static struct clk *twi_clk;
   static void __iomem *twi_base;
-@@ -53,7 +56,7 @@
+@@ -53,7 +56,7 @@ static void __devinit at91_twi_hwinit(vo
         at91_twi_write(AT91_TWI_CR, AT91_TWI_MSEN);     /* Set Master mode */
   
         /* Calcuate clock dividers */
         at91_twi_write(AT91_TWI_CR, AT91_TWI_MSEN);     /* Set Master mode */
   
         /* Calcuate clock dividers */
@@ -4943,7 +4983,7 @@ diff -urN -x CVS linux-2.6.21/drivers/i2c/busses/i2c-at91.c linux-2.6-stable/dri
         cdiv = cdiv + 1;        /* round up */
         ckdiv = 0;
         while (cdiv > 255) {
         cdiv = cdiv + 1;        /* round up */
         ckdiv = 0;
         while (cdiv > 255) {
-@@ -61,11 +64,12 @@
+@@ -61,11 +64,12 @@ static void __devinit at91_twi_hwinit(vo
                 cdiv = cdiv >> 1;
         }
   
                 cdiv = cdiv >> 1;
         }
   
@@ -4961,9 +5001,10 @@ diff -urN -x CVS linux-2.6.21/drivers/i2c/busses/i2c-at91.c linux-2.6-stable/dri
         }
   
         at91_twi_write(AT91_TWI_CWGR, (ckdiv << 16) | (cdiv << 8) | cdiv);
         }
   
         at91_twi_write(AT91_TWI_CWGR, (ckdiv << 16) | (cdiv << 8) | cdiv);
-diff -urN -x CVS linux-2.6.21/drivers/i2c/busses/i2c-pca.c linux-2.6-stable/drivers/i2c/busses/i2c-pca.c
---- linux-2.6.21/drivers/i2c/busses/i2c-pca.c  Thu Jan  1 02:00:00 1970
-+++ linux-2.6-stable/drivers/i2c/busses/i2c-pca.c      Tue May  8 12:13:31 2007
+Index: linux-2.6.21.7/drivers/i2c/busses/i2c-pca.c
+===================================================================
+--- /dev/null
++++ linux-2.6.21.7/drivers/i2c/busses/i2c-pca.c
  @@ -0,0 +1,213 @@
  +/*
  + *  Platform driver for PCA9564 I2C bus controller.
  @@ -0,0 +1,213 @@
  +/*
  + *  Platform driver for PCA9564 I2C bus controller.
@@ -5178,9 +5219,10 @@ diff -urN -x CVS linux-2.6.21/drivers/i2c/busses/i2c-pca.c linux-2.6-stable/driv
  +MODULE_AUTHOR("Andrew Victor");
  +MODULE_DESCRIPTION("PCA9564 platform driver");
  +MODULE_LICENSE("GPL");
  +MODULE_AUTHOR("Andrew Victor");
  +MODULE_DESCRIPTION("PCA9564 platform driver");
  +MODULE_LICENSE("GPL");
-diff -urN -x CVS linux-2.6.21/drivers/input/touchscreen/ads7846.c linux-2.6-stable/drivers/input/touchscreen/ads7846.c
---- linux-2.6.21/drivers/input/touchscreen/ads7846.c   Thu Apr 26 05:08:32 2007
-+++ linux-2.6-stable/drivers/input/touchscreen/ads7846.c       Tue May  8 12:56:33 2007
+Index: linux-2.6.21.7/drivers/input/touchscreen/ads7846.c
+===================================================================
+--- linux-2.6.21.7.orig/drivers/input/touchscreen/ads7846.c
++++ linux-2.6.21.7/drivers/input/touchscreen/ads7846.c
  @@ -39,7 +39,8 @@
   /*
    * This code has been heavily tested on a Nokia 770, and lightly
  @@ -39,7 +39,8 @@
   /*
    * This code has been heavily tested on a Nokia 770, and lightly
@@ -5191,7 +5233,7 @@ diff -urN -x CVS linux-2.6.21/drivers/input/touchscreen/ads7846.c linux-2.6-stab
    *
    * IRQ handling needs a workaround because of a shortcoming in handling
    * edge triggered IRQs on some platforms like the OMAP1/2. These
    *
    * IRQ handling needs a workaround because of a shortcoming in handling
    * edge triggered IRQs on some platforms like the OMAP1/2. These
-@@ -246,18 +247,16 @@
+@@ -246,18 +247,16 @@ static int ads7846_read12_ser(struct dev
   
         /* REVISIT:  take a few more samples, and compare ... */
   
   
         /* REVISIT:  take a few more samples, and compare ... */
   
@@ -5220,7 +5262,7 @@ diff -urN -x CVS linux-2.6.21/drivers/input/touchscreen/ads7846.c linux-2.6-stab
   
         ts->irq_disabled = 1;
         disable_irq(spi->irq);
   
         ts->irq_disabled = 1;
         disable_irq(spi->irq);
-@@ -536,6 +535,9 @@
+@@ -536,6 +535,9 @@ static void ads7846_rx(void *ads)
         } else
                 Rt = 0;
   
         } else
                 Rt = 0;
   
@@ -5230,10 +5272,11 @@ diff -urN -x CVS linux-2.6.21/drivers/input/touchscreen/ads7846.c linux-2.6-stab
         /* Sample found inconsistent by debouncing or pressure is beyond
          * the maximum. Don't report it to user space, repeat at least
          * once more the measurement
         /* Sample found inconsistent by debouncing or pressure is beyond
          * the maximum. Don't report it to user space, repeat at least
          * once more the measurement
-diff -urN -x CVS linux-2.6.21/drivers/leds/Kconfig linux-2.6-stable/drivers/leds/Kconfig
---- linux-2.6.21/drivers/leds/Kconfig  Thu Apr 26 05:08:32 2007
-+++ linux-2.6-stable/drivers/leds/Kconfig      Tue May  8 12:13:31 2007
-@@ -76,6 +76,13 @@
+Index: linux-2.6.21.7/drivers/leds/Kconfig
+===================================================================
+--- linux-2.6.21.7.orig/drivers/leds/Kconfig
++++ linux-2.6.21.7/drivers/leds/Kconfig
+@@ -76,6 +76,13 @@ config LEDS_NET48XX
           This option enables support for the Soekris net4801 and net4826 error
           LED.
   
           This option enables support for the Soekris net4801 and net4826 error
           LED.
   
@@ -5247,10 +5290,11 @@ diff -urN -x CVS linux-2.6.21/drivers/leds/Kconfig linux-2.6-stable/drivers/leds
   config LEDS_WRAP
         tristate "LED Support for the WRAP series LEDs"
         depends on LEDS_CLASS && SCx200_GPIO
   config LEDS_WRAP
         tristate "LED Support for the WRAP series LEDs"
         depends on LEDS_CLASS && SCx200_GPIO
-diff -urN -x CVS linux-2.6.21/drivers/leds/Makefile linux-2.6-stable/drivers/leds/Makefile
---- linux-2.6.21/drivers/leds/Makefile Thu Apr 26 05:08:32 2007
-+++ linux-2.6-stable/drivers/leds/Makefile     Tue May  8 12:13:31 2007
-@@ -16,6 +16,7 @@
+Index: linux-2.6.21.7/drivers/leds/Makefile
+===================================================================
+--- linux-2.6.21.7.orig/drivers/leds/Makefile
++++ linux-2.6.21.7/drivers/leds/Makefile
+@@ -16,6 +16,7 @@ obj-$(CONFIG_LEDS_NET48XX)           += leds-net4
   obj-$(CONFIG_LEDS_WRAP)                       += leds-wrap.o
   obj-$(CONFIG_LEDS_H1940)              += leds-h1940.o
   obj-$(CONFIG_LEDS_COBALT)             += leds-cobalt.o
   obj-$(CONFIG_LEDS_WRAP)                       += leds-wrap.o
   obj-$(CONFIG_LEDS_H1940)              += leds-h1940.o
   obj-$(CONFIG_LEDS_COBALT)             += leds-cobalt.o
@@ -5258,9 +5302,10 @@ diff -urN -x CVS linux-2.6.21/drivers/leds/Makefile linux-2.6-stable/drivers/led
   
   # LED Triggers
   obj-$(CONFIG_LEDS_TRIGGER_TIMER)      += ledtrig-timer.o
   
   # LED Triggers
   obj-$(CONFIG_LEDS_TRIGGER_TIMER)      += ledtrig-timer.o
-diff -urN -x CVS linux-2.6.21/drivers/leds/leds-at91.c linux-2.6-stable/drivers/leds/leds-at91.c
---- linux-2.6.21/drivers/leds/leds-at91.c      Thu Jan  1 02:00:00 1970
-+++ linux-2.6-stable/drivers/leds/leds-at91.c  Tue May  8 12:13:31 2007
+Index: linux-2.6.21.7/drivers/leds/leds-at91.c
+===================================================================
+--- /dev/null
++++ linux-2.6.21.7/drivers/leds/leds-at91.c
  @@ -0,0 +1,140 @@
  +/*
  + * AT91 GPIO based LED driver
  @@ -0,0 +1,140 @@
  +/*
  + * AT91 GPIO based LED driver
@@ -5402,9 +5447,10 @@ diff -urN -x CVS linux-2.6.21/drivers/leds/leds-at91.c linux-2.6-stable/drivers/
  +MODULE_DESCRIPTION("AT91 GPIO LED driver");
  +MODULE_AUTHOR("David Brownell");
  +MODULE_LICENSE("GPL");
  +MODULE_DESCRIPTION("AT91 GPIO LED driver");
  +MODULE_AUTHOR("David Brownell");
  +MODULE_LICENSE("GPL");
-diff -urN -x CVS linux-2.6.21/drivers/mmc/at91_mci.c linux-2.6-stable/drivers/mmc/at91_mci.c
---- linux-2.6.21/drivers/mmc/at91_mci.c        Thu Apr 26 05:08:32 2007
-+++ linux-2.6-stable/drivers/mmc/at91_mci.c    Fri May 11 17:13:13 2007
+Index: linux-2.6.21.7/drivers/mmc/at91_mci.c
+===================================================================
+--- linux-2.6.21.7.orig/drivers/mmc/at91_mci.c
++++ linux-2.6.21.7/drivers/mmc/at91_mci.c
  @@ -86,7 +86,7 @@
   
   #define AT91_MCI_ERRORS       (AT91_MCI_RINDE | AT91_MCI_RDIRE | AT91_MCI_RCRCE       \
  @@ -86,7 +86,7 @@
   
   #define AT91_MCI_ERRORS       (AT91_MCI_RINDE | AT91_MCI_RDIRE | AT91_MCI_RCRCE       \
@@ -5414,7 +5460,7 @@ diff -urN -x CVS linux-2.6.21/drivers/mmc/at91_mci.c linux-2.6-stable/drivers/mm
   
   #define at91_mci_read(host, reg)      __raw_readl((host)->baseaddr + (reg))
   #define at91_mci_write(host, reg, val)        __raw_writel((val), (host)->baseaddr + (reg))
   
   #define at91_mci_read(host, reg)      __raw_readl((host)->baseaddr + (reg))
   #define at91_mci_write(host, reg, val)        __raw_writel((val), (host)->baseaddr + (reg))
-@@ -561,9 +561,7 @@
+@@ -561,9 +561,7 @@ static void at91mci_completed_command(st
         pr_debug("Status = %08X [%08X %08X %08X %08X]\n",
                  status, cmd->resp[0], cmd->resp[1], cmd->resp[2], cmd->resp[3]);
   
         pr_debug("Status = %08X [%08X %08X %08X %08X]\n",
                  status, cmd->resp[0], cmd->resp[1], cmd->resp[2], cmd->resp[3]);
   
@@ -5425,7 +5471,7 @@ diff -urN -x CVS linux-2.6.21/drivers/mmc/at91_mci.c linux-2.6-stable/drivers/mm
                 if ((status & AT91_MCI_RCRCE) &&
                         ((cmd->opcode == MMC_SEND_OP_COND) || (cmd->opcode == SD_APP_OP_COND))) {
                         cmd->error = MMC_ERR_NONE;
                 if ((status & AT91_MCI_RCRCE) &&
                         ((cmd->opcode == MMC_SEND_OP_COND) || (cmd->opcode == SD_APP_OP_COND))) {
                         cmd->error = MMC_ERR_NONE;
-@@ -665,15 +663,15 @@
+@@ -665,15 +663,15 @@ static irqreturn_t at91_mci_irq(int irq,
   
         int_status = at91_mci_read(host, AT91_MCI_SR);
         int_mask = at91_mci_read(host, AT91_MCI_IMR);
   
         int_status = at91_mci_read(host, AT91_MCI_SR);
         int_mask = at91_mci_read(host, AT91_MCI_IMR);
@@ -5444,7 +5490,7 @@ diff -urN -x CVS linux-2.6.21/drivers/mmc/at91_mci.c linux-2.6-stable/drivers/mm
                 if (int_status & AT91_MCI_UNRE)
                         pr_debug("MMC: Underrun error\n");
                 if (int_status & AT91_MCI_OVRE)
                 if (int_status & AT91_MCI_UNRE)
                         pr_debug("MMC: Underrun error\n");
                 if (int_status & AT91_MCI_OVRE)
-@@ -821,7 +819,7 @@
+@@ -821,7 +819,7 @@ static int __init at91_mci_probe(struct 
         mmc->f_min = 375000;
         mmc->f_max = 25000000;
         mmc->ocr_avail = MMC_VDD_32_33 | MMC_VDD_33_34;
         mmc->f_min = 375000;
         mmc->f_max = 25000000;
         mmc->ocr_avail = MMC_VDD_32_33 | MMC_VDD_33_34;
@@ -5453,7 +5499,7 @@ diff -urN -x CVS linux-2.6.21/drivers/mmc/at91_mci.c linux-2.6-stable/drivers/mm
   
         mmc->max_blk_size = 4095;
         mmc->max_blk_count = mmc->max_req_size;
   
         mmc->max_blk_size = 4095;
         mmc->max_blk_count = mmc->max_req_size;
-@@ -895,6 +893,8 @@
+@@ -895,6 +893,8 @@ static int __init at91_mci_probe(struct 
   
         mmc_add_host(mmc);
   
   
         mmc_add_host(mmc);
   
@@ -5462,7 +5508,7 @@ diff -urN -x CVS linux-2.6.21/drivers/mmc/at91_mci.c linux-2.6-stable/drivers/mm
         /*
          * monitor card insertion/removal if we can
          */
         /*
          * monitor card insertion/removal if we can
          */
-@@ -924,6 +924,8 @@
+@@ -924,6 +924,8 @@ static int __exit at91_mci_remove(struct
   
         host = mmc_priv(mmc);
   
   
         host = mmc_priv(mmc);
   
@@ -5471,7 +5517,7 @@ diff -urN -x CVS linux-2.6.21/drivers/mmc/at91_mci.c linux-2.6-stable/drivers/mm
         if (host->present != -1) {
                 free_irq(host->board->det_pin, host);
                 cancel_delayed_work(&host->mmc->detect);
         if (host->present != -1) {
                 free_irq(host->board->det_pin, host);
                 cancel_delayed_work(&host->mmc->detect);
-@@ -951,8 +953,12 @@
+@@ -951,8 +953,12 @@ static int __exit at91_mci_remove(struct
   static int at91_mci_suspend(struct platform_device *pdev, pm_message_t state)
   {
         struct mmc_host *mmc = platform_get_drvdata(pdev);
   static int at91_mci_suspend(struct platform_device *pdev, pm_message_t state)
   {
         struct mmc_host *mmc = platform_get_drvdata(pdev);
@@ -5484,7 +5530,7 @@ diff -urN -x CVS linux-2.6.21/drivers/mmc/at91_mci.c linux-2.6-stable/drivers/mm
         if (mmc)
                 ret = mmc_suspend_host(mmc, state);
   
         if (mmc)
                 ret = mmc_suspend_host(mmc, state);
   
-@@ -962,8 +968,12 @@
+@@ -962,8 +968,12 @@ static int at91_mci_suspend(struct platf
   static int at91_mci_resume(struct platform_device *pdev)
   {
         struct mmc_host *mmc = platform_get_drvdata(pdev);
   static int at91_mci_resume(struct platform_device *pdev)
   {
         struct mmc_host *mmc = platform_get_drvdata(pdev);
@@ -5497,10 +5543,11 @@ diff -urN -x CVS linux-2.6.21/drivers/mmc/at91_mci.c linux-2.6-stable/drivers/mm
         if (mmc)
                 ret = mmc_resume_host(mmc);
   
         if (mmc)
                 ret = mmc_resume_host(mmc);
   
-diff -urN -x CVS linux-2.6.21/drivers/mtd/devices/Kconfig linux-2.6-stable/drivers/mtd/devices/Kconfig
---- linux-2.6.21/drivers/mtd/devices/Kconfig   Thu Apr 26 05:08:32 2007
-+++ linux-2.6-stable/drivers/mtd/devices/Kconfig       Tue May  8 14:31:24 2007
-@@ -267,5 +267,11 @@
+Index: linux-2.6.21.7/drivers/mtd/devices/Kconfig
+===================================================================
+--- linux-2.6.21.7.orig/drivers/mtd/devices/Kconfig
++++ linux-2.6.21.7/drivers/mtd/devices/Kconfig
+@@ -267,5 +267,11 @@ config MTD_DOCPROBE_55AA
           LinuxBIOS or if you need to recover a DiskOnChip Millennium on which
           you have managed to wipe the first block.
   
           LinuxBIOS or if you need to recover a DiskOnChip Millennium on which
           you have managed to wipe the first block.
   
@@ -5513,17 +5560,19 @@ diff -urN -x CVS linux-2.6.21/drivers/mtd/devices/Kconfig linux-2.6-stable/drive
  +        If you have such a board, say 'Y'.
   
  +endmenu
  +        If you have such a board, say 'Y'.
   
  +endmenu
-diff -urN -x CVS linux-2.6.21/drivers/mtd/devices/Makefile linux-2.6-stable/drivers/mtd/devices/Makefile
---- linux-2.6.21/drivers/mtd/devices/Makefile  Thu Apr 26 05:08:32 2007
-+++ linux-2.6-stable/drivers/mtd/devices/Makefile      Tue May  8 14:31:24 2007
-@@ -17,3 +17,4 @@
+Index: linux-2.6.21.7/drivers/mtd/devices/Makefile
+===================================================================
+--- linux-2.6.21.7.orig/drivers/mtd/devices/Makefile
++++ linux-2.6.21.7/drivers/mtd/devices/Makefile
+@@ -17,3 +17,4 @@ obj-$(CONFIG_MTD_LART)               += lart.o
   obj-$(CONFIG_MTD_BLOCK2MTD)   += block2mtd.o
   obj-$(CONFIG_MTD_DATAFLASH)   += mtd_dataflash.o
   obj-$(CONFIG_MTD_M25P80)      += m25p80.o
  +obj-$(CONFIG_MTD_AT91_DATAFLASH)+= at91_dataflash.o
   obj-$(CONFIG_MTD_BLOCK2MTD)   += block2mtd.o
   obj-$(CONFIG_MTD_DATAFLASH)   += mtd_dataflash.o
   obj-$(CONFIG_MTD_M25P80)      += m25p80.o
  +obj-$(CONFIG_MTD_AT91_DATAFLASH)+= at91_dataflash.o
-diff -urN -x CVS linux-2.6.21/drivers/mtd/devices/at91_dataflash.c linux-2.6-stable/drivers/mtd/devices/at91_dataflash.c
---- linux-2.6.21/drivers/mtd/devices/at91_dataflash.c  Thu Jan  1 02:00:00 1970
-+++ linux-2.6-stable/drivers/mtd/devices/at91_dataflash.c      Tue May  8 14:31:24 2007
+Index: linux-2.6.21.7/drivers/mtd/devices/at91_dataflash.c
+===================================================================
+--- /dev/null
++++ linux-2.6.21.7/drivers/mtd/devices/at91_dataflash.c
  @@ -0,0 +1,667 @@
  +/*
  + * Atmel DataFlash driver for Atmel AT91RM9200 (Thunder)
  @@ -0,0 +1,667 @@
  +/*
  + * Atmel DataFlash driver for Atmel AT91RM9200 (Thunder)
@@ -6192,10 +6241,11 @@ diff -urN -x CVS linux-2.6.21/drivers/mtd/devices/at91_dataflash.c linux-2.6-sta
  +MODULE_LICENSE("GPL");
  +MODULE_AUTHOR("Andrew Victor");
  +MODULE_DESCRIPTION("DataFlash driver for Atmel AT91RM9200");
  +MODULE_LICENSE("GPL");
  +MODULE_AUTHOR("Andrew Victor");
  +MODULE_DESCRIPTION("DataFlash driver for Atmel AT91RM9200");
-diff -urN -x CVS linux-2.6.21/drivers/mtd/nand/at91_nand.c linux-2.6-stable/drivers/mtd/nand/at91_nand.c
---- linux-2.6.21/drivers/mtd/nand/at91_nand.c  Thu Apr 26 05:08:32 2007
-+++ linux-2.6-stable/drivers/mtd/nand/at91_nand.c      Tue May  8 12:13:31 2007
-@@ -82,6 +82,10 @@
+Index: linux-2.6.21.7/drivers/mtd/nand/at91_nand.c
+===================================================================
+--- linux-2.6.21.7.orig/drivers/mtd/nand/at91_nand.c
++++ linux-2.6.21.7/drivers/mtd/nand/at91_nand.c
+@@ -82,6 +82,10 @@ static void at91_nand_disable(struct at9
                 at91_set_gpio_value(host->board->enable_pin, 1);
   }
   
                 at91_set_gpio_value(host->board->enable_pin, 1);
   }
   
@@ -6206,7 +6256,7 @@ diff -urN -x CVS linux-2.6.21/drivers/mtd/nand/at91_nand.c linux-2.6-stable/driv
   /*
    * Probe for the NAND device.
    */
   /*
    * Probe for the NAND device.
    */
-@@ -151,6 +155,12 @@
+@@ -151,6 +155,12 @@ static int __init at91_nand_probe(struct
   #ifdef CONFIG_MTD_PARTITIONS
         if (host->board->partition_info)
                 partitions = host->board->partition_info(mtd->size, &num_partitions);
   #ifdef CONFIG_MTD_PARTITIONS
         if (host->board->partition_info)
                 partitions = host->board->partition_info(mtd->size, &num_partitions);
@@ -6219,10 +6269,11 @@ diff -urN -x CVS linux-2.6.21/drivers/mtd/nand/at91_nand.c linux-2.6-stable/driv
   
         if ((!partitions) || (num_partitions == 0)) {
                 printk(KERN_ERR "at91_nand: No parititions defined, or unsupported device.\n");
   
         if ((!partitions) || (num_partitions == 0)) {
                 printk(KERN_ERR "at91_nand: No parititions defined, or unsupported device.\n");
-diff -urN -x CVS linux-2.6.21/drivers/net/arm/at91_ether.c linux-2.6-stable/drivers/net/arm/at91_ether.c
---- linux-2.6.21/drivers/net/arm/at91_ether.c  Thu Apr 26 05:08:32 2007
-+++ linux-2.6-stable/drivers/net/arm/at91_ether.c      Tue May  8 12:13:31 2007
-@@ -225,6 +225,16 @@
+Index: linux-2.6.21.7/drivers/net/arm/at91_ether.c
+===================================================================
+--- linux-2.6.21.7.orig/drivers/net/arm/at91_ether.c
++++ linux-2.6.21.7/drivers/net/arm/at91_ether.c
+@@ -225,6 +225,16 @@ static irqreturn_t at91ether_phy_interru
                 if (!(phy & ((1 << 2) | 1)))
                         goto done;
         }
                 if (!(phy & ((1 << 2) | 1)))
                         goto done;
         }
@@ -6239,7 +6290,7 @@ diff -urN -x CVS linux-2.6.21/drivers/net/arm/at91_ether.c linux-2.6-stable/driv
   
         update_linkspeed(dev, 0);
   
   
         update_linkspeed(dev, 0);
   
-@@ -280,6 +290,19 @@
+@@ -280,6 +290,19 @@ static void enable_phyirq(struct net_dev
                 dsintr = (1 << 10) | ( 1 << 8);
                 write_phy(lp->phy_address, MII_TPISTATUS, dsintr);
         }
                 dsintr = (1 << 10) | ( 1 << 8);
                 write_phy(lp->phy_address, MII_TPISTATUS, dsintr);
         }
@@ -6259,7 +6310,7 @@ diff -urN -x CVS linux-2.6.21/drivers/net/arm/at91_ether.c linux-2.6-stable/driv
   
         disable_mdi();
         spin_unlock_irq(&lp->lock);
   
         disable_mdi();
         spin_unlock_irq(&lp->lock);
-@@ -323,6 +346,19 @@
+@@ -323,6 +346,19 @@ static void disable_phyirq(struct net_de
                 dsintr = ~((1 << 10) | (1 << 8));
                 write_phy(lp->phy_address, MII_TPISTATUS, dsintr);
         }
                 dsintr = ~((1 << 10) | (1 << 8));
                 write_phy(lp->phy_address, MII_TPISTATUS, dsintr);
         }
@@ -6279,7 +6330,7 @@ diff -urN -x CVS linux-2.6.21/drivers/net/arm/at91_ether.c linux-2.6-stable/driv
   
         disable_mdi();
         spin_unlock_irq(&lp->lock);
   
         disable_mdi();
         spin_unlock_irq(&lp->lock);
-@@ -535,8 +571,8 @@
+@@ -535,8 +571,8 @@ static void at91ether_sethashtable(struc
                 mc_filter[bitnr >> 5] |= 1 << (bitnr & 31);
         }
   
                 mc_filter[bitnr >> 5] |= 1 << (bitnr & 31);
         }
   
@@ -6290,7 +6341,7 @@ diff -urN -x CVS linux-2.6.21/drivers/net/arm/at91_ether.c linux-2.6-stable/driv
   }
   
   /*
   }
   
   /*
-@@ -943,14 +979,22 @@
+@@ -943,14 +979,22 @@ static int __init at91ether_setup(unsign
         struct net_device *dev;
         struct at91_private *lp;
         unsigned int val;
         struct net_device *dev;
         struct at91_private *lp;
         unsigned int val;
@@ -6316,7 +6367,7 @@ diff -urN -x CVS linux-2.6.21/drivers/net/arm/at91_ether.c linux-2.6-stable/driv
         SET_MODULE_OWNER(dev);
   
         /* Install the interrupt handler */
         SET_MODULE_OWNER(dev);
   
         /* Install the interrupt handler */
-@@ -1023,12 +1067,12 @@
+@@ -1023,12 +1067,12 @@ static int __init at91ether_setup(unsign
         lp->phy_address = phy_address;  /* MDI address of PHY */
   
         /* Register the network interface */
         lp->phy_address = phy_address;  /* MDI address of PHY */
   
         /* Register the network interface */
@@ -6332,7 +6383,7 @@ diff -urN -x CVS linux-2.6.21/drivers/net/arm/at91_ether.c linux-2.6-stable/driv
         }
   
         /* Determine current link speed */
         }
   
         /* Determine current link speed */
-@@ -1063,10 +1107,16 @@
+@@ -1063,10 +1107,16 @@ static int __init at91ether_setup(unsign
                 printk(KERN_INFO "%s: Broadcom BCM5221 PHY\n", dev->name);
         else if (phy_type == MII_DP83847_ID)
                 printk(KERN_INFO "%s: National Semiconductor DP83847 PHY\n", dev->name);
                 printk(KERN_INFO "%s: Broadcom BCM5221 PHY\n", dev->name);
         else if (phy_type == MII_DP83847_ID)
                 printk(KERN_INFO "%s: National Semiconductor DP83847 PHY\n", dev->name);
@@ -6349,7 +6400,7 @@ diff -urN -x CVS linux-2.6.21/drivers/net/arm/at91_ether.c linux-2.6-stable/driv
   
         return 0;
   }
   
         return 0;
   }
-@@ -1104,8 +1154,11 @@
+@@ -1104,8 +1154,11 @@ static int __init at91ether_probe(struct
                         case MII_RTL8201_ID:            /* Realtek RTL8201: PHY_ID1 = 0, PHY_ID2 = 0x8201 */
                         case MII_BCM5221_ID:            /* Broadcom BCM5221: PHY_ID1 = 0x40, PHY_ID2 = 0x61e0 */
                         case MII_DP83847_ID:            /* National Semiconductor DP83847:  */
                         case MII_RTL8201_ID:            /* Realtek RTL8201: PHY_ID1 = 0, PHY_ID2 = 0x8201 */
                         case MII_BCM5221_ID:            /* Broadcom BCM5221: PHY_ID1 = 0x40, PHY_ID2 = 0x61e0 */
                         case MII_DP83847_ID:            /* National Semiconductor DP83847:  */
@@ -6361,9 +6412,10 @@ diff -urN -x CVS linux-2.6.21/drivers/net/arm/at91_ether.c linux-2.6-stable/driv
                                 detected = at91ether_setup(phy_id, phy_address, pdev, ether_clk);
                                 break;
                 }
                                 detected = at91ether_setup(phy_id, phy_address, pdev, ether_clk);
                                 break;
                 }
-diff -urN -x CVS linux-2.6.21/drivers/net/arm/at91_ether.h linux-2.6-stable/drivers/net/arm/at91_ether.h
---- linux-2.6.21/drivers/net/arm/at91_ether.h  Thu Apr 26 05:08:32 2007
-+++ linux-2.6-stable/drivers/net/arm/at91_ether.h      Tue May  8 12:13:31 2007
+Index: linux-2.6.21.7/drivers/net/arm/at91_ether.h
+===================================================================
+--- linux-2.6.21.7.orig/drivers/net/arm/at91_ether.h
++++ linux-2.6.21.7/drivers/net/arm/at91_ether.h
  @@ -17,39 +17,46 @@
   
   
  @@ -17,39 +17,46 @@
   
   
@@ -6432,10 +6484,11 @@ diff -urN -x CVS linux-2.6.21/drivers/net/arm/at91_ether.h linux-2.6-stable/driv
   
   /* ........................................................................ */
   
   
   /* ........................................................................ */
   
-diff -urN -x CVS linux-2.6.21/drivers/pcmcia/at91_cf.c linux-2.6-stable/drivers/pcmcia/at91_cf.c
---- linux-2.6.21/drivers/pcmcia/at91_cf.c      Thu Apr 26 05:08:32 2007
-+++ linux-2.6-stable/drivers/pcmcia/at91_cf.c  Tue May  8 12:13:31 2007
-@@ -332,20 +332,27 @@
+Index: linux-2.6.21.7/drivers/pcmcia/at91_cf.c
+===================================================================
+--- linux-2.6.21.7.orig/drivers/pcmcia/at91_cf.c
++++ linux-2.6.21.7/drivers/pcmcia/at91_cf.c
+@@ -332,20 +332,27 @@ static int at91_cf_suspend(struct platfo
         struct at91_cf_data     *board = cf->board;
   
         pcmcia_socket_dev_suspend(&pdev->dev, mesg);
         struct at91_cf_data     *board = cf->board;
   
         pcmcia_socket_dev_suspend(&pdev->dev, mesg);
@@ -6467,7 +6520,7 @@ diff -urN -x CVS linux-2.6.21/drivers/pcmcia/at91_cf.c linux-2.6-stable/drivers/
         pcmcia_socket_dev_resume(&pdev->dev);
         return 0;
   }
         pcmcia_socket_dev_resume(&pdev->dev);
         return 0;
   }
-@@ -360,7 +367,6 @@
+@@ -360,7 +367,6 @@ static struct platform_driver at91_cf_dr
                 .name           = (char *) driver_name,
                 .owner          = THIS_MODULE,
         },
                 .name           = (char *) driver_name,
                 .owner          = THIS_MODULE,
         },
@@ -6475,7 +6528,7 @@ diff -urN -x CVS linux-2.6.21/drivers/pcmcia/at91_cf.c linux-2.6-stable/drivers/
         .remove         = __exit_p(at91_cf_remove),
         .suspend        = at91_cf_suspend,
         .resume         = at91_cf_resume,
         .remove         = __exit_p(at91_cf_remove),
         .suspend        = at91_cf_suspend,
         .resume         = at91_cf_resume,
-@@ -370,7 +376,7 @@
+@@ -370,7 +376,7 @@ static struct platform_driver at91_cf_dr
   
   static int __init at91_cf_init(void)
   {
   
   static int __init at91_cf_init(void)
   {
@@ -6484,9 +6537,10 @@ diff -urN -x CVS linux-2.6.21/drivers/pcmcia/at91_cf.c linux-2.6-stable/drivers/
   }
   module_init(at91_cf_init);
   
   }
   module_init(at91_cf_init);
   
-diff -urN -x CVS linux-2.6.21/drivers/serial/atmel_serial.c linux-2.6-stable/drivers/serial/atmel_serial.c
---- linux-2.6.21/drivers/serial/atmel_serial.c Thu Apr 26 05:08:32 2007
-+++ linux-2.6-stable/drivers/serial/atmel_serial.c     Tue May  8 12:13:31 2007
+Index: linux-2.6.21.7/drivers/serial/atmel_serial.c
+===================================================================
+--- linux-2.6.21.7.orig/drivers/serial/atmel_serial.c
++++ linux-2.6.21.7/drivers/serial/atmel_serial.c
  @@ -7,6 +7,8 @@
    *  Based on drivers/char/serial_sa1100.c, by Deep Blue Solutions Ltd.
    *  Based on drivers/char/serial.c, by Linus Torvalds, Theodore Ts'o.
  @@ -7,6 +7,8 @@
    *  Based on drivers/char/serial_sa1100.c, by Deep Blue Solutions Ltd.
    *  Based on drivers/char/serial.c, by Linus Torvalds, Theodore Ts'o.
@@ -6530,7 +6584,7 @@ diff -urN -x CVS linux-2.6.21/drivers/serial/atmel_serial.c linux-2.6-stable/dri
   /*
    * We wrap our port structure around the generic uart_port.
    */
   /*
    * We wrap our port structure around the generic uart_port.
    */
-@@ -114,10 +129,20 @@
+@@ -114,10 +129,20 @@ struct atmel_uart_port {
         struct uart_port        uart;           /* uart */
         struct clk              *clk;           /* uart clock */
         unsigned short          suspended;      /* is port suspended? */
         struct uart_port        uart;           /* uart */
         struct clk              *clk;           /* uart clock */
         unsigned short          suspended;      /* is port suspended? */
@@ -6551,7 +6605,7 @@ diff -urN -x CVS linux-2.6.21/drivers/serial/atmel_serial.c linux-2.6-stable/dri
   #ifdef SUPPORT_SYSRQ
   static struct console atmel_console;
   #endif
   #ifdef SUPPORT_SYSRQ
   static struct console atmel_console;
   #endif
-@@ -205,7 +230,12 @@
+@@ -205,7 +230,12 @@ static void atmel_stop_tx(struct uart_po
   {
         struct atmel_uart_port *atmel_port = (struct atmel_uart_port *) port;
   
   {
         struct atmel_uart_port *atmel_port = (struct atmel_uart_port *) port;
   
@@ -6565,7 +6619,7 @@ diff -urN -x CVS linux-2.6.21/drivers/serial/atmel_serial.c linux-2.6-stable/dri
   }
   
   /*
   }
   
   /*
-@@ -215,7 +245,17 @@
+@@ -215,7 +245,17 @@ static void atmel_start_tx(struct uart_p
   {
         struct atmel_uart_port *atmel_port = (struct atmel_uart_port *) port;
   
   {
         struct atmel_uart_port *atmel_port = (struct atmel_uart_port *) port;
   
@@ -6584,7 +6638,7 @@ diff -urN -x CVS linux-2.6.21/drivers/serial/atmel_serial.c linux-2.6-stable/dri
   }
   
   /*
   }
   
   /*
-@@ -225,7 +265,12 @@
+@@ -225,7 +265,12 @@ static void atmel_stop_rx(struct uart_po
   {
         struct atmel_uart_port *atmel_port = (struct atmel_uart_port *) port;
   
   {
         struct atmel_uart_port *atmel_port = (struct atmel_uart_port *) port;
   
@@ -6598,7 +6652,7 @@ diff -urN -x CVS linux-2.6.21/drivers/serial/atmel_serial.c linux-2.6-stable/dri
   }
   
   /*
   }
   
   /*
-@@ -248,6 +293,134 @@
+@@ -248,6 +293,134 @@ static void atmel_break_ctl(struct uart_
   }
   
   /*
   }
   
   /*
@@ -6733,7 +6787,7 @@ diff -urN -x CVS linux-2.6.21/drivers/serial/atmel_serial.c linux-2.6-stable/dri
    * Characters received (called from interrupt handler)
    */
   static void atmel_rx_chars(struct uart_port *port)
    * Characters received (called from interrupt handler)
    */
   static void atmel_rx_chars(struct uart_port *port)
-@@ -349,6 +522,14 @@
+@@ -349,6 +522,14 @@ static irqreturn_t atmel_interrupt(int i
         status = UART_GET_CSR(port);
         pending = status & UART_GET_IMR(port);
         while (pending) {
         status = UART_GET_CSR(port);
         pending = status & UART_GET_IMR(port);
         while (pending) {
@@ -6748,7 +6802,7 @@ diff -urN -x CVS linux-2.6.21/drivers/serial/atmel_serial.c linux-2.6-stable/dri
                 /* Interrupt receive */
                 if (pending & ATMEL_US_RXRDY)
                         atmel_rx_chars(port);
                 /* Interrupt receive */
                 if (pending & ATMEL_US_RXRDY)
                         atmel_rx_chars(port);
-@@ -363,6 +544,12 @@
+@@ -363,6 +544,12 @@ static irqreturn_t atmel_interrupt(int i
                 if (pending & (ATMEL_US_RIIC | ATMEL_US_DSRIC | ATMEL_US_DCDIC | ATMEL_US_CTSIC))
                         wake_up_interruptible(&port->info->delta_msr_wait);
   
                 if (pending & (ATMEL_US_RIIC | ATMEL_US_DSRIC | ATMEL_US_DCDIC | ATMEL_US_CTSIC))
                         wake_up_interruptible(&port->info->delta_msr_wait);
   
@@ -6761,7 +6815,7 @@ diff -urN -x CVS linux-2.6.21/drivers/serial/atmel_serial.c linux-2.6-stable/dri
                 /* Interrupt transmit */
                 if (pending & ATMEL_US_TXRDY)
                         atmel_tx_chars(port);
                 /* Interrupt transmit */
                 if (pending & ATMEL_US_TXRDY)
                         atmel_tx_chars(port);
-@@ -401,6 +588,47 @@
+@@ -401,6 +588,47 @@ static int atmel_startup(struct uart_por
         }
   
         /*
         }
   
         /*
@@ -6809,7 +6863,7 @@ diff -urN -x CVS linux-2.6.21/drivers/serial/atmel_serial.c linux-2.6-stable/dri
          * If there is a specific "open" function (to register
          * control line interrupts)
          */
          * If there is a specific "open" function (to register
          * control line interrupts)
          */
-@@ -418,7 +646,15 @@
+@@ -418,7 +646,15 @@ static int atmel_startup(struct uart_por
         UART_PUT_CR(port, ATMEL_US_RSTSTA | ATMEL_US_RSTRX);
         UART_PUT_CR(port, ATMEL_US_TXEN | ATMEL_US_RXEN);               /* enable xmit & rcvr */
   
         UART_PUT_CR(port, ATMEL_US_RSTSTA | ATMEL_US_RSTRX);
         UART_PUT_CR(port, ATMEL_US_TXEN | ATMEL_US_RXEN);               /* enable xmit & rcvr */
   
@@ -6826,7 +6880,7 @@ diff -urN -x CVS linux-2.6.21/drivers/serial/atmel_serial.c linux-2.6-stable/dri
   
         return 0;
   }
   
         return 0;
   }
-@@ -431,6 +667,31 @@
+@@ -431,6 +667,31 @@ static void atmel_shutdown(struct uart_p
         struct atmel_uart_port *atmel_port = (struct atmel_uart_port *) port;
   
         /*
         struct atmel_uart_port *atmel_port = (struct atmel_uart_port *) port;
   
         /*
@@ -6858,7 +6912,7 @@ diff -urN -x CVS linux-2.6.21/drivers/serial/atmel_serial.c linux-2.6-stable/dri
          * Disable all interrupts, port and break condition.
          */
         UART_PUT_CR(port, ATMEL_US_RSTSTA);
          * Disable all interrupts, port and break condition.
          */
         UART_PUT_CR(port, ATMEL_US_RSTSTA);
-@@ -481,14 +742,20 @@
+@@ -481,14 +742,20 @@ static void atmel_serial_pm(struct uart_
    */
   static void atmel_set_termios(struct uart_port *port, struct ktermios * termios, struct ktermios * old)
   {
    */
   static void atmel_set_termios(struct uart_port *port, struct ktermios * termios, struct ktermios * old)
   {
@@ -6881,7 +6935,7 @@ diff -urN -x CVS linux-2.6.21/drivers/serial/atmel_serial.c linux-2.6-stable/dri
   
         /* byte size */
         switch (termios->c_cflag & CSIZE) {
   
         /* byte size */
         switch (termios->c_cflag & CSIZE) {
-@@ -534,6 +801,9 @@
+@@ -534,6 +801,9 @@ static void atmel_set_termios(struct uar
         if (termios->c_iflag & (BRKINT | PARMRK))
                 port->read_status_mask |= ATMEL_US_RXBRK;
   
         if (termios->c_iflag & (BRKINT | PARMRK))
                 port->read_status_mask |= ATMEL_US_RXBRK;
   
@@ -6891,7 +6945,7 @@ diff -urN -x CVS linux-2.6.21/drivers/serial/atmel_serial.c linux-2.6-stable/dri
         /*
          * Characters to ignore
          */
         /*
          * Characters to ignore
          */
-@@ -712,6 +982,13 @@
+@@ -712,6 +982,13 @@ static void __devinit atmel_init_port(st
                 clk_enable(atmel_port->clk);
                 port->uartclk = clk_get_rate(atmel_port->clk);
         }
                 clk_enable(atmel_port->clk);
                 port->uartclk = clk_get_rate(atmel_port->clk);
         }
@@ -6905,7 +6959,7 @@ diff -urN -x CVS linux-2.6.21/drivers/serial/atmel_serial.c linux-2.6-stable/dri
   }
   
   /*
   }
   
   /*
-@@ -888,7 +1165,8 @@
+@@ -888,7 +1165,8 @@ static int atmel_serial_suspend(struct p
         struct uart_port *port = platform_get_drvdata(pdev);
         struct atmel_uart_port *atmel_port = (struct atmel_uart_port *) port;
   
         struct uart_port *port = platform_get_drvdata(pdev);
         struct atmel_uart_port *atmel_port = (struct atmel_uart_port *) port;
   
@@ -6915,9 +6969,10 @@ diff -urN -x CVS linux-2.6.21/drivers/serial/atmel_serial.c linux-2.6-stable/dri
                 enable_irq_wake(port->irq);
         else {
                 uart_suspend_port(&atmel_uart, port);
                 enable_irq_wake(port->irq);
         else {
                 uart_suspend_port(&atmel_uart, port);
-diff -urN -x CVS linux-2.6.21/drivers/serial/atmel_serial.h linux-2.6-stable/drivers/serial/atmel_serial.h
---- linux-2.6.21/drivers/serial/atmel_serial.h Thu Apr 26 05:08:32 2007
-+++ linux-2.6-stable/drivers/serial/atmel_serial.h     Tue May  8 12:13:31 2007
+Index: linux-2.6.21.7/drivers/serial/atmel_serial.h
+===================================================================
+--- linux-2.6.21.7.orig/drivers/serial/atmel_serial.h
++++ linux-2.6.21.7/drivers/serial/atmel_serial.h
  @@ -46,6 +46,9 @@
   #define                       ATMEL_US_USMODE_ISO7816_T1      6
   #define                       ATMEL_US_USMODE_IRDA            8
  @@ -46,6 +46,9 @@
   #define                       ATMEL_US_USMODE_ISO7816_T1      6
   #define                       ATMEL_US_USMODE_IRDA            8
@@ -6928,10 +6983,11 @@ diff -urN -x CVS linux-2.6.21/drivers/serial/atmel_serial.h linux-2.6-stable/dri
   #define               ATMEL_US_CHRL           (3   <<  6)             /* Character Length */
   #define                       ATMEL_US_CHRL_5                 (0 <<  6)
   #define                       ATMEL_US_CHRL_6                 (1 <<  6)
   #define               ATMEL_US_CHRL           (3   <<  6)             /* Character Length */
   #define                       ATMEL_US_CHRL_5                 (0 <<  6)
   #define                       ATMEL_US_CHRL_6                 (1 <<  6)
-diff -urN -x CVS linux-2.6.21/drivers/spi/Kconfig linux-2.6-stable/drivers/spi/Kconfig
---- linux-2.6.21/drivers/spi/Kconfig   Thu Apr 26 05:08:32 2007
-+++ linux-2.6-stable/drivers/spi/Kconfig       Tue May  8 14:31:24 2007
-@@ -54,6 +54,7 @@
+Index: linux-2.6.21.7/drivers/spi/Kconfig
+===================================================================
+--- linux-2.6.21.7.orig/drivers/spi/Kconfig
++++ linux-2.6.21.7/drivers/spi/Kconfig
+@@ -54,6 +54,7 @@ comment "SPI Master Controller Drivers"
   config SPI_ATMEL
         tristate "Atmel SPI Controller"
         depends on (ARCH_AT91 || AVR32) && SPI_MASTER
   config SPI_ATMEL
         tristate "Atmel SPI Controller"
         depends on (ARCH_AT91 || AVR32) && SPI_MASTER
@@ -6939,7 +6995,7 @@ diff -urN -x CVS linux-2.6.21/drivers/spi/Kconfig linux-2.6-stable/drivers/spi/K
         help
           This selects a driver for the Atmel SPI Controller, present on
           many AT32 (AVR32) and AT91 (ARM) chips.
         help
           This selects a driver for the Atmel SPI Controller, present on
           many AT32 (AVR32) and AT91 (ARM) chips.
-@@ -82,6 +83,24 @@
+@@ -82,6 +83,24 @@ config SPI_BUTTERFLY
           inexpensive battery powered microcontroller evaluation board.
           This same cable can be used to flash new firmware.
   
           inexpensive battery powered microcontroller evaluation board.
           This same cable can be used to flash new firmware.
   
@@ -6964,10 +7020,11 @@ diff -urN -x CVS linux-2.6.21/drivers/spi/Kconfig linux-2.6-stable/drivers/spi/K
   config SPI_IMX
         tristate "Freescale iMX SPI controller"
         depends on SPI_MASTER && ARCH_IMX && EXPERIMENTAL
   config SPI_IMX
         tristate "Freescale iMX SPI controller"
         depends on SPI_MASTER && ARCH_IMX && EXPERIMENTAL
-diff -urN -x CVS linux-2.6.21/drivers/spi/Makefile linux-2.6-stable/drivers/spi/Makefile
---- linux-2.6.21/drivers/spi/Makefile  Thu Apr 26 05:08:32 2007
-+++ linux-2.6-stable/drivers/spi/Makefile      Tue May  8 14:31:24 2007
-@@ -20,6 +20,7 @@
+Index: linux-2.6.21.7/drivers/spi/Makefile
+===================================================================
+--- linux-2.6.21.7.orig/drivers/spi/Makefile
++++ linux-2.6.21.7/drivers/spi/Makefile
+@@ -20,6 +20,7 @@ obj-$(CONFIG_SPI_OMAP_UWIRE)         += omap_uw
   obj-$(CONFIG_SPI_MPC83xx)             += spi_mpc83xx.o
   obj-$(CONFIG_SPI_S3C24XX_GPIO)                += spi_s3c24xx_gpio.o
   obj-$(CONFIG_SPI_S3C24XX)             += spi_s3c24xx.o
   obj-$(CONFIG_SPI_MPC83xx)             += spi_mpc83xx.o
   obj-$(CONFIG_SPI_S3C24XX_GPIO)                += spi_s3c24xx_gpio.o
   obj-$(CONFIG_SPI_S3C24XX)             += spi_s3c24xx.o
@@ -6975,9 +7032,10 @@ diff -urN -x CVS linux-2.6.21/drivers/spi/Makefile linux-2.6-stable/drivers/spi/
   #     ... add above this line ...
   
   # SPI protocol drivers (device/link on bus)
   #     ... add above this line ...
   
   # SPI protocol drivers (device/link on bus)
-diff -urN -x CVS linux-2.6.21/drivers/spi/spi_at91_bitbang.c linux-2.6-stable/drivers/spi/spi_at91_bitbang.c
---- linux-2.6.21/drivers/spi/spi_at91_bitbang.c        Thu Jan  1 02:00:00 1970
-+++ linux-2.6-stable/drivers/spi/spi_at91_bitbang.c    Tue May  8 14:31:24 2007
+Index: linux-2.6.21.7/drivers/spi/spi_at91_bitbang.c
+===================================================================
+--- /dev/null
++++ linux-2.6.21.7/drivers/spi/spi_at91_bitbang.c
  @@ -0,0 +1,207 @@
  +/*
  + * at91_spi.c - at91 SPI driver (BOOTSTRAP/BITBANG VERSION)
  @@ -0,0 +1,207 @@
  +/*
  + * at91_spi.c - at91 SPI driver (BOOTSTRAP/BITBANG VERSION)
@@ -7186,10 +7244,11 @@ diff -urN -x CVS linux-2.6.21/drivers/spi/spi_at91_bitbang.c linux-2.6-stable/dr
  +MODULE_DESCRIPTION("AT91 SPI support (BOOTSTRAP/BITBANG VERSION)");
  +MODULE_AUTHOR("David Brownell");
  +MODULE_LICENSE("GPL");
  +MODULE_DESCRIPTION("AT91 SPI support (BOOTSTRAP/BITBANG VERSION)");
  +MODULE_AUTHOR("David Brownell");
  +MODULE_LICENSE("GPL");
-diff -urN -x CVS linux-2.6.21/drivers/usb/gadget/Kconfig linux-2.6-stable/drivers/usb/gadget/Kconfig
---- linux-2.6.21/drivers/usb/gadget/Kconfig    Thu Apr 26 05:08:32 2007
-+++ linux-2.6-stable/drivers/usb/gadget/Kconfig        Wed May  9 10:20:54 2007
-@@ -189,7 +189,7 @@
+Index: linux-2.6.21.7/drivers/usb/gadget/Kconfig
+===================================================================
+--- linux-2.6.21.7.orig/drivers/usb/gadget/Kconfig
++++ linux-2.6.21.7/drivers/usb/gadget/Kconfig
+@@ -189,7 +189,7 @@ config USB_OTG
   
   config USB_GADGET_AT91
         boolean "AT91 USB Device Port"
   
   config USB_GADGET_AT91
         boolean "AT91 USB Device Port"
@@ -7198,10 +7257,11 @@ diff -urN -x CVS linux-2.6.21/drivers/usb/gadget/Kconfig linux-2.6-stable/driver
         select USB_GADGET_SELECTED
         help
            Many Atmel AT91 processors (such as the AT91RM2000) have a
         select USB_GADGET_SELECTED
         help
            Many Atmel AT91 processors (such as the AT91RM2000) have a
-diff -urN -x CVS linux-2.6.21/drivers/usb/gadget/at91_udc.c linux-2.6-stable/drivers/usb/gadget/at91_udc.c
---- linux-2.6.21/drivers/usb/gadget/at91_udc.c Thu Apr 26 05:08:32 2007
-+++ linux-2.6-stable/drivers/usb/gadget/at91_udc.c     Tue May  8 12:13:31 2007
-@@ -1804,7 +1804,7 @@
+Index: linux-2.6.21.7/drivers/usb/gadget/at91_udc.c
+===================================================================
+--- linux-2.6.21.7.orig/drivers/usb/gadget/at91_udc.c
++++ linux-2.6.21.7/drivers/usb/gadget/at91_udc.c
+@@ -1804,7 +1804,7 @@ static int at91udc_suspend(struct platfo
          */
         if ((!udc->suspended && udc->addr)
                         || !wake
          */
         if ((!udc->suspended && udc->addr)
                         || !wake
@@ -7210,10 +7270,11 @@ diff -urN -x CVS linux-2.6.21/drivers/usb/gadget/at91_udc.c linux-2.6-stable/dri
                 pullup(udc, 0);
                 wake = 0;
         } else
                 pullup(udc, 0);
                 wake = 0;
         } else
-diff -urN -x CVS linux-2.6.21/drivers/usb/host/ohci-at91.c linux-2.6-stable/drivers/usb/host/ohci-at91.c
---- linux-2.6.21/drivers/usb/host/ohci-at91.c  Thu Apr 26 05:08:32 2007
-+++ linux-2.6-stable/drivers/usb/host/ohci-at91.c      Tue May  8 12:13:31 2007
-@@ -299,7 +299,7 @@
+Index: linux-2.6.21.7/drivers/usb/host/ohci-at91.c
+===================================================================
+--- linux-2.6.21.7.orig/drivers/usb/host/ohci-at91.c
++++ linux-2.6.21.7/drivers/usb/host/ohci-at91.c
+@@ -299,7 +299,7 @@ ohci_hcd_at91_drv_suspend(struct platfor
          *
          * REVISIT: some boards will be able to turn VBUS off...
          */
          *
          * REVISIT: some boards will be able to turn VBUS off...
          */
@@ -7222,10 +7283,11 @@ diff -urN -x CVS linux-2.6.21/drivers/usb/host/ohci-at91.c linux-2.6-stable/driv
                 ohci_usb_reset (ohci);
                 at91_stop_clock();
         }
                 ohci_usb_reset (ohci);
                 at91_stop_clock();
         }
-diff -urN -x CVS linux-2.6.21/drivers/video/Kconfig linux-2.6-stable/drivers/video/Kconfig
---- linux-2.6.21/drivers/video/Kconfig Thu Apr 26 05:08:32 2007
-+++ linux-2.6-stable/drivers/video/Kconfig     Thu May 10 12:34:41 2007
-@@ -663,6 +663,17 @@
+Index: linux-2.6.21.7/drivers/video/Kconfig
+===================================================================
+--- linux-2.6.21.7.orig/drivers/video/Kconfig
++++ linux-2.6.21.7/drivers/video/Kconfig
+@@ -663,6 +663,17 @@ config FB_EPSON1355
           framebuffer.  Product specs at
           <http://www.erd.epson.com/vdc/html/products.htm>.
   
           framebuffer.  Product specs at
           <http://www.erd.epson.com/vdc/html/products.htm>.
   
@@ -7243,7 +7305,7 @@ diff -urN -x CVS linux-2.6.21/drivers/video/Kconfig linux-2.6-stable/drivers/vid
   config FB_S1D13XXX
         tristate "Epson S1D13XXX framebuffer support"
         depends on FB
   config FB_S1D13XXX
         tristate "Epson S1D13XXX framebuffer support"
         depends on FB
-@@ -674,6 +685,22 @@
+@@ -674,6 +685,22 @@ config FB_S1D13XXX
           working with S1D13806). Product specs at
           <http://www.erd.epson.com/vdc/html/legacy_13xxx.htm>
   
           working with S1D13806). Product specs at
           <http://www.erd.epson.com/vdc/html/legacy_13xxx.htm>
   
@@ -7266,10 +7328,11 @@ diff -urN -x CVS linux-2.6.21/drivers/video/Kconfig linux-2.6-stable/drivers/vid
   config FB_NVIDIA
         tristate "nVidia Framebuffer Support"
         depends on FB && PCI
   config FB_NVIDIA
         tristate "nVidia Framebuffer Support"
         depends on FB && PCI
-diff -urN -x CVS linux-2.6.21/drivers/video/Makefile linux-2.6-stable/drivers/video/Makefile
---- linux-2.6.21/drivers/video/Makefile        Thu Apr 26 05:08:32 2007
-+++ linux-2.6-stable/drivers/video/Makefile    Thu May 10 12:34:01 2007
-@@ -75,6 +75,8 @@
+Index: linux-2.6.21.7/drivers/video/Makefile
+===================================================================
+--- linux-2.6.21.7.orig/drivers/video/Makefile
++++ linux-2.6.21.7/drivers/video/Makefile
+@@ -75,6 +75,8 @@ obj-$(CONFIG_FB_G364)             += g36
   obj-$(CONFIG_FB_SA1100)           += sa1100fb.o
   obj-$(CONFIG_FB_HIT)              += hitfb.o
   obj-$(CONFIG_FB_EPSON1355)      += epson1355fb.o
   obj-$(CONFIG_FB_SA1100)           += sa1100fb.o
   obj-$(CONFIG_FB_HIT)              += hitfb.o
   obj-$(CONFIG_FB_EPSON1355)      += epson1355fb.o
@@ -7278,9 +7341,10 @@ diff -urN -x CVS linux-2.6.21/drivers/video/Makefile linux-2.6-stable/drivers/vi
   obj-$(CONFIG_FB_PVR2)             += pvr2fb.o
   obj-$(CONFIG_FB_VOODOO1)          += sstfb.o
   obj-$(CONFIG_FB_ARMCLCD)        += amba-clcd.o
   obj-$(CONFIG_FB_PVR2)             += pvr2fb.o
   obj-$(CONFIG_FB_VOODOO1)          += sstfb.o
   obj-$(CONFIG_FB_ARMCLCD)        += amba-clcd.o
-diff -urN -x CVS linux-2.6.21/drivers/video/atmel_lcdfb.c linux-2.6-stable/drivers/video/atmel_lcdfb.c
---- linux-2.6.21/drivers/video/atmel_lcdfb.c   Thu Jan  1 02:00:00 1970
-+++ linux-2.6-stable/drivers/video/atmel_lcdfb.c       Thu May 10 12:34:01 2007
+Index: linux-2.6.21.7/drivers/video/atmel_lcdfb.c
+===================================================================
+--- /dev/null
++++ linux-2.6.21.7/drivers/video/atmel_lcdfb.c
  @@ -0,0 +1,752 @@
  +/*
  + *  Driver for AT91/AT32 LCD Controller
  @@ -0,0 +1,752 @@
  +/*
  + *  Driver for AT91/AT32 LCD Controller
@@ -8034,10 +8098,11 @@ diff -urN -x CVS linux-2.6.21/drivers/video/atmel_lcdfb.c linux-2.6-stable/drive
  +MODULE_DESCRIPTION("AT91/AT32 LCD Controller framebuffer driver");
  +MODULE_AUTHOR("Nicolas Ferre <nicolas.ferre@rfo.atmel.com>");
  +MODULE_LICENSE("GPL");
  +MODULE_DESCRIPTION("AT91/AT32 LCD Controller framebuffer driver");
  +MODULE_AUTHOR("Nicolas Ferre <nicolas.ferre@rfo.atmel.com>");
  +MODULE_LICENSE("GPL");
-diff -urN -x CVS linux-2.6.21/drivers/video/backlight/Kconfig linux-2.6-stable/drivers/video/backlight/Kconfig
---- linux-2.6.21/drivers/video/backlight/Kconfig       Thu Apr 26 05:08:32 2007
-+++ linux-2.6-stable/drivers/video/backlight/Kconfig   Tue May  8 12:13:31 2007
-@@ -63,3 +63,11 @@
+Index: linux-2.6.21.7/drivers/video/backlight/Kconfig
+===================================================================
+--- linux-2.6.21.7.orig/drivers/video/backlight/Kconfig
++++ linux-2.6.21.7/drivers/video/backlight/Kconfig
+@@ -63,3 +63,11 @@ config BACKLIGHT_PROGEAR
         help
           If you have a Frontpath ProGear say Y to enable the
           backlight driver.
         help
           If you have a Frontpath ProGear say Y to enable the
           backlight driver.
@@ -8049,17 +8114,19 @@ diff -urN -x CVS linux-2.6.21/drivers/video/backlight/Kconfig linux-2.6-stable/d
  +      help
  +        If you have a KwikByte KB9202 board, say Y to enable the
  +        backlight driver.
  +      help
  +        If you have a KwikByte KB9202 board, say Y to enable the
  +        backlight driver.
-diff -urN -x CVS linux-2.6.21/drivers/video/backlight/Makefile linux-2.6-stable/drivers/video/backlight/Makefile
---- linux-2.6.21/drivers/video/backlight/Makefile      Thu Apr 26 05:08:32 2007
-+++ linux-2.6-stable/drivers/video/backlight/Makefile  Tue May  8 12:13:31 2007
-@@ -6,3 +6,4 @@
+Index: linux-2.6.21.7/drivers/video/backlight/Makefile
+===================================================================
+--- linux-2.6.21.7.orig/drivers/video/backlight/Makefile
++++ linux-2.6.21.7/drivers/video/backlight/Makefile
+@@ -6,3 +6,4 @@ obj-$(CONFIG_BACKLIGHT_CORGI)  += corgi_b
   obj-$(CONFIG_BACKLIGHT_HP680) += hp680_bl.o
   obj-$(CONFIG_BACKLIGHT_LOCOMO)        += locomolcd.o
   obj-$(CONFIG_BACKLIGHT_PROGEAR) += progear_bl.o
  +obj-$(CONFIG_BACKLIGHT_KB920x)        += kb920x_bl.o
   obj-$(CONFIG_BACKLIGHT_HP680) += hp680_bl.o
   obj-$(CONFIG_BACKLIGHT_LOCOMO)        += locomolcd.o
   obj-$(CONFIG_BACKLIGHT_PROGEAR) += progear_bl.o
  +obj-$(CONFIG_BACKLIGHT_KB920x)        += kb920x_bl.o
-diff -urN -x CVS linux-2.6.21/drivers/video/backlight/kb920x_bl.c linux-2.6-stable/drivers/video/backlight/kb920x_bl.c
---- linux-2.6.21/drivers/video/backlight/kb920x_bl.c   Thu Jan  1 02:00:00 1970
-+++ linux-2.6-stable/drivers/video/backlight/kb920x_bl.c       Tue May  8 12:13:31 2007
+Index: linux-2.6.21.7/drivers/video/backlight/kb920x_bl.c
+===================================================================
+--- /dev/null
++++ linux-2.6.21.7/drivers/video/backlight/kb920x_bl.c
  @@ -0,0 +1,164 @@
  +/*
  + * Backlight Driver for KB9202
  @@ -0,0 +1,164 @@
  +/*
  + * Backlight Driver for KB9202
@@ -8225,9 +8292,10 @@ diff -urN -x CVS linux-2.6.21/drivers/video/backlight/kb920x_bl.c linux-2.6-stab
  +MODULE_AUTHOR("KwikByte <kb9200_dev@kwikbyte.com>");
  +MODULE_DESCRIPTION("KB9202 Backlight Driver");
  +MODULE_LICENSE("GPL");
  +MODULE_AUTHOR("KwikByte <kb9200_dev@kwikbyte.com>");
  +MODULE_DESCRIPTION("KB9202 Backlight Driver");
  +MODULE_LICENSE("GPL");
-diff -urN -x CVS linux-2.6.21/drivers/video/s1d15605fb.c linux-2.6-stable/drivers/video/s1d15605fb.c
---- linux-2.6.21/drivers/video/s1d15605fb.c    Thu Jan  1 02:00:00 1970
-+++ linux-2.6-stable/drivers/video/s1d15605fb.c        Tue May  8 12:13:31 2007
+Index: linux-2.6.21.7/drivers/video/s1d15605fb.c
+===================================================================
+--- /dev/null
++++ linux-2.6.21.7/drivers/video/s1d15605fb.c
  @@ -0,0 +1,659 @@
  +/*
  + *  drivers/video/s1d15605.c
  @@ -0,0 +1,659 @@
  +/*
  + *  drivers/video/s1d15605.c
@@ -8888,9 +8956,10 @@ diff -urN -x CVS linux-2.6.21/drivers/video/s1d15605fb.c linux-2.6-stable/driver
  +MODULE_AUTHOR("KwikByte");
  +MODULE_DESCRIPTION("Epson S1D15605 LCD Controller framebuffer driver");
  +MODULE_LICENSE("GPL");
  +MODULE_AUTHOR("KwikByte");
  +MODULE_DESCRIPTION("Epson S1D15605 LCD Controller framebuffer driver");
  +MODULE_LICENSE("GPL");
-diff -urN -x CVS linux-2.6.21/include/asm-arm/arch-at91/at91_adc.h linux-2.6-stable/include/asm-arm/arch-at91/at91_adc.h
---- linux-2.6.21/include/asm-arm/arch-at91/at91_adc.h  Thu Jan  1 02:00:00 1970
-+++ linux-2.6-stable/include/asm-arm/arch-at91/at91_adc.h      Tue May  8 12:13:31 2007
+Index: linux-2.6.21.7/include/asm-arm/arch-at91/at91_adc.h
+===================================================================
+--- /dev/null
++++ linux-2.6.21.7/include/asm-arm/arch-at91/at91_adc.h
  @@ -0,0 +1,61 @@
  +/*
  + * include/asm-arm/arch-at91/at91_adc.h
  @@ -0,0 +1,61 @@
  +/*
  + * include/asm-arm/arch-at91/at91_adc.h
@@ -8953,9 +9022,10 @@ diff -urN -x CVS linux-2.6.21/include/asm-arm/arch-at91/at91_adc.h linux-2.6-sta
  +#define               AT91_ADC_DATA           (0x3ff)
  +
  +#endif
  +#define               AT91_ADC_DATA           (0x3ff)
  +
  +#endif
-diff -urN -x CVS linux-2.6.21/include/asm-arm/arch-at91/at91_mci.h linux-2.6-stable/include/asm-arm/arch-at91/at91_mci.h
---- linux-2.6.21/include/asm-arm/arch-at91/at91_mci.h  Thu Apr 26 05:08:32 2007
-+++ linux-2.6-stable/include/asm-arm/arch-at91/at91_mci.h      Tue May  8 12:13:31 2007
+Index: linux-2.6.21.7/include/asm-arm/arch-at91/at91_mci.h
+===================================================================
+--- linux-2.6.21.7.orig/include/asm-arm/arch-at91/at91_mci.h
++++ linux-2.6.21.7/include/asm-arm/arch-at91/at91_mci.h
  @@ -26,6 +26,9 @@
   #define AT91_MCI_MR           0x04            /* Mode Register */
   #define               AT91_MCI_CLKDIV         (0xff  <<  0)   /* Clock Divider */
  @@ -26,6 +26,9 @@
   #define AT91_MCI_MR           0x04            /* Mode Register */
   #define               AT91_MCI_CLKDIV         (0xff  <<  0)   /* Clock Divider */
@@ -8966,9 +9036,10 @@ diff -urN -x CVS linux-2.6.21/include/asm-arm/arch-at91/at91_mci.h linux-2.6-sta
   #define               AT91_MCI_PDCPADV        (1     << 14)   /* PDC Padding Value */
   #define               AT91_MCI_PDCMODE        (1     << 15)   /* PDC-orientated Mode */
   #define               AT91_MCI_BLKLEN         (0xfff << 18)   /* Data Block Length */
   #define               AT91_MCI_PDCPADV        (1     << 14)   /* PDC Padding Value */
   #define               AT91_MCI_PDCMODE        (1     << 15)   /* PDC-orientated Mode */
   #define               AT91_MCI_BLKLEN         (0xfff << 18)   /* Data Block Length */
-diff -urN -x CVS linux-2.6.21/include/asm-arm/arch-at91/at91_pmc.h linux-2.6-stable/include/asm-arm/arch-at91/at91_pmc.h
---- linux-2.6.21/include/asm-arm/arch-at91/at91_pmc.h  Thu Apr 26 05:08:32 2007
-+++ linux-2.6-stable/include/asm-arm/arch-at91/at91_pmc.h      Fri May 11 16:45:00 2007
+Index: linux-2.6.21.7/include/asm-arm/arch-at91/at91_pmc.h
+===================================================================
+--- linux-2.6.21.7.orig/include/asm-arm/arch-at91/at91_pmc.h
++++ linux-2.6.21.7/include/asm-arm/arch-at91/at91_pmc.h
  @@ -37,7 +37,9 @@
   #define       AT91_PMC_PCDR           (AT91_PMC + 0x14)       /* Peripheral Clock Disable Register */
   #define       AT91_PMC_PCSR           (AT91_PMC + 0x18)       /* Peripheral Clock Status Register */
  @@ -37,7 +37,9 @@
   #define       AT91_PMC_PCDR           (AT91_PMC + 0x14)       /* Peripheral Clock Disable Register */
   #define       AT91_PMC_PCSR           (AT91_PMC + 0x18)       /* Peripheral Clock Status Register */
@@ -8980,9 +9051,10 @@ diff -urN -x CVS linux-2.6.21/include/asm-arm/arch-at91/at91_pmc.h linux-2.6-sta
   #define               AT91_PMC_MOSCEN         (1    << 0)             /* Main Oscillator Enable */
   #define               AT91_PMC_OSCBYPASS      (1    << 1)             /* Oscillator Bypass [AT91SAM926x only] */
   #define               AT91_PMC_OSCOUNT        (0xff << 8)             /* Main Oscillator Start-up Time */
   #define               AT91_PMC_MOSCEN         (1    << 0)             /* Main Oscillator Enable */
   #define               AT91_PMC_OSCBYPASS      (1    << 1)             /* Oscillator Bypass [AT91SAM926x only] */
   #define               AT91_PMC_OSCOUNT        (0xff << 8)             /* Main Oscillator Start-up Time */
-diff -urN -x CVS linux-2.6.21/include/asm-arm/arch-at91/at91rm9200.h linux-2.6-stable/include/asm-arm/arch-at91/at91rm9200.h
---- linux-2.6.21/include/asm-arm/arch-at91/at91rm9200.h        Thu Apr 26 05:08:32 2007
-+++ linux-2.6-stable/include/asm-arm/arch-at91/at91rm9200.h    Tue May  8 12:56:33 2007
+Index: linux-2.6.21.7/include/asm-arm/arch-at91/at91rm9200.h
+===================================================================
+--- linux-2.6.21.7.orig/include/asm-arm/arch-at91/at91rm9200.h
++++ linux-2.6.21.7/include/asm-arm/arch-at91/at91rm9200.h
  @@ -107,185 +107,4 @@
   #define AT91RM9200_UHP_BASE   0x00300000      /* USB Host controller */
   
  @@ -107,185 +107,4 @@
   #define AT91RM9200_UHP_BASE   0x00300000      /* USB Host controller */
   
@@ -9169,9 +9241,10 @@ diff -urN -x CVS linux-2.6.21/include/asm-arm/arch-at91/at91rm9200.h linux-2.6-s
  -#endif
  -
   #endif
  -#endif
  -
   #endif
-diff -urN -x CVS linux-2.6.21/include/asm-arm/arch-at91/at91sam9260.h linux-2.6-stable/include/asm-arm/arch-at91/at91sam9260.h
---- linux-2.6.21/include/asm-arm/arch-at91/at91sam9260.h       Thu Apr 26 05:08:32 2007
-+++ linux-2.6-stable/include/asm-arm/arch-at91/at91sam9260.h   Tue May  8 12:56:33 2007
+Index: linux-2.6.21.7/include/asm-arm/arch-at91/at91sam9260.h
+===================================================================
+--- linux-2.6.21.7.orig/include/asm-arm/arch-at91/at91sam9260.h
++++ linux-2.6.21.7/include/asm-arm/arch-at91/at91sam9260.h
  @@ -117,13 +117,4 @@
   #define AT91SAM9XE_SRAM_BASE  0x00300000      /* Internal SRAM base address */
   
  @@ -117,13 +117,4 @@
   #define AT91SAM9XE_SRAM_BASE  0x00300000      /* Internal SRAM base address */
   
@@ -9186,9 +9259,10 @@ diff -urN -x CVS linux-2.6.21/include/asm-arm/arch-at91/at91sam9260.h linux-2.6-
  -#endif
  -
   #endif
  -#endif
  -
   #endif
-diff -urN -x CVS linux-2.6.21/include/asm-arm/arch-at91/at91sam9260_matrix.h linux-2.6-stable/include/asm-arm/arch-at91/at91sam9260_matrix.h
---- linux-2.6.21/include/asm-arm/arch-at91/at91sam9260_matrix.h        Thu Apr 26 05:08:32 2007
-+++ linux-2.6-stable/include/asm-arm/arch-at91/at91sam9260_matrix.h    Fri May 11 16:20:33 2007
+Index: linux-2.6.21.7/include/asm-arm/arch-at91/at91sam9260_matrix.h
+===================================================================
+--- linux-2.6.21.7.orig/include/asm-arm/arch-at91/at91sam9260_matrix.h
++++ linux-2.6.21.7/include/asm-arm/arch-at91/at91sam9260_matrix.h
  @@ -67,7 +67,7 @@
   #define               AT91_MATRIX_CS4A                (1 << 4)        /* Chip Select 4 Assignment */
   #define                       AT91_MATRIX_CS4A_SMC            (0 << 4)
  @@ -67,7 +67,7 @@
   #define               AT91_MATRIX_CS4A                (1 << 4)        /* Chip Select 4 Assignment */
   #define                       AT91_MATRIX_CS4A_SMC            (0 << 4)
@@ -9198,9 +9272,10 @@ diff -urN -x CVS linux-2.6.21/include/asm-arm/arch-at91/at91sam9260_matrix.h lin
   #define                       AT91_MATRIX_CS5A_SMC            (0 << 5)
   #define                       AT91_MATRIX_CS5A_SMC_CF2        (1 << 5)
   #define               AT91_MATRIX_DBPUC               (1 << 8)        /* Data Bus Pull-up Configuration */
   #define                       AT91_MATRIX_CS5A_SMC            (0 << 5)
   #define                       AT91_MATRIX_CS5A_SMC_CF2        (1 << 5)
   #define               AT91_MATRIX_DBPUC               (1 << 8)        /* Data Bus Pull-up Configuration */
-diff -urN -x CVS linux-2.6.21/include/asm-arm/arch-at91/at91sam9261.h linux-2.6-stable/include/asm-arm/arch-at91/at91sam9261.h
---- linux-2.6.21/include/asm-arm/arch-at91/at91sam9261.h       Thu Apr 26 05:08:32 2007
-+++ linux-2.6-stable/include/asm-arm/arch-at91/at91sam9261.h   Tue May  8 12:56:33 2007
+Index: linux-2.6.21.7/include/asm-arm/arch-at91/at91sam9261.h
+===================================================================
+--- linux-2.6.21.7.orig/include/asm-arm/arch-at91/at91sam9261.h
++++ linux-2.6.21.7/include/asm-arm/arch-at91/at91sam9261.h
  @@ -98,195 +98,4 @@
   #define AT91SAM9261_LCDC_BASE 0x00600000      /* LDC controller */
   
  @@ -98,195 +98,4 @@
   #define AT91SAM9261_LCDC_BASE 0x00600000      /* LDC controller */
   
@@ -9397,9 +9472,10 @@ diff -urN -x CVS linux-2.6.21/include/asm-arm/arch-at91/at91sam9261.h linux-2.6-
  -#endif
  -
   #endif
  -#endif
  -
   #endif
-diff -urN -x CVS linux-2.6.21/include/asm-arm/arch-at91/at91sam9263.h linux-2.6-stable/include/asm-arm/arch-at91/at91sam9263.h
---- linux-2.6.21/include/asm-arm/arch-at91/at91sam9263.h       Thu Apr 26 05:08:32 2007
-+++ linux-2.6-stable/include/asm-arm/arch-at91/at91sam9263.h   Tue May  8 12:56:33 2007
+Index: linux-2.6.21.7/include/asm-arm/arch-at91/at91sam9263.h
+===================================================================
+--- linux-2.6.21.7.orig/include/asm-arm/arch-at91/at91sam9263.h
++++ linux-2.6.21.7/include/asm-arm/arch-at91/at91sam9263.h
  @@ -119,13 +119,5 @@
   #define AT91SAM9263_DMAC_BASE 0x00800000      /* DMA Controller */
   #define AT91SAM9263_UHP_BASE  0x00a00000      /* USB Host controller */
  @@ -119,13 +119,5 @@
   #define AT91SAM9263_DMAC_BASE 0x00800000      /* DMA Controller */
   #define AT91SAM9263_UHP_BASE  0x00a00000      /* USB Host controller */
@@ -9414,9 +9490,10 @@ diff -urN -x CVS linux-2.6.21/include/asm-arm/arch-at91/at91sam9263.h linux-2.6-
  -#endif
   
   #endif
  -#endif
   
   #endif
-diff -urN -x CVS linux-2.6.21/include/asm-arm/arch-at91/at91sam9rl.h linux-2.6-stable/include/asm-arm/arch-at91/at91sam9rl.h
---- linux-2.6.21/include/asm-arm/arch-at91/at91sam9rl.h        Thu Jan  1 02:00:00 1970
-+++ linux-2.6-stable/include/asm-arm/arch-at91/at91sam9rl.h    Fri May 11 14:53:48 2007
+Index: linux-2.6.21.7/include/asm-arm/arch-at91/at91sam9rl.h
+===================================================================
+--- /dev/null
++++ linux-2.6.21.7/include/asm-arm/arch-at91/at91sam9rl.h
  @@ -0,0 +1,110 @@
  +/*
  + * include/asm-arm/arch-at91/at91sam9260.h
  @@ -0,0 +1,110 @@
  +/*
  + * include/asm-arm/arch-at91/at91sam9260.h
@@ -9528,9 +9605,10 @@ diff -urN -x CVS linux-2.6.21/include/asm-arm/arch-at91/at91sam9rl.h linux-2.6-s
  +#define AT91SAM9RL_UDPHS_BASE 0x00600000      /* USB Device HS controller */
  +
  +#endif
  +#define AT91SAM9RL_UDPHS_BASE 0x00600000      /* USB Device HS controller */
  +
  +#endif
-diff -urN -x CVS linux-2.6.21/include/asm-arm/arch-at91/at91sam9rl_matrix.h linux-2.6-stable/include/asm-arm/arch-at91/at91sam9rl_matrix.h
---- linux-2.6.21/include/asm-arm/arch-at91/at91sam9rl_matrix.h Thu Jan  1 02:00:00 1970
-+++ linux-2.6-stable/include/asm-arm/arch-at91/at91sam9rl_matrix.h     Fri May 11 16:18:45 2007
+Index: linux-2.6.21.7/include/asm-arm/arch-at91/at91sam9rl_matrix.h
+===================================================================
+--- /dev/null
++++ linux-2.6.21.7/include/asm-arm/arch-at91/at91sam9rl_matrix.h
  @@ -0,0 +1,96 @@
  +/*
  + * include/asm-arm/arch-at91/at91sam9rl_matrix.h
  @@ -0,0 +1,96 @@
  +/*
  + * include/asm-arm/arch-at91/at91sam9rl_matrix.h
@@ -9628,10 +9706,11 @@ diff -urN -x CVS linux-2.6.21/include/asm-arm/arch-at91/at91sam9rl_matrix.h linu
  +
  +
  +#endif
  +
  +
  +#endif
-diff -urN -x CVS linux-2.6.21/include/asm-arm/arch-at91/board.h linux-2.6-stable/include/asm-arm/arch-at91/board.h
---- linux-2.6.21/include/asm-arm/arch-at91/board.h     Thu Apr 26 05:08:32 2007
-+++ linux-2.6-stable/include/asm-arm/arch-at91/board.h Thu May 10 12:21:10 2007
-@@ -62,7 +62,7 @@
+Index: linux-2.6.21.7/include/asm-arm/arch-at91/board.h
+===================================================================
+--- linux-2.6.21.7.orig/include/asm-arm/arch-at91/board.h
++++ linux-2.6.21.7/include/asm-arm/arch-at91/board.h
+@@ -62,7 +62,7 @@ struct at91_mmc_data {
   };
   extern void __init at91_add_device_mmc(short mmc_id, struct at91_mmc_data *data);
   
   };
   extern void __init at91_add_device_mmc(short mmc_id, struct at91_mmc_data *data);
   
@@ -9640,7 +9719,7 @@ diff -urN -x CVS linux-2.6.21/include/asm-arm/arch-at91/board.h linux-2.6-stable
   struct at91_eth_data {
         u8              phy_irq_pin;    /* PHY IRQ */
         u8              is_rmii;        /* using RMII interface? */
   struct at91_eth_data {
         u8              phy_irq_pin;    /* PHY IRQ */
         u8              is_rmii;        /* using RMII interface? */
-@@ -114,9 +114,31 @@
+@@ -114,9 +114,31 @@ struct atmel_uart_data {
   };
   extern void __init at91_add_device_serial(void);
   
   };
   extern void __init at91_add_device_serial(void);
   
@@ -9672,9 +9751,10 @@ diff -urN -x CVS linux-2.6.21/include/asm-arm/arch-at91/board.h linux-2.6-stable
  +extern void __init at91_gpio_leds(struct at91_gpio_led *leds, int nr);
  +
   #endif
  +extern void __init at91_gpio_leds(struct at91_gpio_led *leds, int nr);
  +
   #endif
-diff -urN -x CVS linux-2.6.21/include/asm-arm/arch-at91/cpu.h linux-2.6-stable/include/asm-arm/arch-at91/cpu.h
---- linux-2.6.21/include/asm-arm/arch-at91/cpu.h       Thu Apr 26 05:08:32 2007
-+++ linux-2.6-stable/include/asm-arm/arch-at91/cpu.h   Wed May  9 10:20:54 2007
+Index: linux-2.6.21.7/include/asm-arm/arch-at91/cpu.h
+===================================================================
+--- linux-2.6.21.7.orig/include/asm-arm/arch-at91/cpu.h
++++ linux-2.6.21.7/include/asm-arm/arch-at91/cpu.h
  @@ -26,6 +26,8 @@
   #define ARCH_ID_AT91SAM9XE256 0x329a93a0
   #define ARCH_ID_AT91SAM9XE512 0x329aa3a0
  @@ -26,6 +26,8 @@
   #define ARCH_ID_AT91SAM9XE256 0x329a93a0
   #define ARCH_ID_AT91SAM9XE512 0x329aa3a0
@@ -9684,7 +9764,7 @@ diff -urN -x CVS linux-2.6.21/include/asm-arm/arch-at91/cpu.h linux-2.6-stable/i
   static inline unsigned long at91_cpu_identify(void)
   {
         return (at91_sys_read(AT91_DBGU_CIDR) & ~AT91_CIDR_VERSION);
   static inline unsigned long at91_cpu_identify(void)
   {
         return (at91_sys_read(AT91_DBGU_CIDR) & ~AT91_CIDR_VERSION);
-@@ -68,4 +70,10 @@
+@@ -68,4 +70,10 @@ static inline unsigned long at91_arch_id
   #define cpu_is_at91sam9263()  (0)
   #endif
   
   #define cpu_is_at91sam9263()  (0)
   #endif
   
@@ -9695,9 +9775,10 @@ diff -urN -x CVS linux-2.6.21/include/asm-arm/arch-at91/cpu.h linux-2.6-stable/i
  +#endif
  +
   #endif
  +#endif
  +
   #endif
-diff -urN -x CVS linux-2.6.21/include/asm-arm/arch-at91/hardware.h linux-2.6-stable/include/asm-arm/arch-at91/hardware.h
---- linux-2.6.21/include/asm-arm/arch-at91/hardware.h  Thu Apr 26 05:08:32 2007
-+++ linux-2.6-stable/include/asm-arm/arch-at91/hardware.h      Fri May 11 14:45:12 2007
+Index: linux-2.6.21.7/include/asm-arm/arch-at91/hardware.h
+===================================================================
+--- linux-2.6.21.7.orig/include/asm-arm/arch-at91/hardware.h
++++ linux-2.6.21.7/include/asm-arm/arch-at91/hardware.h
  @@ -24,6 +24,8 @@
   #include <asm/arch/at91sam9261.h>
   #elif defined(CONFIG_ARCH_AT91SAM9263)
  @@ -24,6 +24,8 @@
   #include <asm/arch/at91sam9261.h>
   #elif defined(CONFIG_ARCH_AT91SAM9263)
@@ -9730,9 +9811,10 @@ diff -urN -x CVS linux-2.6.21/include/asm-arm/arch-at91/hardware.h linux-2.6-sta
  -#endif
   
   #endif
  -#endif
   
   #endif
-diff -urN -x CVS linux-2.6.21/include/asm-arm/arch-at91/ics1523.h linux-2.6-stable/include/asm-arm/arch-at91/ics1523.h
---- linux-2.6.21/include/asm-arm/arch-at91/ics1523.h   Thu Jan  1 02:00:00 1970
-+++ linux-2.6-stable/include/asm-arm/arch-at91/ics1523.h       Tue May  8 12:13:31 2007
+Index: linux-2.6.21.7/include/asm-arm/arch-at91/ics1523.h
+===================================================================
+--- /dev/null
++++ linux-2.6.21.7/include/asm-arm/arch-at91/ics1523.h
  @@ -0,0 +1,154 @@
  +//*----------------------------------------------------------------------------
  +//*         ATMEL Microcontroller Software Support  -  ROUSSET  -
  @@ -0,0 +1,154 @@
  +//*----------------------------------------------------------------------------
  +//*         ATMEL Microcontroller Software Support  -  ROUSSET  -
@@ -9888,9 +9970,10 @@ diff -urN -x CVS linux-2.6.21/include/asm-arm/arch-at91/ics1523.h linux-2.6-stab
  +int at91_ics1523_init(void);
  +
  +#endif /* ics1523_h */
  +int at91_ics1523_init(void);
  +
  +#endif /* ics1523_h */
-diff -urN -x CVS linux-2.6.21/include/asm-arm/arch-at91/io.h linux-2.6-stable/include/asm-arm/arch-at91/io.h
---- linux-2.6.21/include/asm-arm/arch-at91/io.h        Thu Apr 26 05:08:32 2007
-+++ linux-2.6-stable/include/asm-arm/arch-at91/io.h    Fri May 11 14:45:12 2007
+Index: linux-2.6.21.7/include/asm-arm/arch-at91/io.h
+===================================================================
+--- linux-2.6.21.7.orig/include/asm-arm/arch-at91/io.h
++++ linux-2.6.21.7/include/asm-arm/arch-at91/io.h
  @@ -29,4 +29,22 @@
   #define __mem_pci(a)          (a)
   
  @@ -29,4 +29,22 @@
   #define __mem_pci(a)          (a)
   
@@ -9914,9 +9997,10 @@ diff -urN -x CVS linux-2.6.21/include/asm-arm/arch-at91/io.h linux-2.6-stable/in
  +#endif
  +
   #endif
  +#endif
  +
   #endif
-diff -urN -x CVS linux-2.6.21/include/asm-arm/arch-at91/irqs.h linux-2.6-stable/include/asm-arm/arch-at91/irqs.h
---- linux-2.6.21/include/asm-arm/arch-at91/irqs.h      Thu Apr 26 05:08:32 2007
-+++ linux-2.6-stable/include/asm-arm/arch-at91/irqs.h  Fri May 11 14:45:12 2007
+Index: linux-2.6.21.7/include/asm-arm/arch-at91/irqs.h
+===================================================================
+--- linux-2.6.21.7.orig/include/asm-arm/arch-at91/irqs.h
++++ linux-2.6.21.7/include/asm-arm/arch-at91/irqs.h
  @@ -21,6 +21,7 @@
   #ifndef __ASM_ARCH_IRQS_H
   #define __ASM_ARCH_IRQS_H
  @@ -21,6 +21,7 @@
   #ifndef __ASM_ARCH_IRQS_H
   #define __ASM_ARCH_IRQS_H
@@ -9925,9 +10009,10 @@ diff -urN -x CVS linux-2.6.21/include/asm-arm/arch-at91/irqs.h linux-2.6-stable/
   #include <asm/arch/at91_aic.h>
   
   #define NR_AIC_IRQS 32
   #include <asm/arch/at91_aic.h>
   
   #define NR_AIC_IRQS 32
-diff -urN -x CVS linux-2.6.21/include/asm-arm/arch-at91/spi.h linux-2.6-stable/include/asm-arm/arch-at91/spi.h
---- linux-2.6.21/include/asm-arm/arch-at91/spi.h       Thu Jan  1 02:00:00 1970
-+++ linux-2.6-stable/include/asm-arm/arch-at91/spi.h   Tue May  8 14:31:24 2007
+Index: linux-2.6.21.7/include/asm-arm/arch-at91/spi.h
+===================================================================
+--- /dev/null
++++ linux-2.6.21.7/include/asm-arm/arch-at91/spi.h
  @@ -0,0 +1,54 @@
  +/*
  + * Serial Peripheral Interface (SPI) driver for the Atmel AT91RM9200
  @@ -0,0 +1,54 @@
  +/*
  + * Serial Peripheral Interface (SPI) driver for the Atmel AT91RM9200
@@ -9983,9 +10068,10 @@ diff -urN -x CVS linux-2.6.21/include/asm-arm/arch-at91/spi.h linux-2.6-stable/i
  +extern int spi_transfer(struct spi_transfer_list* list);
  +
  +#endif
  +extern int spi_transfer(struct spi_transfer_list* list);
  +
  +#endif
-diff -urN -x CVS linux-2.6.21/include/asm-arm/arch-at91/timex.h linux-2.6-stable/include/asm-arm/arch-at91/timex.h
---- linux-2.6.21/include/asm-arm/arch-at91/timex.h     Thu Apr 26 05:08:32 2007
-+++ linux-2.6-stable/include/asm-arm/arch-at91/timex.h Wed May  9 10:20:53 2007
+Index: linux-2.6.21.7/include/asm-arm/arch-at91/timex.h
+===================================================================
+--- linux-2.6.21.7.orig/include/asm-arm/arch-at91/timex.h
++++ linux-2.6.21.7/include/asm-arm/arch-at91/timex.h
  @@ -37,6 +37,11 @@
   #define AT91SAM9_MASTER_CLOCK 99959500
   #define CLOCK_TICK_RATE               (AT91SAM9_MASTER_CLOCK/16)
  @@ -37,6 +37,11 @@
   #define AT91SAM9_MASTER_CLOCK 99959500
   #define CLOCK_TICK_RATE               (AT91SAM9_MASTER_CLOCK/16)
@@ -9998,9 +10084,10 @@ diff -urN -x CVS linux-2.6.21/include/asm-arm/arch-at91/timex.h linux-2.6-stable
   #endif
   
   #endif
   #endif
   
   #endif
-diff -urN -x CVS linux-2.6.21/include/asm-arm/arch-at91/uncompress.h linux-2.6-stable/include/asm-arm/arch-at91/uncompress.h
---- linux-2.6.21/include/asm-arm/arch-at91/uncompress.h        Thu Apr 26 05:08:32 2007
-+++ linux-2.6-stable/include/asm-arm/arch-at91/uncompress.h    Fri May 11 14:45:12 2007
+Index: linux-2.6.21.7/include/asm-arm/arch-at91/uncompress.h
+===================================================================
+--- linux-2.6.21.7.orig/include/asm-arm/arch-at91/uncompress.h
++++ linux-2.6.21.7/include/asm-arm/arch-at91/uncompress.h
  @@ -21,7 +21,7 @@
   #ifndef __ASM_ARCH_UNCOMPRESS_H
   #define __ASM_ARCH_UNCOMPRESS_H
  @@ -21,7 +21,7 @@
   #ifndef __ASM_ARCH_UNCOMPRESS_H
   #define __ASM_ARCH_UNCOMPRESS_H
@@ -10010,10 +10097,11 @@ diff -urN -x CVS linux-2.6.21/include/asm-arm/arch-at91/uncompress.h linux-2.6-s
   #include <asm/arch/at91_dbgu.h>
   
   /*
   #include <asm/arch/at91_dbgu.h>
   
   /*
-diff -urN -x CVS linux-2.6.21/include/linux/clk.h linux-2.6-stable/include/linux/clk.h
---- linux-2.6.21/include/linux/clk.h   Thu Apr 26 05:08:32 2007
-+++ linux-2.6-stable/include/linux/clk.h       Tue May  8 12:13:31 2007
-@@ -121,4 +121,24 @@
+Index: linux-2.6.21.7/include/linux/clk.h
+===================================================================
+--- linux-2.6.21.7.orig/include/linux/clk.h
++++ linux-2.6.21.7/include/linux/clk.h
+@@ -121,4 +121,24 @@ int clk_set_parent(struct clk *clk, stru
    */
   struct clk *clk_get_parent(struct clk *clk);
   
    */
   struct clk *clk_get_parent(struct clk *clk);
   
@@ -10038,9 +10126,10 @@ diff -urN -x CVS linux-2.6.21/include/linux/clk.h linux-2.6-stable/include/linux
  +int clk_must_disable(struct clk *clk);
  +
   #endif
  +int clk_must_disable(struct clk *clk);
  +
   #endif
-diff -urN -x CVS linux-2.6.21/include/linux/i2c-id.h linux-2.6-stable/include/linux/i2c-id.h
---- linux-2.6.21/include/linux/i2c-id.h        Thu Apr 26 05:08:32 2007
-+++ linux-2.6-stable/include/linux/i2c-id.h    Tue May  8 12:13:31 2007
+Index: linux-2.6.21.7/include/linux/i2c-id.h
+===================================================================
+--- linux-2.6.21.7.orig/include/linux/i2c-id.h
++++ linux-2.6.21.7/include/linux/i2c-id.h
  @@ -202,6 +202,7 @@
   
   /* --- PCA 9564 based algorithms */
  @@ -202,6 +202,7 @@
   
   /* --- PCA 9564 based algorithms */
@@ -10049,9 +10138,10 @@ diff -urN -x CVS linux-2.6.21/include/linux/i2c-id.h linux-2.6-stable/include/li
   
   /* --- ACPI Embedded controller algorithms                              */
   #define I2C_HW_ACPI_EC          0x1f0000
   
   /* --- ACPI Embedded controller algorithms                              */
   #define I2C_HW_ACPI_EC          0x1f0000
-diff -urN -x CVS linux-2.6.21/include/video/atmel_lcdc.h linux-2.6-stable/include/video/atmel_lcdc.h
---- linux-2.6.21/include/video/atmel_lcdc.h    Thu Jan  1 02:00:00 1970
-+++ linux-2.6-stable/include/video/atmel_lcdc.h        Thu May 10 12:34:01 2007
+Index: linux-2.6.21.7/include/video/atmel_lcdc.h
+===================================================================
+--- /dev/null
++++ linux-2.6.21.7/include/video/atmel_lcdc.h
  @@ -0,0 +1,196 @@
  +/*
  + *  Header file for AT91/AT32 LCD Controller
  @@ -0,0 +1,196 @@
  +/*
  + *  Header file for AT91/AT32 LCD Controller
@@ -10249,9 +10339,10 @@ diff -urN -x CVS linux-2.6.21/include/video/atmel_lcdc.h linux-2.6-stable/includ
  +#define ATMEL_LCDC_LUT(n)     (0x0c00 + ((n)*4))
  +
  +#endif /* __ATMEL_LCDC_H__ */
  +#define ATMEL_LCDC_LUT(n)     (0x0c00 + ((n)*4))
  +
  +#endif /* __ATMEL_LCDC_H__ */
-diff -urN -x CVS linux-2.6.21/sound/soc/at91/eti_b1_wm8731.c linux-2.6-stable/sound/soc/at91/eti_b1_wm8731.c
---- linux-2.6.21/sound/soc/at91/eti_b1_wm8731.c        Thu Apr 26 05:08:32 2007
-+++ linux-2.6-stable/sound/soc/at91/eti_b1_wm8731.c    Tue May  8 12:13:58 2007
+Index: linux-2.6.21.7/sound/soc/at91/eti_b1_wm8731.c
+===================================================================
+--- linux-2.6.21.7.orig/sound/soc/at91/eti_b1_wm8731.c
++++ linux-2.6.21.7/sound/soc/at91/eti_b1_wm8731.c
  @@ -34,8 +34,7 @@
   #include <sound/soc.h>
   #include <sound/soc-dapm.h>
  @@ -34,8 +34,7 @@
   #include <sound/soc.h>
   #include <sound/soc-dapm.h>
@@ -10276,7 +10367,7 @@ diff -urN -x CVS linux-2.6.21/sound/soc/at91/eti_b1_wm8731.c linux-2.6-stable/so
   static struct clk *pck1_clk;
   static struct clk *pllb_clk;
   
   static struct clk *pck1_clk;
   static struct clk *pllb_clk;
   
-@@ -277,7 +269,6 @@
+@@ -277,7 +269,6 @@ static struct platform_device *eti_b1_sn
   static int __init eti_b1_init(void)
   {
         int ret;
   static int __init eti_b1_init(void)
   {
         int ret;
@@ -10284,7 +10375,7 @@ diff -urN -x CVS linux-2.6.21/sound/soc/at91/eti_b1_wm8731.c linux-2.6-stable/so
         struct at91_ssc_periph *ssc = eti_b1_dai.cpu_dai->private_data;
   
         if (!request_mem_region(AT91RM9200_BASE_SSC1, SZ_16K, "soc-audio")) {
         struct at91_ssc_periph *ssc = eti_b1_dai.cpu_dai->private_data;
   
         if (!request_mem_region(AT91RM9200_BASE_SSC1, SZ_16K, "soc-audio")) {
-@@ -311,19 +302,12 @@
+@@ -311,19 +302,12 @@ static int __init eti_b1_init(void)
                 goto fail_io_unmap;
         }
   
                 goto fail_io_unmap;
         }
   
diff --git a/target/linux/at91/patches-2.6.21/001-vlink-machine.patch b/target/linux/at91/patches-2.6.21/001-vlink-machine.patch

index 1c12db3..f40dbae 100644 (file)
--- a/target/linux/at91/patches-2.6.21/001-vlink-machine.patch
+++ b/target/linux/at91/patches-2.6.21/001-vlink-machine.patch
@@ -1,5 +1,7 @@
---- linux-2.6.21.1.orig/arch/arm/boot/compressed/head-at91rm9200.S     2007-05-28 12:22:29.000000000 +0200
-+++ linux-2.6.21.1/arch/arm/boot/compressed/head-at91rm9200.S  2007-05-28 12:52:16.000000000 +0200
+Index: linux-2.6.21.7/arch/arm/boot/compressed/head-at91rm9200.S
+===================================================================
+--- linux-2.6.21.7.orig/arch/arm/boot/compressed/head-at91rm9200.S
++++ linux-2.6.21.7/arch/arm/boot/compressed/head-at91rm9200.S
  @@ -61,6 +61,12 @@
                 cmp     r7, r3
                 beq     99f
  @@ -61,6 +61,12 @@
                 cmp     r7, r3
                 beq     99f
@@ -13,8 +15,10 @@
                 @ Ajeco 1ARM : 1075
                 mov     r3,     #(MACH_TYPE_ONEARM & 0xff)
                 orr     r3, r3, #(MACH_TYPE_ONEARM & 0xff00)
                 @ Ajeco 1ARM : 1075
                 mov     r3,     #(MACH_TYPE_ONEARM & 0xff)
                 orr     r3, r3, #(MACH_TYPE_ONEARM & 0xff00)
---- linux-2.6.21.1.orig/arch/arm/mach-at91/board-vlink.c       1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.21.1/arch/arm/mach-at91/board-vlink.c    2007-05-28 13:09:54.000000000 +0200
+Index: linux-2.6.21.7/arch/arm/mach-at91/board-vlink.c
+===================================================================
+--- /dev/null
++++ linux-2.6.21.7/arch/arm/mach-at91/board-vlink.c
  @@ -0,0 +1,160 @@
  +/*
  + * linux/arch/arm/mach-at91/board-vlink.c
  @@ -0,0 +1,160 @@
  +/*
  + * linux/arch/arm/mach-at91/board-vlink.c
@@ -176,9 +180,11 @@
  +      .init_irq       = vlink_init_irq,
  +      .init_machine   = vlink_board_init,
  +MACHINE_END
  +      .init_irq       = vlink_init_irq,
  +      .init_machine   = vlink_board_init,
  +MACHINE_END
---- linux-2.6.21.1.orig/arch/arm/mach-at91/Kconfig     2007-05-28 12:22:29.000000000 +0200
-+++ linux-2.6.21.1/arch/arm/mach-at91/Kconfig  2007-05-28 13:11:45.000000000 +0200
-@@ -96,6 +96,12 @@
+Index: linux-2.6.21.7/arch/arm/mach-at91/Kconfig
+===================================================================
+--- linux-2.6.21.7.orig/arch/arm/mach-at91/Kconfig
++++ linux-2.6.21.7/arch/arm/mach-at91/Kconfig
+@@ -96,6 +96,12 @@ config MACH_CHUB
         help
           Select this if you are using Promwad's Chub board.
   
         help
           Select this if you are using Promwad's Chub board.
   
@@ -191,9 +197,11 @@
   endif
   
   # ----------------------------------------------------------
   endif
   
   # ----------------------------------------------------------
---- linux-2.6.21.1.orig/arch/arm/mach-at91/Makefile    2007-05-28 12:22:29.000000000 +0200
-+++ linux-2.6.21.1/arch/arm/mach-at91/Makefile 2007-05-28 13:13:15.000000000 +0200
-@@ -29,6 +29,7 @@
+Index: linux-2.6.21.7/arch/arm/mach-at91/Makefile
+===================================================================
+--- linux-2.6.21.7.orig/arch/arm/mach-at91/Makefile
++++ linux-2.6.21.7/arch/arm/mach-at91/Makefile
+@@ -29,6 +29,7 @@ obj-$(CONFIG_MACH_KB9200)    += board-kb920
   obj-$(CONFIG_MACH_ATEB9200)   += board-eb9200.o
   obj-$(CONFIG_MACH_KAFA)               += board-kafa.o
   obj-$(CONFIG_MACH_CHUB)               += board-chub.o
   obj-$(CONFIG_MACH_ATEB9200)   += board-eb9200.o
   obj-$(CONFIG_MACH_KAFA)               += board-kafa.o
   obj-$(CONFIG_MACH_CHUB)               += board-chub.o
@@ -201,7 +209,7 @@
   
   # AT91SAM9260 board-specific support
   obj-$(CONFIG_MACH_AT91SAM9260EK) += board-sam9260ek.o
   
   # AT91SAM9260 board-specific support
   obj-$(CONFIG_MACH_AT91SAM9260EK) += board-sam9260ek.o
-@@ -51,6 +52,7 @@
+@@ -51,6 +52,7 @@ led-$(CONFIG_MACH_CSB337)    += leds.o
   led-$(CONFIG_MACH_CSB637)     += leds.o
   led-$(CONFIG_MACH_KB9200)     += leds.o
   led-$(CONFIG_MACH_KAFA)               += leds.o
   led-$(CONFIG_MACH_CSB637)     += leds.o
   led-$(CONFIG_MACH_KB9200)     += leds.o
   led-$(CONFIG_MACH_KAFA)               += leds.o
diff --git a/target/linux/at91/patches-2.6.21/002-led-driver.patch b/target/linux/at91/patches-2.6.21/002-led-driver.patch

index e78ed44..f8e915d 100644 (file)
--- a/target/linux/at91/patches-2.6.21/002-led-driver.patch
+++ b/target/linux/at91/patches-2.6.21/002-led-driver.patch
@@ -1,7 +1,8 @@
-diff -urN linux-2.6.21.1.orig/arch/arm/mach-at91/board-vlink.c linux-2.6.21.1/arch/arm/mach-at91/board-vlink.c
---- linux-2.6.21.1.orig/arch/arm/mach-at91/board-vlink.c       2007-05-28 13:33:41.000000000 +0200
-+++ linux-2.6.21.1/arch/arm/mach-at91/board-vlink.c    2007-05-28 14:43:28.000000000 +0200
-@@ -61,7 +61,7 @@
+Index: linux-2.6.21.7/arch/arm/mach-at91/board-vlink.c
+===================================================================
+--- linux-2.6.21.7.orig/arch/arm/mach-at91/board-vlink.c
++++ linux-2.6.21.7/arch/arm/mach-at91/board-vlink.c
+@@ -61,7 +61,7 @@ static void __init vlink_map_io(void)
         at91rm9200_initialize(18432000, AT91RM9200_PQFP);
   
         /* Setup the LEDs */
         at91rm9200_initialize(18432000, AT91RM9200_PQFP);
   
         /* Setup the LEDs */
@@ -10,7 +11,7 @@ diff -urN linux-2.6.21.1.orig/arch/arm/mach-at91/board-vlink.c linux-2.6.21.1/ar
   
         /* Setup the serial ports and console */
         at91_init_serial(&vlink_uart_config);
   
         /* Setup the serial ports and console */
         at91_init_serial(&vlink_uart_config);
-@@ -81,10 +81,12 @@
+@@ -81,10 +81,12 @@ static struct at91_usbh_data __initdata 
         .ports          = 1,
   };
   
         .ports          = 1,
   };
   
@@ -23,7 +24,7 @@ diff -urN linux-2.6.21.1.orig/arch/arm/mach-at91/board-vlink.c linux-2.6.21.1/ar
   
   static struct at91_mmc_data __initdata vlink_mmc_data = {
   //    .det_pin        = AT91_PIN_PB27,
   
   static struct at91_mmc_data __initdata vlink_mmc_data = {
   //    .det_pin        = AT91_PIN_PB27,
-@@ -108,18 +110,19 @@
+@@ -108,18 +110,19 @@ static struct spi_board_info vlink_spi_d
   #endif
   };
   
   #endif
   };
   
@@ -46,7 +47,7 @@ diff -urN linux-2.6.21.1.orig/arch/arm/mach-at91/board-vlink.c linux-2.6.21.1/ar
   
   static void __init vlink_board_init(void)
   {
   
   static void __init vlink_board_init(void)
   {
-@@ -130,8 +133,8 @@
+@@ -130,8 +133,8 @@ static void __init vlink_board_init(void
         /* USB Host */
         at91_add_device_usbh(&vlink_usbh_data);
         /* USB Device */
         /* USB Host */
         at91_add_device_usbh(&vlink_usbh_data);
         /* USB Device */
@@ -57,7 +58,7 @@ diff -urN linux-2.6.21.1.orig/arch/arm/mach-at91/board-vlink.c linux-2.6.21.1/ar
         /* I2C */
         at91_add_device_i2c();
         /* SPI */
         /* I2C */
         at91_add_device_i2c();
         /* SPI */
-@@ -145,7 +148,7 @@
+@@ -145,7 +148,7 @@ static void __init vlink_board_init(void
         at91_add_device_mmc(0, &vlink_mmc_data);
   #endif
         /* LEDs */
         at91_add_device_mmc(0, &vlink_mmc_data);
   #endif
         /* LEDs */
@@ -66,10 +67,11 @@ diff -urN linux-2.6.21.1.orig/arch/arm/mach-at91/board-vlink.c linux-2.6.21.1/ar
   }
   
   MACHINE_START(VLINK, "FDL VersaLink")
   }
   
   MACHINE_START(VLINK, "FDL VersaLink")
-diff -urN linux-2.6.21.1.orig/arch/arm/mach-at91/Makefile linux-2.6.21.1/arch/arm/mach-at91/Makefile
---- linux-2.6.21.1.orig/arch/arm/mach-at91/Makefile    2007-05-28 13:13:15.000000000 +0200
-+++ linux-2.6.21.1/arch/arm/mach-at91/Makefile 2007-05-28 14:19:06.000000000 +0200
-@@ -52,7 +52,7 @@
+Index: linux-2.6.21.7/arch/arm/mach-at91/Makefile
+===================================================================
+--- linux-2.6.21.7.orig/arch/arm/mach-at91/Makefile
++++ linux-2.6.21.7/arch/arm/mach-at91/Makefile
+@@ -52,7 +52,7 @@ led-$(CONFIG_MACH_CSB337)    += leds.o
   led-$(CONFIG_MACH_CSB637)     += leds.o
   led-$(CONFIG_MACH_KB9200)     += leds.o
   led-$(CONFIG_MACH_KAFA)               += leds.o
   led-$(CONFIG_MACH_CSB637)     += leds.o
   led-$(CONFIG_MACH_KB9200)     += leds.o
   led-$(CONFIG_MACH_KAFA)               += leds.o
@@ -78,9 +80,10 @@ diff -urN linux-2.6.21.1.orig/arch/arm/mach-at91/Makefile linux-2.6.21.1/arch/ar
   obj-$(CONFIG_LEDS) += $(led-y)
   
   # VGA support
   obj-$(CONFIG_LEDS) += $(led-y)
   
   # VGA support
-diff -urN linux-2.6.21.1.orig/arch/arm/mach-at91/vlink_leds.c linux-2.6.21.1/arch/arm/mach-at91/vlink_leds.c
---- linux-2.6.21.1.orig/arch/arm/mach-at91/vlink_leds.c        1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.21.1/arch/arm/mach-at91/vlink_leds.c     2007-05-28 14:41:03.000000000 +0200
+Index: linux-2.6.21.7/arch/arm/mach-at91/vlink_leds.c
+===================================================================
+--- /dev/null
++++ linux-2.6.21.7/arch/arm/mach-at91/vlink_leds.c
  @@ -0,0 +1,105 @@
  +/*
  + * LED driver for Atmel AT91-based boards.
  @@ -0,0 +1,105 @@
  +/*
  + * LED driver for Atmel AT91-based boards.
diff --git a/target/linux/at91/patches-2.6.21/003-gpio-driver.patch b/target/linux/at91/patches-2.6.21/003-gpio-driver.patch

index aa5a2e3..b4ef42d 100644 (file)
--- a/target/linux/at91/patches-2.6.21/003-gpio-driver.patch
+++ b/target/linux/at91/patches-2.6.21/003-gpio-driver.patch
@@ -1,5 +1,7 @@
---- linux-2.6.21.1.orig/arch/arm/mach-at91/gpio.c      2007-04-27 23:49:26.000000000 +0200
-+++ linux-2.6.21.1/arch/arm/mach-at91/gpio.c   2007-05-28 15:30:48.000000000 +0200
+Index: linux-2.6.21.7/arch/arm/mach-at91/gpio.c
+===================================================================
+--- linux-2.6.21.7.orig/arch/arm/mach-at91/gpio.c
++++ linux-2.6.21.7/arch/arm/mach-at91/gpio.c
  @@ -27,6 +27,7 @@
   
   static struct at91_gpio_bank *gpio;
  @@ -27,6 +27,7 @@
   
   static struct at91_gpio_bank *gpio;
@@ -8,7 +10,7 @@
   
   
   static inline void __iomem *pin_to_controller(unsigned pin)
   
   
   static inline void __iomem *pin_to_controller(unsigned pin)
-@@ -71,9 +72,13 @@
+@@ -71,9 +72,13 @@ int __init_or_module at91_set_GPIO_perip
   {
         void __iomem    *pio = pin_to_controller(pin);
         unsigned        mask = pin_to_mask(pin);
   {
         void __iomem    *pio = pin_to_controller(pin);
         unsigned        mask = pin_to_mask(pin);
@@ -22,7 +24,7 @@
         __raw_writel(mask, pio + PIO_IDR);
         __raw_writel(mask, pio + (use_pullup ? PIO_PUER : PIO_PUDR));
         __raw_writel(mask, pio + PIO_PER);
         __raw_writel(mask, pio + PIO_IDR);
         __raw_writel(mask, pio + (use_pullup ? PIO_PUER : PIO_PUDR));
         __raw_writel(mask, pio + PIO_PER);
-@@ -130,10 +135,13 @@
+@@ -130,10 +135,13 @@ int __init_or_module at91_set_gpio_input
   {
         void __iomem    *pio = pin_to_controller(pin);
         unsigned        mask = pin_to_mask(pin);
   {
         void __iomem    *pio = pin_to_controller(pin);
         unsigned        mask = pin_to_mask(pin);
@@ -36,7 +38,7 @@
         __raw_writel(mask, pio + PIO_IDR);
         __raw_writel(mask, pio + (use_pullup ? PIO_PUER : PIO_PUDR));
         __raw_writel(mask, pio + PIO_ODR);
         __raw_writel(mask, pio + PIO_IDR);
         __raw_writel(mask, pio + (use_pullup ? PIO_PUER : PIO_PUDR));
         __raw_writel(mask, pio + PIO_ODR);
-@@ -151,10 +159,13 @@
+@@ -151,10 +159,13 @@ int __init_or_module at91_set_gpio_outpu
   {
         void __iomem    *pio = pin_to_controller(pin);
         unsigned        mask = pin_to_mask(pin);
   {
         void __iomem    *pio = pin_to_controller(pin);
         unsigned        mask = pin_to_mask(pin);
@@ -50,7 +52,7 @@
         __raw_writel(mask, pio + PIO_IDR);
         __raw_writel(mask, pio + PIO_PUDR);
         __raw_writel(mask, pio + (value ? PIO_SODR : PIO_CODR));
         __raw_writel(mask, pio + PIO_IDR);
         __raw_writel(mask, pio + PIO_PUDR);
         __raw_writel(mask, pio + (value ? PIO_SODR : PIO_CODR));
-@@ -262,6 +273,18 @@
+@@ -262,6 +273,18 @@ int at91_get_gpio_value(unsigned pin)
   }
   EXPORT_SYMBOL(at91_get_gpio_value);
   
   }
   EXPORT_SYMBOL(at91_get_gpio_value);
   
@@ -69,9 +71,11 @@
   /*--------------------------------------------------------------------------*/
   
   #ifdef CONFIG_PM
   /*--------------------------------------------------------------------------*/
   
   #ifdef CONFIG_PM
---- linux-2.6.21.1.orig/drivers/char/Kconfig   2007-05-28 12:22:29.000000000 +0200
-+++ linux-2.6.21.1/drivers/char/Kconfig        2007-05-28 15:37:43.000000000 +0200
-@@ -1087,5 +1087,12 @@
+Index: linux-2.6.21.7/drivers/char/Kconfig
+===================================================================
+--- linux-2.6.21.7.orig/drivers/char/Kconfig
++++ linux-2.6.21.7/drivers/char/Kconfig
+@@ -1087,5 +1087,12 @@ config AT91_SPIDEV
           The SPI driver gives user mode access to this serial
           bus on the AT91RM9200 processor.
   
           The SPI driver gives user mode access to this serial
           bus on the AT91RM9200 processor.
   
@@ -84,9 +88,11 @@
  +
   endmenu
   
  +
   endmenu
   
---- linux-2.6.21.1.orig/drivers/char/Makefile  2007-05-28 12:22:29.000000000 +0200
-+++ linux-2.6.21.1/drivers/char/Makefile       2007-05-28 15:38:11.000000000 +0200
-@@ -95,6 +95,7 @@
+Index: linux-2.6.21.7/drivers/char/Makefile
+===================================================================
+--- linux-2.6.21.7.orig/drivers/char/Makefile
++++ linux-2.6.21.7/drivers/char/Makefile
+@@ -95,6 +95,7 @@ obj-$(CONFIG_TANBAC_TB0219)  += tb0219.o
   obj-$(CONFIG_TELCLOCK)                += tlclk.o
   obj-$(CONFIG_AT91_SPI)                += at91_spi.o
   obj-$(CONFIG_AT91_SPIDEV)     += at91_spidev.o
   obj-$(CONFIG_TELCLOCK)                += tlclk.o
   obj-$(CONFIG_AT91_SPI)                += at91_spi.o
   obj-$(CONFIG_AT91_SPIDEV)     += at91_spidev.o
@@ -94,8 +100,10 @@
   
   obj-$(CONFIG_WATCHDOG)                += watchdog/
   obj-$(CONFIG_MWAVE)           += mwave/
   
   obj-$(CONFIG_WATCHDOG)                += watchdog/
   obj-$(CONFIG_MWAVE)           += mwave/
---- linux-2.6.21.1.orig/drivers/char/vlink_giu.c       1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.21.1/drivers/char/vlink_giu.c    2007-05-28 15:39:47.000000000 +0200
+Index: linux-2.6.21.7/drivers/char/vlink_giu.c
+===================================================================
+--- /dev/null
++++ linux-2.6.21.7/drivers/char/vlink_giu.c
  @@ -0,0 +1,256 @@
  +/*
  + *  Driver for FDL Versalink GPIO
  @@ -0,0 +1,256 @@
  +/*
  + *  Driver for FDL Versalink GPIO
diff --git a/target/linux/at91/patches-2.6.21/006-change-gpios.patch b/target/linux/at91/patches-2.6.21/006-change-gpios.patch

index 97a4a8d..97c71fe 100644 (file)
--- a/target/linux/at91/patches-2.6.21/006-change-gpios.patch
+++ b/target/linux/at91/patches-2.6.21/006-change-gpios.patch
@@ -1,6 +1,8 @@
---- linux-2.6.21.1.orig/arch/arm/mach-at91/board-vlink.c       2007-05-28 15:53:31.000000000 +0200
-+++ linux-2.6.21.1/arch/arm/mach-at91/board-vlink.c    2007-05-28 15:58:46.000000000 +0200
-@@ -149,6 +149,33 @@
+Index: linux-2.6.21.7/arch/arm/mach-at91/board-vlink.c
+===================================================================
+--- linux-2.6.21.7.orig/arch/arm/mach-at91/board-vlink.c
++++ linux-2.6.21.7/arch/arm/mach-at91/board-vlink.c
+@@ -149,6 +149,33 @@ static void __init vlink_board_init(void
   #endif
         /* LEDs */
   //    at91_gpio_leds(vlink_leds, ARRAY_SIZE(vlink_leds));
   #endif
         /* LEDs */
   //    at91_gpio_leds(vlink_leds, ARRAY_SIZE(vlink_leds));
diff --git a/target/linux/at91/patches-2.6.21/007-mtd-partition.patch b/target/linux/at91/patches-2.6.21/007-mtd-partition.patch

index 98bec0d..f97f45b 100644 (file)
--- a/target/linux/at91/patches-2.6.21/007-mtd-partition.patch
+++ b/target/linux/at91/patches-2.6.21/007-mtd-partition.patch
@@ -1,6 +1,8 @@
---- linux-2.6.21.1.orig/drivers/mtd/devices/at91_dataflash.c   2007-05-28 12:22:29.000000000 +0200
-+++ linux-2.6.21.1/drivers/mtd/devices/at91_dataflash.c        2007-05-28 16:10:21.000000000 +0200
-@@ -173,7 +173,7 @@
+Index: linux-2.6.21.7/drivers/mtd/devices/at91_dataflash.c
+===================================================================
+--- linux-2.6.21.7.orig/drivers/mtd/devices/at91_dataflash.c
++++ linux-2.6.21.7/drivers/mtd/devices/at91_dataflash.c
+@@ -173,7 +173,7 @@ static struct mtd_partition static_parti
   };
   #endif
   
   };
   #endif
   
@@ -9,9 +11,11 @@
   
   #endif
   
   
   #endif
   
---- linux-2.6.21.1.orig/drivers/mtd/Kconfig    2007-05-28 12:22:09.000000000 +0200
-+++ linux-2.6.21.1/drivers/mtd/Kconfig 2007-05-28 16:09:16.000000000 +0200
-@@ -157,6 +157,12 @@
+Index: linux-2.6.21.7/drivers/mtd/Kconfig
+===================================================================
+--- linux-2.6.21.7.orig/drivers/mtd/Kconfig
++++ linux-2.6.21.7/drivers/mtd/Kconfig
+@@ -162,6 +162,12 @@ config MTD_AFS_PARTS
           for your particular device. It won't happen automatically. The
           'armflash' map driver (CONFIG_MTD_ARMFLASH) does this, for example.
   
           for your particular device. It won't happen automatically. The
           'armflash' map driver (CONFIG_MTD_ARMFLASH) does this, for example.
   
@@ -24,9 +28,11 @@
   comment "User Modules And Translation Layers"
         depends on MTD
   
   comment "User Modules And Translation Layers"
         depends on MTD
   
---- linux-2.6.21.1.orig/drivers/mtd/Makefile   2007-04-27 23:49:26.000000000 +0200
-+++ linux-2.6.21.1/drivers/mtd/Makefile        2007-05-28 16:09:55.000000000 +0200
-@@ -12,6 +12,7 @@
+Index: linux-2.6.21.7/drivers/mtd/Makefile
+===================================================================
+--- linux-2.6.21.7.orig/drivers/mtd/Makefile
++++ linux-2.6.21.7/drivers/mtd/Makefile
+@@ -12,6 +12,7 @@ obj-$(CONFIG_MTD_CONCAT)     += mtdconcat.o
   obj-$(CONFIG_MTD_REDBOOT_PARTS) += redboot.o
   obj-$(CONFIG_MTD_CMDLINE_PARTS) += cmdlinepart.o
   obj-$(CONFIG_MTD_AFS_PARTS)   += afs.o
   obj-$(CONFIG_MTD_REDBOOT_PARTS) += redboot.o
   obj-$(CONFIG_MTD_CMDLINE_PARTS) += cmdlinepart.o
   obj-$(CONFIG_MTD_AFS_PARTS)   += afs.o
diff --git a/target/linux/at91/patches-2.6.21/008-fdl-serial.patch b/target/linux/at91/patches-2.6.21/008-fdl-serial.patch

index 4258919..1fc369d 100644 (file)
--- a/target/linux/at91/patches-2.6.21/008-fdl-serial.patch
+++ b/target/linux/at91/patches-2.6.21/008-fdl-serial.patch
@@ -1,6 +1,8 @@
---- linux-2.6.21.1.orig/drivers/serial/atmel_serial.c  2007-05-28 12:22:29.000000000 +0200
-+++ linux-2.6.21.1/drivers/serial/atmel_serial.c       2007-05-28 16:39:09.000000000 +0200
-@@ -174,7 +174,35 @@
+Index: linux-2.6.21.7/drivers/serial/atmel_serial.c
+===================================================================
+--- linux-2.6.21.7.orig/drivers/serial/atmel_serial.c
++++ linux-2.6.21.7/drivers/serial/atmel_serial.c
+@@ -174,7 +174,35 @@ static void atmel_set_mctrl(struct uart_
                                 at91_set_gpio_value(AT91_PIN_PA21, 0);
                         else
                                 at91_set_gpio_value(AT91_PIN_PA21, 1);
                                 at91_set_gpio_value(AT91_PIN_PA21, 0);
                         else
                                 at91_set_gpio_value(AT91_PIN_PA21, 1);
@@ -36,7 +38,7 @@
         }
   #endif
   
         }
   #endif
   
-@@ -211,8 +239,10 @@
+@@ -211,8 +239,10 @@ static u_int atmel_get_mctrl(struct uart
         /*
          * The control signals are active low.
          */
         /*
          * The control signals are active low.
          */
@@ -49,7 +51,7 @@
         if (!(status & ATMEL_US_CTS))
                 ret |= TIOCM_CTS;
         if (!(status & ATMEL_US_DSR))
         if (!(status & ATMEL_US_CTS))
                 ret |= TIOCM_CTS;
         if (!(status & ATMEL_US_DSR))
-@@ -220,6 +250,16 @@
+@@ -220,6 +250,16 @@ static u_int atmel_get_mctrl(struct uart
         if (!(status & ATMEL_US_RI))
                 ret |= TIOCM_RI;
   
         if (!(status & ATMEL_US_RI))
                 ret |= TIOCM_RI;
   
@@ -66,7 +68,7 @@
         return ret;
   }
   
         return ret;
   }
   
-@@ -511,6 +551,34 @@
+@@ -511,6 +551,34 @@ static void atmel_tx_chars(struct uart_p
   }
   
   /*
   }
   
   /*
@@ -101,7 +103,7 @@
    * Interrupt handler
    */
   static irqreturn_t atmel_interrupt(int irq, void *dev_id)
    * Interrupt handler
    */
   static irqreturn_t atmel_interrupt(int irq, void *dev_id)
-@@ -587,6 +655,23 @@
+@@ -587,6 +655,23 @@ static int atmel_startup(struct uart_por
                 return retval;
         }
   
                 return retval;
         }
   
@@ -125,7 +127,7 @@
         /*
          * Initialize DMA (if necessary)
          */
         /*
          * Initialize DMA (if necessary)
          */
-@@ -603,6 +688,10 @@
+@@ -603,6 +688,10 @@ static int atmel_startup(struct uart_por
                                         kfree(atmel_port->pdc_rx[0].buf);
                                 }
                                 free_irq(port->irq, port);
                                         kfree(atmel_port->pdc_rx[0].buf);
                                 }
                                 free_irq(port->irq, port);
@@ -136,7 +138,7 @@
                                 return -ENOMEM;
                         }
                         pdc->dma_addr = dma_map_single(port->dev, pdc->buf, PDC_BUFFER_SIZE, DMA_FROM_DEVICE);
                                 return -ENOMEM;
                         }
                         pdc->dma_addr = dma_map_single(port->dev, pdc->buf, PDC_BUFFER_SIZE, DMA_FROM_DEVICE);
-@@ -636,6 +725,10 @@
+@@ -636,6 +725,10 @@ static int atmel_startup(struct uart_por
                 retval = atmel_open_hook(port);
                 if (retval) {
                         free_irq(port->irq, port);
                 retval = atmel_open_hook(port);
                 if (retval) {
                         free_irq(port->irq, port);
@@ -147,7 +149,7 @@
                         return retval;
                 }
         }
                         return retval;
                 }
         }
-@@ -701,6 +794,10 @@
+@@ -701,6 +794,10 @@ static void atmel_shutdown(struct uart_p
          * Free the interrupt
          */
         free_irq(port->irq, port);
          * Free the interrupt
          */
         free_irq(port->irq, port);
diff --git a/target/linux/at91/patches-2.6.21/009-fdl-uartinit.patch b/target/linux/at91/patches-2.6.21/009-fdl-uartinit.patch

index f2491f3..c604710 100644 (file)
--- a/target/linux/at91/patches-2.6.21/009-fdl-uartinit.patch
+++ b/target/linux/at91/patches-2.6.21/009-fdl-uartinit.patch
@@ -1,6 +1,8 @@
---- linux-2.6.21.1.orig/arch/arm/mach-at91/at91rm9200_devices.c        2007-05-28 12:22:29.000000000 +0200
-+++ linux-2.6.21.1/arch/arm/mach-at91/at91rm9200_devices.c     2007-05-28 16:44:36.000000000 +0200
-@@ -618,7 +618,6 @@
+Index: linux-2.6.21.7/arch/arm/mach-at91/at91rm9200_devices.c
+===================================================================
+--- linux-2.6.21.7.orig/arch/arm/mach-at91/at91rm9200_devices.c
++++ linux-2.6.21.7/arch/arm/mach-at91/at91rm9200_devices.c
+@@ -618,7 +618,6 @@ void __init at91_init_leds(u8 cpu_led, u
   
   
   #if defined(CONFIG_NEW_LEDS)
   
   
   #if defined(CONFIG_NEW_LEDS)
@@ -8,7 +10,7 @@
   static struct platform_device at91_leds = {
         .name           = "at91_leds",
         .id             = -1,
   static struct platform_device at91_leds = {
         .name           = "at91_leds",
         .id             = -1,
-@@ -724,6 +723,10 @@
+@@ -724,6 +723,10 @@ static inline void configure_usart0_pins
          *  We need to drive the pin manually.  Default is off (RTS is active low).
          */
         at91_set_gpio_output(AT91_PIN_PA21, 1);
          *  We need to drive the pin manually.  Default is off (RTS is active low).
          */
         at91_set_gpio_output(AT91_PIN_PA21, 1);
@@ -19,7 +21,7 @@
   }
   
   static struct resource uart1_resources[] = {
   }
   
   static struct resource uart1_resources[] = {
-@@ -835,6 +838,12 @@
+@@ -835,6 +838,12 @@ static inline void configure_usart3_pins
   {
         at91_set_B_periph(AT91_PIN_PA5, 1);             /* TXD3 */
         at91_set_B_periph(AT91_PIN_PA6, 0);             /* RXD3 */
   {
         at91_set_B_periph(AT91_PIN_PA5, 1);             /* TXD3 */
         at91_set_B_periph(AT91_PIN_PA6, 0);             /* RXD3 */
diff --git a/target/linux/at91/patches-2.6.21/010-dm9161a-phyfix.patch b/target/linux/at91/patches-2.6.21/010-dm9161a-phyfix.patch

index 9ad8c42..7d7d51f 100644 (file)
--- a/target/linux/at91/patches-2.6.21/010-dm9161a-phyfix.patch
+++ b/target/linux/at91/patches-2.6.21/010-dm9161a-phyfix.patch
@@ -1,6 +1,8 @@
---- linux-2.6.21.1/drivers/net/arm/at91_ether.c.old    2007-06-04 18:15:49.000000000 +0200
-+++ linux-2.6.21.1/drivers/net/arm/at91_ether.c        2007-06-04 18:10:36.000000000 +0200
-@@ -146,6 +146,7 @@
+Index: linux-2.6.21.7/drivers/net/arm/at91_ether.c
+===================================================================
+--- linux-2.6.21.7.orig/drivers/net/arm/at91_ether.c
++++ linux-2.6.21.7/drivers/net/arm/at91_ether.c
+@@ -146,6 +146,7 @@ static void update_linkspeed(struct net_
         struct at91_private *lp = netdev_priv(dev);
         unsigned int bmsr, bmcr, lpa, mac_cfg;
         unsigned int speed, duplex;
         struct at91_private *lp = netdev_priv(dev);
         unsigned int bmsr, bmcr, lpa, mac_cfg;
         unsigned int speed, duplex;
@@ -8,7 +10,7 @@
   
         if (!mii_link_ok(&lp->mii)) {           /* no link */
                 netif_carrier_off(dev);
   
         if (!mii_link_ok(&lp->mii)) {           /* no link */
                 netif_carrier_off(dev);
-@@ -158,8 +159,15 @@
+@@ -158,8 +159,15 @@ static void update_linkspeed(struct net_
         read_phy(lp->phy_address, MII_BMSR, &bmsr);
         read_phy(lp->phy_address, MII_BMCR, &bmcr);
         if (bmcr & BMCR_ANENABLE) {                             /* AutoNegotiation is enabled */
         read_phy(lp->phy_address, MII_BMSR, &bmsr);
         read_phy(lp->phy_address, MII_BMCR, &bmcr);
         if (bmcr & BMCR_ANENABLE) {                             /* AutoNegotiation is enabled */
diff --git a/target/linux/at91/patches-2.6.21/011-vlink-resetfix.patch b/target/linux/at91/patches-2.6.21/011-vlink-resetfix.patch

index 78ff384..38014e8 100644 (file)
--- a/target/linux/at91/patches-2.6.21/011-vlink-resetfix.patch
+++ b/target/linux/at91/patches-2.6.21/011-vlink-resetfix.patch
@@ -1,6 +1,8 @@
---- linux-2.6.21.1.old/arch/arm/mach-at91/board-vlink.c        2007-06-04 15:45:19.000000000 +0200
-+++ linux-2.6.21.1/arch/arm/mach-at91/board-vlink.c    2007-06-05 05:27:19.000000000 +0200
-@@ -175,6 +175,7 @@
+Index: linux-2.6.21.7/arch/arm/mach-at91/board-vlink.c
+===================================================================
+--- linux-2.6.21.7.orig/arch/arm/mach-at91/board-vlink.c
++++ linux-2.6.21.7/arch/arm/mach-at91/board-vlink.c
+@@ -175,6 +175,7 @@ static void __init vlink_board_init(void
   /* USB Device control */
          at91_set_gpio_input(AT91_PIN_PB27, 1);  // UDB_CNX
          at91_set_gpio_output(AT91_PIN_PB28, 1); // UDB_PUP
   /* USB Device control */
          at91_set_gpio_input(AT91_PIN_PB27, 1);  // UDB_CNX
          at91_set_gpio_output(AT91_PIN_PB28, 1); // UDB_PUP
diff --git a/target/linux/at91/patches-2.6.21/012-at91-mmcfix.patch b/target/linux/at91/patches-2.6.21/012-at91-mmcfix.patch

index e8991ae..b7d6fe5 100644 (file)
--- a/target/linux/at91/patches-2.6.21/012-at91-mmcfix.patch
+++ b/target/linux/at91/patches-2.6.21/012-at91-mmcfix.patch
@@ -1,5 +1,7 @@
---- linux-2.6.21.1.old/drivers/mmc/at91_mci.c  2007-06-05 09:08:57.000000000 +0200
-+++ linux-2.6.21.1/drivers/mmc/at91_mci.c      2007-06-05 10:59:11.000000000 +0200
+Index: linux-2.6.21.7/drivers/mmc/at91_mci.c
+===================================================================
+--- linux-2.6.21.7.orig/drivers/mmc/at91_mci.c
++++ linux-2.6.21.7/drivers/mmc/at91_mci.c
  @@ -79,7 +79,8 @@
   
   #define DRIVER_NAME "at91_mci"
  @@ -79,7 +79,8 @@
   
   #define DRIVER_NAME "at91_mci"
@@ -10,7 +12,7 @@
   
   #define FL_SENT_COMMAND       (1 << 0)
   #define FL_SENT_STOP  (1 << 1)
   
   #define FL_SENT_COMMAND       (1 << 0)
   #define FL_SENT_STOP  (1 << 1)
-@@ -132,7 +133,7 @@
+@@ -132,7 +133,7 @@ struct at91mci_host
   /*
    * Copy from sg to a dma block - used for transfers
    */
   /*
    * Copy from sg to a dma block - used for transfers
    */
@@ -19,7 +21,7 @@
   {
         unsigned int len, i, size;
         unsigned *dmabuf = host->buffer;
   {
         unsigned int len, i, size;
         unsigned *dmabuf = host->buffer;
-@@ -181,7 +182,7 @@
+@@ -181,7 +182,7 @@ static inline void at91mci_sg_to_dma(str
   /*
    * Prepare a dma read
    */
   /*
    * Prepare a dma read
    */
@@ -28,7 +30,7 @@
   {
         int i;
         struct scatterlist *sg;
   {
         int i;
         struct scatterlist *sg;
-@@ -249,23 +250,24 @@
+@@ -249,23 +250,24 @@ static void at91mci_pre_dma_read(struct 
   /*
    * Handle after a dma read
    */
   /*
    * Handle after a dma read
    */
@@ -56,7 +58,7 @@
         }
   
         while (host->in_use_index < host->transfer_index) {
         }
   
         while (host->in_use_index < host->transfer_index) {
-@@ -300,39 +302,14 @@
+@@ -300,39 +302,14 @@ static void at91mci_post_dma_read(struct
   
         /* Is there another transfer to trigger? */
         if (host->transfer_index < data->sg_len)
   
         /* Is there another transfer to trigger? */
         if (host->transfer_index < data->sg_len)
@@ -99,7 +101,7 @@
   }
   
   /*
   }
   
   /*
-@@ -340,10 +317,17 @@
+@@ -340,10 +317,17 @@ static void at91_mci_handle_transmitted(
    */
   static void at91_mci_enable(struct at91mci_host *host)
   {
    */
   static void at91_mci_enable(struct at91mci_host *host)
   {
@@ -118,7 +120,7 @@
   
         /* use Slot A or B (only one at same time) */
         at91_mci_write(host, AT91_MCI_SDCR, host->board->slot_b);
   
         /* use Slot A or B (only one at same time) */
         at91_mci_write(host, AT91_MCI_SDCR, host->board->slot_b);
-@@ -359,9 +343,8 @@
+@@ -359,9 +343,8 @@ static void at91_mci_disable(struct at91
   
   /*
    * Send a command
   
   /*
    * Send a command
@@ -129,7 +131,7 @@
   {
         unsigned int cmdr, mr;
         unsigned int block_length;
   {
         unsigned int cmdr, mr;
         unsigned int block_length;
-@@ -372,8 +355,7 @@
+@@ -372,8 +355,7 @@ static unsigned int at91_mci_send_comman
   
         host->cmd = cmd;
   
   
         host->cmd = cmd;
   
@@ -139,7 +141,7 @@
         if ((at91_mci_read(host, AT91_MCI_SR) & AT91_MCI_RTOE) && (cmd->opcode == 1)) {
                 pr_debug("Clearing timeout\n");
                 at91_mci_write(host, AT91_MCI_ARGR, 0);
         if ((at91_mci_read(host, AT91_MCI_SR) & AT91_MCI_RTOE) && (cmd->opcode == 1)) {
                 pr_debug("Clearing timeout\n");
                 at91_mci_write(host, AT91_MCI_ARGR, 0);
-@@ -383,7 +365,7 @@
+@@ -383,7 +365,7 @@ static unsigned int at91_mci_send_comman
                         pr_debug("Clearing: SR = %08X\n", at91_mci_read(host, AT91_MCI_SR));
                 }
         }
                         pr_debug("Clearing: SR = %08X\n", at91_mci_read(host, AT91_MCI_SR));
                 }
         }
@@ -148,7 +150,7 @@
         cmdr = cmd->opcode;
   
         if (mmc_resp_type(cmd) == MMC_RSP_NONE)
         cmdr = cmd->opcode;
   
         if (mmc_resp_type(cmd) == MMC_RSP_NONE)
-@@ -440,50 +422,48 @@
+@@ -440,50 +422,48 @@ static unsigned int at91_mci_send_comman
                 at91_mci_write(host, ATMEL_PDC_TCR, 0);
                 at91_mci_write(host, ATMEL_PDC_TNPR, 0);
                 at91_mci_write(host, ATMEL_PDC_TNCR, 0);
                 at91_mci_write(host, ATMEL_PDC_TCR, 0);
                 at91_mci_write(host, ATMEL_PDC_TNPR, 0);
                 at91_mci_write(host, ATMEL_PDC_TNCR, 0);
@@ -239,7 +241,7 @@
                 }
         }
   
                 }
         }
   
-@@ -498,39 +478,24 @@
+@@ -498,39 +478,24 @@ static unsigned int at91_mci_send_comman
         if (cmdr & AT91_MCI_TRCMD_START) {
                 if (cmdr & AT91_MCI_TRDIR)
                         at91_mci_write(host, ATMEL_PDC_PTCR, ATMEL_PDC_RXTEN);
         if (cmdr & AT91_MCI_TRCMD_START) {
                 if (cmdr & AT91_MCI_TRDIR)
                         at91_mci_write(host, ATMEL_PDC_PTCR, ATMEL_PDC_RXTEN);
@@ -283,7 +285,7 @@
         }
         else
                 mmc_request_done(host->mmc, host->request);
         }
         else
                 mmc_request_done(host->mmc, host->request);
-@@ -539,7 +504,7 @@
+@@ -539,7 +504,7 @@ static void at91mci_process_next(struct 
   /*
    * Handle a command that has been completed
    */
   /*
    * Handle a command that has been completed
    */
@@ -292,7 +294,7 @@
   {
         struct mmc_command *cmd = host->cmd;
         unsigned int status;
   {
         struct mmc_command *cmd = host->cmd;
         unsigned int status;
-@@ -583,7 +548,7 @@
+@@ -583,7 +548,7 @@ static void at91mci_completed_command(st
         else
                 cmd->error = MMC_ERR_NONE;
   
         else
                 cmd->error = MMC_ERR_NONE;
   
@@ -301,7 +303,7 @@
   }
   
   /*
   }
   
   /*
-@@ -595,7 +560,60 @@
+@@ -595,7 +560,60 @@ static void at91_mci_request(struct mmc_
         host->request = mrq;
         host->flags = 0;
   
         host->request = mrq;
         host->flags = 0;
   
@@ -363,7 +365,7 @@
   }
   
   /*
   }
   
   /*
-@@ -698,29 +716,33 @@
+@@ -698,29 +716,33 @@ static irqreturn_t at91_mci_irq(int irq,
                         at91_mci_handle_transmitted(host);
                 }
   
                         at91_mci_handle_transmitted(host);
                 }
   
@@ -405,7 +407,7 @@
   
                 if (int_status & AT91_MCI_TXRDY)
                         pr_debug("Ready to transmit\n");
   
                 if (int_status & AT91_MCI_TXRDY)
                         pr_debug("Ready to transmit\n");
-@@ -730,14 +752,14 @@
+@@ -730,14 +752,14 @@ static irqreturn_t at91_mci_irq(int irq,
   
                 if (int_status & AT91_MCI_CMDRDY) {
                         pr_debug("Command ready\n");
   
                 if (int_status & AT91_MCI_CMDRDY) {
                         pr_debug("Command ready\n");
diff --git a/target/linux/at91/patches-2.6.21/013-at91-mmc1wire.patch b/target/linux/at91/patches-2.6.21/013-at91-mmc1wire.patch

index 31b1e96..5d68e63 100644 (file)
--- a/target/linux/at91/patches-2.6.21/013-at91-mmc1wire.patch
+++ b/target/linux/at91/patches-2.6.21/013-at91-mmc1wire.patch
@@ -1,5 +1,7 @@
---- linux-2.6.21.1.old/drivers/mmc/at91_mci.c  2007-06-05 11:08:39.000000000 +0200
-+++ linux-2.6.21.1/drivers/mmc/at91_mci.c      2007-06-05 11:28:40.000000000 +0200
+Index: linux-2.6.21.7/drivers/mmc/at91_mci.c
+===================================================================
+--- linux-2.6.21.7.orig/drivers/mmc/at91_mci.c
++++ linux-2.6.21.7/drivers/mmc/at91_mci.c
  @@ -79,8 +79,7 @@
   
   #define DRIVER_NAME "at91_mci"
  @@ -79,8 +79,7 @@
   
   #define DRIVER_NAME "at91_mci"
diff --git a/target/linux/at91/patches-2.6.21/014-initpartition.patch b/target/linux/at91/patches-2.6.21/014-initpartition.patch

index 7e78e64..b8bccd2 100644 (file)
--- a/target/linux/at91/patches-2.6.21/014-initpartition.patch
+++ b/target/linux/at91/patches-2.6.21/014-initpartition.patch
@@ -1,6 +1,8 @@
---- linux-2.6.21.5.old/drivers/mtd/devices/at91_dataflash.c    2007-06-13 13:31:24.000000000 +0200
-+++ linux-2.6.21.5/drivers/mtd/devices/at91_dataflash.c        2007-06-19 12:49:48.000000000 +0200
-@@ -161,12 +161,12 @@
+Index: linux-2.6.21.7/drivers/mtd/devices/at91_dataflash.c
+===================================================================
+--- linux-2.6.21.7.orig/drivers/mtd/devices/at91_dataflash.c
++++ linux-2.6.21.7/drivers/mtd/devices/at91_dataflash.c
+@@ -161,12 +161,12 @@ static struct mtd_partition static_parti
                 .mask_flags     = MTD_WRITEABLE,        /* read-only */
         },
         {
                 .mask_flags     = MTD_WRITEABLE,        /* read-only */
         },
         {
diff --git a/target/linux/at91/patches-2.6.21/015-simenable.patch b/target/linux/at91/patches-2.6.21/015-simenable.patch

index 64ee466..9b11f76 100644 (file)
--- a/target/linux/at91/patches-2.6.21/015-simenable.patch
+++ b/target/linux/at91/patches-2.6.21/015-simenable.patch
@@ -1,58 +1,69 @@
-diff -urN linux-2.6.21.5.old/arch/arm/mach-at91/board-vlink.c linux-2.6.21.5/arch/arm/mach-at91/board-vlink.c\r
---- linux-2.6.21.5.old/arch/arm/mach-at91/board-vlink.c        2007-07-26 12:43:11.000000000 +0200\r
-+++ linux-2.6.21.5/arch/arm/mach-at91/board-vlink.c    2007-08-20 16:56:56.000000000 +0200\r
-@@ -151,31 +151,37 @@\r
- //    at91_gpio_leds(vlink_leds, ARRAY_SIZE(vlink_leds));\r
- \r
- /* Other LED's */\r
--       at91_set_gpio_output(AT91_PIN_PC7, 1);  // LED FRONT AP1\r
--       at91_set_gpio_output(AT91_PIN_PC8, 1);  // LED FRONT BP1\r
--       at91_set_gpio_output(AT91_PIN_PB14, 1); // LED BACK AP1\r
--       at91_set_gpio_output(AT91_PIN_PB15, 1); // LED BACK BP1\r
--       at91_set_gpio_output(AT91_PIN_PB16, 1); // LED BACK AP2\r
--       at91_set_gpio_output(AT91_PIN_PB17, 1); // LED BACK BP2\r
-+      at91_set_gpio_output(AT91_PIN_PC7, 1);  // LED FRONT AP1\r
-+      at91_set_gpio_output(AT91_PIN_PC8, 1);  // LED FRONT BP1\r
-+      at91_set_gpio_output(AT91_PIN_PB14, 1); // LED BACK AP1\r
-+      at91_set_gpio_output(AT91_PIN_PB15, 1); // LED BACK BP1\r
-+      at91_set_gpio_output(AT91_PIN_PB16, 1); // LED BACK AP2\r
-+      at91_set_gpio_output(AT91_PIN_PB17, 1); // LED BACK BP2\r
-+\r
-+/* Test jig presence detection */\r
-+      at91_set_gpio_input(AT91_PIN_PB8, 1);   // JIGPRESENT\r
- \r
- /* SIM Cards */\r
--       at91_set_gpio_output(AT91_PIN_PB9, 1);  // ENBSC3\r
--       at91_set_gpio_output(AT91_PIN_PB10, 1); // ENBSC2\r
--       at91_set_gpio_output(AT91_PIN_PB11, 1); // ENBSC1\r
-+      if (at91_get_gpio_value(AT91_PIN_PB8)) {\r
-+              at91_set_gpio_output(AT91_PIN_PB11, 0);\r
-+              at91_set_gpio_output(AT91_PIN_PB9, 1);\r
-+      } else {\r
-+              at91_set_gpio_output(AT91_PIN_PB11, 1);\r
-+              at91_set_gpio_output(AT91_PIN_PB9, 0);\r
-+      }\r
-+              \r
-+      at91_set_gpio_output(AT91_PIN_PB10, 1); // ENBSC2\r
- \r
- /* GSM Module Control */\r
--       at91_set_gpio_output(AT91_PIN_PB12, 1); // GSMONOFF\r
--\r
--/* Test jig presence detection */\r
--       at91_set_gpio_input(AT91_PIN_PB8, 1);   // JIGPRESENT\r
-+      at91_set_gpio_output(AT91_PIN_PB12, 1); // GSMONOFF\r
- \r
- /* Power indicator */\r
--       at91_set_gpio_input(AT91_PIN_PB22, 1);  // PWR_IND\r
-+      at91_set_gpio_input(AT91_PIN_PB22, 1);  // PWR_IND\r
- \r
- /* USB Device control */\r
--       at91_set_gpio_input(AT91_PIN_PB27, 1);  // UDB_CNX\r
--       at91_set_gpio_output(AT91_PIN_PB28, 1); // UDB_PUP\r
--                       at91_set_multi_drive(AT91_PIN_PB28, 1); // Set to multi-drive\r
-+      at91_set_gpio_input(AT91_PIN_PB27, 1);  // UDB_CNX\r
-+      at91_set_gpio_output(AT91_PIN_PB28, 1); // UDB_PUP\r
-+      at91_set_multi_drive(AT91_PIN_PB28, 1); // Set to multi-drive\r
- \r
- }\r
- \r
+Index: linux-2.6.21.7/arch/arm/mach-at91/board-vlink.c
+===================================================================
+--- linux-2.6.21.7.orig/arch/arm/mach-at91/board-vlink.c
++++ linux-2.6.21.7/arch/arm/mach-at91/board-vlink.c
+@@ -150,32 +150,38 @@ static void __init vlink_board_init(void
+       /* LEDs */
+ //    at91_gpio_leds(vlink_leds, ARRAY_SIZE(vlink_leds));
+ 
+-/* Other LED's */
+-       at91_set_gpio_output(AT91_PIN_PC7, 1);  // LED FRONT AP1
+-       at91_set_gpio_output(AT91_PIN_PC8, 1);  // LED FRONT BP1
+-       at91_set_gpio_output(AT91_PIN_PB14, 1); // LED BACK AP1
+-       at91_set_gpio_output(AT91_PIN_PB15, 1); // LED BACK BP1
+-       at91_set_gpio_output(AT91_PIN_PB16, 1); // LED BACK AP2
+-       at91_set_gpio_output(AT91_PIN_PB17, 1); // LED BACK BP2
+-
+-/* SIM Cards */
+-       at91_set_gpio_output(AT91_PIN_PB9, 1);  // ENBSC3
+-       at91_set_gpio_output(AT91_PIN_PB10, 1); // ENBSC2
+-       at91_set_gpio_output(AT91_PIN_PB11, 1); // ENBSC1
+-
+-/* GSM Module Control */
+-       at91_set_gpio_output(AT91_PIN_PB12, 1); // GSMONOFF
+-
+-/* Test jig presence detection */
+-       at91_set_gpio_input(AT91_PIN_PB8, 1);   // JIGPRESENT
+-
+-/* Power indicator */
+-       at91_set_gpio_input(AT91_PIN_PB22, 1);  // PWR_IND
+-
+-/* USB Device control */
+-       at91_set_gpio_input(AT91_PIN_PB27, 1);  // UDB_CNX
+-       at91_set_gpio_output(AT91_PIN_PB28, 1); // UDB_PUP
+-                       at91_set_multi_drive(AT91_PIN_PB28, 1); // Set to multi-drive
++      /* Other LED's */
++      at91_set_gpio_output(AT91_PIN_PC7, 1);  // LED FRONT AP1
++      at91_set_gpio_output(AT91_PIN_PC8, 1);  // LED FRONT BP1
++      at91_set_gpio_output(AT91_PIN_PB14, 1); // LED BACK AP1
++      at91_set_gpio_output(AT91_PIN_PB15, 1); // LED BACK BP1
++      at91_set_gpio_output(AT91_PIN_PB16, 1); // LED BACK AP2
++      at91_set_gpio_output(AT91_PIN_PB17, 1); // LED BACK BP2
++
++      /* Test jig presence detection */
++      at91_set_gpio_input(AT91_PIN_PB8, 1);   // JIGPRESENT
++
++      /* SIM Cards */
++      if (at91_get_gpio_value(AT91_PIN_PB8)) {
++              at91_set_gpio_output(AT91_PIN_PB11, 0);
++              at91_set_gpio_output(AT91_PIN_PB9, 1);
++      } else {
++              at91_set_gpio_output(AT91_PIN_PB11, 1);
++              at91_set_gpio_output(AT91_PIN_PB9, 0);
++      }
++
++      at91_set_gpio_output(AT91_PIN_PB10, 1); // ENBSC2
++
++      /* GSM Module Control */
++      at91_set_gpio_output(AT91_PIN_PB12, 1); // GSMONOFF
++
++      /* Power indicator */
++      at91_set_gpio_input(AT91_PIN_PB22, 1);  // PWR_IND
++
++      /* USB Device control */
++      at91_set_gpio_input(AT91_PIN_PB27, 1);  // UDB_CNX
++      at91_set_gpio_output(AT91_PIN_PB28, 1); // UDB_PUP
++      at91_set_multi_drive(AT91_PIN_PB28, 1); // Set to multi-drive
+ 
+ }
+ 
diff --git a/target/linux/at91/patches-2.6.21/016-v1-15-detect.patch b/target/linux/at91/patches-2.6.21/016-v1-15-detect.patch

index 0778d6a..ccdb579 100644 (file)
--- a/target/linux/at91/patches-2.6.21/016-v1-15-detect.patch
+++ b/target/linux/at91/patches-2.6.21/016-v1-15-detect.patch
@@ -1,7 +1,8 @@
-diff -urN linux-2.6.21.5.old/arch/arm/mach-at91/at91rm9200_devices.c linux-2.6.21.5/arch/arm/mach-at91/at91rm9200_devices.c
---- linux-2.6.21.5.old/arch/arm/mach-at91/at91rm9200_devices.c 2008-03-13 16:24:18.000000000 +0100
-+++ linux-2.6.21.5/arch/arm/mach-at91/at91rm9200_devices.c     2008-03-13 16:34:43.000000000 +0100
-@@ -840,9 +840,9 @@
+Index: linux-2.6.21.7/arch/arm/mach-at91/at91rm9200_devices.c
+===================================================================
+--- linux-2.6.21.7.orig/arch/arm/mach-at91/at91rm9200_devices.c
++++ linux-2.6.21.7/arch/arm/mach-at91/at91rm9200_devices.c
+@@ -840,9 +840,9 @@ static inline void configure_usart3_pins
         at91_set_B_periph(AT91_PIN_PA6, 0);             /* RXD3 */
         at91_set_B_periph(AT91_PIN_PB0, 0);   /* RTS3 */
         at91_set_B_periph(AT91_PIN_PB1, 0);   /* CTS3 */
         at91_set_B_periph(AT91_PIN_PA6, 0);             /* RXD3 */
         at91_set_B_periph(AT91_PIN_PB0, 0);   /* RTS3 */
         at91_set_B_periph(AT91_PIN_PB1, 0);   /* CTS3 */
@@ -14,10 +15,11 @@ diff -urN linux-2.6.21.5.old/arch/arm/mach-at91/at91rm9200_devices.c linux-2.6.2
         at91_set_deglitch(AT91_PIN_PA24, 1);
   }
   
         at91_set_deglitch(AT91_PIN_PA24, 1);
   }
   
-diff -urN linux-2.6.21.5.old/arch/arm/mach-at91/board-vlink.c linux-2.6.21.5/arch/arm/mach-at91/board-vlink.c
---- linux-2.6.21.5.old/arch/arm/mach-at91/board-vlink.c        2008-03-13 16:24:18.000000000 +0100
-+++ linux-2.6.21.5/arch/arm/mach-at91/board-vlink.c    2008-03-13 16:35:05.000000000 +0100
-@@ -126,6 +126,7 @@
+Index: linux-2.6.21.7/arch/arm/mach-at91/board-vlink.c
+===================================================================
+--- linux-2.6.21.7.orig/arch/arm/mach-at91/board-vlink.c
++++ linux-2.6.21.7/arch/arm/mach-at91/board-vlink.c
+@@ -126,6 +126,7 @@ static struct spi_board_info vlink_spi_d
   
   static void __init vlink_board_init(void)
   {
   
   static void __init vlink_board_init(void)
   {
@@ -25,7 +27,7 @@ diff -urN linux-2.6.21.5.old/arch/arm/mach-at91/board-vlink.c linux-2.6.21.5/arc
         /* Serial */
         at91_add_device_serial();
         /* Ethernet */
         /* Serial */
         at91_add_device_serial();
         /* Ethernet */
-@@ -147,6 +148,10 @@
+@@ -147,6 +148,10 @@ static void __init vlink_board_init(void
   //    at91_set_gpio_output(AT91_PIN_PB22, 1); /* this MMC card slot can optionally use SPI signaling (CS3). */
         at91_add_device_mmc(0, &vlink_mmc_data);
   #endif
   //    at91_set_gpio_output(AT91_PIN_PB22, 1); /* this MMC card slot can optionally use SPI signaling (CS3). */
         at91_add_device_mmc(0, &vlink_mmc_data);
   #endif
@@ -36,8 +38,8 @@ diff -urN linux-2.6.21.5.old/arch/arm/mach-at91/board-vlink.c linux-2.6.21.5/arc
         /* LEDs */
   //    at91_gpio_leds(vlink_leds, ARRAY_SIZE(vlink_leds));
   
         /* LEDs */
   //    at91_gpio_leds(vlink_leds, ARRAY_SIZE(vlink_leds));
   
-@@ -164,10 +169,16 @@
- /* SIM Cards */
+@@ -164,10 +169,16 @@ static void __init vlink_board_init(void
+       /* SIM Cards */
         if (at91_get_gpio_value(AT91_PIN_PB8)) {
                 at91_set_gpio_output(AT91_PIN_PB11, 0);
  -              at91_set_gpio_output(AT91_PIN_PB9, 1);
         if (at91_get_gpio_value(AT91_PIN_PB8)) {
                 at91_set_gpio_output(AT91_PIN_PB11, 0);
  -              at91_set_gpio_output(AT91_PIN_PB9, 1);
@@ -53,9 +55,9 @@ diff -urN linux-2.6.21.5.old/arch/arm/mach-at91/board-vlink.c linux-2.6.21.5/arc
  +              else
  +                      at91_set_gpio_output(AT91_PIN_PC13, 0);
         }
  +              else
  +                      at91_set_gpio_output(AT91_PIN_PC13, 0);
         }
-               
+ 
         at91_set_gpio_output(AT91_PIN_PB10, 1); // ENBSC2
         at91_set_gpio_output(AT91_PIN_PB10, 1); // ENBSC2
-@@ -182,7 +193,18 @@
+@@ -182,7 +193,18 @@ static void __init vlink_board_init(void
         at91_set_gpio_input(AT91_PIN_PB27, 1);  // UDB_CNX
         at91_set_gpio_output(AT91_PIN_PB28, 1); // UDB_PUP
         at91_set_multi_drive(AT91_PIN_PB28, 1); // Set to multi-drive
         at91_set_gpio_input(AT91_PIN_PB27, 1);  // UDB_CNX
         at91_set_gpio_output(AT91_PIN_PB28, 1); // UDB_PUP
         at91_set_multi_drive(AT91_PIN_PB28, 1); // Set to multi-drive
@@ -75,10 +77,11 @@ diff -urN linux-2.6.21.5.old/arch/arm/mach-at91/board-vlink.c linux-2.6.21.5/arc
   }
   
   MACHINE_START(VLINK, "FDL VersaLink")
   }
   
   MACHINE_START(VLINK, "FDL VersaLink")
-diff -urN linux-2.6.21.5.old/drivers/char/vlink_giu.c linux-2.6.21.5/drivers/char/vlink_giu.c
---- linux-2.6.21.5.old/drivers/char/vlink_giu.c        2008-03-13 16:24:18.000000000 +0100
-+++ linux-2.6.21.5/drivers/char/vlink_giu.c    2008-03-13 16:37:06.000000000 +0100
-@@ -41,8 +41,7 @@
+Index: linux-2.6.21.7/drivers/char/vlink_giu.c
+===================================================================
+--- linux-2.6.21.7.orig/drivers/char/vlink_giu.c
++++ linux-2.6.21.7/drivers/char/vlink_giu.c
+@@ -41,8 +41,7 @@ static int major;    /* default is dynamic 
   module_param(major, int, 0);
   MODULE_PARM_DESC(major, "Major device number");
   
   module_param(major, int, 0);
   MODULE_PARM_DESC(major, "Major device number");
   
@@ -88,7 +91,7 @@ diff -urN linux-2.6.21.5.old/drivers/char/vlink_giu.c linux-2.6.21.5/drivers/cha
   struct vio_dev {
         struct cdev cdev;
   };
   struct vio_dev {
         struct cdev cdev;
   };
-@@ -50,6 +49,53 @@
+@@ -50,6 +49,53 @@ struct vio_dev {
   struct vio_dev *vio_devices;
   static struct class *vio_class;
   
   struct vio_dev *vio_devices;
   static struct class *vio_class;
   
@@ -142,7 +145,7 @@ diff -urN linux-2.6.21.5.old/drivers/char/vlink_giu.c linux-2.6.21.5/drivers/cha
   static ssize_t gpio_read(struct file *file, char __user *buf, size_t len,
                            loff_t *ppos)
   {
   static ssize_t gpio_read(struct file *file, char __user *buf, size_t len,
                            loff_t *ppos)
   {
-@@ -160,6 +206,8 @@
+@@ -160,6 +206,8 @@ static int vio_probe(struct platform_dev
   {
         int retval, i, j;
         dev_t vdev = 0;
   {
         int retval, i, j;
         dev_t vdev = 0;
@@ -151,7 +154,7 @@ diff -urN linux-2.6.21.5.old/drivers/char/vlink_giu.c linux-2.6.21.5/drivers/cha
   
         if (major) {
                 vdev = MKDEV(major, 0);
   
         if (major) {
                 vdev = MKDEV(major, 0);
-@@ -185,6 +233,7 @@
+@@ -185,6 +233,7 @@ static int vio_probe(struct platform_dev
                 vio_remove(dev);
                 return PTR_ERR(vio_class);
         }
                 vio_remove(dev);
                 return PTR_ERR(vio_class);
         }
@@ -159,7 +162,7 @@ diff -urN linux-2.6.21.5.old/drivers/char/vlink_giu.c linux-2.6.21.5/drivers/cha
   
         vio_devices = kmalloc(VIO_NR_DEVS * sizeof(struct vio_dev), GFP_KERNEL);
         if (!vio_devices) {
   
         vio_devices = kmalloc(VIO_NR_DEVS * sizeof(struct vio_dev), GFP_KERNEL);
         if (!vio_devices) {
-@@ -198,8 +247,10 @@
+@@ -198,8 +247,10 @@ static int vio_probe(struct platform_dev
                         int iodev = at91_is_pin_gpio(PIN_BASE + i*32 + j);
                         if (iodev) {
                                 vio_setup_cdev(&vio_devices[i*32 + j], i*32 + j);
                         int iodev = at91_is_pin_gpio(PIN_BASE + i*32 + j);
                         if (iodev) {
                                 vio_setup_cdev(&vio_devices[i*32 + j], i*32 + j);
@@ -172,7 +175,7 @@ diff -urN linux-2.6.21.5.old/drivers/char/vlink_giu.c linux-2.6.21.5/drivers/cha
                         }
                 }
   
                         }
                 }
   
-@@ -212,6 +263,29 @@
+@@ -212,6 +263,29 @@ fail:
         return retval;
   }
   
         return retval;
   }
   
diff --git a/target/linux/at91/patches-2.6.22/000-at91.patch b/target/linux/at91/patches-2.6.22/000-at91.patch

index 16ab784..a9e1a09 100644 (file)
--- a/target/linux/at91/patches-2.6.22/000-at91.patch
+++ b/target/linux/at91/patches-2.6.22/000-at91.patch
@@ -1,6 +1,7 @@
-diff -urN linux-2.6.22-rc5/arch/arm/boot/compressed/head-at91rm9200.S linux-2.6.22-rc5.new/arch/arm/boot/compressed/head-at91rm9200.S
---- linux-2.6.22-rc5/arch/arm/boot/compressed/head-at91rm9200.S        2007-06-17 04:09:12.000000000 +0200
-+++ linux-2.6.22-rc5.new/arch/arm/boot/compressed/head-at91rm9200.S    2007-07-29 05:23:04.000000000 +0200
+Index: linux-2.6.22.19/arch/arm/boot/compressed/head-at91rm9200.S
+===================================================================
+--- linux-2.6.22.19.orig/arch/arm/boot/compressed/head-at91rm9200.S
++++ linux-2.6.22.19/arch/arm/boot/compressed/head-at91rm9200.S
  @@ -73,6 +73,12 @@
                 cmp     r7, r3
                 beq     99f
  @@ -73,6 +73,12 @@
                 cmp     r7, r3
                 beq     99f
@@ -14,9 +15,10 @@ diff -urN linux-2.6.22-rc5/arch/arm/boot/compressed/head-at91rm9200.S linux-2.6.
                 @ Unknown board, use the AT91RM9200DK board
                 @ mov   r7, #MACH_TYPE_AT91RM9200
                 mov     r7,     #(MACH_TYPE_AT91RM9200DK & 0xff)
                 @ Unknown board, use the AT91RM9200DK board
                 @ mov   r7, #MACH_TYPE_AT91RM9200
                 mov     r7,     #(MACH_TYPE_AT91RM9200DK & 0xff)
-diff -urN linux-2.6.22-rc5/arch/arm/configs/at91sam9260ek_defconfig linux-2.6.22-rc5.new/arch/arm/configs/at91sam9260ek_defconfig
---- linux-2.6.22-rc5/arch/arm/configs/at91sam9260ek_defconfig  2007-06-17 04:09:12.000000000 +0200
-+++ linux-2.6.22-rc5.new/arch/arm/configs/at91sam9260ek_defconfig      2007-07-29 05:23:04.000000000 +0200
+Index: linux-2.6.22.19/arch/arm/configs/at91sam9260ek_defconfig
+===================================================================
+--- linux-2.6.22.19.orig/arch/arm/configs/at91sam9260ek_defconfig
++++ linux-2.6.22.19/arch/arm/configs/at91sam9260ek_defconfig
  @@ -1,18 +1,24 @@
   #
   # Automatically generated make config: don't edit
  @@ -1,18 +1,24 @@
   #
   # Automatically generated make config: don't edit
@@ -44,7 +46,7 @@ diff -urN linux-2.6.22-rc5/arch/arm/configs/at91sam9260ek_defconfig linux-2.6.22
   CONFIG_VECTORS_BASE=0xffff0000
   CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
   
   CONFIG_VECTORS_BASE=0xffff0000
   CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
   
-@@ -31,13 +37,16 @@
+@@ -31,13 +37,16 @@ CONFIG_LOCALVERSION=""
   # CONFIG_SWAP is not set
   CONFIG_SYSVIPC=y
   # CONFIG_IPC_NS is not set
   # CONFIG_SWAP is not set
   CONFIG_SYSVIPC=y
   # CONFIG_IPC_NS is not set
@@ -61,7 +63,7 @@ diff -urN linux-2.6.22-rc5/arch/arm/configs/at91sam9260ek_defconfig linux-2.6.22
   CONFIG_INITRAMFS_SOURCE=""
   CONFIG_CC_OPTIMIZE_FOR_SIZE=y
   CONFIG_SYSCTL=y
   CONFIG_INITRAMFS_SOURCE=""
   CONFIG_CC_OPTIMIZE_FOR_SIZE=y
   CONFIG_SYSCTL=y
-@@ -76,7 +85,9 @@
+@@ -76,7 +85,9 @@ CONFIG_KMOD=y
   # Block layer
   #
   CONFIG_BLOCK=y
   # Block layer
   #
   CONFIG_BLOCK=y
@@ -71,7 +73,7 @@ diff -urN linux-2.6.22-rc5/arch/arm/configs/at91sam9260ek_defconfig linux-2.6.22
   
   #
   # IO Schedulers
   
   #
   # IO Schedulers
-@@ -110,10 +121,12 @@
+@@ -110,10 +121,12 @@ CONFIG_ARCH_AT91=y
   # CONFIG_ARCH_IMX is not set
   # CONFIG_ARCH_IOP32X is not set
   # CONFIG_ARCH_IOP33X is not set
   # CONFIG_ARCH_IMX is not set
   # CONFIG_ARCH_IOP32X is not set
   # CONFIG_ARCH_IOP33X is not set
@@ -84,7 +86,7 @@ diff -urN linux-2.6.22-rc5/arch/arm/configs/at91sam9260ek_defconfig linux-2.6.22
   # CONFIG_ARCH_PNX4008 is not set
   # CONFIG_ARCH_PXA is not set
   # CONFIG_ARCH_RPC is not set
   # CONFIG_ARCH_PNX4008 is not set
   # CONFIG_ARCH_PXA is not set
   # CONFIG_ARCH_RPC is not set
-@@ -129,21 +142,29 @@
+@@ -129,21 +142,29 @@ CONFIG_ARCH_AT91=y
   # CONFIG_ARCH_AT91RM9200 is not set
   CONFIG_ARCH_AT91SAM9260=y
   # CONFIG_ARCH_AT91SAM9261 is not set
   # CONFIG_ARCH_AT91RM9200 is not set
   CONFIG_ARCH_AT91SAM9260=y
   # CONFIG_ARCH_AT91SAM9261 is not set
@@ -115,7 +117,7 @@ diff -urN linux-2.6.22-rc5/arch/arm/configs/at91sam9260ek_defconfig linux-2.6.22
   
   #
   # Processor Type
   
   #
   # Processor Type
-@@ -166,6 +187,7 @@
+@@ -166,6 +187,7 @@ CONFIG_CPU_CP15_MMU=y
   # CONFIG_CPU_DCACHE_DISABLE is not set
   # CONFIG_CPU_DCACHE_WRITETHROUGH is not set
   # CONFIG_CPU_CACHE_ROUND_ROBIN is not set
   # CONFIG_CPU_DCACHE_DISABLE is not set
   # CONFIG_CPU_DCACHE_WRITETHROUGH is not set
   # CONFIG_CPU_CACHE_ROUND_ROBIN is not set
@@ -123,7 +125,7 @@ diff -urN linux-2.6.22-rc5/arch/arm/configs/at91sam9260ek_defconfig linux-2.6.22
   
   #
   # Bus support
   
   #
   # Bus support
-@@ -193,6 +215,7 @@
+@@ -193,6 +215,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y
   # CONFIG_SPARSEMEM_STATIC is not set
   CONFIG_SPLIT_PTLOCK_CPUS=4096
   # CONFIG_RESOURCES_64BIT is not set
   # CONFIG_SPARSEMEM_STATIC is not set
   CONFIG_SPLIT_PTLOCK_CPUS=4096
   # CONFIG_RESOURCES_64BIT is not set
@@ -131,7 +133,7 @@ diff -urN linux-2.6.22-rc5/arch/arm/configs/at91sam9260ek_defconfig linux-2.6.22
   # CONFIG_LEDS is not set
   CONFIG_ALIGNMENT_TRAP=y
   
   # CONFIG_LEDS is not set
   CONFIG_ALIGNMENT_TRAP=y
   
-@@ -203,6 +226,7 @@
+@@ -203,6 +226,7 @@ CONFIG_ZBOOT_ROM_TEXT=0x0
   CONFIG_ZBOOT_ROM_BSS=0x0
   CONFIG_CMDLINE="mem=64M console=ttyS0,115200 initrd=0x21100000,3145728 root=/dev/ram0 rw"
   # CONFIG_XIP_KERNEL is not set
   CONFIG_ZBOOT_ROM_BSS=0x0
   CONFIG_CMDLINE="mem=64M console=ttyS0,115200 initrd=0x21100000,3145728 root=/dev/ram0 rw"
   # CONFIG_XIP_KERNEL is not set
@@ -139,7 +141,7 @@ diff -urN linux-2.6.22-rc5/arch/arm/configs/at91sam9260ek_defconfig linux-2.6.22
   
   #
   # Floating point emulation
   
   #
   # Floating point emulation
-@@ -228,7 +252,6 @@
+@@ -228,7 +252,6 @@ CONFIG_BINFMT_ELF=y
   # Power management options
   #
   # CONFIG_PM is not set
   # Power management options
   #
   # CONFIG_PM is not set
@@ -147,7 +149,7 @@ diff -urN linux-2.6.22-rc5/arch/arm/configs/at91sam9260ek_defconfig linux-2.6.22
   
   #
   # Networking
   
   #
   # Networking
-@@ -242,9 +265,6 @@
+@@ -242,9 +265,6 @@ CONFIG_NET=y
   CONFIG_PACKET=y
   # CONFIG_PACKET_MMAP is not set
   CONFIG_UNIX=y
   CONFIG_PACKET=y
   # CONFIG_PACKET_MMAP is not set
   CONFIG_UNIX=y
@@ -157,7 +159,7 @@ diff -urN linux-2.6.22-rc5/arch/arm/configs/at91sam9260ek_defconfig linux-2.6.22
   # CONFIG_NET_KEY is not set
   CONFIG_INET=y
   # CONFIG_IP_MULTICAST is not set
   # CONFIG_NET_KEY is not set
   CONFIG_INET=y
   # CONFIG_IP_MULTICAST is not set
-@@ -263,14 +283,15 @@
+@@ -263,14 +283,15 @@ CONFIG_IP_PNP_BOOTP=y
   # CONFIG_INET_IPCOMP is not set
   # CONFIG_INET_XFRM_TUNNEL is not set
   # CONFIG_INET_TUNNEL is not set
   # CONFIG_INET_IPCOMP is not set
   # CONFIG_INET_XFRM_TUNNEL is not set
   # CONFIG_INET_TUNNEL is not set
@@ -176,7 +178,7 @@ diff -urN linux-2.6.22-rc5/arch/arm/configs/at91sam9260ek_defconfig linux-2.6.22
   # CONFIG_IPV6 is not set
   # CONFIG_INET6_XFRM_TUNNEL is not set
   # CONFIG_INET6_TUNNEL is not set
   # CONFIG_IPV6 is not set
   # CONFIG_INET6_XFRM_TUNNEL is not set
   # CONFIG_INET6_TUNNEL is not set
-@@ -328,6 +349,7 @@
+@@ -328,6 +349,7 @@ CONFIG_STANDALONE=y
   CONFIG_PREVENT_FIRMWARE_BUILD=y
   # CONFIG_FW_LOADER is not set
   # CONFIG_DEBUG_DRIVER is not set
   CONFIG_PREVENT_FIRMWARE_BUILD=y
   # CONFIG_FW_LOADER is not set
   # CONFIG_DEBUG_DRIVER is not set
@@ -184,7 +186,7 @@ diff -urN linux-2.6.22-rc5/arch/arm/configs/at91sam9260ek_defconfig linux-2.6.22
   # CONFIG_SYS_HYPERVISOR is not set
   
   #
   # CONFIG_SYS_HYPERVISOR is not set
   
   #
-@@ -348,6 +370,7 @@
+@@ -348,6 +370,7 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y
   #
   # Plug and Play support
   #
   #
   # Plug and Play support
   #
@@ -192,7 +194,7 @@ diff -urN linux-2.6.22-rc5/arch/arm/configs/at91sam9260ek_defconfig linux-2.6.22
   
   #
   # Block devices
   
   #
   # Block devices
-@@ -360,7 +383,6 @@
+@@ -360,7 +383,6 @@ CONFIG_BLK_DEV_RAM=y
   CONFIG_BLK_DEV_RAM_COUNT=16
   CONFIG_BLK_DEV_RAM_SIZE=8192
   CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
   CONFIG_BLK_DEV_RAM_COUNT=16
   CONFIG_BLK_DEV_RAM_SIZE=8192
   CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
@@ -200,7 +202,7 @@ diff -urN linux-2.6.22-rc5/arch/arm/configs/at91sam9260ek_defconfig linux-2.6.22
   # CONFIG_CDROM_PKTCDVD is not set
   # CONFIG_ATA_OVER_ETH is not set
   
   # CONFIG_CDROM_PKTCDVD is not set
   # CONFIG_ATA_OVER_ETH is not set
   
-@@ -369,6 +391,7 @@
+@@ -369,6 +391,7 @@ CONFIG_BLK_DEV_INITRD=y
   #
   # CONFIG_RAID_ATTRS is not set
   CONFIG_SCSI=y
   #
   # CONFIG_RAID_ATTRS is not set
   CONFIG_SCSI=y
@@ -208,7 +210,7 @@ diff -urN linux-2.6.22-rc5/arch/arm/configs/at91sam9260ek_defconfig linux-2.6.22
   # CONFIG_SCSI_NETLINK is not set
   CONFIG_SCSI_PROC_FS=y
   
   # CONFIG_SCSI_NETLINK is not set
   CONFIG_SCSI_PROC_FS=y
   
-@@ -388,6 +411,7 @@
+@@ -388,6 +411,7 @@ CONFIG_BLK_DEV_SD=y
   CONFIG_SCSI_MULTI_LUN=y
   # CONFIG_SCSI_CONSTANTS is not set
   # CONFIG_SCSI_LOGGING is not set
   CONFIG_SCSI_MULTI_LUN=y
   # CONFIG_SCSI_CONSTANTS is not set
   # CONFIG_SCSI_LOGGING is not set
@@ -216,7 +218,7 @@ diff -urN linux-2.6.22-rc5/arch/arm/configs/at91sam9260ek_defconfig linux-2.6.22
   
   #
   # SCSI Transports
   
   #
   # SCSI Transports
-@@ -405,6 +429,11 @@
+@@ -405,6 +429,11 @@ CONFIG_SCSI_MULTI_LUN=y
   # CONFIG_SCSI_DEBUG is not set
   
   #
   # CONFIG_SCSI_DEBUG is not set
   
   #
@@ -228,7 +230,7 @@ diff -urN linux-2.6.22-rc5/arch/arm/configs/at91sam9260ek_defconfig linux-2.6.22
   # Multi-device support (RAID and LVM)
   #
   # CONFIG_MD is not set
   # Multi-device support (RAID and LVM)
   #
   # CONFIG_MD is not set
-@@ -425,7 +454,51 @@
+@@ -425,7 +454,51 @@ CONFIG_SCSI_MULTI_LUN=y
   #
   # Network device support
   #
   #
   # Network device support
   #
@@ -281,7 +283,7 @@ diff -urN linux-2.6.22-rc5/arch/arm/configs/at91sam9260ek_defconfig linux-2.6.22
   # CONFIG_NETPOLL is not set
   # CONFIG_NET_POLL_CONTROLLER is not set
   
   # CONFIG_NETPOLL is not set
   # CONFIG_NET_POLL_CONTROLLER is not set
   
-@@ -517,10 +590,6 @@
+@@ -517,10 +590,6 @@ CONFIG_HW_RANDOM=y
   # CONFIG_NVRAM is not set
   # CONFIG_DTLK is not set
   # CONFIG_R3964 is not set
   # CONFIG_NVRAM is not set
   # CONFIG_DTLK is not set
   # CONFIG_R3964 is not set
@@ -292,7 +294,7 @@ diff -urN linux-2.6.22-rc5/arch/arm/configs/at91sam9260ek_defconfig linux-2.6.22
   # CONFIG_RAW_DRIVER is not set
   
   #
   # CONFIG_RAW_DRIVER is not set
   
   #
-@@ -553,7 +622,11 @@
+@@ -553,7 +622,11 @@ CONFIG_HW_RANDOM=y
   #
   # Misc devices
   #
   #
   # Misc devices
   #
@@ -305,7 +307,7 @@ diff -urN linux-2.6.22-rc5/arch/arm/configs/at91sam9260ek_defconfig linux-2.6.22
   
   #
   # LED devices
   
   #
   # LED devices
-@@ -582,7 +655,7 @@
+@@ -582,7 +655,7 @@ CONFIG_HW_RANDOM=y
   #
   # Graphics support
   #
   #
   # Graphics support
   #
@@ -314,7 +316,7 @@ diff -urN linux-2.6.22-rc5/arch/arm/configs/at91sam9260ek_defconfig linux-2.6.22
   # CONFIG_FB is not set
   
   #
   # CONFIG_FB is not set
   
   #
-@@ -590,7 +663,6 @@
+@@ -590,7 +663,6 @@ CONFIG_HW_RANDOM=y
   #
   # CONFIG_VGA_CONSOLE is not set
   CONFIG_DUMMY_CONSOLE=y
   #
   # CONFIG_VGA_CONSOLE is not set
   CONFIG_DUMMY_CONSOLE=y
@@ -322,7 +324,7 @@ diff -urN linux-2.6.22-rc5/arch/arm/configs/at91sam9260ek_defconfig linux-2.6.22
   
   #
   # Sound
   
   #
   # Sound
-@@ -598,6 +670,12 @@
+@@ -598,6 +670,12 @@ CONFIG_DUMMY_CONSOLE=y
   # CONFIG_SOUND is not set
   
   #
   # CONFIG_SOUND is not set
   
   #
@@ -335,7 +337,7 @@ diff -urN linux-2.6.22-rc5/arch/arm/configs/at91sam9260ek_defconfig linux-2.6.22
   # USB support
   #
   CONFIG_USB_ARCH_HAS_HCD=y
   # USB support
   #
   CONFIG_USB_ARCH_HAS_HCD=y
-@@ -610,7 +688,6 @@
+@@ -610,7 +688,6 @@ CONFIG_USB=y
   # Miscellaneous USB options
   #
   CONFIG_USB_DEVICEFS=y
   # Miscellaneous USB options
   #
   CONFIG_USB_DEVICEFS=y
@@ -343,7 +345,7 @@ diff -urN linux-2.6.22-rc5/arch/arm/configs/at91sam9260ek_defconfig linux-2.6.22
   # CONFIG_USB_DYNAMIC_MINORS is not set
   # CONFIG_USB_OTG is not set
   
   # CONFIG_USB_DYNAMIC_MINORS is not set
   # CONFIG_USB_OTG is not set
   
-@@ -619,7 +696,8 @@
+@@ -619,7 +696,8 @@ CONFIG_USB_DEVICEFS=y
   #
   # CONFIG_USB_ISP116X_HCD is not set
   CONFIG_USB_OHCI_HCD=y
   #
   # CONFIG_USB_ISP116X_HCD is not set
   CONFIG_USB_OHCI_HCD=y
@@ -353,7 +355,7 @@ diff -urN linux-2.6.22-rc5/arch/arm/configs/at91sam9260ek_defconfig linux-2.6.22
   CONFIG_USB_OHCI_LITTLE_ENDIAN=y
   # CONFIG_USB_SL811_HCD is not set
   
   CONFIG_USB_OHCI_LITTLE_ENDIAN=y
   # CONFIG_USB_SL811_HCD is not set
   
-@@ -671,6 +749,7 @@
+@@ -671,6 +749,7 @@ CONFIG_USB_STORAGE_DEBUG=y
   # CONFIG_USB_ATI_REMOTE2 is not set
   # CONFIG_USB_KEYSPAN_REMOTE is not set
   # CONFIG_USB_APPLETOUCH is not set
   # CONFIG_USB_ATI_REMOTE2 is not set
   # CONFIG_USB_KEYSPAN_REMOTE is not set
   # CONFIG_USB_APPLETOUCH is not set
@@ -361,7 +363,7 @@ diff -urN linux-2.6.22-rc5/arch/arm/configs/at91sam9260ek_defconfig linux-2.6.22
   
   #
   # USB Imaging devices
   
   #
   # USB Imaging devices
-@@ -708,6 +787,7 @@
+@@ -708,6 +787,7 @@ CONFIG_USB_MON=y
   # CONFIG_USB_RIO500 is not set
   # CONFIG_USB_LEGOTOWER is not set
   # CONFIG_USB_LCD is not set
   # CONFIG_USB_RIO500 is not set
   # CONFIG_USB_LEGOTOWER is not set
   # CONFIG_USB_LCD is not set
@@ -369,7 +371,7 @@ diff -urN linux-2.6.22-rc5/arch/arm/configs/at91sam9260ek_defconfig linux-2.6.22
   # CONFIG_USB_LED is not set
   # CONFIG_USB_CYPRESS_CY7C63 is not set
   # CONFIG_USB_CYTHERM is not set
   # CONFIG_USB_LED is not set
   # CONFIG_USB_CYPRESS_CY7C63 is not set
   # CONFIG_USB_CYTHERM is not set
-@@ -717,6 +797,7 @@
+@@ -717,6 +797,7 @@ CONFIG_USB_MON=y
   # CONFIG_USB_APPLEDISPLAY is not set
   # CONFIG_USB_LD is not set
   # CONFIG_USB_TRANCEVIBRATOR is not set
   # CONFIG_USB_APPLEDISPLAY is not set
   # CONFIG_USB_LD is not set
   # CONFIG_USB_TRANCEVIBRATOR is not set
@@ -377,7 +379,7 @@ diff -urN linux-2.6.22-rc5/arch/arm/configs/at91sam9260ek_defconfig linux-2.6.22
   # CONFIG_USB_TEST is not set
   
   #
   # CONFIG_USB_TEST is not set
   
   #
-@@ -889,6 +970,11 @@
+@@ -889,6 +970,11 @@ CONFIG_NLS_ISO8859_1=y
   # CONFIG_NLS_UTF8 is not set
   
   #
   # CONFIG_NLS_UTF8 is not set
   
   #
@@ -389,7 +391,7 @@ diff -urN linux-2.6.22-rc5/arch/arm/configs/at91sam9260ek_defconfig linux-2.6.22
   # Profiling support
   #
   # CONFIG_PROFILING is not set
   # Profiling support
   #
   # CONFIG_PROFILING is not set
-@@ -900,28 +986,30 @@
+@@ -900,28 +986,30 @@ CONFIG_NLS_ISO8859_1=y
   CONFIG_ENABLE_MUST_CHECK=y
   # CONFIG_MAGIC_SYSRQ is not set
   # CONFIG_UNUSED_SYMBOLS is not set
   CONFIG_ENABLE_MUST_CHECK=y
   # CONFIG_MAGIC_SYSRQ is not set
   # CONFIG_UNUSED_SYMBOLS is not set
@@ -423,7 +425,7 @@ diff -urN linux-2.6.22-rc5/arch/arm/configs/at91sam9260ek_defconfig linux-2.6.22
   CONFIG_DEBUG_USER=y
   # CONFIG_DEBUG_ERRORS is not set
   CONFIG_DEBUG_LL=y
   CONFIG_DEBUG_USER=y
   # CONFIG_DEBUG_ERRORS is not set
   CONFIG_DEBUG_LL=y
-@@ -941,9 +1029,12 @@
+@@ -941,9 +1029,12 @@ CONFIG_DEBUG_LL=y
   #
   # Library routines
   #
   #
   # Library routines
   #
@@ -436,9 +438,10 @@ diff -urN linux-2.6.22-rc5/arch/arm/configs/at91sam9260ek_defconfig linux-2.6.22
   CONFIG_PLIST=y
  +CONFIG_HAS_IOMEM=y
  +CONFIG_HAS_IOPORT=y
   CONFIG_PLIST=y
  +CONFIG_HAS_IOMEM=y
  +CONFIG_HAS_IOPORT=y
-diff -urN linux-2.6.22-rc5/arch/arm/configs/at91sam9261ek_defconfig linux-2.6.22-rc5.new/arch/arm/configs/at91sam9261ek_defconfig
---- linux-2.6.22-rc5/arch/arm/configs/at91sam9261ek_defconfig  2007-06-17 04:09:12.000000000 +0200
-+++ linux-2.6.22-rc5.new/arch/arm/configs/at91sam9261ek_defconfig      2007-07-29 05:23:04.000000000 +0200
+Index: linux-2.6.22.19/arch/arm/configs/at91sam9261ek_defconfig
+===================================================================
+--- linux-2.6.22.19.orig/arch/arm/configs/at91sam9261ek_defconfig
++++ linux-2.6.22.19/arch/arm/configs/at91sam9261ek_defconfig
  @@ -1,18 +1,24 @@
   #
   # Automatically generated make config: don't edit
  @@ -1,18 +1,24 @@
   #
   # Automatically generated make config: don't edit
@@ -466,7 +469,7 @@ diff -urN linux-2.6.22-rc5/arch/arm/configs/at91sam9261ek_defconfig linux-2.6.22
   CONFIG_VECTORS_BASE=0xffff0000
   CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
   
   CONFIG_VECTORS_BASE=0xffff0000
   CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
   
-@@ -31,13 +37,16 @@
+@@ -31,13 +37,16 @@ CONFIG_LOCALVERSION=""
   # CONFIG_SWAP is not set
   CONFIG_SYSVIPC=y
   # CONFIG_IPC_NS is not set
   # CONFIG_SWAP is not set
   CONFIG_SYSVIPC=y
   # CONFIG_IPC_NS is not set
@@ -483,7 +486,7 @@ diff -urN linux-2.6.22-rc5/arch/arm/configs/at91sam9261ek_defconfig linux-2.6.22
   CONFIG_INITRAMFS_SOURCE=""
   CONFIG_CC_OPTIMIZE_FOR_SIZE=y
   CONFIG_SYSCTL=y
   CONFIG_INITRAMFS_SOURCE=""
   CONFIG_CC_OPTIMIZE_FOR_SIZE=y
   CONFIG_SYSCTL=y
-@@ -76,7 +85,9 @@
+@@ -76,7 +85,9 @@ CONFIG_KMOD=y
   # Block layer
   #
   CONFIG_BLOCK=y
   # Block layer
   #
   CONFIG_BLOCK=y
@@ -493,7 +496,7 @@ diff -urN linux-2.6.22-rc5/arch/arm/configs/at91sam9261ek_defconfig linux-2.6.22
   
   #
   # IO Schedulers
   
   #
   # IO Schedulers
-@@ -110,10 +121,12 @@
+@@ -110,10 +121,12 @@ CONFIG_ARCH_AT91=y
   # CONFIG_ARCH_IMX is not set
   # CONFIG_ARCH_IOP32X is not set
   # CONFIG_ARCH_IOP33X is not set
   # CONFIG_ARCH_IMX is not set
   # CONFIG_ARCH_IOP32X is not set
   # CONFIG_ARCH_IOP33X is not set
@@ -506,7 +509,7 @@ diff -urN linux-2.6.22-rc5/arch/arm/configs/at91sam9261ek_defconfig linux-2.6.22
   # CONFIG_ARCH_PNX4008 is not set
   # CONFIG_ARCH_PXA is not set
   # CONFIG_ARCH_RPC is not set
   # CONFIG_ARCH_PNX4008 is not set
   # CONFIG_ARCH_PXA is not set
   # CONFIG_ARCH_RPC is not set
-@@ -129,6 +142,7 @@
+@@ -129,6 +142,7 @@ CONFIG_ARCH_AT91=y
   # CONFIG_ARCH_AT91RM9200 is not set
   # CONFIG_ARCH_AT91SAM9260 is not set
   CONFIG_ARCH_AT91SAM9261=y
   # CONFIG_ARCH_AT91RM9200 is not set
   # CONFIG_ARCH_AT91SAM9260 is not set
   CONFIG_ARCH_AT91SAM9261=y
@@ -514,7 +517,7 @@ diff -urN linux-2.6.22-rc5/arch/arm/configs/at91sam9261ek_defconfig linux-2.6.22
   
   #
   # AT91SAM9261 Board Type
   
   #
   # AT91SAM9261 Board Type
-@@ -138,12 +152,14 @@
+@@ -138,12 +152,14 @@ CONFIG_MACH_AT91SAM9261EK=y
   #
   # AT91 Board Options
   #
   #
   # AT91 Board Options
   #
@@ -529,7 +532,7 @@ diff -urN linux-2.6.22-rc5/arch/arm/configs/at91sam9261ek_defconfig linux-2.6.22
   
   #
   # Processor Type
   
   #
   # Processor Type
-@@ -166,6 +182,7 @@
+@@ -166,6 +182,7 @@ CONFIG_CPU_CP15_MMU=y
   # CONFIG_CPU_DCACHE_DISABLE is not set
   # CONFIG_CPU_DCACHE_WRITETHROUGH is not set
   # CONFIG_CPU_CACHE_ROUND_ROBIN is not set
   # CONFIG_CPU_DCACHE_DISABLE is not set
   # CONFIG_CPU_DCACHE_WRITETHROUGH is not set
   # CONFIG_CPU_CACHE_ROUND_ROBIN is not set
@@ -537,7 +540,7 @@ diff -urN linux-2.6.22-rc5/arch/arm/configs/at91sam9261ek_defconfig linux-2.6.22
   
   #
   # Bus support
   
   #
   # Bus support
-@@ -193,6 +210,7 @@
+@@ -193,6 +210,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y
   # CONFIG_SPARSEMEM_STATIC is not set
   CONFIG_SPLIT_PTLOCK_CPUS=4096
   # CONFIG_RESOURCES_64BIT is not set
   # CONFIG_SPARSEMEM_STATIC is not set
   CONFIG_SPLIT_PTLOCK_CPUS=4096
   # CONFIG_RESOURCES_64BIT is not set
@@ -545,7 +548,7 @@ diff -urN linux-2.6.22-rc5/arch/arm/configs/at91sam9261ek_defconfig linux-2.6.22
   # CONFIG_LEDS is not set
   CONFIG_ALIGNMENT_TRAP=y
   
   # CONFIG_LEDS is not set
   CONFIG_ALIGNMENT_TRAP=y
   
-@@ -203,6 +221,7 @@
+@@ -203,6 +221,7 @@ CONFIG_ZBOOT_ROM_TEXT=0x0
   CONFIG_ZBOOT_ROM_BSS=0x0
   CONFIG_CMDLINE="mem=64M console=ttyS0,115200 initrd=0x21100000,3145728 root=/dev/ram0 rw"
   # CONFIG_XIP_KERNEL is not set
   CONFIG_ZBOOT_ROM_BSS=0x0
   CONFIG_CMDLINE="mem=64M console=ttyS0,115200 initrd=0x21100000,3145728 root=/dev/ram0 rw"
   # CONFIG_XIP_KERNEL is not set
@@ -553,7 +556,7 @@ diff -urN linux-2.6.22-rc5/arch/arm/configs/at91sam9261ek_defconfig linux-2.6.22
   
   #
   # Floating point emulation
   
   #
   # Floating point emulation
-@@ -228,7 +247,6 @@
+@@ -228,7 +247,6 @@ CONFIG_BINFMT_ELF=y
   # Power management options
   #
   # CONFIG_PM is not set
   # Power management options
   #
   # CONFIG_PM is not set
@@ -561,7 +564,7 @@ diff -urN linux-2.6.22-rc5/arch/arm/configs/at91sam9261ek_defconfig linux-2.6.22
   
   #
   # Networking
   
   #
   # Networking
-@@ -245,6 +263,7 @@
+@@ -245,6 +263,7 @@ CONFIG_UNIX=y
   CONFIG_XFRM=y
   # CONFIG_XFRM_USER is not set
   # CONFIG_XFRM_SUB_POLICY is not set
   CONFIG_XFRM=y
   # CONFIG_XFRM_USER is not set
   # CONFIG_XFRM_SUB_POLICY is not set
@@ -569,7 +572,7 @@ diff -urN linux-2.6.22-rc5/arch/arm/configs/at91sam9261ek_defconfig linux-2.6.22
   # CONFIG_NET_KEY is not set
   CONFIG_INET=y
   # CONFIG_IP_MULTICAST is not set
   # CONFIG_NET_KEY is not set
   CONFIG_INET=y
   # CONFIG_IP_MULTICAST is not set
-@@ -271,6 +290,7 @@
+@@ -271,6 +290,7 @@ CONFIG_INET_TCP_DIAG=y
   # CONFIG_TCP_CONG_ADVANCED is not set
   CONFIG_TCP_CONG_CUBIC=y
   CONFIG_DEFAULT_TCP_CONG="cubic"
   # CONFIG_TCP_CONG_ADVANCED is not set
   CONFIG_TCP_CONG_CUBIC=y
   CONFIG_DEFAULT_TCP_CONG="cubic"
@@ -577,7 +580,7 @@ diff -urN linux-2.6.22-rc5/arch/arm/configs/at91sam9261ek_defconfig linux-2.6.22
   # CONFIG_IPV6 is not set
   # CONFIG_INET6_XFRM_TUNNEL is not set
   # CONFIG_INET6_TUNNEL is not set
   # CONFIG_IPV6 is not set
   # CONFIG_INET6_XFRM_TUNNEL is not set
   # CONFIG_INET6_TUNNEL is not set
-@@ -328,6 +348,7 @@
+@@ -328,6 +348,7 @@ CONFIG_STANDALONE=y
   CONFIG_PREVENT_FIRMWARE_BUILD=y
   # CONFIG_FW_LOADER is not set
   # CONFIG_DEBUG_DRIVER is not set
   CONFIG_PREVENT_FIRMWARE_BUILD=y
   # CONFIG_FW_LOADER is not set
   # CONFIG_DEBUG_DRIVER is not set
@@ -585,7 +588,7 @@ diff -urN linux-2.6.22-rc5/arch/arm/configs/at91sam9261ek_defconfig linux-2.6.22
   # CONFIG_SYS_HYPERVISOR is not set
   
   #
   # CONFIG_SYS_HYPERVISOR is not set
   
   #
-@@ -350,6 +371,7 @@
+@@ -350,6 +371,7 @@ CONFIG_MTD_CMDLINE_PARTS=y
   # User Modules And Translation Layers
   #
   # CONFIG_MTD_CHAR is not set
   # User Modules And Translation Layers
   #
   # CONFIG_MTD_CHAR is not set
@@ -593,7 +596,7 @@ diff -urN linux-2.6.22-rc5/arch/arm/configs/at91sam9261ek_defconfig linux-2.6.22
   CONFIG_MTD_BLOCK=y
   # CONFIG_FTL is not set
   # CONFIG_NFTL is not set
   CONFIG_MTD_BLOCK=y
   # CONFIG_FTL is not set
   # CONFIG_NFTL is not set
-@@ -386,6 +408,8 @@
+@@ -386,6 +408,8 @@ CONFIG_MTD_CFI_I2=y
   #
   # Self-contained MTD device drivers
   #
   #
   # Self-contained MTD device drivers
   #
@@ -602,7 +605,7 @@ diff -urN linux-2.6.22-rc5/arch/arm/configs/at91sam9261ek_defconfig linux-2.6.22
   # CONFIG_MTD_SLRAM is not set
   # CONFIG_MTD_PHRAM is not set
   # CONFIG_MTD_MTDRAM is not set
   # CONFIG_MTD_SLRAM is not set
   # CONFIG_MTD_PHRAM is not set
   # CONFIG_MTD_MTDRAM is not set
-@@ -422,6 +446,7 @@
+@@ -422,6 +446,7 @@ CONFIG_MTD_NAND_AT91=y
   #
   # Plug and Play support
   #
   #
   # Plug and Play support
   #
@@ -610,7 +613,7 @@ diff -urN linux-2.6.22-rc5/arch/arm/configs/at91sam9261ek_defconfig linux-2.6.22
   
   #
   # Block devices
   
   #
   # Block devices
-@@ -434,7 +459,6 @@
+@@ -434,7 +459,6 @@ CONFIG_BLK_DEV_RAM=y
   CONFIG_BLK_DEV_RAM_COUNT=16
   CONFIG_BLK_DEV_RAM_SIZE=8192
   CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
   CONFIG_BLK_DEV_RAM_COUNT=16
   CONFIG_BLK_DEV_RAM_SIZE=8192
   CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
@@ -618,7 +621,7 @@ diff -urN linux-2.6.22-rc5/arch/arm/configs/at91sam9261ek_defconfig linux-2.6.22
   # CONFIG_CDROM_PKTCDVD is not set
   # CONFIG_ATA_OVER_ETH is not set
   
   # CONFIG_CDROM_PKTCDVD is not set
   # CONFIG_ATA_OVER_ETH is not set
   
-@@ -443,6 +467,7 @@
+@@ -443,6 +467,7 @@ CONFIG_BLK_DEV_INITRD=y
   #
   # CONFIG_RAID_ATTRS is not set
   CONFIG_SCSI=y
   #
   # CONFIG_RAID_ATTRS is not set
   CONFIG_SCSI=y
@@ -626,7 +629,7 @@ diff -urN linux-2.6.22-rc5/arch/arm/configs/at91sam9261ek_defconfig linux-2.6.22
   # CONFIG_SCSI_NETLINK is not set
   CONFIG_SCSI_PROC_FS=y
   
   # CONFIG_SCSI_NETLINK is not set
   CONFIG_SCSI_PROC_FS=y
   
-@@ -462,6 +487,7 @@
+@@ -462,6 +487,7 @@ CONFIG_BLK_DEV_SD=y
   CONFIG_SCSI_MULTI_LUN=y
   # CONFIG_SCSI_CONSTANTS is not set
   # CONFIG_SCSI_LOGGING is not set
   CONFIG_SCSI_MULTI_LUN=y
   # CONFIG_SCSI_CONSTANTS is not set
   # CONFIG_SCSI_LOGGING is not set
@@ -634,7 +637,7 @@ diff -urN linux-2.6.22-rc5/arch/arm/configs/at91sam9261ek_defconfig linux-2.6.22
   
   #
   # SCSI Transports
   
   #
   # SCSI Transports
-@@ -479,6 +505,11 @@
+@@ -479,6 +505,11 @@ CONFIG_SCSI_MULTI_LUN=y
   # CONFIG_SCSI_DEBUG is not set
   
   #
   # CONFIG_SCSI_DEBUG is not set
   
   #
@@ -646,7 +649,7 @@ diff -urN linux-2.6.22-rc5/arch/arm/configs/at91sam9261ek_defconfig linux-2.6.22
   # Multi-device support (RAID and LVM)
   #
   # CONFIG_MD is not set
   # Multi-device support (RAID and LVM)
   #
   # CONFIG_MD is not set
-@@ -575,7 +606,16 @@
+@@ -575,7 +606,16 @@ CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
   # CONFIG_INPUT_KEYBOARD is not set
   # CONFIG_INPUT_MOUSE is not set
   # CONFIG_INPUT_JOYSTICK is not set
   # CONFIG_INPUT_KEYBOARD is not set
   # CONFIG_INPUT_MOUSE is not set
   # CONFIG_INPUT_JOYSTICK is not set
@@ -664,7 +667,7 @@ diff -urN linux-2.6.22-rc5/arch/arm/configs/at91sam9261ek_defconfig linux-2.6.22
   # CONFIG_INPUT_MISC is not set
   
   #
   # CONFIG_INPUT_MISC is not set
   
   #
-@@ -634,10 +674,6 @@
+@@ -634,10 +674,6 @@ CONFIG_HW_RANDOM=y
   # CONFIG_NVRAM is not set
   # CONFIG_DTLK is not set
   # CONFIG_R3964 is not set
   # CONFIG_NVRAM is not set
   # CONFIG_DTLK is not set
   # CONFIG_R3964 is not set
@@ -675,7 +678,7 @@ diff -urN linux-2.6.22-rc5/arch/arm/configs/at91sam9261ek_defconfig linux-2.6.22
   # CONFIG_RAW_DRIVER is not set
   
   #
   # CONFIG_RAW_DRIVER is not set
   
   #
-@@ -662,6 +698,7 @@
+@@ -662,6 +698,7 @@ CONFIG_I2C_CHARDEV=y
   # I2C Hardware Bus support
   #
   CONFIG_I2C_AT91=y
   # I2C Hardware Bus support
   #
   CONFIG_I2C_AT91=y
@@ -683,7 +686,7 @@ diff -urN linux-2.6.22-rc5/arch/arm/configs/at91sam9261ek_defconfig linux-2.6.22
   # CONFIG_I2C_OCORES is not set
   # CONFIG_I2C_PARPORT_LIGHT is not set
   # CONFIG_I2C_STUB is not set
   # CONFIG_I2C_OCORES is not set
   # CONFIG_I2C_PARPORT_LIGHT is not set
   # CONFIG_I2C_STUB is not set
-@@ -686,8 +723,20 @@
+@@ -686,8 +723,20 @@ CONFIG_I2C_AT91=y
   #
   # SPI support
   #
   #
   # SPI support
   #
@@ -706,7 +709,7 @@ diff -urN linux-2.6.22-rc5/arch/arm/configs/at91sam9261ek_defconfig linux-2.6.22
   
   #
   # Dallas's 1-wire bus
   
   #
   # Dallas's 1-wire bus
-@@ -703,7 +752,11 @@
+@@ -703,7 +752,11 @@ CONFIG_I2C_AT91=y
   #
   # Misc devices
   #
   #
   # Misc devices
   #
@@ -719,7 +722,7 @@ diff -urN linux-2.6.22-rc5/arch/arm/configs/at91sam9261ek_defconfig linux-2.6.22
   
   #
   # LED devices
   
   #
   # LED devices
-@@ -732,7 +785,7 @@
+@@ -732,7 +785,7 @@ CONFIG_I2C_AT91=y
   #
   # Graphics support
   #
   #
   # Graphics support
   #
@@ -728,7 +731,7 @@ diff -urN linux-2.6.22-rc5/arch/arm/configs/at91sam9261ek_defconfig linux-2.6.22
   # CONFIG_FB is not set
   
   #
   # CONFIG_FB is not set
   
   #
-@@ -740,7 +793,6 @@
+@@ -740,7 +793,6 @@ CONFIG_I2C_AT91=y
   #
   # CONFIG_VGA_CONSOLE is not set
   CONFIG_DUMMY_CONSOLE=y
   #
   # CONFIG_VGA_CONSOLE is not set
   CONFIG_DUMMY_CONSOLE=y
@@ -736,7 +739,7 @@ diff -urN linux-2.6.22-rc5/arch/arm/configs/at91sam9261ek_defconfig linux-2.6.22
   
   #
   # Sound
   
   #
   # Sound
-@@ -748,6 +800,12 @@
+@@ -748,6 +800,12 @@ CONFIG_DUMMY_CONSOLE=y
   # CONFIG_SOUND is not set
   
   #
   # CONFIG_SOUND is not set
   
   #
@@ -749,7 +752,7 @@ diff -urN linux-2.6.22-rc5/arch/arm/configs/at91sam9261ek_defconfig linux-2.6.22
   # USB support
   #
   CONFIG_USB_ARCH_HAS_HCD=y
   # USB support
   #
   CONFIG_USB_ARCH_HAS_HCD=y
-@@ -760,7 +818,6 @@
+@@ -760,7 +818,6 @@ CONFIG_USB=y
   # Miscellaneous USB options
   #
   CONFIG_USB_DEVICEFS=y
   # Miscellaneous USB options
   #
   CONFIG_USB_DEVICEFS=y
@@ -757,7 +760,7 @@ diff -urN linux-2.6.22-rc5/arch/arm/configs/at91sam9261ek_defconfig linux-2.6.22
   # CONFIG_USB_DYNAMIC_MINORS is not set
   # CONFIG_USB_OTG is not set
   
   # CONFIG_USB_DYNAMIC_MINORS is not set
   # CONFIG_USB_OTG is not set
   
-@@ -769,7 +826,8 @@
+@@ -769,7 +826,8 @@ CONFIG_USB_DEVICEFS=y
   #
   # CONFIG_USB_ISP116X_HCD is not set
   CONFIG_USB_OHCI_HCD=y
   #
   # CONFIG_USB_ISP116X_HCD is not set
   CONFIG_USB_OHCI_HCD=y
@@ -767,7 +770,7 @@ diff -urN linux-2.6.22-rc5/arch/arm/configs/at91sam9261ek_defconfig linux-2.6.22
   CONFIG_USB_OHCI_LITTLE_ENDIAN=y
   # CONFIG_USB_SL811_HCD is not set
   
   CONFIG_USB_OHCI_LITTLE_ENDIAN=y
   # CONFIG_USB_SL811_HCD is not set
   
-@@ -821,6 +879,7 @@
+@@ -821,6 +879,7 @@ CONFIG_USB_STORAGE_DEBUG=y
   # CONFIG_USB_ATI_REMOTE2 is not set
   # CONFIG_USB_KEYSPAN_REMOTE is not set
   # CONFIG_USB_APPLETOUCH is not set
   # CONFIG_USB_ATI_REMOTE2 is not set
   # CONFIG_USB_KEYSPAN_REMOTE is not set
   # CONFIG_USB_APPLETOUCH is not set
@@ -775,7 +778,7 @@ diff -urN linux-2.6.22-rc5/arch/arm/configs/at91sam9261ek_defconfig linux-2.6.22
   
   #
   # USB Imaging devices
   
   #
   # USB Imaging devices
-@@ -858,6 +917,7 @@
+@@ -858,6 +917,7 @@ CONFIG_USB_MON=y
   # CONFIG_USB_RIO500 is not set
   # CONFIG_USB_LEGOTOWER is not set
   # CONFIG_USB_LCD is not set
   # CONFIG_USB_RIO500 is not set
   # CONFIG_USB_LEGOTOWER is not set
   # CONFIG_USB_LCD is not set
@@ -783,7 +786,7 @@ diff -urN linux-2.6.22-rc5/arch/arm/configs/at91sam9261ek_defconfig linux-2.6.22
   # CONFIG_USB_LED is not set
   # CONFIG_USB_CYPRESS_CY7C63 is not set
   # CONFIG_USB_CYTHERM is not set
   # CONFIG_USB_LED is not set
   # CONFIG_USB_CYPRESS_CY7C63 is not set
   # CONFIG_USB_CYTHERM is not set
-@@ -867,6 +927,7 @@
+@@ -867,6 +927,7 @@ CONFIG_USB_MON=y
   # CONFIG_USB_APPLEDISPLAY is not set
   # CONFIG_USB_LD is not set
   # CONFIG_USB_TRANCEVIBRATOR is not set
   # CONFIG_USB_APPLEDISPLAY is not set
   # CONFIG_USB_LD is not set
   # CONFIG_USB_TRANCEVIBRATOR is not set
@@ -791,7 +794,7 @@ diff -urN linux-2.6.22-rc5/arch/arm/configs/at91sam9261ek_defconfig linux-2.6.22
   # CONFIG_USB_TEST is not set
   
   #
   # CONFIG_USB_TEST is not set
   
   #
-@@ -903,7 +964,6 @@
+@@ -903,7 +964,6 @@ CONFIG_MMC=y
   # CONFIG_MMC_DEBUG is not set
   CONFIG_MMC_BLOCK=y
   CONFIG_MMC_AT91=m
   # CONFIG_MMC_DEBUG is not set
   CONFIG_MMC_BLOCK=y
   CONFIG_MMC_AT91=m
@@ -799,7 +802,7 @@ diff -urN linux-2.6.22-rc5/arch/arm/configs/at91sam9261ek_defconfig linux-2.6.22
   
   #
   # Real Time Clock
   
   #
   # Real Time Clock
-@@ -973,7 +1033,6 @@
+@@ -973,7 +1033,6 @@ CONFIG_RAMFS=y
   # CONFIG_BEFS_FS is not set
   # CONFIG_BFS_FS is not set
   # CONFIG_EFS_FS is not set
   # CONFIG_BEFS_FS is not set
   # CONFIG_BFS_FS is not set
   # CONFIG_EFS_FS is not set
@@ -807,7 +810,7 @@ diff -urN linux-2.6.22-rc5/arch/arm/configs/at91sam9261ek_defconfig linux-2.6.22
   # CONFIG_JFFS2_FS is not set
   CONFIG_CRAMFS=y
   # CONFIG_VXFS_FS is not set
   # CONFIG_JFFS2_FS is not set
   CONFIG_CRAMFS=y
   # CONFIG_VXFS_FS is not set
-@@ -1045,6 +1104,11 @@
+@@ -1045,6 +1104,11 @@ CONFIG_NLS_ISO8859_1=y
   # CONFIG_NLS_UTF8 is not set
   
   #
   # CONFIG_NLS_UTF8 is not set
   
   #
@@ -819,7 +822,7 @@ diff -urN linux-2.6.22-rc5/arch/arm/configs/at91sam9261ek_defconfig linux-2.6.22
   # Profiling support
   #
   # CONFIG_PROFILING is not set
   # Profiling support
   #
   # CONFIG_PROFILING is not set
-@@ -1056,28 +1120,30 @@
+@@ -1056,28 +1120,30 @@ CONFIG_NLS_ISO8859_1=y
   CONFIG_ENABLE_MUST_CHECK=y
   # CONFIG_MAGIC_SYSRQ is not set
   # CONFIG_UNUSED_SYMBOLS is not set
   CONFIG_ENABLE_MUST_CHECK=y
   # CONFIG_MAGIC_SYSRQ is not set
   # CONFIG_UNUSED_SYMBOLS is not set
@@ -853,7 +856,7 @@ diff -urN linux-2.6.22-rc5/arch/arm/configs/at91sam9261ek_defconfig linux-2.6.22
   CONFIG_DEBUG_USER=y
   # CONFIG_DEBUG_ERRORS is not set
   CONFIG_DEBUG_LL=y
   CONFIG_DEBUG_USER=y
   # CONFIG_DEBUG_ERRORS is not set
   CONFIG_DEBUG_LL=y
-@@ -1097,9 +1163,12 @@
+@@ -1097,9 +1163,12 @@ CONFIG_DEBUG_LL=y
   #
   # Library routines
   #
   #
   # Library routines
   #
@@ -866,9 +869,10 @@ diff -urN linux-2.6.22-rc5/arch/arm/configs/at91sam9261ek_defconfig linux-2.6.22
   CONFIG_PLIST=y
  +CONFIG_HAS_IOMEM=y
  +CONFIG_HAS_IOPORT=y
   CONFIG_PLIST=y
  +CONFIG_HAS_IOMEM=y
  +CONFIG_HAS_IOPORT=y
-diff -urN linux-2.6.22-rc5/arch/arm/configs/at91sam9263ek_defconfig linux-2.6.22-rc5.new/arch/arm/configs/at91sam9263ek_defconfig
---- linux-2.6.22-rc5/arch/arm/configs/at91sam9263ek_defconfig  2007-06-17 04:09:12.000000000 +0200
-+++ linux-2.6.22-rc5.new/arch/arm/configs/at91sam9263ek_defconfig      2007-07-29 05:23:04.000000000 +0200
+Index: linux-2.6.22.19/arch/arm/configs/at91sam9263ek_defconfig
+===================================================================
+--- linux-2.6.22.19.orig/arch/arm/configs/at91sam9263ek_defconfig
++++ linux-2.6.22.19/arch/arm/configs/at91sam9263ek_defconfig
  @@ -1,11 +1,14 @@
   #
   # Automatically generated make config: don't edit
  @@ -1,11 +1,14 @@
   #
   # Automatically generated make config: don't edit
@@ -886,7 +890,7 @@ diff -urN linux-2.6.22-rc5/arch/arm/configs/at91sam9263ek_defconfig linux-2.6.22
   CONFIG_GENERIC_HARDIRQS=y
   CONFIG_TRACE_IRQFLAGS_SUPPORT=y
   CONFIG_HARDIRQS_SW_RESEND=y
   CONFIG_GENERIC_HARDIRQS=y
   CONFIG_TRACE_IRQFLAGS_SUPPORT=y
   CONFIG_HARDIRQS_SW_RESEND=y
-@@ -15,6 +18,7 @@
+@@ -15,6 +18,7 @@ CONFIG_RWSEM_GENERIC_SPINLOCK=y
   # CONFIG_ARCH_HAS_ILOG2_U64 is not set
   CONFIG_GENERIC_HWEIGHT=y
   CONFIG_GENERIC_CALIBRATE_DELAY=y
   # CONFIG_ARCH_HAS_ILOG2_U64 is not set
   CONFIG_GENERIC_HWEIGHT=y
   CONFIG_GENERIC_CALIBRATE_DELAY=y
@@ -894,7 +898,7 @@ diff -urN linux-2.6.22-rc5/arch/arm/configs/at91sam9263ek_defconfig linux-2.6.22
   CONFIG_VECTORS_BASE=0xffff0000
   CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
   
   CONFIG_VECTORS_BASE=0xffff0000
   CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
   
-@@ -33,6 +37,7 @@
+@@ -33,6 +37,7 @@ CONFIG_LOCALVERSION=""
   # CONFIG_SWAP is not set
   CONFIG_SYSVIPC=y
   # CONFIG_IPC_NS is not set
   # CONFIG_SWAP is not set
   CONFIG_SYSVIPC=y
   # CONFIG_IPC_NS is not set
@@ -902,7 +906,7 @@ diff -urN linux-2.6.22-rc5/arch/arm/configs/at91sam9263ek_defconfig linux-2.6.22
   # CONFIG_POSIX_MQUEUE is not set
   # CONFIG_BSD_PROCESS_ACCT is not set
   # CONFIG_TASKSTATS is not set
   # CONFIG_POSIX_MQUEUE is not set
   # CONFIG_BSD_PROCESS_ACCT is not set
   # CONFIG_TASKSTATS is not set
-@@ -41,6 +46,7 @@
+@@ -41,6 +46,7 @@ CONFIG_SYSVIPC=y
   # CONFIG_IKCONFIG is not set
   CONFIG_SYSFS_DEPRECATED=y
   # CONFIG_RELAY is not set
   # CONFIG_IKCONFIG is not set
   CONFIG_SYSFS_DEPRECATED=y
   # CONFIG_RELAY is not set
@@ -910,7 +914,7 @@ diff -urN linux-2.6.22-rc5/arch/arm/configs/at91sam9263ek_defconfig linux-2.6.22
   CONFIG_INITRAMFS_SOURCE=""
   CONFIG_CC_OPTIMIZE_FOR_SIZE=y
   CONFIG_SYSCTL=y
   CONFIG_INITRAMFS_SOURCE=""
   CONFIG_CC_OPTIMIZE_FOR_SIZE=y
   CONFIG_SYSCTL=y
-@@ -120,6 +126,7 @@
+@@ -120,6 +126,7 @@ CONFIG_ARCH_AT91=y
   # CONFIG_ARCH_IXP2000 is not set
   # CONFIG_ARCH_IXP23XX is not set
   # CONFIG_ARCH_L7200 is not set
   # CONFIG_ARCH_IXP2000 is not set
   # CONFIG_ARCH_IXP23XX is not set
   # CONFIG_ARCH_L7200 is not set
@@ -918,7 +922,7 @@ diff -urN linux-2.6.22-rc5/arch/arm/configs/at91sam9263ek_defconfig linux-2.6.22
   # CONFIG_ARCH_PNX4008 is not set
   # CONFIG_ARCH_PXA is not set
   # CONFIG_ARCH_RPC is not set
   # CONFIG_ARCH_PNX4008 is not set
   # CONFIG_ARCH_PXA is not set
   # CONFIG_ARCH_RPC is not set
-@@ -152,6 +159,7 @@
+@@ -152,6 +159,7 @@ CONFIG_MTD_AT91_DATAFLASH_CARD=y
   # AT91 Feature Selections
   #
   # CONFIG_AT91_PROGRAMMABLE_CLOCKS is not set
   # AT91 Feature Selections
   #
   # CONFIG_AT91_PROGRAMMABLE_CLOCKS is not set
@@ -926,7 +930,7 @@ diff -urN linux-2.6.22-rc5/arch/arm/configs/at91sam9263ek_defconfig linux-2.6.22
   
   #
   # Processor Type
   
   #
   # Processor Type
-@@ -174,6 +182,7 @@
+@@ -174,6 +182,7 @@ CONFIG_CPU_CP15_MMU=y
   # CONFIG_CPU_DCACHE_DISABLE is not set
   # CONFIG_CPU_DCACHE_WRITETHROUGH is not set
   # CONFIG_CPU_CACHE_ROUND_ROBIN is not set
   # CONFIG_CPU_DCACHE_DISABLE is not set
   # CONFIG_CPU_DCACHE_WRITETHROUGH is not set
   # CONFIG_CPU_CACHE_ROUND_ROBIN is not set
@@ -934,7 +938,7 @@ diff -urN linux-2.6.22-rc5/arch/arm/configs/at91sam9263ek_defconfig linux-2.6.22
   
   #
   # Bus support
   
   #
   # Bus support
-@@ -201,6 +210,7 @@
+@@ -201,6 +210,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y
   # CONFIG_SPARSEMEM_STATIC is not set
   CONFIG_SPLIT_PTLOCK_CPUS=4096
   # CONFIG_RESOURCES_64BIT is not set
   # CONFIG_SPARSEMEM_STATIC is not set
   CONFIG_SPLIT_PTLOCK_CPUS=4096
   # CONFIG_RESOURCES_64BIT is not set
@@ -942,7 +946,7 @@ diff -urN linux-2.6.22-rc5/arch/arm/configs/at91sam9263ek_defconfig linux-2.6.22
   # CONFIG_LEDS is not set
   CONFIG_ALIGNMENT_TRAP=y
   
   # CONFIG_LEDS is not set
   CONFIG_ALIGNMENT_TRAP=y
   
-@@ -211,6 +221,7 @@
+@@ -211,6 +221,7 @@ CONFIG_ZBOOT_ROM_TEXT=0x0
   CONFIG_ZBOOT_ROM_BSS=0x0
   CONFIG_CMDLINE="mem=64M console=ttyS0,115200 initrd=0x21100000,3145728 root=/dev/ram0 rw"
   # CONFIG_XIP_KERNEL is not set
   CONFIG_ZBOOT_ROM_BSS=0x0
   CONFIG_CMDLINE="mem=64M console=ttyS0,115200 initrd=0x21100000,3145728 root=/dev/ram0 rw"
   # CONFIG_XIP_KERNEL is not set
@@ -950,7 +954,7 @@ diff -urN linux-2.6.22-rc5/arch/arm/configs/at91sam9263ek_defconfig linux-2.6.22
   
   #
   # Floating point emulation
   
   #
   # Floating point emulation
-@@ -236,7 +247,6 @@
+@@ -236,7 +247,6 @@ CONFIG_BINFMT_ELF=y
   # Power management options
   #
   # CONFIG_PM is not set
   # Power management options
   #
   # CONFIG_PM is not set
@@ -958,7 +962,7 @@ diff -urN linux-2.6.22-rc5/arch/arm/configs/at91sam9263ek_defconfig linux-2.6.22
   
   #
   # Networking
   
   #
   # Networking
-@@ -333,6 +343,7 @@
+@@ -333,6 +343,7 @@ CONFIG_STANDALONE=y
   CONFIG_PREVENT_FIRMWARE_BUILD=y
   # CONFIG_FW_LOADER is not set
   # CONFIG_DEBUG_DRIVER is not set
   CONFIG_PREVENT_FIRMWARE_BUILD=y
   # CONFIG_FW_LOADER is not set
   # CONFIG_DEBUG_DRIVER is not set
@@ -966,7 +970,7 @@ diff -urN linux-2.6.22-rc5/arch/arm/configs/at91sam9263ek_defconfig linux-2.6.22
   # CONFIG_SYS_HYPERVISOR is not set
   
   #
   # CONFIG_SYS_HYPERVISOR is not set
   
   #
-@@ -430,6 +441,7 @@
+@@ -430,6 +441,7 @@ CONFIG_MTD_NAND_AT91=y
   #
   # Plug and Play support
   #
   #
   # Plug and Play support
   #
@@ -974,7 +978,7 @@ diff -urN linux-2.6.22-rc5/arch/arm/configs/at91sam9263ek_defconfig linux-2.6.22
   
   #
   # Block devices
   
   #
   # Block devices
-@@ -443,7 +455,6 @@
+@@ -443,7 +455,6 @@ CONFIG_BLK_DEV_RAM=y
   CONFIG_BLK_DEV_RAM_COUNT=16
   CONFIG_BLK_DEV_RAM_SIZE=8192
   CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
   CONFIG_BLK_DEV_RAM_COUNT=16
   CONFIG_BLK_DEV_RAM_SIZE=8192
   CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
@@ -982,7 +986,7 @@ diff -urN linux-2.6.22-rc5/arch/arm/configs/at91sam9263ek_defconfig linux-2.6.22
   # CONFIG_CDROM_PKTCDVD is not set
   # CONFIG_ATA_OVER_ETH is not set
   
   # CONFIG_CDROM_PKTCDVD is not set
   # CONFIG_ATA_OVER_ETH is not set
   
-@@ -531,6 +542,7 @@
+@@ -531,6 +542,7 @@ CONFIG_NETDEVICES=y
   #
   CONFIG_NET_ETHERNET=y
   CONFIG_MII=y
   #
   CONFIG_NET_ETHERNET=y
   CONFIG_MII=y
@@ -990,7 +994,7 @@ diff -urN linux-2.6.22-rc5/arch/arm/configs/at91sam9263ek_defconfig linux-2.6.22
   # CONFIG_SMC91X is not set
   # CONFIG_DM9000 is not set
   
   # CONFIG_SMC91X is not set
   # CONFIG_DM9000 is not set
   
-@@ -685,6 +697,7 @@
+@@ -685,6 +697,7 @@ CONFIG_I2C_CHARDEV=y
   # I2C Hardware Bus support
   #
   CONFIG_I2C_AT91=y
   # I2C Hardware Bus support
   #
   CONFIG_I2C_AT91=y
@@ -998,7 +1002,7 @@ diff -urN linux-2.6.22-rc5/arch/arm/configs/at91sam9263ek_defconfig linux-2.6.22
   # CONFIG_I2C_OCORES is not set
   # CONFIG_I2C_PARPORT_LIGHT is not set
   # CONFIG_I2C_STUB is not set
   # CONFIG_I2C_OCORES is not set
   # CONFIG_I2C_PARPORT_LIGHT is not set
   # CONFIG_I2C_STUB is not set
-@@ -722,6 +735,7 @@
+@@ -722,6 +735,7 @@ CONFIG_SPI_ATMEL=y
   #
   # SPI Protocol Masters
   #
   #
   # SPI Protocol Masters
   #
@@ -1006,7 +1010,7 @@ diff -urN linux-2.6.22-rc5/arch/arm/configs/at91sam9263ek_defconfig linux-2.6.22
   
   #
   # Dallas's 1-wire bus
   
   #
   # Dallas's 1-wire bus
-@@ -737,7 +751,11 @@
+@@ -737,7 +751,11 @@ CONFIG_SPI_ATMEL=y
   #
   # Misc devices
   #
   #
   # Misc devices
   #
@@ -1019,7 +1023,7 @@ diff -urN linux-2.6.22-rc5/arch/arm/configs/at91sam9263ek_defconfig linux-2.6.22
   
   #
   # LED devices
   
   #
   # LED devices
-@@ -766,15 +784,23 @@
+@@ -766,15 +784,23 @@ CONFIG_SPI_ATMEL=y
   #
   # Graphics support
   #
   #
   # Graphics support
   #
@@ -1044,7 +1048,7 @@ diff -urN linux-2.6.22-rc5/arch/arm/configs/at91sam9263ek_defconfig linux-2.6.22
   # CONFIG_FB_S1D13XXX is not set
   # CONFIG_FB_VIRTUAL is not set
   
   # CONFIG_FB_S1D13XXX is not set
   # CONFIG_FB_VIRTUAL is not set
   
-@@ -789,7 +815,6 @@
+@@ -789,7 +815,6 @@ CONFIG_DUMMY_CONSOLE=y
   # Logo configuration
   #
   # CONFIG_LOGO is not set
   # Logo configuration
   #
   # CONFIG_LOGO is not set
@@ -1052,7 +1056,7 @@ diff -urN linux-2.6.22-rc5/arch/arm/configs/at91sam9263ek_defconfig linux-2.6.22
   
   #
   # Sound
   
   #
   # Sound
-@@ -800,6 +825,7 @@
+@@ -800,6 +825,7 @@ CONFIG_DUMMY_CONSOLE=y
   # HID Devices
   #
   CONFIG_HID=y
   # HID Devices
   #
   CONFIG_HID=y
@@ -1060,7 +1064,7 @@ diff -urN linux-2.6.22-rc5/arch/arm/configs/at91sam9263ek_defconfig linux-2.6.22
   
   #
   # USB support
   
   #
   # USB support
-@@ -814,9 +840,7 @@
+@@ -814,9 +840,7 @@ CONFIG_USB=y
   # Miscellaneous USB options
   #
   CONFIG_USB_DEVICEFS=y
   # Miscellaneous USB options
   #
   CONFIG_USB_DEVICEFS=y
@@ -1070,7 +1074,7 @@ diff -urN linux-2.6.22-rc5/arch/arm/configs/at91sam9263ek_defconfig linux-2.6.22
   # CONFIG_USB_OTG is not set
   
   #
   # CONFIG_USB_OTG is not set
   
   #
-@@ -824,7 +848,8 @@
+@@ -824,7 +848,8 @@ CONFIG_USB_DEVICEFS=y
   #
   # CONFIG_USB_ISP116X_HCD is not set
   CONFIG_USB_OHCI_HCD=y
   #
   # CONFIG_USB_ISP116X_HCD is not set
   CONFIG_USB_OHCI_HCD=y
@@ -1080,7 +1084,7 @@ diff -urN linux-2.6.22-rc5/arch/arm/configs/at91sam9263ek_defconfig linux-2.6.22
   CONFIG_USB_OHCI_LITTLE_ENDIAN=y
   # CONFIG_USB_SL811_HCD is not set
   
   CONFIG_USB_OHCI_LITTLE_ENDIAN=y
   # CONFIG_USB_SL811_HCD is not set
   
-@@ -877,6 +902,7 @@
+@@ -877,6 +902,7 @@ CONFIG_USB_STORAGE=y
   # CONFIG_USB_ATI_REMOTE2 is not set
   # CONFIG_USB_KEYSPAN_REMOTE is not set
   # CONFIG_USB_APPLETOUCH is not set
   # CONFIG_USB_ATI_REMOTE2 is not set
   # CONFIG_USB_KEYSPAN_REMOTE is not set
   # CONFIG_USB_APPLETOUCH is not set
@@ -1088,7 +1092,7 @@ diff -urN linux-2.6.22-rc5/arch/arm/configs/at91sam9263ek_defconfig linux-2.6.22
   
   #
   # USB Imaging devices
   
   #
   # USB Imaging devices
-@@ -914,6 +940,7 @@
+@@ -914,6 +940,7 @@ CONFIG_USB_MON=y
   # CONFIG_USB_RIO500 is not set
   # CONFIG_USB_LEGOTOWER is not set
   # CONFIG_USB_LCD is not set
   # CONFIG_USB_RIO500 is not set
   # CONFIG_USB_LEGOTOWER is not set
   # CONFIG_USB_LCD is not set
@@ -1096,7 +1100,7 @@ diff -urN linux-2.6.22-rc5/arch/arm/configs/at91sam9263ek_defconfig linux-2.6.22
   # CONFIG_USB_LED is not set
   # CONFIG_USB_CYPRESS_CY7C63 is not set
   # CONFIG_USB_CYTHERM is not set
   # CONFIG_USB_LED is not set
   # CONFIG_USB_CYPRESS_CY7C63 is not set
   # CONFIG_USB_CYTHERM is not set
-@@ -923,6 +950,7 @@
+@@ -923,6 +950,7 @@ CONFIG_USB_MON=y
   # CONFIG_USB_APPLEDISPLAY is not set
   # CONFIG_USB_LD is not set
   # CONFIG_USB_TRANCEVIBRATOR is not set
   # CONFIG_USB_APPLEDISPLAY is not set
   # CONFIG_USB_LD is not set
   # CONFIG_USB_TRANCEVIBRATOR is not set
@@ -1104,7 +1108,7 @@ diff -urN linux-2.6.22-rc5/arch/arm/configs/at91sam9263ek_defconfig linux-2.6.22
   # CONFIG_USB_TEST is not set
   
   #
   # CONFIG_USB_TEST is not set
   
   #
-@@ -959,7 +987,6 @@
+@@ -959,7 +987,6 @@ CONFIG_MMC=y
   # CONFIG_MMC_DEBUG is not set
   CONFIG_MMC_BLOCK=y
   CONFIG_MMC_AT91=m
   # CONFIG_MMC_DEBUG is not set
   CONFIG_MMC_BLOCK=y
   CONFIG_MMC_AT91=m
@@ -1112,7 +1116,7 @@ diff -urN linux-2.6.22-rc5/arch/arm/configs/at91sam9263ek_defconfig linux-2.6.22
   
   #
   # Real Time Clock
   
   #
   # Real Time Clock
-@@ -1136,15 +1163,16 @@
+@@ -1136,15 +1163,16 @@ CONFIG_ENABLE_MUST_CHECK=y
   # CONFIG_DEBUG_FS is not set
   # CONFIG_HEADERS_CHECK is not set
   CONFIG_DEBUG_KERNEL=y
   # CONFIG_DEBUG_FS is not set
   # CONFIG_HEADERS_CHECK is not set
   CONFIG_DEBUG_KERNEL=y
@@ -1130,7 +1134,7 @@ diff -urN linux-2.6.22-rc5/arch/arm/configs/at91sam9263ek_defconfig linux-2.6.22
   # CONFIG_DEBUG_SPINLOCK_SLEEP is not set
   # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
   # CONFIG_DEBUG_KOBJECT is not set
   # CONFIG_DEBUG_SPINLOCK_SLEEP is not set
   # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
   # CONFIG_DEBUG_KOBJECT is not set
-@@ -1155,6 +1183,7 @@
+@@ -1155,6 +1183,7 @@ CONFIG_DEBUG_BUGVERBOSE=y
   CONFIG_FRAME_POINTER=y
   CONFIG_FORCED_INLINING=y
   # CONFIG_RCU_TORTURE_TEST is not set
   CONFIG_FRAME_POINTER=y
   CONFIG_FORCED_INLINING=y
   # CONFIG_RCU_TORTURE_TEST is not set
@@ -1138,7 +1142,7 @@ diff -urN linux-2.6.22-rc5/arch/arm/configs/at91sam9263ek_defconfig linux-2.6.22
   CONFIG_DEBUG_USER=y
   # CONFIG_DEBUG_ERRORS is not set
   CONFIG_DEBUG_LL=y
   CONFIG_DEBUG_USER=y
   # CONFIG_DEBUG_ERRORS is not set
   CONFIG_DEBUG_LL=y
-@@ -1180,5 +1209,7 @@
+@@ -1180,5 +1209,7 @@ CONFIG_BITREVERSE=y
   CONFIG_CRC32=y
   # CONFIG_LIBCRC32C is not set
   CONFIG_ZLIB_INFLATE=y
   CONFIG_CRC32=y
   # CONFIG_LIBCRC32C is not set
   CONFIG_ZLIB_INFLATE=y
@@ -1147,9 +1151,10 @@ diff -urN linux-2.6.22-rc5/arch/arm/configs/at91sam9263ek_defconfig linux-2.6.22
  -CONFIG_IOMAP_COPY=y
  +CONFIG_HAS_IOMEM=y
  +CONFIG_HAS_IOPORT=y
  -CONFIG_IOMAP_COPY=y
  +CONFIG_HAS_IOMEM=y
  +CONFIG_HAS_IOPORT=y
-diff -urN linux-2.6.22-rc5/arch/arm/configs/cam60_defconfig linux-2.6.22-rc5.new/arch/arm/configs/cam60_defconfig
---- linux-2.6.22-rc5/arch/arm/configs/cam60_defconfig  1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.22-rc5.new/arch/arm/configs/cam60_defconfig      2007-07-29 05:23:04.000000000 +0200
+Index: linux-2.6.22.19/arch/arm/configs/cam60_defconfig
+===================================================================
+--- /dev/null
++++ linux-2.6.22.19/arch/arm/configs/cam60_defconfig
  @@ -0,0 +1,954 @@
  +#
  +# Automatically generated make config: don't edit
  @@ -0,0 +1,954 @@
  +#
  +# Automatically generated make config: don't edit
@@ -2105,9 +2110,10 @@ diff -urN linux-2.6.22-rc5/arch/arm/configs/cam60_defconfig linux-2.6.22-rc5.new
  +CONFIG_ZLIB_DEFLATE=y
  +CONFIG_PLIST=y
  +CONFIG_IOMAP_COPY=y
  +CONFIG_ZLIB_DEFLATE=y
  +CONFIG_PLIST=y
  +CONFIG_IOMAP_COPY=y
-diff -urN linux-2.6.22-rc5/arch/arm/configs/kb9202_defconfig linux-2.6.22-rc5.new/arch/arm/configs/kb9202_defconfig
---- linux-2.6.22-rc5/arch/arm/configs/kb9202_defconfig 2007-06-17 04:09:12.000000000 +0200
-+++ linux-2.6.22-rc5.new/arch/arm/configs/kb9202_defconfig     2007-07-29 05:23:04.000000000 +0200
+Index: linux-2.6.22.19/arch/arm/configs/kb9202_defconfig
+===================================================================
+--- linux-2.6.22.19.orig/arch/arm/configs/kb9202_defconfig
++++ linux-2.6.22.19/arch/arm/configs/kb9202_defconfig
  @@ -1,19 +1,31 @@
   #
   # Automatically generated make config: don't edit
  @@ -1,19 +1,31 @@
   #
   # Automatically generated make config: don't edit
@@ -2145,7 +2151,7 @@ diff -urN linux-2.6.22-rc5/arch/arm/configs/kb9202_defconfig linux-2.6.22-rc5.ne
   CONFIG_BROKEN_ON_SMP=y
   CONFIG_INIT_ENV_ARG_LIMIT=32
   
   CONFIG_BROKEN_ON_SMP=y
   CONFIG_INIT_ENV_ARG_LIMIT=32
   
-@@ -21,54 +33,103 @@
+@@ -21,54 +33,103 @@ CONFIG_INIT_ENV_ARG_LIMIT=32
   # General setup
   #
   CONFIG_LOCALVERSION=""
   # General setup
   #
   CONFIG_LOCALVERSION=""
@@ -2266,7 +2272,7 @@ diff -urN linux-2.6.22-rc5/arch/arm/configs/kb9202_defconfig linux-2.6.22-rc5.ne
   # CONFIG_ARCH_PXA is not set
   # CONFIG_ARCH_RPC is not set
   # CONFIG_ARCH_SA1100 is not set
   # CONFIG_ARCH_PXA is not set
   # CONFIG_ARCH_RPC is not set
   # CONFIG_ARCH_SA1100 is not set
-@@ -76,34 +137,52 @@
+@@ -76,34 +137,52 @@ CONFIG_KMOD=y
   # CONFIG_ARCH_SHARK is not set
   # CONFIG_ARCH_LH7A40X is not set
   # CONFIG_ARCH_OMAP is not set
   # CONFIG_ARCH_SHARK is not set
   # CONFIG_ARCH_LH7A40X is not set
   # CONFIG_ARCH_OMAP is not set
@@ -2326,7 +2332,7 @@ diff -urN linux-2.6.22-rc5/arch/arm/configs/kb9202_defconfig linux-2.6.22-rc5.ne
   
   #
   # Processor Features
   
   #
   # Processor Features
-@@ -112,24 +191,44 @@
+@@ -112,24 +191,44 @@ CONFIG_ARM_THUMB=y
   # CONFIG_CPU_ICACHE_DISABLE is not set
   # CONFIG_CPU_DCACHE_DISABLE is not set
   # CONFIG_CPU_DCACHE_WRITETHROUGH is not set
   # CONFIG_CPU_ICACHE_DISABLE is not set
   # CONFIG_CPU_DCACHE_DISABLE is not set
   # CONFIG_CPU_DCACHE_WRITETHROUGH is not set
@@ -2373,7 +2379,7 @@ diff -urN linux-2.6.22-rc5/arch/arm/configs/kb9202_defconfig linux-2.6.22-rc5.ne
   # CONFIG_LEDS is not set
   CONFIG_ALIGNMENT_TRAP=y
   
   # CONFIG_LEDS is not set
   CONFIG_ALIGNMENT_TRAP=y
   
-@@ -138,8 +237,10 @@
+@@ -138,8 +237,10 @@ CONFIG_ALIGNMENT_TRAP=y
   #
   CONFIG_ZBOOT_ROM_TEXT=0x10000000
   CONFIG_ZBOOT_ROM_BSS=0x20040000
   #
   CONFIG_ZBOOT_ROM_TEXT=0x10000000
   CONFIG_ZBOOT_ROM_BSS=0x20040000
@@ -2386,7 +2392,7 @@ diff -urN linux-2.6.22-rc5/arch/arm/configs/kb9202_defconfig linux-2.6.22-rc5.ne
   
   #
   # Floating point emulation
   
   #
   # Floating point emulation
-@@ -150,6 +251,7 @@
+@@ -150,6 +251,7 @@ CONFIG_CMDLINE="console=ttyS0,115200 roo
   #
   CONFIG_FPE_NWFPE=y
   # CONFIG_FPE_NWFPE_XP is not set
   #
   CONFIG_FPE_NWFPE=y
   # CONFIG_FPE_NWFPE_XP is not set
@@ -2394,7 +2400,7 @@ diff -urN linux-2.6.22-rc5/arch/arm/configs/kb9202_defconfig linux-2.6.22-rc5.ne
   
   #
   # Userspace binary formats
   
   #
   # Userspace binary formats
-@@ -165,6 +267,96 @@
+@@ -165,6 +267,96 @@ CONFIG_BINFMT_MISC=y
   # CONFIG_PM is not set
   
   #
   # CONFIG_PM is not set
   
   #
@@ -2491,7 +2497,7 @@ diff -urN linux-2.6.22-rc5/arch/arm/configs/kb9202_defconfig linux-2.6.22-rc5.ne
   # Device Drivers
   #
   
   # Device Drivers
   #
   
-@@ -173,13 +365,95 @@
+@@ -173,13 +365,95 @@ CONFIG_BINFMT_MISC=y
   #
   CONFIG_STANDALONE=y
   CONFIG_PREVENT_FIRMWARE_BUILD=y
   #
   CONFIG_STANDALONE=y
   CONFIG_PREVENT_FIRMWARE_BUILD=y
@@ -2590,7 +2596,7 @@ diff -urN linux-2.6.22-rc5/arch/arm/configs/kb9202_defconfig linux-2.6.22-rc5.ne
   
   #
   # Parallel port support
   
   #
   # Parallel port support
-@@ -189,6 +463,7 @@
+@@ -189,6 +463,7 @@ CONFIG_DEBUG_DRIVER=y
   #
   # Plug and Play support
   #
   #
   # Plug and Play support
   #
@@ -2598,7 +2604,7 @@ diff -urN linux-2.6.22-rc5/arch/arm/configs/kb9202_defconfig linux-2.6.22-rc5.ne
   
   #
   # Block devices
   
   #
   # Block devices
-@@ -196,28 +471,27 @@
+@@ -196,28 +471,27 @@ CONFIG_DEBUG_DRIVER=y
   # CONFIG_BLK_DEV_COW_COMMON is not set
   CONFIG_BLK_DEV_LOOP=y
   # CONFIG_BLK_DEV_CRYPTOLOOP is not set
   # CONFIG_BLK_DEV_COW_COMMON is not set
   CONFIG_BLK_DEV_LOOP=y
   # CONFIG_BLK_DEV_CRYPTOLOOP is not set
@@ -2636,7 +2642,7 @@ diff -urN linux-2.6.22-rc5/arch/arm/configs/kb9202_defconfig linux-2.6.22-rc5.ne
   CONFIG_SCSI_PROC_FS=y
   
   #
   CONFIG_SCSI_PROC_FS=y
   
   #
-@@ -233,97 +507,61 @@
+@@ -233,97 +507,61 @@ CONFIG_CHR_DEV_SG=y
   #
   # Some SCSI devices (e.g. CD jukebox) support multiple LUNs
   #
   #
   # Some SCSI devices (e.g. CD jukebox) support multiple LUNs
   #
@@ -2758,7 +2764,7 @@ diff -urN linux-2.6.22-rc5/arch/arm/configs/kb9202_defconfig linux-2.6.22-rc5.ne
   CONFIG_NETDEVICES=y
   # CONFIG_DUMMY is not set
   # CONFIG_BONDING is not set
   CONFIG_NETDEVICES=y
   # CONFIG_DUMMY is not set
   # CONFIG_BONDING is not set
-@@ -331,6 +569,11 @@
+@@ -331,6 +569,11 @@ CONFIG_NETDEVICES=y
   # CONFIG_TUN is not set
   
   #
   # CONFIG_TUN is not set
   
   #
@@ -2770,7 +2776,7 @@ diff -urN linux-2.6.22-rc5/arch/arm/configs/kb9202_defconfig linux-2.6.22-rc5.ne
   # Ethernet (10 or 100Mbit)
   #
   CONFIG_NET_ETHERNET=y
   # Ethernet (10 or 100Mbit)
   #
   CONFIG_NET_ETHERNET=y
-@@ -357,11 +600,20 @@
+@@ -357,11 +600,20 @@ CONFIG_ARM_AT91_ETHER=y
   # CONFIG_NET_RADIO is not set
   
   #
   # CONFIG_NET_RADIO is not set
   
   #
@@ -2791,7 +2797,7 @@ diff -urN linux-2.6.22-rc5/arch/arm/configs/kb9202_defconfig linux-2.6.22-rc5.ne
   
   #
   # ISDN subsystem
   
   #
   # ISDN subsystem
-@@ -372,6 +624,7 @@
+@@ -372,6 +624,7 @@ CONFIG_ARM_AT91_ETHER=y
   # Input device support
   #
   CONFIG_INPUT=y
   # Input device support
   #
   CONFIG_INPUT=y
@@ -2799,7 +2805,7 @@ diff -urN linux-2.6.22-rc5/arch/arm/configs/kb9202_defconfig linux-2.6.22-rc5.ne
   
   #
   # Userland interfaces
   
   #
   # Userland interfaces
-@@ -397,9 +650,7 @@
+@@ -397,9 +650,7 @@ CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
   #
   # Hardware I/O ports
   #
   #
   # Hardware I/O ports
   #
@@ -2810,7 +2816,7 @@ diff -urN linux-2.6.22-rc5/arch/arm/configs/kb9202_defconfig linux-2.6.22-rc5.ne
   # CONFIG_GAMEPORT is not set
   
   #
   # CONFIG_GAMEPORT is not set
   
   #
-@@ -408,6 +659,7 @@
+@@ -408,6 +659,7 @@ CONFIG_SERIO=y
   CONFIG_VT=y
   CONFIG_VT_CONSOLE=y
   CONFIG_HW_CONSOLE=y
   CONFIG_VT=y
   CONFIG_VT_CONSOLE=y
   CONFIG_HW_CONSOLE=y
@@ -2818,7 +2824,7 @@ diff -urN linux-2.6.22-rc5/arch/arm/configs/kb9202_defconfig linux-2.6.22-rc5.ne
   # CONFIG_SERIAL_NONSTANDARD is not set
   
   #
   # CONFIG_SERIAL_NONSTANDARD is not set
   
   #
-@@ -420,11 +672,11 @@
+@@ -420,11 +672,11 @@ CONFIG_HW_CONSOLE=y
   #
   CONFIG_SERIAL_ATMEL=y
   CONFIG_SERIAL_ATMEL_CONSOLE=y
   #
   CONFIG_SERIAL_ATMEL=y
   CONFIG_SERIAL_ATMEL_CONSOLE=y
@@ -2832,7 +2838,7 @@ diff -urN linux-2.6.22-rc5/arch/arm/configs/kb9202_defconfig linux-2.6.22-rc5.ne
   
   #
   # IPMI
   
   #
   # IPMI
-@@ -435,21 +687,23 @@
+@@ -435,21 +687,23 @@ CONFIG_LEGACY_PTY_COUNT=256
   # Watchdog Cards
   #
   # CONFIG_WATCHDOG is not set
   # Watchdog Cards
   #
   # CONFIG_WATCHDOG is not set
@@ -2860,7 +2866,7 @@ diff -urN linux-2.6.22-rc5/arch/arm/configs/kb9202_defconfig linux-2.6.22-rc5.ne
   
   #
   # I2C support
   
   #
   # I2C support
-@@ -457,10 +711,50 @@
+@@ -457,10 +711,50 @@ CONFIG_LEGACY_PTY_COUNT=256
   # CONFIG_I2C is not set
   
   #
   # CONFIG_I2C is not set
   
   #
@@ -2911,7 +2917,7 @@ diff -urN linux-2.6.22-rc5/arch/arm/configs/kb9202_defconfig linux-2.6.22-rc5.ne
   # Multimedia devices
   #
   # CONFIG_VIDEO_DEV is not set
   # Multimedia devices
   #
   # CONFIG_VIDEO_DEV is not set
-@@ -469,17 +763,57 @@
+@@ -469,17 +763,57 @@ CONFIG_LEGACY_PTY_COUNT=256
   # Digital Video Broadcasting Devices
   #
   # CONFIG_DVB is not set
   # Digital Video Broadcasting Devices
   #
   # CONFIG_DVB is not set
@@ -2970,7 +2976,7 @@ diff -urN linux-2.6.22-rc5/arch/arm/configs/kb9202_defconfig linux-2.6.22-rc5.ne
   
   #
   # Sound
   
   #
   # Sound
-@@ -487,82 +821,98 @@
+@@ -487,82 +821,98 @@ CONFIG_DUMMY_CONSOLE=y
   # CONFIG_SOUND is not set
   
   #
   # CONFIG_SOUND is not set
   
   #
@@ -3093,7 +3099,7 @@ diff -urN linux-2.6.22-rc5/arch/arm/configs/kb9202_defconfig linux-2.6.22-rc5.ne
   # CONFIG_USB_USBNET is not set
   # CONFIG_USB_MON is not set
   
   # CONFIG_USB_USBNET is not set
   # CONFIG_USB_MON is not set
   
-@@ -580,12 +930,23 @@
+@@ -580,12 +930,23 @@ CONFIG_USB_STORAGE_DEBUG=y
   #
   # CONFIG_USB_EMI62 is not set
   # CONFIG_USB_EMI26 is not set
   #
   # CONFIG_USB_EMI62 is not set
   # CONFIG_USB_EMI26 is not set
@@ -3119,7 +3125,7 @@ diff -urN linux-2.6.22-rc5/arch/arm/configs/kb9202_defconfig linux-2.6.22-rc5.ne
   
   #
   # USB DSL modem support
   
   #
   # USB DSL modem support
-@@ -599,36 +960,51 @@
+@@ -599,36 +960,51 @@ CONFIG_USB_STORAGE_DEBUG=y
   #
   # MMC/SD Card support
   #
   #
   # MMC/SD Card support
   #
@@ -3182,7 +3188,7 @@ diff -urN linux-2.6.22-rc5/arch/arm/configs/kb9202_defconfig linux-2.6.22-rc5.ne
   
   #
   # CD-ROM/DVD Filesystems
   
   #
   # CD-ROM/DVD Filesystems
-@@ -643,25 +1019,40 @@
+@@ -643,25 +1019,40 @@ CONFIG_FAT_FS=y
   CONFIG_MSDOS_FS=y
   CONFIG_VFAT_FS=y
   CONFIG_FAT_DEFAULT_CODEPAGE=437
   CONFIG_MSDOS_FS=y
   CONFIG_VFAT_FS=y
   CONFIG_FAT_DEFAULT_CODEPAGE=437
@@ -3227,7 +3233,7 @@ diff -urN linux-2.6.22-rc5/arch/arm/configs/kb9202_defconfig linux-2.6.22-rc5.ne
   # CONFIG_CRAMFS is not set
   # CONFIG_VXFS_FS is not set
   # CONFIG_HPFS_FS is not set
   # CONFIG_CRAMFS is not set
   # CONFIG_VXFS_FS is not set
   # CONFIG_HPFS_FS is not set
-@@ -675,16 +1066,23 @@
+@@ -675,16 +1066,23 @@ CONFIG_RAMFS=y
   CONFIG_NFS_FS=y
   CONFIG_NFS_V3=y
   # CONFIG_NFS_V3_ACL is not set
   CONFIG_NFS_FS=y
   CONFIG_NFS_V3=y
   # CONFIG_NFS_V3_ACL is not set
@@ -3251,7 +3257,7 @@ diff -urN linux-2.6.22-rc5/arch/arm/configs/kb9202_defconfig linux-2.6.22-rc5.ne
   
   #
   # Partition Types
   
   #
   # Partition Types
-@@ -734,26 +1132,51 @@
+@@ -734,26 +1132,51 @@ CONFIG_NLS_ASCII=y
   # CONFIG_NLS_ISO8859_15 is not set
   # CONFIG_NLS_KOI8_R is not set
   # CONFIG_NLS_KOI8_U is not set
   # CONFIG_NLS_ISO8859_15 is not set
   # CONFIG_NLS_KOI8_R is not set
   # CONFIG_NLS_KOI8_U is not set
@@ -3311,7 +3317,7 @@ diff -urN linux-2.6.22-rc5/arch/arm/configs/kb9202_defconfig linux-2.6.22-rc5.ne
   CONFIG_DEBUG_LL=y
   # CONFIG_DEBUG_ICEDCC is not set
   
   CONFIG_DEBUG_LL=y
   # CONFIG_DEBUG_ICEDCC is not set
   
-@@ -766,7 +1189,43 @@
+@@ -766,7 +1189,43 @@ CONFIG_DEBUG_LL=y
   #
   # Cryptographic options
   #
   #
   # Cryptographic options
   #
@@ -3356,7 +3362,7 @@ diff -urN linux-2.6.22-rc5/arch/arm/configs/kb9202_defconfig linux-2.6.22-rc5.ne
   
   #
   # Hardware crypto devices
   
   #
   # Hardware crypto devices
-@@ -775,6 +1234,14 @@
+@@ -775,6 +1234,14 @@ CONFIG_DEBUG_LL=y
   #
   # Library routines
   #
   #
   # Library routines
   #
@@ -3371,10 +3377,11 @@ diff -urN linux-2.6.22-rc5/arch/arm/configs/kb9202_defconfig linux-2.6.22-rc5.ne
  +CONFIG_PLIST=y
  +CONFIG_HAS_IOMEM=y
  +CONFIG_HAS_IOPORT=y
  +CONFIG_PLIST=y
  +CONFIG_HAS_IOMEM=y
  +CONFIG_HAS_IOPORT=y
-diff -urN linux-2.6.22-rc5/arch/arm/mach-at91/at91rm9200.c linux-2.6.22-rc5.new/arch/arm/mach-at91/at91rm9200.c
---- linux-2.6.22-rc5/arch/arm/mach-at91/at91rm9200.c   2007-06-17 04:09:12.000000000 +0200
-+++ linux-2.6.22-rc5.new/arch/arm/mach-at91/at91rm9200.c       2007-07-29 05:23:04.000000000 +0200
-@@ -267,6 +267,33 @@
+Index: linux-2.6.22.19/arch/arm/mach-at91/at91rm9200.c
+===================================================================
+--- linux-2.6.22.19.orig/arch/arm/mach-at91/at91rm9200.c
++++ linux-2.6.22.19/arch/arm/mach-at91/at91rm9200.c
+@@ -267,6 +267,33 @@ static void at91rm9200_reset(void)
   
   
   /* --------------------------------------------------------------------
   
   
   /* --------------------------------------------------------------------
@@ -3408,7 +3415,7 @@ diff -urN linux-2.6.22-rc5/arch/arm/mach-at91/at91rm9200.c linux-2.6.22-rc5.new/
    *  AT91RM9200 processor initialization
    * -------------------------------------------------------------------- */
   void __init at91rm9200_initialize(unsigned long main_clock, unsigned short banks)
    *  AT91RM9200 processor initialization
    * -------------------------------------------------------------------- */
   void __init at91rm9200_initialize(unsigned long main_clock, unsigned short banks)
-@@ -288,6 +315,9 @@
+@@ -288,6 +315,9 @@ void __init at91rm9200_initialize(unsign
   
         /* Initialize GPIO subsystem */
         at91_gpio_init(at91rm9200_gpio, banks);
   
         /* Initialize GPIO subsystem */
         at91_gpio_init(at91rm9200_gpio, banks);
@@ -3418,7 +3425,7 @@ diff -urN linux-2.6.22-rc5/arch/arm/mach-at91/at91rm9200.c linux-2.6.22-rc5.new/
   }
   
   
   }
   
   
-@@ -301,28 +331,28 @@
+@@ -301,28 +331,28 @@ void __init at91rm9200_initialize(unsign
   static unsigned int at91rm9200_default_irq_priority[NR_AIC_IRQS] __initdata = {
         7,      /* Advanced Interrupt Controller (FIQ) */
         7,      /* System Peripherals */
   static unsigned int at91rm9200_default_irq_priority[NR_AIC_IRQS] __initdata = {
         7,      /* Advanced Interrupt Controller (FIQ) */
         7,      /* System Peripherals */
@@ -3462,10 +3469,11 @@ diff -urN linux-2.6.22-rc5/arch/arm/mach-at91/at91rm9200.c linux-2.6.22-rc5.new/
         3,      /* Ethernet MAC */
         0,      /* Advanced Interrupt Controller (IRQ0) */
         0,      /* Advanced Interrupt Controller (IRQ1) */
         3,      /* Ethernet MAC */
         0,      /* Advanced Interrupt Controller (IRQ0) */
         0,      /* Advanced Interrupt Controller (IRQ1) */
-diff -urN linux-2.6.22-rc5/arch/arm/mach-at91/at91rm9200_devices.c linux-2.6.22-rc5.new/arch/arm/mach-at91/at91rm9200_devices.c
---- linux-2.6.22-rc5/arch/arm/mach-at91/at91rm9200_devices.c   2007-06-17 04:09:12.000000000 +0200
-+++ linux-2.6.22-rc5.new/arch/arm/mach-at91/at91rm9200_devices.c       2007-07-29 05:23:04.000000000 +0200
-@@ -477,7 +477,18 @@
+Index: linux-2.6.22.19/arch/arm/mach-at91/at91rm9200_devices.c
+===================================================================
+--- linux-2.6.22.19.orig/arch/arm/mach-at91/at91rm9200_devices.c
++++ linux-2.6.22.19/arch/arm/mach-at91/at91rm9200_devices.c
+@@ -477,7 +477,18 @@ void __init at91_add_device_i2c(void) {}
    *  SPI
    * -------------------------------------------------------------------- */
   
    *  SPI
    * -------------------------------------------------------------------- */
   
@@ -3485,7 +3493,7 @@ diff -urN linux-2.6.22-rc5/arch/arm/mach-at91/at91rm9200_devices.c linux-2.6.22-
   static u64 spi_dmamask = 0xffffffffUL;
   
   static struct resource spi_resources[] = {
   static u64 spi_dmamask = 0xffffffffUL;
   
   static struct resource spi_resources[] = {
-@@ -494,7 +505,7 @@
+@@ -494,7 +505,7 @@ static struct resource spi_resources[] =
   };
   
   static struct platform_device at91rm9200_spi_device = {
   };
   
   static struct platform_device at91rm9200_spi_device = {
@@ -3494,7 +3502,7 @@ diff -urN linux-2.6.22-rc5/arch/arm/mach-at91/at91rm9200_devices.c linux-2.6.22-
         .id             = 0,
         .dev            = {
                                 .dma_mask               = &spi_dmamask,
         .id             = 0,
         .dev            = {
                                 .dma_mask               = &spi_dmamask,
-@@ -603,6 +614,32 @@
+@@ -603,6 +614,32 @@ void __init at91_init_leds(u8 cpu_led, u
   #endif
   
   
   #endif
   
   
@@ -3527,10 +3535,11 @@ diff -urN linux-2.6.22-rc5/arch/arm/mach-at91/at91rm9200_devices.c linux-2.6.22-
   /* --------------------------------------------------------------------
    *  UART
    * -------------------------------------------------------------------- */
   /* --------------------------------------------------------------------
    *  UART
    * -------------------------------------------------------------------- */
-diff -urN linux-2.6.22-rc5/arch/arm/mach-at91/at91sam9260.c linux-2.6.22-rc5.new/arch/arm/mach-at91/at91sam9260.c
---- linux-2.6.22-rc5/arch/arm/mach-at91/at91sam9260.c  2007-06-17 04:09:12.000000000 +0200
-+++ linux-2.6.22-rc5.new/arch/arm/mach-at91/at91sam9260.c      2007-07-29 05:23:04.000000000 +0200
-@@ -269,6 +269,33 @@
+Index: linux-2.6.22.19/arch/arm/mach-at91/at91sam9260.c
+===================================================================
+--- linux-2.6.22.19.orig/arch/arm/mach-at91/at91sam9260.c
++++ linux-2.6.22.19/arch/arm/mach-at91/at91sam9260.c
+@@ -269,6 +269,33 @@ static void at91sam9260_reset(void)
   
   
   /* --------------------------------------------------------------------
   
   
   /* --------------------------------------------------------------------
@@ -3564,7 +3573,7 @@ diff -urN linux-2.6.22-rc5/arch/arm/mach-at91/at91sam9260.c linux-2.6.22-rc5.new
    *  AT91SAM9260 processor initialization
    * -------------------------------------------------------------------- */
   
    *  AT91SAM9260 processor initialization
    * -------------------------------------------------------------------- */
   
-@@ -315,6 +342,9 @@
+@@ -315,6 +342,9 @@ void __init at91sam9260_initialize(unsig
   
         /* Register GPIO subsystem */
         at91_gpio_init(at91sam9260_gpio, 3);
   
         /* Register GPIO subsystem */
         at91_gpio_init(at91sam9260_gpio, 3);
@@ -3574,7 +3583,7 @@ diff -urN linux-2.6.22-rc5/arch/arm/mach-at91/at91sam9260.c linux-2.6.22-rc5.new
   }
   
   /* --------------------------------------------------------------------
   }
   
   /* --------------------------------------------------------------------
-@@ -327,30 +357,30 @@
+@@ -327,30 +357,30 @@ void __init at91sam9260_initialize(unsig
   static unsigned int at91sam9260_default_irq_priority[NR_AIC_IRQS] __initdata = {
         7,      /* Advanced Interrupt Controller */
         7,      /* System Peripherals */
   static unsigned int at91sam9260_default_irq_priority[NR_AIC_IRQS] __initdata = {
         7,      /* Advanced Interrupt Controller */
         7,      /* System Peripherals */
@@ -3619,10 +3628,11 @@ diff -urN linux-2.6.22-rc5/arch/arm/mach-at91/at91sam9260.c linux-2.6.22-rc5.new
         0,      /* Timer Counter 3 */
         0,      /* Timer Counter 4 */
         0,      /* Timer Counter 5 */
         0,      /* Timer Counter 3 */
         0,      /* Timer Counter 4 */
         0,      /* Timer Counter 5 */
-diff -urN linux-2.6.22-rc5/arch/arm/mach-at91/at91sam9260_devices.c linux-2.6.22-rc5.new/arch/arm/mach-at91/at91sam9260_devices.c
---- linux-2.6.22-rc5/arch/arm/mach-at91/at91sam9260_devices.c  2007-06-17 04:09:12.000000000 +0200
-+++ linux-2.6.22-rc5.new/arch/arm/mach-at91/at91sam9260_devices.c      2007-07-29 05:23:04.000000000 +0200
-@@ -524,6 +524,32 @@
+Index: linux-2.6.22.19/arch/arm/mach-at91/at91sam9260_devices.c
+===================================================================
+--- linux-2.6.22.19.orig/arch/arm/mach-at91/at91sam9260_devices.c
++++ linux-2.6.22.19/arch/arm/mach-at91/at91sam9260_devices.c
+@@ -524,6 +524,32 @@ void __init at91_init_leds(u8 cpu_led, u
   #endif
   
   
   #endif
   
   
@@ -3655,10 +3665,11 @@ diff -urN linux-2.6.22-rc5/arch/arm/mach-at91/at91sam9260_devices.c linux-2.6.22
   /* --------------------------------------------------------------------
    *  UART
    * -------------------------------------------------------------------- */
   /* --------------------------------------------------------------------
    *  UART
    * -------------------------------------------------------------------- */
-diff -urN linux-2.6.22-rc5/arch/arm/mach-at91/at91sam9261.c linux-2.6.22-rc5.new/arch/arm/mach-at91/at91sam9261.c
---- linux-2.6.22-rc5/arch/arm/mach-at91/at91sam9261.c  2007-06-17 04:09:12.000000000 +0200
-+++ linux-2.6.22-rc5.new/arch/arm/mach-at91/at91sam9261.c      2007-07-29 05:23:04.000000000 +0200
-@@ -247,6 +247,28 @@
+Index: linux-2.6.22.19/arch/arm/mach-at91/at91sam9261.c
+===================================================================
+--- linux-2.6.22.19.orig/arch/arm/mach-at91/at91sam9261.c
++++ linux-2.6.22.19/arch/arm/mach-at91/at91sam9261.c
+@@ -247,6 +247,28 @@ static void at91sam9261_reset(void)
   
   
   /* --------------------------------------------------------------------
   
   
   /* --------------------------------------------------------------------
@@ -3687,7 +3698,7 @@ diff -urN linux-2.6.22-rc5/arch/arm/mach-at91/at91sam9261.c linux-2.6.22-rc5.new
    *  AT91SAM9261 processor initialization
    * -------------------------------------------------------------------- */
   
    *  AT91SAM9261 processor initialization
    * -------------------------------------------------------------------- */
   
-@@ -267,6 +289,9 @@
+@@ -267,6 +289,9 @@ void __init at91sam9261_initialize(unsig
   
         /* Register GPIO subsystem */
         at91_gpio_init(at91sam9261_gpio, 3);
   
         /* Register GPIO subsystem */
         at91_gpio_init(at91sam9261_gpio, 3);
@@ -3697,7 +3708,7 @@ diff -urN linux-2.6.22-rc5/arch/arm/mach-at91/at91sam9261.c linux-2.6.22-rc5.new
   }
   
   /* --------------------------------------------------------------------
   }
   
   /* --------------------------------------------------------------------
-@@ -279,25 +304,25 @@
+@@ -279,25 +304,25 @@ void __init at91sam9261_initialize(unsig
   static unsigned int at91sam9261_default_irq_priority[NR_AIC_IRQS] __initdata = {
         7,      /* Advanced Interrupt Controller */
         7,      /* System Peripherals */
   static unsigned int at91sam9261_default_irq_priority[NR_AIC_IRQS] __initdata = {
         7,      /* Advanced Interrupt Controller */
         7,      /* System Peripherals */
@@ -3738,9 +3749,10 @@ diff -urN linux-2.6.22-rc5/arch/arm/mach-at91/at91sam9261.c linux-2.6.22-rc5.new
         3,      /* LCD Controller */
         0,
         0,
         3,      /* LCD Controller */
         0,
         0,
-diff -urN linux-2.6.22-rc5/arch/arm/mach-at91/at91sam9261_devices.c linux-2.6.22-rc5.new/arch/arm/mach-at91/at91sam9261_devices.c
---- linux-2.6.22-rc5/arch/arm/mach-at91/at91sam9261_devices.c  2007-06-17 04:09:12.000000000 +0200
-+++ linux-2.6.22-rc5.new/arch/arm/mach-at91/at91sam9261_devices.c      2007-07-29 05:23:04.000000000 +0200
+Index: linux-2.6.22.19/arch/arm/mach-at91/at91sam9261_devices.c
+===================================================================
+--- linux-2.6.22.19.orig/arch/arm/mach-at91/at91sam9261_devices.c
++++ linux-2.6.22.19/arch/arm/mach-at91/at91sam9261_devices.c
  @@ -14,6 +14,9 @@
   #include <asm/mach/map.h>
   
  @@ -14,6 +14,9 @@
   #include <asm/mach/map.h>
   
@@ -3751,7 +3763,7 @@ diff -urN linux-2.6.22-rc5/arch/arm/mach-at91/at91sam9261_devices.c linux-2.6.22
   
   #include <asm/arch/board.h>
   #include <asm/arch/gpio.h>
   
   #include <asm/arch/board.h>
   #include <asm/arch/gpio.h>
-@@ -522,6 +525,32 @@
+@@ -522,6 +525,32 @@ void __init at91_init_leds(u8 cpu_led, u
   #endif
   
   
   #endif
   
   
@@ -3784,10 +3796,11 @@ diff -urN linux-2.6.22-rc5/arch/arm/mach-at91/at91sam9261_devices.c linux-2.6.22
   /* --------------------------------------------------------------------
    *  UART
    * -------------------------------------------------------------------- */
   /* --------------------------------------------------------------------
    *  UART
    * -------------------------------------------------------------------- */
-diff -urN linux-2.6.22-rc5/arch/arm/mach-at91/at91sam9263.c linux-2.6.22-rc5.new/arch/arm/mach-at91/at91sam9263.c
---- linux-2.6.22-rc5/arch/arm/mach-at91/at91sam9263.c  2007-06-17 04:09:12.000000000 +0200
-+++ linux-2.6.22-rc5.new/arch/arm/mach-at91/at91sam9263.c      2007-07-29 05:23:04.000000000 +0200
-@@ -273,6 +273,28 @@
+Index: linux-2.6.22.19/arch/arm/mach-at91/at91sam9263.c
+===================================================================
+--- linux-2.6.22.19.orig/arch/arm/mach-at91/at91sam9263.c
++++ linux-2.6.22.19/arch/arm/mach-at91/at91sam9263.c
+@@ -273,6 +273,28 @@ static void at91sam9263_reset(void)
   
   
   /* --------------------------------------------------------------------
   
   
   /* --------------------------------------------------------------------
@@ -3816,7 +3829,7 @@ diff -urN linux-2.6.22-rc5/arch/arm/mach-at91/at91sam9263.c linux-2.6.22-rc5.new
    *  AT91SAM9263 processor initialization
    * -------------------------------------------------------------------- */
   
    *  AT91SAM9263 processor initialization
    * -------------------------------------------------------------------- */
   
-@@ -292,6 +314,9 @@
+@@ -292,6 +314,9 @@ void __init at91sam9263_initialize(unsig
   
         /* Register GPIO subsystem */
         at91_gpio_init(at91sam9263_gpio, 5);
   
         /* Register GPIO subsystem */
         at91_gpio_init(at91sam9263_gpio, 5);
@@ -3826,7 +3839,7 @@ diff -urN linux-2.6.22-rc5/arch/arm/mach-at91/at91sam9263.c linux-2.6.22-rc5.new
   }
   
   /* --------------------------------------------------------------------
   }
   
   /* --------------------------------------------------------------------
-@@ -304,34 +329,34 @@
+@@ -304,34 +329,34 @@ void __init at91sam9263_initialize(unsig
   static unsigned int at91sam9263_default_irq_priority[NR_AIC_IRQS] __initdata = {
         7,      /* Advanced Interrupt Controller (FIQ) */
         7,      /* System Peripherals */
   static unsigned int at91sam9263_default_irq_priority[NR_AIC_IRQS] __initdata = {
         7,      /* Advanced Interrupt Controller (FIQ) */
         7,      /* System Peripherals */
@@ -3876,9 +3889,10 @@ diff -urN linux-2.6.22-rc5/arch/arm/mach-at91/at91sam9263.c linux-2.6.22-rc5.new
         0,      /* Advanced Interrupt Controller (IRQ0) */
         0,      /* Advanced Interrupt Controller (IRQ1) */
   };
         0,      /* Advanced Interrupt Controller (IRQ0) */
         0,      /* Advanced Interrupt Controller (IRQ1) */
   };
-diff -urN linux-2.6.22-rc5/arch/arm/mach-at91/at91sam9263_devices.c linux-2.6.22-rc5.new/arch/arm/mach-at91/at91sam9263_devices.c
---- linux-2.6.22-rc5/arch/arm/mach-at91/at91sam9263_devices.c  2007-06-17 04:09:12.000000000 +0200
-+++ linux-2.6.22-rc5.new/arch/arm/mach-at91/at91sam9263_devices.c      2007-07-29 05:23:04.000000000 +0200
+Index: linux-2.6.22.19/arch/arm/mach-at91/at91sam9263_devices.c
+===================================================================
+--- linux-2.6.22.19.orig/arch/arm/mach-at91/at91sam9263_devices.c
++++ linux-2.6.22.19/arch/arm/mach-at91/at91sam9263_devices.c
  @@ -13,6 +13,9 @@
   #include <asm/mach/map.h>
   
  @@ -13,6 +13,9 @@
   #include <asm/mach/map.h>
   
@@ -3889,7 +3903,7 @@ diff -urN linux-2.6.22-rc5/arch/arm/mach-at91/at91sam9263_devices.c linux-2.6.22
   
   #include <asm/arch/board.h>
   #include <asm/arch/gpio.h>
   
   #include <asm/arch/board.h>
   #include <asm/arch/gpio.h>
-@@ -625,6 +628,56 @@
+@@ -625,6 +628,56 @@ void __init at91_add_device_ac97(struct 
   
   
   /* --------------------------------------------------------------------
   
   
   /* --------------------------------------------------------------------
@@ -3946,7 +3960,7 @@ diff -urN linux-2.6.22-rc5/arch/arm/mach-at91/at91sam9263_devices.c linux-2.6.22
    *  LCD Controller
    * -------------------------------------------------------------------- */
   
    *  LCD Controller
    * -------------------------------------------------------------------- */
   
-@@ -715,6 +768,32 @@
+@@ -715,6 +768,32 @@ void __init at91_init_leds(u8 cpu_led, u
   #endif
   
   
   #endif
   
   
@@ -3979,10 +3993,11 @@ diff -urN linux-2.6.22-rc5/arch/arm/mach-at91/at91sam9263_devices.c linux-2.6.22
   /* --------------------------------------------------------------------
    *  UART
    * -------------------------------------------------------------------- */
   /* --------------------------------------------------------------------
    *  UART
    * -------------------------------------------------------------------- */
-diff -urN linux-2.6.22-rc5/arch/arm/mach-at91/at91sam9rl.c linux-2.6.22-rc5.new/arch/arm/mach-at91/at91sam9rl.c
---- linux-2.6.22-rc5/arch/arm/mach-at91/at91sam9rl.c   2007-06-17 04:09:12.000000000 +0200
-+++ linux-2.6.22-rc5.new/arch/arm/mach-at91/at91sam9rl.c       2007-07-29 05:23:04.000000000 +0200
-@@ -246,6 +246,28 @@
+Index: linux-2.6.22.19/arch/arm/mach-at91/at91sam9rl.c
+===================================================================
+--- linux-2.6.22.19.orig/arch/arm/mach-at91/at91sam9rl.c
++++ linux-2.6.22.19/arch/arm/mach-at91/at91sam9rl.c
+@@ -246,6 +246,28 @@ static void at91sam9rl_reset(void)
   
   
   /* --------------------------------------------------------------------
   
   
   /* --------------------------------------------------------------------
@@ -4011,7 +4026,7 @@ diff -urN linux-2.6.22-rc5/arch/arm/mach-at91/at91sam9rl.c linux-2.6.22-rc5.new/
    *  AT91SAM9RL processor initialization
    * -------------------------------------------------------------------- */
   
    *  AT91SAM9RL processor initialization
    * -------------------------------------------------------------------- */
   
-@@ -284,6 +306,9 @@
+@@ -284,6 +306,9 @@ void __init at91sam9rl_initialize(unsign
   
         /* Register GPIO subsystem */
         at91_gpio_init(at91sam9rl_gpio, 4);
   
         /* Register GPIO subsystem */
         at91_gpio_init(at91sam9rl_gpio, 4);
@@ -4021,10 +4036,11 @@ diff -urN linux-2.6.22-rc5/arch/arm/mach-at91/at91sam9rl.c linux-2.6.22-rc5.new/
   }
   
   /* --------------------------------------------------------------------
   }
   
   /* --------------------------------------------------------------------
-diff -urN linux-2.6.22-rc5/arch/arm/mach-at91/at91sam9rl_devices.c linux-2.6.22-rc5.new/arch/arm/mach-at91/at91sam9rl_devices.c
---- linux-2.6.22-rc5/arch/arm/mach-at91/at91sam9rl_devices.c   2007-06-17 04:09:12.000000000 +0200
-+++ linux-2.6.22-rc5.new/arch/arm/mach-at91/at91sam9rl_devices.c       2007-07-29 05:23:04.000000000 +0200
-@@ -370,6 +370,32 @@
+Index: linux-2.6.22.19/arch/arm/mach-at91/at91sam9rl_devices.c
+===================================================================
+--- linux-2.6.22.19.orig/arch/arm/mach-at91/at91sam9rl_devices.c
++++ linux-2.6.22.19/arch/arm/mach-at91/at91sam9rl_devices.c
+@@ -370,6 +370,32 @@ void __init at91_init_leds(u8 cpu_led, u
   #endif
   
   
   #endif
   
   
@@ -4057,9 +4073,10 @@ diff -urN linux-2.6.22-rc5/arch/arm/mach-at91/at91sam9rl_devices.c linux-2.6.22-
   /* --------------------------------------------------------------------
    *  UART
    * -------------------------------------------------------------------- */
   /* --------------------------------------------------------------------
    *  UART
    * -------------------------------------------------------------------- */
-diff -urN linux-2.6.22-rc5/arch/arm/mach-at91/board-cam60.c linux-2.6.22-rc5.new/arch/arm/mach-at91/board-cam60.c
---- linux-2.6.22-rc5/arch/arm/mach-at91/board-cam60.c  1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.22-rc5.new/arch/arm/mach-at91/board-cam60.c      2007-07-29 05:23:04.000000000 +0200
+Index: linux-2.6.22.19/arch/arm/mach-at91/board-cam60.c
+===================================================================
+--- /dev/null
++++ linux-2.6.22.19/arch/arm/mach-at91/board-cam60.c
  @@ -0,0 +1,148 @@
  +/*
  + * KwikByte CAM60
  @@ -0,0 +1,148 @@
  +/*
  + * KwikByte CAM60
@@ -4209,9 +4226,10 @@ diff -urN linux-2.6.22-rc5/arch/arm/mach-at91/board-cam60.c linux-2.6.22-rc5.new
  +      .init_irq       = cam60_init_irq,
  +      .init_machine   = cam60_board_init,
  +MACHINE_END
  +      .init_irq       = cam60_init_irq,
  +      .init_machine   = cam60_board_init,
  +MACHINE_END
-diff -urN linux-2.6.22-rc5/arch/arm/mach-at91/board-chub.c linux-2.6.22-rc5.new/arch/arm/mach-at91/board-chub.c
---- linux-2.6.22-rc5/arch/arm/mach-at91/board-chub.c   1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.22-rc5.new/arch/arm/mach-at91/board-chub.c       2007-07-29 05:23:04.000000000 +0200
+Index: linux-2.6.22.19/arch/arm/mach-at91/board-chub.c
+===================================================================
+--- /dev/null
++++ linux-2.6.22.19/arch/arm/mach-at91/board-chub.c
  @@ -0,0 +1,132 @@
  +/*
  + * linux/arch/arm/mach-at91/board-chub.c
  @@ -0,0 +1,132 @@
  +/*
  + * linux/arch/arm/mach-at91/board-chub.c
@@ -4345,9 +4363,10 @@ diff -urN linux-2.6.22-rc5/arch/arm/mach-at91/board-chub.c linux-2.6.22-rc5.new/
  +      .init_irq       = chub_init_irq,
  +      .init_machine   = chub_board_init,
  +MACHINE_END
  +      .init_irq       = chub_init_irq,
  +      .init_machine   = chub_board_init,
  +MACHINE_END
-diff -urN linux-2.6.22-rc5/arch/arm/mach-at91/board-csb337.c linux-2.6.22-rc5.new/arch/arm/mach-at91/board-csb337.c
---- linux-2.6.22-rc5/arch/arm/mach-at91/board-csb337.c 2007-06-17 04:09:12.000000000 +0200
-+++ linux-2.6.22-rc5.new/arch/arm/mach-at91/board-csb337.c     2007-07-29 05:23:04.000000000 +0200
+Index: linux-2.6.22.19/arch/arm/mach-at91/board-csb337.c
+===================================================================
+--- linux-2.6.22.19.orig/arch/arm/mach-at91/board-csb337.c
++++ linux-2.6.22.19/arch/arm/mach-at91/board-csb337.c
  @@ -24,6 +24,7 @@
   #include <linux/module.h>
   #include <linux/platform_device.h>
  @@ -24,6 +24,7 @@
   #include <linux/module.h>
   #include <linux/platform_device.h>
@@ -4356,7 +4375,7 @@ diff -urN linux-2.6.22-rc5/arch/arm/mach-at91/board-csb337.c linux-2.6.22-rc5.ne
   #include <linux/mtd/physmap.h>
   
   #include <asm/hardware.h>
   #include <linux/mtd/physmap.h>
   
   #include <asm/hardware.h>
-@@ -59,6 +60,7 @@
+@@ -59,6 +60,7 @@ static void __init csb337_map_io(void)
   
         /* Setup the LEDs */
         at91_init_leds(AT91_PIN_PB0, AT91_PIN_PB1);
   
         /* Setup the LEDs */
         at91_init_leds(AT91_PIN_PB0, AT91_PIN_PB1);
@@ -4364,7 +4383,7 @@ diff -urN linux-2.6.22-rc5/arch/arm/mach-at91/board-csb337.c linux-2.6.22-rc5.ne
   
         /* Setup the serial ports and console */
         at91_init_serial(&csb337_uart_config);
   
         /* Setup the serial ports and console */
         at91_init_serial(&csb337_uart_config);
-@@ -149,6 +151,55 @@
+@@ -149,6 +151,55 @@ static struct platform_device csb_flash 
         .num_resources  = ARRAY_SIZE(csb_flash_resources),
   };
   
         .num_resources  = ARRAY_SIZE(csb_flash_resources),
   };
   
@@ -4420,7 +4439,7 @@ diff -urN linux-2.6.22-rc5/arch/arm/mach-at91/board-csb337.c linux-2.6.22-rc5.ne
   static void __init csb337_board_init(void)
   {
         /* Serial */
   static void __init csb337_board_init(void)
   {
         /* Serial */
-@@ -168,8 +219,12 @@
+@@ -168,8 +219,12 @@ static void __init csb337_board_init(voi
         at91_add_device_spi(csb337_spi_devices, ARRAY_SIZE(csb337_spi_devices));
         /* MMC */
         at91_add_device_mmc(0, &csb337_mmc_data);
         at91_add_device_spi(csb337_spi_devices, ARRAY_SIZE(csb337_spi_devices));
         /* MMC */
         at91_add_device_mmc(0, &csb337_mmc_data);
@@ -4433,10 +4452,11 @@ diff -urN linux-2.6.22-rc5/arch/arm/mach-at91/board-csb337.c linux-2.6.22-rc5.ne
   }
   
   MACHINE_START(CSB337, "Cogent CSB337")
   }
   
   MACHINE_START(CSB337, "Cogent CSB337")
-diff -urN linux-2.6.22-rc5/arch/arm/mach-at91/board-dk.c linux-2.6.22-rc5.new/arch/arm/mach-at91/board-dk.c
---- linux-2.6.22-rc5/arch/arm/mach-at91/board-dk.c     2007-06-17 04:09:12.000000000 +0200
-+++ linux-2.6.22-rc5.new/arch/arm/mach-at91/board-dk.c 2007-07-29 05:23:04.000000000 +0200
-@@ -73,6 +73,185 @@
+Index: linux-2.6.22.19/arch/arm/mach-at91/board-dk.c
+===================================================================
+--- linux-2.6.22.19.orig/arch/arm/mach-at91/board-dk.c
++++ linux-2.6.22.19/arch/arm/mach-at91/board-dk.c
+@@ -73,6 +73,185 @@ static void __init dk_init_irq(void)
         at91rm9200_init_interrupts(NULL);
   }
   
         at91rm9200_init_interrupts(NULL);
   }
   
@@ -4622,7 +4642,7 @@ diff -urN linux-2.6.22-rc5/arch/arm/mach-at91/board-dk.c linux-2.6.22-rc5.new/ar
   static struct at91_eth_data __initdata dk_eth_data = {
         .phy_irq_pin    = AT91_PIN_PC4,
         .is_rmii        = 1,
   static struct at91_eth_data __initdata dk_eth_data = {
         .phy_irq_pin    = AT91_PIN_PC4,
         .is_rmii        = 1,
-@@ -151,7 +330,7 @@
+@@ -151,7 +330,7 @@ static struct at91_nand_data __initdata 
   #define DK_FLASH_SIZE 0x200000
   
   static struct physmap_flash_data dk_flash_data = {
   #define DK_FLASH_SIZE 0x200000
   
   static struct physmap_flash_data dk_flash_data = {
@@ -4631,7 +4651,7 @@ diff -urN linux-2.6.22-rc5/arch/arm/mach-at91/board-dk.c linux-2.6.22-rc5.new/ar
   };
   
   static struct resource dk_flash_resource = {
   };
   
   static struct resource dk_flash_resource = {
-@@ -170,6 +349,13 @@
+@@ -170,6 +349,13 @@ static struct platform_device dk_flash =
         .num_resources  = 1,
   };
   
         .num_resources  = 1,
   };
   
@@ -4645,7 +4665,7 @@ diff -urN linux-2.6.22-rc5/arch/arm/mach-at91/board-dk.c linux-2.6.22-rc5.new/ar
   
   static void __init dk_board_init(void)
   {
   
   static void __init dk_board_init(void)
   {
-@@ -200,8 +386,10 @@
+@@ -200,8 +386,10 @@ static void __init dk_board_init(void)
         at91_add_device_nand(&dk_nand_data);
         /* NOR Flash */
         platform_device_register(&dk_flash);
         at91_add_device_nand(&dk_nand_data);
         /* NOR Flash */
         platform_device_register(&dk_flash);
@@ -4657,10 +4677,11 @@ diff -urN linux-2.6.22-rc5/arch/arm/mach-at91/board-dk.c linux-2.6.22-rc5.new/ar
   }
   
   MACHINE_START(AT91RM9200DK, "Atmel AT91RM9200-DK")
   }
   
   MACHINE_START(AT91RM9200DK, "Atmel AT91RM9200-DK")
-diff -urN linux-2.6.22-rc5/arch/arm/mach-at91/board-ek.c linux-2.6.22-rc5.new/arch/arm/mach-at91/board-ek.c
---- linux-2.6.22-rc5/arch/arm/mach-at91/board-ek.c     2007-06-17 04:09:12.000000000 +0200
-+++ linux-2.6.22-rc5.new/arch/arm/mach-at91/board-ek.c 2007-07-29 05:23:04.000000000 +0200
-@@ -73,6 +73,187 @@
+Index: linux-2.6.22.19/arch/arm/mach-at91/board-ek.c
+===================================================================
+--- linux-2.6.22.19.orig/arch/arm/mach-at91/board-ek.c
++++ linux-2.6.22.19/arch/arm/mach-at91/board-ek.c
+@@ -73,6 +73,187 @@ static void __init ek_init_irq(void)
         at91rm9200_init_interrupts(NULL);
   }
   
         at91rm9200_init_interrupts(NULL);
   }
   
@@ -4848,7 +4869,7 @@ diff -urN linux-2.6.22-rc5/arch/arm/mach-at91/board-ek.c linux-2.6.22-rc5.new/ar
   static struct at91_eth_data __initdata ek_eth_data = {
         .phy_irq_pin    = AT91_PIN_PC4,
         .is_rmii        = 1,
   static struct at91_eth_data __initdata ek_eth_data = {
         .phy_irq_pin    = AT91_PIN_PC4,
         .is_rmii        = 1,
-@@ -113,7 +294,7 @@
+@@ -113,7 +294,7 @@ static struct spi_board_info ek_spi_devi
   #define EK_FLASH_SIZE 0x200000
   
   static struct physmap_flash_data ek_flash_data = {
   #define EK_FLASH_SIZE 0x200000
   
   static struct physmap_flash_data ek_flash_data = {
@@ -4857,7 +4878,7 @@ diff -urN linux-2.6.22-rc5/arch/arm/mach-at91/board-ek.c linux-2.6.22-rc5.new/ar
   };
   
   static struct resource ek_flash_resource = {
   };
   
   static struct resource ek_flash_resource = {
-@@ -132,6 +313,18 @@
+@@ -132,6 +313,18 @@ static struct platform_device ek_flash =
         .num_resources  = 1,
   };
   
         .num_resources  = 1,
   };
   
@@ -4876,7 +4897,7 @@ diff -urN linux-2.6.22-rc5/arch/arm/mach-at91/board-ek.c linux-2.6.22-rc5.new/ar
   
   static void __init ek_board_init(void)
   {
   
   static void __init ek_board_init(void)
   {
-@@ -158,8 +351,10 @@
+@@ -158,8 +351,10 @@ static void __init ek_board_init(void)
   #endif
         /* NOR Flash */
         platform_device_register(&ek_flash);
   #endif
         /* NOR Flash */
         platform_device_register(&ek_flash);
@@ -4888,9 +4909,10 @@ diff -urN linux-2.6.22-rc5/arch/arm/mach-at91/board-ek.c linux-2.6.22-rc5.new/ar
   }
   
   MACHINE_START(AT91RM9200EK, "Atmel AT91RM9200-EK")
   }
   
   MACHINE_START(AT91RM9200EK, "Atmel AT91RM9200-EK")
-diff -urN linux-2.6.22-rc5/arch/arm/mach-at91/board-kb9202.c linux-2.6.22-rc5.new/arch/arm/mach-at91/board-kb9202.c
---- linux-2.6.22-rc5/arch/arm/mach-at91/board-kb9202.c 2007-06-17 04:09:12.000000000 +0200
-+++ linux-2.6.22-rc5.new/arch/arm/mach-at91/board-kb9202.c     2007-07-29 05:23:04.000000000 +0200
+Index: linux-2.6.22.19/arch/arm/mach-at91/board-kb9202.c
+===================================================================
+--- linux-2.6.22.19.orig/arch/arm/mach-at91/board-kb9202.c
++++ linux-2.6.22.19/arch/arm/mach-at91/board-kb9202.c
  @@ -37,6 +37,8 @@
   #include <asm/arch/board.h>
   #include <asm/arch/gpio.h>
  @@ -37,6 +37,8 @@
   #include <asm/arch/board.h>
   #include <asm/arch/gpio.h>
@@ -4900,7 +4922,7 @@ diff -urN linux-2.6.22-rc5/arch/arm/mach-at91/board-kb9202.c linux-2.6.22-rc5.ne
   #include "generic.h"
   
   
   #include "generic.h"
   
   
-@@ -111,6 +113,48 @@
+@@ -111,6 +113,48 @@ static struct at91_nand_data __initdata 
         .partition_info = nand_partitions,
   };
   
         .partition_info = nand_partitions,
   };
   
@@ -4949,7 +4971,7 @@ diff -urN linux-2.6.22-rc5/arch/arm/mach-at91/board-kb9202.c linux-2.6.22-rc5.ne
   static void __init kb9202_board_init(void)
   {
         /* Serial */
   static void __init kb9202_board_init(void)
   {
         /* Serial */
-@@ -129,6 +173,8 @@
+@@ -129,6 +173,8 @@ static void __init kb9202_board_init(voi
         at91_add_device_spi(NULL, 0);
         /* NAND */
         at91_add_device_nand(&kb9202_nand_data);
         at91_add_device_spi(NULL, 0);
         /* NAND */
         at91_add_device_nand(&kb9202_nand_data);
@@ -4958,9 +4980,10 @@ diff -urN linux-2.6.22-rc5/arch/arm/mach-at91/board-kb9202.c linux-2.6.22-rc5.ne
   }
   
   MACHINE_START(KB9200, "KB920x")
   }
   
   MACHINE_START(KB9200, "KB920x")
-diff -urN linux-2.6.22-rc5/arch/arm/mach-at91/board-sam9261ek.c linux-2.6.22-rc5.new/arch/arm/mach-at91/board-sam9261ek.c
---- linux-2.6.22-rc5/arch/arm/mach-at91/board-sam9261ek.c      2007-06-17 04:09:12.000000000 +0200
-+++ linux-2.6.22-rc5.new/arch/arm/mach-at91/board-sam9261ek.c  2007-07-29 05:23:04.000000000 +0200
+Index: linux-2.6.22.19/arch/arm/mach-at91/board-sam9261ek.c
+===================================================================
+--- linux-2.6.22.19.orig/arch/arm/mach-at91/board-sam9261ek.c
++++ linux-2.6.22.19/arch/arm/mach-at91/board-sam9261ek.c
  @@ -27,6 +27,9 @@
   #include <linux/spi/spi.h>
   #include <linux/spi/ads7846.h>
  @@ -27,6 +27,9 @@
   #include <linux/spi/spi.h>
   #include <linux/spi/ads7846.h>
@@ -4971,7 +4994,7 @@ diff -urN linux-2.6.22-rc5/arch/arm/mach-at91/board-sam9261ek.c linux-2.6.22-rc5
   
   #include <asm/hardware.h>
   #include <asm/setup.h>
   
   #include <asm/hardware.h>
   #include <asm/setup.h>
-@@ -251,6 +254,7 @@
+@@ -251,6 +254,7 @@ static struct spi_board_info ek_spi_devi
                 .bus_num        = 0,
                 .platform_data  = &ads_info,
                 .irq            = AT91SAM9261_ID_IRQ0,
                 .bus_num        = 0,
                 .platform_data  = &ads_info,
                 .irq            = AT91SAM9261_ID_IRQ0,
@@ -4979,7 +5002,7 @@ diff -urN linux-2.6.22-rc5/arch/arm/mach-at91/board-sam9261ek.c linux-2.6.22-rc5
         },
   #endif
   #if defined(CONFIG_MTD_AT91_DATAFLASH_CARD)
         },
   #endif
   #if defined(CONFIG_MTD_AT91_DATAFLASH_CARD)
-@@ -271,6 +275,65 @@
+@@ -271,6 +275,65 @@ static struct spi_board_info ek_spi_devi
   };
   
   
   };
   
   
@@ -5045,7 +5068,7 @@ diff -urN linux-2.6.22-rc5/arch/arm/mach-at91/board-sam9261ek.c linux-2.6.22-rc5
   static void __init ek_board_init(void)
   {
         /* Serial */
   static void __init ek_board_init(void)
   {
         /* Serial */
-@@ -296,6 +359,8 @@
+@@ -296,6 +359,8 @@ static void __init ek_board_init(void)
         /* MMC */
         at91_add_device_mmc(0, &ek_mmc_data);
   #endif
         /* MMC */
         at91_add_device_mmc(0, &ek_mmc_data);
   #endif
@@ -5054,9 +5077,10 @@ diff -urN linux-2.6.22-rc5/arch/arm/mach-at91/board-sam9261ek.c linux-2.6.22-rc5
   }
   
   MACHINE_START(AT91SAM9261EK, "Atmel AT91SAM9261-EK")
   }
   
   MACHINE_START(AT91SAM9261EK, "Atmel AT91SAM9261-EK")
-diff -urN linux-2.6.22-rc5/arch/arm/mach-at91/board-sam9263ek.c linux-2.6.22-rc5.new/arch/arm/mach-at91/board-sam9263ek.c
---- linux-2.6.22-rc5/arch/arm/mach-at91/board-sam9263ek.c      2007-06-17 04:09:12.000000000 +0200
-+++ linux-2.6.22-rc5.new/arch/arm/mach-at91/board-sam9263ek.c  2007-07-29 05:23:04.000000000 +0200
+Index: linux-2.6.22.19/arch/arm/mach-at91/board-sam9263ek.c
+===================================================================
+--- linux-2.6.22.19.orig/arch/arm/mach-at91/board-sam9263ek.c
++++ linux-2.6.22.19/arch/arm/mach-at91/board-sam9263ek.c
  @@ -26,6 +26,9 @@
   #include <linux/platform_device.h>
   #include <linux/spi/spi.h>
  @@ -26,6 +26,9 @@
   #include <linux/platform_device.h>
   #include <linux/spi/spi.h>
@@ -5067,7 +5091,7 @@ diff -urN linux-2.6.22-rc5/arch/arm/mach-at91/board-sam9263ek.c linux-2.6.22-rc5
   
   #include <asm/hardware.h>
   #include <asm/setup.h>
   
   #include <asm/hardware.h>
   #include <asm/setup.h>
-@@ -202,6 +205,65 @@
+@@ -202,6 +205,65 @@ static struct at91_nand_data __initdata 
   
   
   /*
   
   
   /*
@@ -5133,7 +5157,7 @@ diff -urN linux-2.6.22-rc5/arch/arm/mach-at91/board-sam9263ek.c linux-2.6.22-rc5
    * AC97
    */
   static struct atmel_ac97_data ek_ac97_data = {
    * AC97
    */
   static struct atmel_ac97_data ek_ac97_data = {
-@@ -230,6 +292,8 @@
+@@ -230,6 +292,8 @@ static void __init ek_board_init(void)
         at91_add_device_nand(&ek_nand_data);
         /* I2C */
         at91_add_device_i2c();
         at91_add_device_nand(&ek_nand_data);
         /* I2C */
         at91_add_device_i2c();
@@ -5142,9 +5166,10 @@ diff -urN linux-2.6.22-rc5/arch/arm/mach-at91/board-sam9263ek.c linux-2.6.22-rc5
         /* AC97 */
         at91_add_device_ac97(&ek_ac97_data);
   }
         /* AC97 */
         at91_add_device_ac97(&ek_ac97_data);
   }
-diff -urN linux-2.6.22-rc5/arch/arm/mach-at91/clock.c linux-2.6.22-rc5.new/arch/arm/mach-at91/clock.c
---- linux-2.6.22-rc5/arch/arm/mach-at91/clock.c        2007-06-17 04:09:12.000000000 +0200
-+++ linux-2.6.22-rc5.new/arch/arm/mach-at91/clock.c    2007-07-29 05:23:04.000000000 +0200
+Index: linux-2.6.22.19/arch/arm/mach-at91/clock.c
+===================================================================
+--- linux-2.6.22.19.orig/arch/arm/mach-at91/clock.c
++++ linux-2.6.22.19/arch/arm/mach-at91/clock.c
  @@ -32,6 +32,7 @@
   #include <asm/arch/cpu.h>
   
  @@ -32,6 +32,7 @@
   #include <asm/arch/cpu.h>
   
@@ -5153,7 +5178,7 @@ diff -urN linux-2.6.22-rc5/arch/arm/mach-at91/clock.c linux-2.6.22-rc5.new/arch/
   
   
   /*
   
   
   /*
-@@ -254,6 +255,23 @@
+@@ -254,6 +255,23 @@ EXPORT_SYMBOL(clk_get_rate);
   
   /*------------------------------------------------------------------------*/
   
   
   /*------------------------------------------------------------------------*/
   
@@ -5177,10 +5202,11 @@ diff -urN linux-2.6.22-rc5/arch/arm/mach-at91/clock.c linux-2.6.22-rc5.new/arch/
   #ifdef CONFIG_AT91_PROGRAMMABLE_CLOCKS
   
   /*
   #ifdef CONFIG_AT91_PROGRAMMABLE_CLOCKS
   
   /*
-diff -urN linux-2.6.22-rc5/arch/arm/mach-at91/generic.h linux-2.6.22-rc5.new/arch/arm/mach-at91/generic.h
---- linux-2.6.22-rc5/arch/arm/mach-at91/generic.h      2007-06-17 04:09:12.000000000 +0200
-+++ linux-2.6.22-rc5.new/arch/arm/mach-at91/generic.h  2007-07-29 05:23:04.000000000 +0200
-@@ -36,6 +36,7 @@
+Index: linux-2.6.22.19/arch/arm/mach-at91/generic.h
+===================================================================
+--- linux-2.6.22.19.orig/arch/arm/mach-at91/generic.h
++++ linux-2.6.22.19/arch/arm/mach-at91/generic.h
+@@ -36,6 +36,7 @@ extern void __init at91_clock_associate(
    /* Power Management */
   extern void at91_irq_suspend(void);
   extern void at91_irq_resume(void);
    /* Power Management */
   extern void at91_irq_suspend(void);
   extern void at91_irq_resume(void);
@@ -5188,9 +5214,10 @@ diff -urN linux-2.6.22-rc5/arch/arm/mach-at91/generic.h linux-2.6.22-rc5.new/arc
   
    /* GPIO */
   #define AT91RM9200_PQFP               3       /* AT91RM9200 PQFP package has 3 banks */
   
    /* GPIO */
   #define AT91RM9200_PQFP               3       /* AT91RM9200 PQFP package has 3 banks */
-diff -urN linux-2.6.22-rc5/arch/arm/mach-at91/ics1523.c linux-2.6.22-rc5.new/arch/arm/mach-at91/ics1523.c
---- linux-2.6.22-rc5/arch/arm/mach-at91/ics1523.c      1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.22-rc5.new/arch/arm/mach-at91/ics1523.c  2007-07-29 05:23:04.000000000 +0200
+Index: linux-2.6.22.19/arch/arm/mach-at91/ics1523.c
+===================================================================
+--- /dev/null
++++ linux-2.6.22.19/arch/arm/mach-at91/ics1523.c
  @@ -0,0 +1,207 @@
  +/*
  + * arch/arm/mach-at91rm9200/ics1523.c
  @@ -0,0 +1,207 @@
  +/*
  + * arch/arm/mach-at91rm9200/ics1523.c
@@ -5399,10 +5426,11 @@ diff -urN linux-2.6.22-rc5/arch/arm/mach-at91/ics1523.c linux-2.6.22-rc5.new/arc
  +
  +      return ack;
  +}
  +
  +      return ack;
  +}
-diff -urN linux-2.6.22-rc5/arch/arm/mach-at91/Kconfig linux-2.6.22-rc5.new/arch/arm/mach-at91/Kconfig
---- linux-2.6.22-rc5/arch/arm/mach-at91/Kconfig        2007-06-17 04:09:12.000000000 +0200
-+++ linux-2.6.22-rc5.new/arch/arm/mach-at91/Kconfig    2007-07-29 05:23:04.000000000 +0200
-@@ -97,6 +97,12 @@
+Index: linux-2.6.22.19/arch/arm/mach-at91/Kconfig
+===================================================================
+--- linux-2.6.22.19.orig/arch/arm/mach-at91/Kconfig
++++ linux-2.6.22.19/arch/arm/mach-at91/Kconfig
+@@ -97,6 +97,12 @@ config MACH_KAFA
         help
           Select this if you are using Sperry-Sun's KAFA board.
   
         help
           Select this if you are using Sperry-Sun's KAFA board.
   
@@ -5415,7 +5443,7 @@ diff -urN linux-2.6.22-rc5/arch/arm/mach-at91/Kconfig linux-2.6.22-rc5.new/arch/
   endif
   
   # ----------------------------------------------------------
   endif
   
   # ----------------------------------------------------------
-@@ -121,6 +127,13 @@
+@@ -121,6 +127,13 @@ config MACH_AT91SAM9260EK
           Select this if you are using Atmel's AT91SAM9260-EK or AT91SAM9XE Evaluation Kit
           <http://www.atmel.com/dyn/products/tools_card.asp?tool_id=3933>
   
           Select this if you are using Atmel's AT91SAM9260-EK or AT91SAM9XE Evaluation Kit
           <http://www.atmel.com/dyn/products/tools_card.asp?tool_id=3933>
   
@@ -5429,7 +5457,7 @@ diff -urN linux-2.6.22-rc5/arch/arm/mach-at91/Kconfig linux-2.6.22-rc5.new/arch/
   endif
   
   # ----------------------------------------------------------
   endif
   
   # ----------------------------------------------------------
-@@ -184,6 +197,20 @@
+@@ -184,6 +197,20 @@ config MTD_NAND_AT91_BUSWIDTH_16
           On AT91SAM926x boards both types of NAND flash can be present
           (8 and 16 bit data bus width).
   
           On AT91SAM926x boards both types of NAND flash can be present
           (8 and 16 bit data bus width).
   
@@ -5450,7 +5478,7 @@ diff -urN linux-2.6.22-rc5/arch/arm/mach-at91/Kconfig linux-2.6.22-rc5.new/arch/
   # ----------------------------------------------------------
   
   comment "AT91 Feature Selections"
   # ----------------------------------------------------------
   
   comment "AT91 Feature Selections"
-@@ -194,6 +221,20 @@
+@@ -194,6 +221,20 @@ config AT91_PROGRAMMABLE_CLOCKS
           Select this if you need to program one or more of the PCK0..PCK3
           programmable clock outputs.
   
           Select this if you need to program one or more of the PCK0..PCK3
           programmable clock outputs.
   
@@ -5471,10 +5499,11 @@ diff -urN linux-2.6.22-rc5/arch/arm/mach-at91/Kconfig linux-2.6.22-rc5.new/arch/
   endmenu
   
   endif
   endmenu
   
   endif
-diff -urN linux-2.6.22-rc5/arch/arm/mach-at91/Makefile linux-2.6.22-rc5.new/arch/arm/mach-at91/Makefile
---- linux-2.6.22-rc5/arch/arm/mach-at91/Makefile       2007-06-17 04:09:12.000000000 +0200
-+++ linux-2.6.22-rc5.new/arch/arm/mach-at91/Makefile   2007-07-29 05:23:04.000000000 +0200
-@@ -8,6 +8,8 @@
+Index: linux-2.6.22.19/arch/arm/mach-at91/Makefile
+===================================================================
+--- linux-2.6.22.19.orig/arch/arm/mach-at91/Makefile
++++ linux-2.6.22.19/arch/arm/mach-at91/Makefile
+@@ -8,6 +8,8 @@ obj-n          :=
   obj-          :=
   
   obj-$(CONFIG_PM)              += pm.o
   obj-          :=
   
   obj-$(CONFIG_PM)              += pm.o
@@ -5483,7 +5512,7 @@ diff -urN linux-2.6.22-rc5/arch/arm/mach-at91/Makefile linux-2.6.22-rc5.new/arch
   
   # CPU-specific support
   obj-$(CONFIG_ARCH_AT91RM9200) += at91rm9200.o at91rm9200_time.o at91rm9200_devices.o
   
   # CPU-specific support
   obj-$(CONFIG_ARCH_AT91RM9200) += at91rm9200.o at91rm9200_time.o at91rm9200_devices.o
-@@ -26,10 +28,12 @@
+@@ -26,10 +28,12 @@ obj-$(CONFIG_MACH_CARMEVA) += board-carm
   obj-$(CONFIG_MACH_KB9200)     += board-kb9202.o
   obj-$(CONFIG_MACH_ATEB9200)   += board-eb9200.o
   obj-$(CONFIG_MACH_KAFA)               += board-kafa.o
   obj-$(CONFIG_MACH_KB9200)     += board-kb9202.o
   obj-$(CONFIG_MACH_ATEB9200)   += board-eb9200.o
   obj-$(CONFIG_MACH_KAFA)               += board-kafa.o
@@ -5496,7 +5525,7 @@ diff -urN linux-2.6.22-rc5/arch/arm/mach-at91/Makefile linux-2.6.22-rc5.new/arch
   
   # AT91SAM9261 board-specific support
   obj-$(CONFIG_MACH_AT91SAM9261EK) += board-sam9261ek.o
   
   # AT91SAM9261 board-specific support
   obj-$(CONFIG_MACH_AT91SAM9261EK) += board-sam9261ek.o
-@@ -51,7 +55,7 @@
+@@ -51,7 +55,7 @@ led-$(CONFIG_MACH_KAFA)              += leds.o
   obj-$(CONFIG_LEDS) += $(led-y)
   
   # VGA support
   obj-$(CONFIG_LEDS) += $(led-y)
   
   # VGA support
@@ -5505,10 +5534,11 @@ diff -urN linux-2.6.22-rc5/arch/arm/mach-at91/Makefile linux-2.6.22-rc5.new/arch
   
   
   ifeq ($(CONFIG_PM_DEBUG),y)
   
   
   ifeq ($(CONFIG_PM_DEBUG),y)
-diff -urN linux-2.6.22-rc5/arch/arm/mach-at91/pm.c linux-2.6.22-rc5.new/arch/arm/mach-at91/pm.c
---- linux-2.6.22-rc5/arch/arm/mach-at91/pm.c   2007-06-17 04:09:12.000000000 +0200
-+++ linux-2.6.22-rc5.new/arch/arm/mach-at91/pm.c       2007-07-29 05:23:04.000000000 +0200
-@@ -63,6 +63,7 @@
+Index: linux-2.6.22.19/arch/arm/mach-at91/pm.c
+===================================================================
+--- linux-2.6.22.19.orig/arch/arm/mach-at91/pm.c
++++ linux-2.6.22.19/arch/arm/mach-at91/pm.c
+@@ -63,6 +63,7 @@ static int at91_pm_set_target(suspend_st
    * Verify that all the clocks are correct before entering
    * slow-clock mode.
    */
    * Verify that all the clocks are correct before entering
    * slow-clock mode.
    */
@@ -5516,7 +5546,7 @@ diff -urN linux-2.6.22-rc5/arch/arm/mach-at91/pm.c linux-2.6.22-rc5.new/arch/arm
   static int at91_pm_verify_clocks(void)
   {
         unsigned long scsr;
   static int at91_pm_verify_clocks(void)
   {
         unsigned long scsr;
-@@ -103,20 +104,15 @@
+@@ -103,20 +104,15 @@ static int at91_pm_verify_clocks(void)
   }
   
   /*
   }
   
   /*
@@ -5538,7 +5568,7 @@ diff -urN linux-2.6.22-rc5/arch/arm/mach-at91/pm.c linux-2.6.22-rc5.new/arch/arm
   
   
   static void (*slow_clock)(void);
   
   
   static void (*slow_clock)(void);
-@@ -205,16 +201,23 @@
+@@ -205,16 +201,23 @@ static struct pm_ops at91_pm_ops ={
         .enter          = at91_pm_enter,
   };
   
         .enter          = at91_pm_enter,
   };
   
@@ -5567,9 +5597,10 @@ diff -urN linux-2.6.22-rc5/arch/arm/mach-at91/pm.c linux-2.6.22-rc5.new/arch/arm
   #endif
   
         /* Disable SDRAM low-power mode.  Cannot be used with self-refresh. */
   #endif
   
         /* Disable SDRAM low-power mode.  Cannot be used with self-refresh. */
-diff -urN linux-2.6.22-rc5/arch/arm/mach-at91/pm.c.orig linux-2.6.22-rc5.new/arch/arm/mach-at91/pm.c.orig
---- linux-2.6.22-rc5/arch/arm/mach-at91/pm.c.orig      1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.22-rc5.new/arch/arm/mach-at91/pm.c.orig  2007-06-17 04:09:12.000000000 +0200
+Index: linux-2.6.22.19/arch/arm/mach-at91/pm.c.orig
+===================================================================
+--- /dev/null
++++ linux-2.6.22.19/arch/arm/mach-at91/pm.c.orig
  @@ -0,0 +1,227 @@
  +/*
  + * arch/arm/mach-at91/pm.c
  @@ -0,0 +1,227 @@
  +/*
  + * arch/arm/mach-at91/pm.c
@@ -5798,9 +5829,10 @@ diff -urN linux-2.6.22-rc5/arch/arm/mach-at91/pm.c.orig linux-2.6.22-rc5.new/arc
  +      return 0;
  +}
  +arch_initcall(at91_pm_init);
  +      return 0;
  +}
  +arch_initcall(at91_pm_init);
-diff -urN linux-2.6.22-rc5/arch/arm/mach-at91/pm_slowclock.S linux-2.6.22-rc5.new/arch/arm/mach-at91/pm_slowclock.S
---- linux-2.6.22-rc5/arch/arm/mach-at91/pm_slowclock.S 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.22-rc5.new/arch/arm/mach-at91/pm_slowclock.S     2007-07-29 05:23:04.000000000 +0200
+Index: linux-2.6.22.19/arch/arm/mach-at91/pm_slowclock.S
+===================================================================
+--- /dev/null
++++ linux-2.6.22.19/arch/arm/mach-at91/pm_slowclock.S
  @@ -0,0 +1,172 @@
  +/*
  + * arch/arm/mach-at91/pm_slow_clock.S
  @@ -0,0 +1,172 @@
  +/*
  + * arch/arm/mach-at91/pm_slow_clock.S
@@ -5974,9 +6006,10 @@ diff -urN linux-2.6.22-rc5/arch/arm/mach-at91/pm_slowclock.S linux-2.6.22-rc5.ne
  +
  +ENTRY(at91rm9200_slow_clock_sz)
  +      .word .-at91rm9200_slow_clock
  +
  +ENTRY(at91rm9200_slow_clock_sz)
  +      .word .-at91rm9200_slow_clock
-diff -urN linux-2.6.22-rc5/arch/arm/mach-at91/tclib.c linux-2.6.22-rc5.new/arch/arm/mach-at91/tclib.c
---- linux-2.6.22-rc5/arch/arm/mach-at91/tclib.c        1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.22-rc5.new/arch/arm/mach-at91/tclib.c    2007-07-29 05:23:04.000000000 +0200
+Index: linux-2.6.22.19/arch/arm/mach-at91/tclib.c
+===================================================================
+--- /dev/null
++++ linux-2.6.22.19/arch/arm/mach-at91/tclib.c
  @@ -0,0 +1,17 @@
  +#include <linux/clk.h>
  +#include <linux/kernel.h>
  @@ -0,0 +1,17 @@
  +#include <linux/clk.h>
  +#include <linux/kernel.h>
@@ -5995,9 +6028,10 @@ diff -urN linux-2.6.22-rc5/arch/arm/mach-at91/tclib.c linux-2.6.22-rc5.new/arch/
  +      blocks = tcblocks;
  +      nblocks = n;
  +}
  +      blocks = tcblocks;
  +      nblocks = n;
  +}
-diff -urN linux-2.6.22-rc5/arch/arm/mach-at91/tclib.h linux-2.6.22-rc5.new/arch/arm/mach-at91/tclib.h
---- linux-2.6.22-rc5/arch/arm/mach-at91/tclib.h        1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.22-rc5.new/arch/arm/mach-at91/tclib.h    2007-07-29 05:23:04.000000000 +0200
+Index: linux-2.6.22.19/arch/arm/mach-at91/tclib.h
+===================================================================
+--- /dev/null
++++ linux-2.6.22.19/arch/arm/mach-at91/tclib.h
  @@ -0,0 +1,11 @@
  +
  +#define TC_PER_TCB    3
  @@ -0,0 +1,11 @@
  +
  +#define TC_PER_TCB    3
@@ -6010,9 +6044,10 @@ diff -urN linux-2.6.22-rc5/arch/arm/mach-at91/tclib.h linux-2.6.22-rc5.new/arch/
  +};
  +
  +extern void __init atmel_tc_init(struct atmel_tcblock *tcblocks, int n);
  +};
  +
  +extern void __init atmel_tc_init(struct atmel_tcblock *tcblocks, int n);
-diff -urN -x CVS linux-2.6.22-rc1/include/asm-arm/arch-at91/at91_mci.h linux-2.6-stable/include/asm-arm/arch-at91/at91_mci.h
---- linux-2.6.22-rc1/include/asm-arm/arch-at91/at91_mci.h      Thu Apr 26 05:08:32 2007
-+++ linux-2.6-stable/include/asm-arm/arch-at91/at91_mci.h      Tue May  8 12:13:31 2007
+Index: linux-2.6.22.19/include/asm-arm/arch-at91/at91_mci.h
+===================================================================
+--- linux-2.6.22.19.orig/include/asm-arm/arch-at91/at91_mci.h
++++ linux-2.6.22.19/include/asm-arm/arch-at91/at91_mci.h
  @@ -26,6 +26,9 @@
   #define AT91_MCI_MR           0x04            /* Mode Register */
   #define               AT91_MCI_CLKDIV         (0xff  <<  0)   /* Clock Divider */
  @@ -26,6 +26,9 @@
   #define AT91_MCI_MR           0x04            /* Mode Register */
   #define               AT91_MCI_CLKDIV         (0xff  <<  0)   /* Clock Divider */
@@ -6023,9 +6058,10 @@ diff -urN -x CVS linux-2.6.22-rc1/include/asm-arm/arch-at91/at91_mci.h linux-2.6
   #define               AT91_MCI_PDCPADV        (1     << 14)   /* PDC Padding Value */
   #define               AT91_MCI_PDCMODE        (1     << 15)   /* PDC-orientated Mode */
   #define               AT91_MCI_BLKLEN         (0xfff << 18)   /* Data Block Length */
   #define               AT91_MCI_PDCPADV        (1     << 14)   /* PDC Padding Value */
   #define               AT91_MCI_PDCMODE        (1     << 15)   /* PDC-orientated Mode */
   #define               AT91_MCI_BLKLEN         (0xfff << 18)   /* Data Block Length */
-diff -urN -x CVS linux-2.6.22-rc1/include/asm-arm/arch-at91/at91_pmc.h linux-2.6-stable/include/asm-arm/arch-at91/at91_pmc.h
---- linux-2.6.22-rc1/include/asm-arm/arch-at91/at91_pmc.h      Thu Apr 26 05:08:32 2007
-+++ linux-2.6-stable/include/asm-arm/arch-at91/at91_pmc.h      Fri May 11 16:45:00 2007
+Index: linux-2.6.22.19/include/asm-arm/arch-at91/at91_pmc.h
+===================================================================
+--- linux-2.6.22.19.orig/include/asm-arm/arch-at91/at91_pmc.h
++++ linux-2.6.22.19/include/asm-arm/arch-at91/at91_pmc.h
  @@ -37,7 +37,9 @@
   #define       AT91_PMC_PCDR           (AT91_PMC + 0x14)       /* Peripheral Clock Disable Register */
   #define       AT91_PMC_PCSR           (AT91_PMC + 0x18)       /* Peripheral Clock Status Register */
  @@ -37,7 +37,9 @@
   #define       AT91_PMC_PCDR           (AT91_PMC + 0x14)       /* Peripheral Clock Disable Register */
   #define       AT91_PMC_PCSR           (AT91_PMC + 0x18)       /* Peripheral Clock Status Register */
@@ -6037,9 +6073,10 @@ diff -urN -x CVS linux-2.6.22-rc1/include/asm-arm/arch-at91/at91_pmc.h linux-2.6
   #define               AT91_PMC_MOSCEN         (1    << 0)             /* Main Oscillator Enable */
   #define               AT91_PMC_OSCBYPASS      (1    << 1)             /* Oscillator Bypass [AT91SAM926x only] */
   #define               AT91_PMC_OSCOUNT        (0xff << 8)             /* Main Oscillator Start-up Time */
   #define               AT91_PMC_MOSCEN         (1    << 0)             /* Main Oscillator Enable */
   #define               AT91_PMC_OSCBYPASS      (1    << 1)             /* Oscillator Bypass [AT91SAM926x only] */
   #define               AT91_PMC_OSCOUNT        (0xff << 8)             /* Main Oscillator Start-up Time */
-diff -urN -x CVS linux-2.6.22-rc1/include/asm-arm/arch-at91/at91sam9260_matrix.h linux-2.6-stable/include/asm-arm/arch-at91/at91sam9260_matrix.h
---- linux-2.6.22-rc1/include/asm-arm/arch-at91/at91sam9260_matrix.h    Thu Apr 26 05:08:32 2007
-+++ linux-2.6-stable/include/asm-arm/arch-at91/at91sam9260_matrix.h    Fri May 11 16:20:33 2007
+Index: linux-2.6.22.19/include/asm-arm/arch-at91/at91sam9260_matrix.h
+===================================================================
+--- linux-2.6.22.19.orig/include/asm-arm/arch-at91/at91sam9260_matrix.h
++++ linux-2.6.22.19/include/asm-arm/arch-at91/at91sam9260_matrix.h
  @@ -67,7 +67,7 @@
   #define               AT91_MATRIX_CS4A                (1 << 4)        /* Chip Select 4 Assignment */
   #define                       AT91_MATRIX_CS4A_SMC            (0 << 4)
  @@ -67,7 +67,7 @@
   #define               AT91_MATRIX_CS4A                (1 << 4)        /* Chip Select 4 Assignment */
   #define                       AT91_MATRIX_CS4A_SMC            (0 << 4)
@@ -6049,10 +6086,11 @@ diff -urN -x CVS linux-2.6.22-rc1/include/asm-arm/arch-at91/at91sam9260_matrix.h
   #define                       AT91_MATRIX_CS5A_SMC            (0 << 5)
   #define                       AT91_MATRIX_CS5A_SMC_CF2        (1 << 5)
   #define               AT91_MATRIX_DBPUC               (1 << 8)        /* Data Bus Pull-up Configuration */
   #define                       AT91_MATRIX_CS5A_SMC            (0 << 5)
   #define                       AT91_MATRIX_CS5A_SMC_CF2        (1 << 5)
   #define               AT91_MATRIX_DBPUC               (1 << 8)        /* Data Bus Pull-up Configuration */
-diff -urN -x CVS linux-2.6.22-rc1/include/asm-arm/arch-at91/board.h linux-2.6-stable/include/asm-arm/arch-at91/board.h
---- linux-2.6.22-rc1/include/asm-arm/arch-at91/board.h Thu May 17 12:13:17 2007
-+++ linux-2.6-stable/include/asm-arm/arch-at91/board.h Thu May 10 12:21:10 2007
-@@ -124,9 +124,21 @@
+Index: linux-2.6.22.19/include/asm-arm/arch-at91/board.h
+===================================================================
+--- linux-2.6.22.19.orig/include/asm-arm/arch-at91/board.h
++++ linux-2.6.22.19/include/asm-arm/arch-at91/board.h
+@@ -124,9 +124,21 @@ struct atmel_ac97_data {
   };
   extern void __init at91_add_device_ac97(struct atmel_ac97_data *data);
   
   };
   extern void __init at91_add_device_ac97(struct atmel_ac97_data *data);
   
@@ -6074,9 +6112,10 @@ diff -urN -x CVS linux-2.6.22-rc1/include/asm-arm/arch-at91/board.h linux-2.6-st
  +extern void __init at91_gpio_leds(struct at91_gpio_led *leds, int nr);
  +
   #endif
  +extern void __init at91_gpio_leds(struct at91_gpio_led *leds, int nr);
  +
   #endif
-diff -urN -x CVS linux-2.6.22-rc1/include/asm-arm/arch-at91/ics1523.h linux-2.6-stable/include/asm-arm/arch-at91/ics1523.h
---- linux-2.6.22-rc1/include/asm-arm/arch-at91/ics1523.h       Thu Jan  1 02:00:00 1970
-+++ linux-2.6-stable/include/asm-arm/arch-at91/ics1523.h       Mon May 14 13:49:47 2007
+Index: linux-2.6.22.19/include/asm-arm/arch-at91/ics1523.h
+===================================================================
+--- /dev/null
++++ linux-2.6.22.19/include/asm-arm/arch-at91/ics1523.h
  @@ -0,0 +1,154 @@
  +//*----------------------------------------------------------------------------
  +//*         ATMEL Microcontroller Software Support  -  ROUSSET  -
  @@ -0,0 +1,154 @@
  +//*----------------------------------------------------------------------------
  +//*         ATMEL Microcontroller Software Support  -  ROUSSET  -
@@ -6232,9 +6271,10 @@ diff -urN -x CVS linux-2.6.22-rc1/include/asm-arm/arch-at91/ics1523.h linux-2.6-
  +int at91_ics1523_init(void);
  +
  +#endif /* ics1523_h */
  +int at91_ics1523_init(void);
  +
  +#endif /* ics1523_h */
-diff -urN -x CVS linux-2.6.22-rc1/include/asm-arm/arch-at91/spi.h linux-2.6-stable/include/asm-arm/arch-at91/spi.h
---- linux-2.6.22-rc1/include/asm-arm/arch-at91/spi.h   Thu Jan  1 02:00:00 1970
-+++ linux-2.6-stable/include/asm-arm/arch-at91/spi.h   Mon May 14 13:49:47 2007
+Index: linux-2.6.22.19/include/asm-arm/arch-at91/spi.h
+===================================================================
+--- /dev/null
++++ linux-2.6.22.19/include/asm-arm/arch-at91/spi.h
  @@ -0,0 +1,54 @@
  +/*
  + * Serial Peripheral Interface (SPI) driver for the Atmel AT91RM9200
  @@ -0,0 +1,54 @@
  +/*
  + * Serial Peripheral Interface (SPI) driver for the Atmel AT91RM9200
@@ -6290,10 +6330,11 @@ diff -urN -x CVS linux-2.6.22-rc1/include/asm-arm/arch-at91/spi.h linux-2.6-stab
  +extern int spi_transfer(struct spi_transfer_list* list);
  +
  +#endif
  +extern int spi_transfer(struct spi_transfer_list* list);
  +
  +#endif
-diff -urN -x CVS linux-2.6.22-rc1/include/linux/clk.h linux-2.6-stable/include/linux/clk.h
---- linux-2.6.22-rc1/include/linux/clk.h       Thu Apr 26 05:08:32 2007
-+++ linux-2.6-stable/include/linux/clk.h       Tue May  8 12:13:31 2007
-@@ -121,4 +121,24 @@
+Index: linux-2.6.22.19/include/linux/clk.h
+===================================================================
+--- linux-2.6.22.19.orig/include/linux/clk.h
++++ linux-2.6.22.19/include/linux/clk.h
+@@ -121,4 +121,24 @@ int clk_set_parent(struct clk *clk, stru
    */
   struct clk *clk_get_parent(struct clk *clk);
   
    */
   struct clk *clk_get_parent(struct clk *clk);
   
@@ -6318,9 +6359,10 @@ diff -urN -x CVS linux-2.6.22-rc1/include/linux/clk.h linux-2.6-stable/include/l
  +int clk_must_disable(struct clk *clk);
  +
   #endif
  +int clk_must_disable(struct clk *clk);
  +
   #endif
-diff -urN -x CVS linux-2.6.22-rc1/include/linux/i2c-id.h linux-2.6-stable/include/linux/i2c-id.h
---- linux-2.6.22-rc1/include/linux/i2c-id.h    Thu May 17 12:13:23 2007
-+++ linux-2.6-stable/include/linux/i2c-id.h    Mon May 14 10:18:35 2007
+Index: linux-2.6.22.19/include/linux/i2c-id.h
+===================================================================
+--- linux-2.6.22.19.orig/include/linux/i2c-id.h
++++ linux-2.6.22.19/include/linux/i2c-id.h
  @@ -203,6 +203,7 @@
   
   /* --- PCA 9564 based algorithms */
  @@ -203,6 +203,7 @@
   
   /* --- PCA 9564 based algorithms */
@@ -6329,9 +6371,10 @@ diff -urN -x CVS linux-2.6.22-rc1/include/linux/i2c-id.h linux-2.6-stable/includ
   
   /* --- ACPI Embedded controller algorithms                              */
   #define I2C_HW_ACPI_EC          0x1f0000
   
   /* --- ACPI Embedded controller algorithms                              */
   #define I2C_HW_ACPI_EC          0x1f0000
-diff -urN -x CVS linux-2.6.22-rc1/sound/soc/at91/eti_b1_wm8731.c linux-2.6-stable/sound/soc/at91/eti_b1_wm8731.c
---- linux-2.6.22-rc1/sound/soc/at91/eti_b1_wm8731.c    Thu May 17 12:13:36 2007
-+++ linux-2.6-stable/sound/soc/at91/eti_b1_wm8731.c    Mon May 14 10:19:04 2007
+Index: linux-2.6.22.19/sound/soc/at91/eti_b1_wm8731.c
+===================================================================
+--- linux-2.6.22.19.orig/sound/soc/at91/eti_b1_wm8731.c
++++ linux-2.6.22.19/sound/soc/at91/eti_b1_wm8731.c
  @@ -34,8 +34,7 @@
   #include <sound/soc.h>
   #include <sound/soc-dapm.h>
  @@ -34,8 +34,7 @@
   #include <sound/soc.h>
   #include <sound/soc-dapm.h>
@@ -6356,7 +6399,7 @@ diff -urN -x CVS linux-2.6.22-rc1/sound/soc/at91/eti_b1_wm8731.c linux-2.6-stabl
   static struct clk *pck1_clk;
   static struct clk *pllb_clk;
   
   static struct clk *pck1_clk;
   static struct clk *pllb_clk;
   
-@@ -277,7 +269,6 @@
+@@ -277,7 +269,6 @@ static struct platform_device *eti_b1_sn
   static int __init eti_b1_init(void)
   {
         int ret;
   static int __init eti_b1_init(void)
   {
         int ret;
@@ -6364,7 +6407,7 @@ diff -urN -x CVS linux-2.6.22-rc1/sound/soc/at91/eti_b1_wm8731.c linux-2.6-stabl
         struct at91_ssc_periph *ssc = eti_b1_dai.cpu_dai->private_data;
   
         if (!request_mem_region(AT91RM9200_BASE_SSC1, SZ_16K, "soc-audio")) {
         struct at91_ssc_periph *ssc = eti_b1_dai.cpu_dai->private_data;
   
         if (!request_mem_region(AT91RM9200_BASE_SSC1, SZ_16K, "soc-audio")) {
-@@ -311,19 +302,12 @@
+@@ -311,19 +302,12 @@ static int __init eti_b1_init(void)
                 goto fail_io_unmap;
         }
   
                 goto fail_io_unmap;
         }
   
@@ -6390,9 +6433,10 @@ diff -urN -x CVS linux-2.6.22-rc1/sound/soc/at91/eti_b1_wm8731.c linux-2.6-stabl
   
         /*
          * Set PCK1 parent to PLLB and its rate to 12 Mhz.
   
         /*
          * Set PCK1 parent to PLLB and its rate to 12 Mhz.
-diff -urN linux-2.6.22-rc5/drivers/char/at91_spi.c linux-2.6.22-rc5.new/drivers/char/at91_spi.c
---- linux-2.6.22-rc5/drivers/char/at91_spi.c   1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.22-rc5.new/drivers/char/at91_spi.c       2007-07-29 05:55:39.000000000 +0200
+Index: linux-2.6.22.19/drivers/char/at91_spi.c
+===================================================================
+--- /dev/null
++++ linux-2.6.22.19/drivers/char/at91_spi.c
  @@ -0,0 +1,336 @@
  +/*
  + * Serial Peripheral Interface (SPI) driver for the Atmel AT91RM9200 (Thunder)
  @@ -0,0 +1,336 @@
  +/*
  + * Serial Peripheral Interface (SPI) driver for the Atmel AT91RM9200 (Thunder)
@@ -6730,9 +6774,10 @@ diff -urN linux-2.6.22-rc5/drivers/char/at91_spi.c linux-2.6.22-rc5.new/drivers/
  +MODULE_LICENSE("GPL")
  +MODULE_AUTHOR("Andrew Victor")
  +MODULE_DESCRIPTION("SPI driver for Atmel AT91RM9200")
  +MODULE_LICENSE("GPL")
  +MODULE_AUTHOR("Andrew Victor")
  +MODULE_DESCRIPTION("SPI driver for Atmel AT91RM9200")
-diff -urN linux-2.6.22-rc5/drivers/char/at91_spidev.c linux-2.6.22-rc5.new/drivers/char/at91_spidev.c
---- linux-2.6.22-rc5/drivers/char/at91_spidev.c        1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.22-rc5.new/drivers/char/at91_spidev.c    2007-07-29 05:55:39.000000000 +0200
+Index: linux-2.6.22.19/drivers/char/at91_spidev.c
+===================================================================
+--- /dev/null
++++ linux-2.6.22.19/drivers/char/at91_spidev.c
  @@ -0,0 +1,236 @@
  +/*
  + * User-space interface to the SPI bus on Atmel AT91RM9200
  @@ -0,0 +1,236 @@
  +/*
  + * User-space interface to the SPI bus on Atmel AT91RM9200
@@ -6970,10 +7015,11 @@ diff -urN linux-2.6.22-rc5/drivers/char/at91_spidev.c linux-2.6.22-rc5.new/drive
  +MODULE_LICENSE("GPL")
  +MODULE_AUTHOR("Andrew Victor")
  +MODULE_DESCRIPTION("SPI /dev interface for Atmel AT91RM9200")
  +MODULE_LICENSE("GPL")
  +MODULE_AUTHOR("Andrew Victor")
  +MODULE_DESCRIPTION("SPI /dev interface for Atmel AT91RM9200")
-diff -urN linux-2.6.22-rc5/drivers/char/Kconfig linux-2.6.22-rc5.new/drivers/char/Kconfig
---- linux-2.6.22-rc5/drivers/char/Kconfig      2007-06-17 04:09:12.000000000 +0200
-+++ linux-2.6.22-rc5.new/drivers/char/Kconfig  2007-07-29 05:55:39.000000000 +0200
-@@ -1083,5 +1083,21 @@
+Index: linux-2.6.22.19/drivers/char/Kconfig
+===================================================================
+--- linux-2.6.22.19.orig/drivers/char/Kconfig
++++ linux-2.6.22.19/drivers/char/Kconfig
+@@ -1083,5 +1083,21 @@ config DEVPORT
   
   source "drivers/s390/char/Kconfig"
   
   
   source "drivers/s390/char/Kconfig"
   
@@ -6995,10 +7041,11 @@ diff -urN linux-2.6.22-rc5/drivers/char/Kconfig linux-2.6.22-rc5.new/drivers/cha
  +
   endmenu
   
  +
   endmenu
   
-diff -urN linux-2.6.22-rc5/drivers/char/Makefile linux-2.6.22-rc5.new/drivers/char/Makefile
---- linux-2.6.22-rc5/drivers/char/Makefile     2007-06-17 04:09:12.000000000 +0200
-+++ linux-2.6.22-rc5.new/drivers/char/Makefile 2007-07-29 05:55:39.000000000 +0200
-@@ -93,6 +93,8 @@
+Index: linux-2.6.22.19/drivers/char/Makefile
+===================================================================
+--- linux-2.6.22.19.orig/drivers/char/Makefile
++++ linux-2.6.22.19/drivers/char/Makefile
+@@ -93,6 +93,8 @@ obj-$(CONFIG_CS5535_GPIO)    += cs5535_gpio
   obj-$(CONFIG_GPIO_VR41XX)     += vr41xx_giu.o
   obj-$(CONFIG_GPIO_TB0219)     += tb0219.o
   obj-$(CONFIG_TELCLOCK)                += tlclk.o
   obj-$(CONFIG_GPIO_VR41XX)     += vr41xx_giu.o
   obj-$(CONFIG_GPIO_TB0219)     += tb0219.o
   obj-$(CONFIG_TELCLOCK)                += tlclk.o
@@ -7007,9 +7054,10 @@ diff -urN linux-2.6.22-rc5/drivers/char/Makefile linux-2.6.22-rc5.new/drivers/ch
   
   obj-$(CONFIG_WATCHDOG)                += watchdog/
   obj-$(CONFIG_MWAVE)           += mwave/
   
   obj-$(CONFIG_WATCHDOG)                += watchdog/
   obj-$(CONFIG_MWAVE)           += mwave/
-diff -urN linux-2.6.22-rc5/drivers/i2c/busses/i2c-at91.c linux-2.6.22-rc5.new/drivers/i2c/busses/i2c-at91.c
---- linux-2.6.22-rc5/drivers/i2c/busses/i2c-at91.c     2007-06-17 04:09:12.000000000 +0200
-+++ linux-2.6.22-rc5.new/drivers/i2c/busses/i2c-at91.c 2007-07-29 05:55:39.000000000 +0200
+Index: linux-2.6.22.19/drivers/i2c/busses/i2c-at91.c
+===================================================================
+--- linux-2.6.22.19.orig/drivers/i2c/busses/i2c-at91.c
++++ linux-2.6.22.19/drivers/i2c/busses/i2c-at91.c
  @@ -31,8 +31,11 @@
   #include <asm/arch/board.h>
   #include <asm/arch/cpu.h>
  @@ -31,8 +31,11 @@
   #include <asm/arch/board.h>
   #include <asm/arch/cpu.h>
@@ -7023,7 +7071,7 @@ diff -urN linux-2.6.22-rc5/drivers/i2c/busses/i2c-at91.c linux-2.6.22-rc5.new/dr
   
   static struct clk *twi_clk;
   static void __iomem *twi_base;
   
   static struct clk *twi_clk;
   static void __iomem *twi_base;
-@@ -53,7 +56,7 @@
+@@ -53,7 +56,7 @@ static void __devinit at91_twi_hwinit(vo
         at91_twi_write(AT91_TWI_CR, AT91_TWI_MSEN);     /* Set Master mode */
   
         /* Calcuate clock dividers */
         at91_twi_write(AT91_TWI_CR, AT91_TWI_MSEN);     /* Set Master mode */
   
         /* Calcuate clock dividers */
@@ -7032,7 +7080,7 @@ diff -urN linux-2.6.22-rc5/drivers/i2c/busses/i2c-at91.c linux-2.6.22-rc5.new/dr
         cdiv = cdiv + 1;        /* round up */
         ckdiv = 0;
         while (cdiv > 255) {
         cdiv = cdiv + 1;        /* round up */
         ckdiv = 0;
         while (cdiv > 255) {
-@@ -61,11 +64,12 @@
+@@ -61,11 +64,12 @@ static void __devinit at91_twi_hwinit(vo
                 cdiv = cdiv >> 1;
         }
   
                 cdiv = cdiv >> 1;
         }
   
@@ -7050,9 +7098,10 @@ diff -urN linux-2.6.22-rc5/drivers/i2c/busses/i2c-at91.c linux-2.6.22-rc5.new/dr
         }
   
         at91_twi_write(AT91_TWI_CWGR, (ckdiv << 16) | (cdiv << 8) | cdiv);
         }
   
         at91_twi_write(AT91_TWI_CWGR, (ckdiv << 16) | (cdiv << 8) | cdiv);
-diff -urN linux-2.6.22-rc5/drivers/i2c/busses/i2c-pca.c linux-2.6.22-rc5.new/drivers/i2c/busses/i2c-pca.c
---- linux-2.6.22-rc5/drivers/i2c/busses/i2c-pca.c      1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.22-rc5.new/drivers/i2c/busses/i2c-pca.c  2007-07-29 05:55:39.000000000 +0200
+Index: linux-2.6.22.19/drivers/i2c/busses/i2c-pca.c
+===================================================================
+--- /dev/null
++++ linux-2.6.22.19/drivers/i2c/busses/i2c-pca.c
  @@ -0,0 +1,213 @@
  +/*
  + *  Platform driver for PCA9564 I2C bus controller.
  @@ -0,0 +1,213 @@
  +/*
  + *  Platform driver for PCA9564 I2C bus controller.
@@ -7267,10 +7316,11 @@ diff -urN linux-2.6.22-rc5/drivers/i2c/busses/i2c-pca.c linux-2.6.22-rc5.new/dri
  +MODULE_AUTHOR("Andrew Victor");
  +MODULE_DESCRIPTION("PCA9564 platform driver");
  +MODULE_LICENSE("GPL");
  +MODULE_AUTHOR("Andrew Victor");
  +MODULE_DESCRIPTION("PCA9564 platform driver");
  +MODULE_LICENSE("GPL");
-diff -urN linux-2.6.22-rc5/drivers/i2c/busses/Kconfig linux-2.6.22-rc5.new/drivers/i2c/busses/Kconfig
---- linux-2.6.22-rc5/drivers/i2c/busses/Kconfig        2007-06-17 04:09:12.000000000 +0200
-+++ linux-2.6.22-rc5.new/drivers/i2c/busses/Kconfig    2007-07-29 05:55:39.000000000 +0200
-@@ -80,6 +80,14 @@
+Index: linux-2.6.22.19/drivers/i2c/busses/Kconfig
+===================================================================
+--- linux-2.6.22.19.orig/drivers/i2c/busses/Kconfig
++++ linux-2.6.22.19/drivers/i2c/busses/Kconfig
+@@ -80,6 +80,14 @@ config I2C_AT91
           This supports the use of the I2C interface on Atmel AT91
           processors.
   
           This supports the use of the I2C interface on Atmel AT91
           processors.
   
@@ -7285,7 +7335,7 @@ diff -urN linux-2.6.22-rc5/drivers/i2c/busses/Kconfig linux-2.6.22-rc5.new/drive
   config I2C_AU1550
         tristate "Au1550/Au1200 SMBus interface"
         depends on SOC_AU1550 || SOC_AU1200
   config I2C_AU1550
         tristate "Au1550/Au1200 SMBus interface"
         depends on SOC_AU1550 || SOC_AU1200
-@@ -598,6 +606,14 @@
+@@ -598,6 +606,14 @@ config I2C_VOODOO3
           This driver can also be built as a module.  If so, the module
           will be called i2c-voodoo3.
   
           This driver can also be built as a module.  If so, the module
           will be called i2c-voodoo3.
   
@@ -7300,10 +7350,11 @@ diff -urN linux-2.6.22-rc5/drivers/i2c/busses/Kconfig linux-2.6.22-rc5.new/drive
   config I2C_PCA_ISA
         tristate "PCA9564 on an ISA bus"
         depends on ISA
   config I2C_PCA_ISA
         tristate "PCA9564 on an ISA bus"
         depends on ISA
-diff -urN linux-2.6.22-rc5/drivers/i2c/busses/Makefile linux-2.6.22-rc5.new/drivers/i2c/busses/Makefile
---- linux-2.6.22-rc5/drivers/i2c/busses/Makefile       2007-06-17 04:09:12.000000000 +0200
-+++ linux-2.6.22-rc5.new/drivers/i2c/busses/Makefile   2007-07-29 05:55:39.000000000 +0200
-@@ -30,6 +30,7 @@
+Index: linux-2.6.22.19/drivers/i2c/busses/Makefile
+===================================================================
+--- linux-2.6.22.19.orig/drivers/i2c/busses/Makefile
++++ linux-2.6.22.19/drivers/i2c/busses/Makefile
+@@ -30,6 +30,7 @@ obj-$(CONFIG_I2C_OMAP)               += i2c-omap.o
   obj-$(CONFIG_I2C_PARPORT)     += i2c-parport.o
   obj-$(CONFIG_I2C_PARPORT_LIGHT)       += i2c-parport-light.o
   obj-$(CONFIG_I2C_PASEMI)      += i2c-pasemi.o
   obj-$(CONFIG_I2C_PARPORT)     += i2c-parport.o
   obj-$(CONFIG_I2C_PARPORT_LIGHT)       += i2c-parport-light.o
   obj-$(CONFIG_I2C_PASEMI)      += i2c-pasemi.o
@@ -7311,10 +7362,11 @@ diff -urN linux-2.6.22-rc5/drivers/i2c/busses/Makefile linux-2.6.22-rc5.new/driv
   obj-$(CONFIG_I2C_PCA_ISA)     += i2c-pca-isa.o
   obj-$(CONFIG_I2C_PIIX4)               += i2c-piix4.o
   obj-$(CONFIG_I2C_PNX)         += i2c-pnx.o
   obj-$(CONFIG_I2C_PCA_ISA)     += i2c-pca-isa.o
   obj-$(CONFIG_I2C_PIIX4)               += i2c-piix4.o
   obj-$(CONFIG_I2C_PNX)         += i2c-pnx.o
-diff -urN linux-2.6.22-rc5/drivers/leds/Kconfig linux-2.6.22-rc5.new/drivers/leds/Kconfig
---- linux-2.6.22-rc5/drivers/leds/Kconfig      2007-06-17 04:09:12.000000000 +0200
-+++ linux-2.6.22-rc5.new/drivers/leds/Kconfig  2007-07-29 05:55:39.000000000 +0200
-@@ -77,6 +77,13 @@
+Index: linux-2.6.22.19/drivers/leds/Kconfig
+===================================================================
+--- linux-2.6.22.19.orig/drivers/leds/Kconfig
++++ linux-2.6.22.19/drivers/leds/Kconfig
+@@ -77,6 +77,13 @@ config LEDS_NET48XX
           This option enables support for the Soekris net4801 and net4826 error
           LED.
   
           This option enables support for the Soekris net4801 and net4826 error
           LED.
   
@@ -7328,9 +7380,10 @@ diff -urN linux-2.6.22-rc5/drivers/leds/Kconfig linux-2.6.22-rc5.new/drivers/led
   config LEDS_WRAP
         tristate "LED Support for the WRAP series LEDs"
         depends on LEDS_CLASS && SCx200_GPIO
   config LEDS_WRAP
         tristate "LED Support for the WRAP series LEDs"
         depends on LEDS_CLASS && SCx200_GPIO
-diff -urN linux-2.6.22-rc5/drivers/leds/leds-at91.c linux-2.6.22-rc5.new/drivers/leds/leds-at91.c
---- linux-2.6.22-rc5/drivers/leds/leds-at91.c  1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.22-rc5.new/drivers/leds/leds-at91.c      2007-07-29 05:55:39.000000000 +0200
+Index: linux-2.6.22.19/drivers/leds/leds-at91.c
+===================================================================
+--- /dev/null
++++ linux-2.6.22.19/drivers/leds/leds-at91.c
  @@ -0,0 +1,140 @@
  +/*
  + * AT91 GPIO based LED driver
  @@ -0,0 +1,140 @@
  +/*
  + * AT91 GPIO based LED driver
@@ -7472,10 +7525,11 @@ diff -urN linux-2.6.22-rc5/drivers/leds/leds-at91.c linux-2.6.22-rc5.new/drivers
  +MODULE_DESCRIPTION("AT91 GPIO LED driver");
  +MODULE_AUTHOR("David Brownell");
  +MODULE_LICENSE("GPL");
  +MODULE_DESCRIPTION("AT91 GPIO LED driver");
  +MODULE_AUTHOR("David Brownell");
  +MODULE_LICENSE("GPL");
-diff -urN linux-2.6.22-rc5/drivers/leds/Makefile linux-2.6.22-rc5.new/drivers/leds/Makefile
---- linux-2.6.22-rc5/drivers/leds/Makefile     2007-06-17 04:09:12.000000000 +0200
-+++ linux-2.6.22-rc5.new/drivers/leds/Makefile 2007-07-29 05:55:39.000000000 +0200
-@@ -16,6 +16,7 @@
+Index: linux-2.6.22.19/drivers/leds/Makefile
+===================================================================
+--- linux-2.6.22.19.orig/drivers/leds/Makefile
++++ linux-2.6.22.19/drivers/leds/Makefile
+@@ -16,6 +16,7 @@ obj-$(CONFIG_LEDS_NET48XX)           += leds-net4
   obj-$(CONFIG_LEDS_WRAP)                       += leds-wrap.o
   obj-$(CONFIG_LEDS_H1940)              += leds-h1940.o
   obj-$(CONFIG_LEDS_COBALT)             += leds-cobalt.o
   obj-$(CONFIG_LEDS_WRAP)                       += leds-wrap.o
   obj-$(CONFIG_LEDS_H1940)              += leds-h1940.o
   obj-$(CONFIG_LEDS_COBALT)             += leds-cobalt.o
@@ -7483,9 +7537,10 @@ diff -urN linux-2.6.22-rc5/drivers/leds/Makefile linux-2.6.22-rc5.new/drivers/le
   
   # LED Triggers
   obj-$(CONFIG_LEDS_TRIGGER_TIMER)      += ledtrig-timer.o
   
   # LED Triggers
   obj-$(CONFIG_LEDS_TRIGGER_TIMER)      += ledtrig-timer.o
-diff -urN linux-2.6.22-rc5/drivers/mmc/host/at91_mci.c linux-2.6.22-rc5.new/drivers/mmc/host/at91_mci.c
---- linux-2.6.22-rc5/drivers/mmc/host/at91_mci.c       2007-06-17 04:09:12.000000000 +0200
-+++ linux-2.6.22-rc5.new/drivers/mmc/host/at91_mci.c   2007-07-29 05:57:56.000000000 +0200
+Index: linux-2.6.22.19/drivers/mmc/host/at91_mci.c
+===================================================================
+--- linux-2.6.22.19.orig/drivers/mmc/host/at91_mci.c
++++ linux-2.6.22.19/drivers/mmc/host/at91_mci.c
  @@ -85,7 +85,7 @@
   
   #define AT91_MCI_ERRORS       (AT91_MCI_RINDE | AT91_MCI_RDIRE | AT91_MCI_RCRCE       \
  @@ -85,7 +85,7 @@
   
   #define AT91_MCI_ERRORS       (AT91_MCI_RINDE | AT91_MCI_RDIRE | AT91_MCI_RCRCE       \
@@ -7495,7 +7550,7 @@ diff -urN linux-2.6.22-rc5/drivers/mmc/host/at91_mci.c linux-2.6.22-rc5.new/driv
   
   #define at91_mci_read(host, reg)      __raw_readl((host)->baseaddr + (reg))
   #define at91_mci_write(host, reg, val)        __raw_writel((val), (host)->baseaddr + (reg))
   
   #define at91_mci_read(host, reg)      __raw_readl((host)->baseaddr + (reg))
   #define at91_mci_write(host, reg, val)        __raw_writel((val), (host)->baseaddr + (reg))
-@@ -560,9 +560,7 @@
+@@ -560,9 +560,7 @@ static void at91mci_completed_command(st
         pr_debug("Status = %08X [%08X %08X %08X %08X]\n",
                  status, cmd->resp[0], cmd->resp[1], cmd->resp[2], cmd->resp[3]);
   
         pr_debug("Status = %08X [%08X %08X %08X %08X]\n",
                  status, cmd->resp[0], cmd->resp[1], cmd->resp[2], cmd->resp[3]);
   
@@ -7506,7 +7561,7 @@ diff -urN linux-2.6.22-rc5/drivers/mmc/host/at91_mci.c linux-2.6.22-rc5.new/driv
                 if ((status & AT91_MCI_RCRCE) && !(mmc_resp_type(cmd) & MMC_RSP_CRC)) {
                         cmd->error = MMC_ERR_NONE;
                 }
                 if ((status & AT91_MCI_RCRCE) && !(mmc_resp_type(cmd) & MMC_RSP_CRC)) {
                         cmd->error = MMC_ERR_NONE;
                 }
-@@ -663,15 +661,15 @@
+@@ -663,15 +661,15 @@ static irqreturn_t at91_mci_irq(int irq,
   
         int_status = at91_mci_read(host, AT91_MCI_SR);
         int_mask = at91_mci_read(host, AT91_MCI_IMR);
   
         int_status = at91_mci_read(host, AT91_MCI_SR);
         int_mask = at91_mci_read(host, AT91_MCI_IMR);
@@ -7525,7 +7580,7 @@ diff -urN linux-2.6.22-rc5/drivers/mmc/host/at91_mci.c linux-2.6.22-rc5.new/driv
                 if (int_status & AT91_MCI_UNRE)
                         pr_debug("MMC: Underrun error\n");
                 if (int_status & AT91_MCI_OVRE)
                 if (int_status & AT91_MCI_UNRE)
                         pr_debug("MMC: Underrun error\n");
                 if (int_status & AT91_MCI_OVRE)
-@@ -819,7 +817,7 @@
+@@ -819,7 +817,7 @@ static int __init at91_mci_probe(struct 
         mmc->f_min = 375000;
         mmc->f_max = 25000000;
         mmc->ocr_avail = MMC_VDD_32_33 | MMC_VDD_33_34;
         mmc->f_min = 375000;
         mmc->f_max = 25000000;
         mmc->ocr_avail = MMC_VDD_32_33 | MMC_VDD_33_34;
@@ -7534,7 +7589,7 @@ diff -urN linux-2.6.22-rc5/drivers/mmc/host/at91_mci.c linux-2.6.22-rc5.new/driv
   
         mmc->max_blk_size = 4095;
         mmc->max_blk_count = mmc->max_req_size;
   
         mmc->max_blk_size = 4095;
         mmc->max_blk_count = mmc->max_req_size;
-@@ -893,6 +891,8 @@
+@@ -893,6 +891,8 @@ static int __init at91_mci_probe(struct 
   
         mmc_add_host(mmc);
   
   
         mmc_add_host(mmc);
   
@@ -7543,7 +7598,7 @@ diff -urN linux-2.6.22-rc5/drivers/mmc/host/at91_mci.c linux-2.6.22-rc5.new/driv
         /*
          * monitor card insertion/removal if we can
          */
         /*
          * monitor card insertion/removal if we can
          */
-@@ -922,6 +922,8 @@
+@@ -922,6 +922,8 @@ static int __exit at91_mci_remove(struct
   
         host = mmc_priv(mmc);
   
   
         host = mmc_priv(mmc);
   
@@ -7552,7 +7607,7 @@ diff -urN linux-2.6.22-rc5/drivers/mmc/host/at91_mci.c linux-2.6.22-rc5.new/driv
         if (host->present != -1) {
                 free_irq(host->board->det_pin, host);
                 cancel_delayed_work(&host->mmc->detect);
         if (host->present != -1) {
                 free_irq(host->board->det_pin, host);
                 cancel_delayed_work(&host->mmc->detect);
-@@ -949,8 +951,12 @@
+@@ -949,8 +951,12 @@ static int __exit at91_mci_remove(struct
   static int at91_mci_suspend(struct platform_device *pdev, pm_message_t state)
   {
         struct mmc_host *mmc = platform_get_drvdata(pdev);
   static int at91_mci_suspend(struct platform_device *pdev, pm_message_t state)
   {
         struct mmc_host *mmc = platform_get_drvdata(pdev);
@@ -7565,7 +7620,7 @@ diff -urN linux-2.6.22-rc5/drivers/mmc/host/at91_mci.c linux-2.6.22-rc5.new/driv
         if (mmc)
                 ret = mmc_suspend_host(mmc, state);
   
         if (mmc)
                 ret = mmc_suspend_host(mmc, state);
   
-@@ -960,8 +966,12 @@
+@@ -960,8 +966,12 @@ static int at91_mci_suspend(struct platf
   static int at91_mci_resume(struct platform_device *pdev)
   {
         struct mmc_host *mmc = platform_get_drvdata(pdev);
   static int at91_mci_resume(struct platform_device *pdev)
   {
         struct mmc_host *mmc = platform_get_drvdata(pdev);
@@ -7578,9 +7633,10 @@ diff -urN linux-2.6.22-rc5/drivers/mmc/host/at91_mci.c linux-2.6.22-rc5.new/driv
         if (mmc)
                 ret = mmc_resume_host(mmc);
   
         if (mmc)
                 ret = mmc_resume_host(mmc);
   
-diff -urN linux-2.6.22-rc5/drivers/mtd/devices/at91_dataflash.c linux-2.6.22-rc5.new/drivers/mtd/devices/at91_dataflash.c
---- linux-2.6.22-rc5/drivers/mtd/devices/at91_dataflash.c      1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.22-rc5.new/drivers/mtd/devices/at91_dataflash.c  2007-07-29 05:55:39.000000000 +0200
+Index: linux-2.6.22.19/drivers/mtd/devices/at91_dataflash.c
+===================================================================
+--- /dev/null
++++ linux-2.6.22.19/drivers/mtd/devices/at91_dataflash.c
  @@ -0,0 +1,667 @@
  +/*
  + * Atmel DataFlash driver for Atmel AT91RM9200 (Thunder)
  @@ -0,0 +1,667 @@
  +/*
  + * Atmel DataFlash driver for Atmel AT91RM9200 (Thunder)
@@ -8249,10 +8305,11 @@ diff -urN linux-2.6.22-rc5/drivers/mtd/devices/at91_dataflash.c linux-2.6.22-rc5
  +MODULE_LICENSE("GPL");
  +MODULE_AUTHOR("Andrew Victor");
  +MODULE_DESCRIPTION("DataFlash driver for Atmel AT91RM9200");
  +MODULE_LICENSE("GPL");
  +MODULE_AUTHOR("Andrew Victor");
  +MODULE_DESCRIPTION("DataFlash driver for Atmel AT91RM9200");
-diff -urN linux-2.6.22-rc5/drivers/mtd/devices/Kconfig linux-2.6.22-rc5.new/drivers/mtd/devices/Kconfig
---- linux-2.6.22-rc5/drivers/mtd/devices/Kconfig       2007-06-17 04:09:12.000000000 +0200
-+++ linux-2.6.22-rc5.new/drivers/mtd/devices/Kconfig   2007-07-29 05:55:39.000000000 +0200
-@@ -269,5 +269,11 @@
+Index: linux-2.6.22.19/drivers/mtd/devices/Kconfig
+===================================================================
+--- linux-2.6.22.19.orig/drivers/mtd/devices/Kconfig
++++ linux-2.6.22.19/drivers/mtd/devices/Kconfig
+@@ -269,5 +269,11 @@ config MTD_DOCPROBE_55AA
           LinuxBIOS or if you need to recover a DiskOnChip Millennium on which
           you have managed to wipe the first block.
   
           LinuxBIOS or if you need to recover a DiskOnChip Millennium on which
           you have managed to wipe the first block.
   
@@ -8265,18 +8322,20 @@ diff -urN linux-2.6.22-rc5/drivers/mtd/devices/Kconfig linux-2.6.22-rc5.new/driv
  +        If you have such a board, say 'Y'.
   
  +endmenu
  +        If you have such a board, say 'Y'.
   
  +endmenu
-diff -urN linux-2.6.22-rc5/drivers/mtd/devices/Makefile linux-2.6.22-rc5.new/drivers/mtd/devices/Makefile
---- linux-2.6.22-rc5/drivers/mtd/devices/Makefile      2007-06-17 04:09:12.000000000 +0200
-+++ linux-2.6.22-rc5.new/drivers/mtd/devices/Makefile  2007-07-29 05:55:39.000000000 +0200
-@@ -18,3 +18,4 @@
+Index: linux-2.6.22.19/drivers/mtd/devices/Makefile
+===================================================================
+--- linux-2.6.22.19.orig/drivers/mtd/devices/Makefile
++++ linux-2.6.22.19/drivers/mtd/devices/Makefile
+@@ -18,3 +18,4 @@ obj-$(CONFIG_MTD_BLOCK2MTD)  += block2mtd
   obj-$(CONFIG_MTD_DATAFLASH)   += mtd_dataflash.o
   obj-$(CONFIG_MTD_DATAFLASH26) += at91_dataflash26.o
   obj-$(CONFIG_MTD_M25P80)      += m25p80.o
  +obj-$(CONFIG_MTD_AT91_DATAFLASH)+= at91_dataflash.o
   obj-$(CONFIG_MTD_DATAFLASH)   += mtd_dataflash.o
   obj-$(CONFIG_MTD_DATAFLASH26) += at91_dataflash26.o
   obj-$(CONFIG_MTD_M25P80)      += m25p80.o
  +obj-$(CONFIG_MTD_AT91_DATAFLASH)+= at91_dataflash.o
-diff -urN linux-2.6.22-rc5/drivers/net/arm/at91_ether.c linux-2.6.22-rc5.new/drivers/net/arm/at91_ether.c
---- linux-2.6.22-rc5/drivers/net/arm/at91_ether.c      2007-06-17 04:09:12.000000000 +0200
-+++ linux-2.6.22-rc5.new/drivers/net/arm/at91_ether.c  2007-07-29 05:55:39.000000000 +0200
-@@ -894,6 +894,7 @@
+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
+@@ -894,6 +894,7 @@ static void at91ether_rx(struct net_devi
                         skb_reserve(skb, 2);
                         memcpy(skb_put(skb, pktlen), p_recv, pktlen);
   
                         skb_reserve(skb, 2);
                         memcpy(skb_put(skb, pktlen), p_recv, pktlen);
   
@@ -8284,7 +8343,7 @@ diff -urN linux-2.6.22-rc5/drivers/net/arm/at91_ether.c linux-2.6.22-rc5.new/dri
                         skb->protocol = eth_type_trans(skb, dev);
                         dev->last_rx = jiffies;
                         lp->stats.rx_bytes += pktlen;
                         skb->protocol = eth_type_trans(skb, dev);
                         dev->last_rx = jiffies;
                         lp->stats.rx_bytes += pktlen;
-@@ -978,14 +979,22 @@
+@@ -978,14 +979,22 @@ static int __init at91ether_setup(unsign
         struct net_device *dev;
         struct at91_private *lp;
         unsigned int val;
         struct net_device *dev;
         struct at91_private *lp;
         unsigned int val;
@@ -8310,7 +8369,7 @@ diff -urN linux-2.6.22-rc5/drivers/net/arm/at91_ether.c linux-2.6.22-rc5.new/dri
         SET_MODULE_OWNER(dev);
   
         /* Install the interrupt handler */
         SET_MODULE_OWNER(dev);
   
         /* Install the interrupt handler */
-@@ -1058,12 +1067,12 @@
+@@ -1058,12 +1067,12 @@ static int __init at91ether_setup(unsign
         lp->phy_address = phy_address;  /* MDI address of PHY */
   
         /* Register the network interface */
         lp->phy_address = phy_address;  /* MDI address of PHY */
   
         /* Register the network interface */
@@ -8326,9 +8385,10 @@ diff -urN linux-2.6.22-rc5/drivers/net/arm/at91_ether.c linux-2.6.22-rc5.new/dri
         }
   
         /* Determine current link speed */
         }
   
         /* Determine current link speed */
-diff -urN linux-2.6.22-rc5/drivers/serial/atmel_serial.c linux-2.6.22-rc5.new/drivers/serial/atmel_serial.c
---- linux-2.6.22-rc5/drivers/serial/atmel_serial.c     2007-06-17 04:09:12.000000000 +0200
-+++ linux-2.6.22-rc5.new/drivers/serial/atmel_serial.c 2007-07-29 05:55:39.000000000 +0200
+Index: linux-2.6.22.19/drivers/serial/atmel_serial.c
+===================================================================
+--- linux-2.6.22.19.orig/drivers/serial/atmel_serial.c
++++ linux-2.6.22.19/drivers/serial/atmel_serial.c
  @@ -7,6 +7,8 @@
    *  Based on drivers/char/serial_sa1100.c, by Deep Blue Solutions Ltd.
    *  Based on drivers/char/serial.c, by Linus Torvalds, Theodore Ts'o.
  @@ -7,6 +7,8 @@
    *  Based on drivers/char/serial_sa1100.c, by Deep Blue Solutions Ltd.
    *  Based on drivers/char/serial.c, by Linus Torvalds, Theodore Ts'o.
@@ -8372,7 +8432,7 @@ diff -urN linux-2.6.22-rc5/drivers/serial/atmel_serial.c linux-2.6.22-rc5.new/dr
   /*
    * We wrap our port structure around the generic uart_port.
    */
   /*
    * We wrap our port structure around the generic uart_port.
    */
-@@ -114,10 +129,20 @@
+@@ -114,10 +129,20 @@ struct atmel_uart_port {
         struct uart_port        uart;           /* uart */
         struct clk              *clk;           /* uart clock */
         unsigned short          suspended;      /* is port suspended? */
         struct uart_port        uart;           /* uart */
         struct clk              *clk;           /* uart clock */
         unsigned short          suspended;      /* is port suspended? */
@@ -8393,7 +8453,7 @@ diff -urN linux-2.6.22-rc5/drivers/serial/atmel_serial.c linux-2.6.22-rc5.new/dr
   #ifdef SUPPORT_SYSRQ
   static struct console atmel_console;
   #endif
   #ifdef SUPPORT_SYSRQ
   static struct console atmel_console;
   #endif
-@@ -205,7 +230,12 @@
+@@ -205,7 +230,12 @@ static void atmel_stop_tx(struct uart_po
   {
         struct atmel_uart_port *atmel_port = (struct atmel_uart_port *) port;
   
   {
         struct atmel_uart_port *atmel_port = (struct atmel_uart_port *) port;
   
@@ -8407,7 +8467,7 @@ diff -urN linux-2.6.22-rc5/drivers/serial/atmel_serial.c linux-2.6.22-rc5.new/dr
   }
   
   /*
   }
   
   /*
-@@ -215,7 +245,17 @@
+@@ -215,7 +245,17 @@ static void atmel_start_tx(struct uart_p
   {
         struct atmel_uart_port *atmel_port = (struct atmel_uart_port *) port;
   
   {
         struct atmel_uart_port *atmel_port = (struct atmel_uart_port *) port;
   
@@ -8426,7 +8486,7 @@ diff -urN linux-2.6.22-rc5/drivers/serial/atmel_serial.c linux-2.6.22-rc5.new/dr
   }
   
   /*
   }
   
   /*
-@@ -225,7 +265,12 @@
+@@ -225,7 +265,12 @@ static void atmel_stop_rx(struct uart_po
   {
         struct atmel_uart_port *atmel_port = (struct atmel_uart_port *) port;
   
   {
         struct atmel_uart_port *atmel_port = (struct atmel_uart_port *) port;
   
@@ -8440,7 +8500,7 @@ diff -urN linux-2.6.22-rc5/drivers/serial/atmel_serial.c linux-2.6.22-rc5.new/dr
   }
   
   /*
   }
   
   /*
-@@ -248,6 +293,134 @@
+@@ -248,6 +293,134 @@ static void atmel_break_ctl(struct uart_
   }
   
   /*
   }
   
   /*
@@ -8575,7 +8635,7 @@ diff -urN linux-2.6.22-rc5/drivers/serial/atmel_serial.c linux-2.6.22-rc5.new/dr
    * Characters received (called from interrupt handler)
    */
   static void atmel_rx_chars(struct uart_port *port)
    * Characters received (called from interrupt handler)
    */
   static void atmel_rx_chars(struct uart_port *port)
-@@ -349,6 +522,14 @@
+@@ -349,6 +522,14 @@ static irqreturn_t atmel_interrupt(int i
         status = UART_GET_CSR(port);
         pending = status & UART_GET_IMR(port);
         while (pending) {
         status = UART_GET_CSR(port);
         pending = status & UART_GET_IMR(port);
         while (pending) {
@@ -8590,7 +8650,7 @@ diff -urN linux-2.6.22-rc5/drivers/serial/atmel_serial.c linux-2.6.22-rc5.new/dr
                 /* Interrupt receive */
                 if (pending & ATMEL_US_RXRDY)
                         atmel_rx_chars(port);
                 /* Interrupt receive */
                 if (pending & ATMEL_US_RXRDY)
                         atmel_rx_chars(port);
-@@ -363,6 +544,12 @@
+@@ -363,6 +544,12 @@ static irqreturn_t atmel_interrupt(int i
                 if (pending & (ATMEL_US_RIIC | ATMEL_US_DSRIC | ATMEL_US_DCDIC | ATMEL_US_CTSIC))
                         wake_up_interruptible(&port->info->delta_msr_wait);
   
                 if (pending & (ATMEL_US_RIIC | ATMEL_US_DSRIC | ATMEL_US_DCDIC | ATMEL_US_CTSIC))
                         wake_up_interruptible(&port->info->delta_msr_wait);
   
@@ -8603,7 +8663,7 @@ diff -urN linux-2.6.22-rc5/drivers/serial/atmel_serial.c linux-2.6.22-rc5.new/dr
                 /* Interrupt transmit */
                 if (pending & ATMEL_US_TXRDY)
                         atmel_tx_chars(port);
                 /* Interrupt transmit */
                 if (pending & ATMEL_US_TXRDY)
                         atmel_tx_chars(port);
-@@ -401,6 +588,47 @@
+@@ -401,6 +588,47 @@ static int atmel_startup(struct uart_por
         }
   
         /*
         }
   
         /*
@@ -8651,7 +8711,7 @@ diff -urN linux-2.6.22-rc5/drivers/serial/atmel_serial.c linux-2.6.22-rc5.new/dr
          * If there is a specific "open" function (to register
          * control line interrupts)
          */
          * If there is a specific "open" function (to register
          * control line interrupts)
          */
-@@ -418,7 +646,15 @@
+@@ -418,7 +646,15 @@ static int atmel_startup(struct uart_por
         UART_PUT_CR(port, ATMEL_US_RSTSTA | ATMEL_US_RSTRX);
         UART_PUT_CR(port, ATMEL_US_TXEN | ATMEL_US_RXEN);               /* enable xmit & rcvr */
   
         UART_PUT_CR(port, ATMEL_US_RSTSTA | ATMEL_US_RSTRX);
         UART_PUT_CR(port, ATMEL_US_TXEN | ATMEL_US_RXEN);               /* enable xmit & rcvr */
   
@@ -8668,7 +8728,7 @@ diff -urN linux-2.6.22-rc5/drivers/serial/atmel_serial.c linux-2.6.22-rc5.new/dr
   
         return 0;
   }
   
         return 0;
   }
-@@ -431,6 +667,31 @@
+@@ -431,6 +667,31 @@ static void atmel_shutdown(struct uart_p
         struct atmel_uart_port *atmel_port = (struct atmel_uart_port *) port;
   
         /*
         struct atmel_uart_port *atmel_port = (struct atmel_uart_port *) port;
   
         /*
@@ -8700,7 +8760,7 @@ diff -urN linux-2.6.22-rc5/drivers/serial/atmel_serial.c linux-2.6.22-rc5.new/dr
          * Disable all interrupts, port and break condition.
          */
         UART_PUT_CR(port, ATMEL_US_RSTSTA);
          * Disable all interrupts, port and break condition.
          */
         UART_PUT_CR(port, ATMEL_US_RSTSTA);
-@@ -481,6 +742,7 @@
+@@ -481,6 +742,7 @@ static void atmel_serial_pm(struct uart_
    */
   static void atmel_set_termios(struct uart_port *port, struct ktermios * termios, struct ktermios * old)
   {
    */
   static void atmel_set_termios(struct uart_port *port, struct ktermios * termios, struct ktermios * old)
   {
@@ -8708,7 +8768,7 @@ diff -urN linux-2.6.22-rc5/drivers/serial/atmel_serial.c linux-2.6.22-rc5.new/dr
         unsigned long flags;
         unsigned int mode, imr, quot, baud;
   
         unsigned long flags;
         unsigned int mode, imr, quot, baud;
   
-@@ -490,7 +752,7 @@
+@@ -490,7 +752,7 @@ static void atmel_set_termios(struct uar
         baud = uart_get_baud_rate(port, termios, old, 0, port->uartclk/16);
         quot = uart_get_divisor(port, baud);
   
         baud = uart_get_baud_rate(port, termios, old, 0, port->uartclk/16);
         quot = uart_get_divisor(port, baud);
   
@@ -8717,7 +8777,7 @@ diff -urN linux-2.6.22-rc5/drivers/serial/atmel_serial.c linux-2.6.22-rc5.new/dr
                 quot /= 8;
                 mode |= ATMEL_US_USCLKS_MCK_DIV8;
         }
                 quot /= 8;
                 mode |= ATMEL_US_USCLKS_MCK_DIV8;
         }
-@@ -539,6 +801,9 @@
+@@ -539,6 +801,9 @@ static void atmel_set_termios(struct uar
         if (termios->c_iflag & (BRKINT | PARMRK))
                 port->read_status_mask |= ATMEL_US_RXBRK;
   
         if (termios->c_iflag & (BRKINT | PARMRK))
                 port->read_status_mask |= ATMEL_US_RXBRK;
   
@@ -8727,7 +8787,7 @@ diff -urN linux-2.6.22-rc5/drivers/serial/atmel_serial.c linux-2.6.22-rc5.new/dr
         /*
          * Characters to ignore
          */
         /*
          * Characters to ignore
          */
-@@ -717,6 +982,13 @@
+@@ -717,6 +982,13 @@ static void __devinit atmel_init_port(st
                 clk_enable(atmel_port->clk);
                 port->uartclk = clk_get_rate(atmel_port->clk);
         }
                 clk_enable(atmel_port->clk);
                 port->uartclk = clk_get_rate(atmel_port->clk);
         }
@@ -8741,7 +8801,7 @@ diff -urN linux-2.6.22-rc5/drivers/serial/atmel_serial.c linux-2.6.22-rc5.new/dr
   }
   
   /*
   }
   
   /*
-@@ -893,7 +1165,8 @@
+@@ -893,7 +1165,8 @@ static int atmel_serial_suspend(struct p
         struct uart_port *port = platform_get_drvdata(pdev);
         struct atmel_uart_port *atmel_port = (struct atmel_uart_port *) port;
   
         struct uart_port *port = platform_get_drvdata(pdev);
         struct atmel_uart_port *atmel_port = (struct atmel_uart_port *) port;
   
@@ -8751,10 +8811,11 @@ diff -urN linux-2.6.22-rc5/drivers/serial/atmel_serial.c linux-2.6.22-rc5.new/dr
                 enable_irq_wake(port->irq);
         else {
                 uart_suspend_port(&atmel_uart, port);
                 enable_irq_wake(port->irq);
         else {
                 uart_suspend_port(&atmel_uart, port);
-diff -urN linux-2.6.22-rc5/drivers/spi/Kconfig linux-2.6.22-rc5.new/drivers/spi/Kconfig
---- linux-2.6.22-rc5/drivers/spi/Kconfig       2007-06-17 04:09:12.000000000 +0200
-+++ linux-2.6.22-rc5.new/drivers/spi/Kconfig   2007-07-29 05:55:39.000000000 +0200
-@@ -55,6 +55,7 @@
+Index: linux-2.6.22.19/drivers/spi/Kconfig
+===================================================================
+--- linux-2.6.22.19.orig/drivers/spi/Kconfig
++++ linux-2.6.22.19/drivers/spi/Kconfig
+@@ -55,6 +55,7 @@ comment "SPI Master Controller Drivers"
   config SPI_ATMEL
         tristate "Atmel SPI Controller"
         depends on (ARCH_AT91 || AVR32) && SPI_MASTER
   config SPI_ATMEL
         tristate "Atmel SPI Controller"
         depends on (ARCH_AT91 || AVR32) && SPI_MASTER
@@ -8762,7 +8823,7 @@ diff -urN linux-2.6.22-rc5/drivers/spi/Kconfig linux-2.6.22-rc5.new/drivers/spi/
         help
           This selects a driver for the Atmel SPI Controller, present on
           many AT32 (AVR32) and AT91 (ARM) chips.
         help
           This selects a driver for the Atmel SPI Controller, present on
           many AT32 (AVR32) and AT91 (ARM) chips.
-@@ -100,6 +101,24 @@
+@@ -100,6 +101,24 @@ config SPI_BUTTERFLY
           inexpensive battery powered microcontroller evaluation board.
           This same cable can be used to flash new firmware.
   
           inexpensive battery powered microcontroller evaluation board.
           This same cable can be used to flash new firmware.
   
@@ -8787,10 +8848,11 @@ diff -urN linux-2.6.22-rc5/drivers/spi/Kconfig linux-2.6.22-rc5.new/drivers/spi/
   config SPI_IMX
         tristate "Freescale iMX SPI controller"
         depends on SPI_MASTER && ARCH_IMX && EXPERIMENTAL
   config SPI_IMX
         tristate "Freescale iMX SPI controller"
         depends on SPI_MASTER && ARCH_IMX && EXPERIMENTAL
-diff -urN linux-2.6.22-rc5/drivers/spi/Makefile linux-2.6.22-rc5.new/drivers/spi/Makefile
---- linux-2.6.22-rc5/drivers/spi/Makefile      2007-06-17 04:09:12.000000000 +0200
-+++ linux-2.6.22-rc5.new/drivers/spi/Makefile  2007-07-29 05:55:39.000000000 +0200
-@@ -23,6 +23,7 @@
+Index: linux-2.6.22.19/drivers/spi/Makefile
+===================================================================
+--- linux-2.6.22.19.orig/drivers/spi/Makefile
++++ linux-2.6.22.19/drivers/spi/Makefile
+@@ -23,6 +23,7 @@ obj-$(CONFIG_SPI_MPC52xx_PSC)                += mpc52x
   obj-$(CONFIG_SPI_MPC83xx)             += spi_mpc83xx.o
   obj-$(CONFIG_SPI_S3C24XX_GPIO)                += spi_s3c24xx_gpio.o
   obj-$(CONFIG_SPI_S3C24XX)             += spi_s3c24xx.o
   obj-$(CONFIG_SPI_MPC83xx)             += spi_mpc83xx.o
   obj-$(CONFIG_SPI_S3C24XX_GPIO)                += spi_s3c24xx_gpio.o
   obj-$(CONFIG_SPI_S3C24XX)             += spi_s3c24xx.o
@@ -8798,9 +8860,10 @@ diff -urN linux-2.6.22-rc5/drivers/spi/Makefile linux-2.6.22-rc5.new/drivers/spi
   #     ... add above this line ...
   
   # SPI protocol drivers (device/link on bus)
   #     ... add above this line ...
   
   # SPI protocol drivers (device/link on bus)
-diff -urN linux-2.6.22-rc5/drivers/spi/spi_at91_bitbang.c linux-2.6.22-rc5.new/drivers/spi/spi_at91_bitbang.c
---- linux-2.6.22-rc5/drivers/spi/spi_at91_bitbang.c    1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.22-rc5.new/drivers/spi/spi_at91_bitbang.c        2007-07-29 05:55:39.000000000 +0200
+Index: linux-2.6.22.19/drivers/spi/spi_at91_bitbang.c
+===================================================================
+--- /dev/null
++++ linux-2.6.22.19/drivers/spi/spi_at91_bitbang.c
  @@ -0,0 +1,207 @@
  +/*
  + * at91_spi.c - at91 SPI driver (BOOTSTRAP/BITBANG VERSION)
  @@ -0,0 +1,207 @@
  +/*
  + * at91_spi.c - at91 SPI driver (BOOTSTRAP/BITBANG VERSION)
@@ -9009,10 +9072,11 @@ diff -urN linux-2.6.22-rc5/drivers/spi/spi_at91_bitbang.c linux-2.6.22-rc5.new/d
  +MODULE_DESCRIPTION("AT91 SPI support (BOOTSTRAP/BITBANG VERSION)");
  +MODULE_AUTHOR("David Brownell");
  +MODULE_LICENSE("GPL");
  +MODULE_DESCRIPTION("AT91 SPI support (BOOTSTRAP/BITBANG VERSION)");
  +MODULE_AUTHOR("David Brownell");
  +MODULE_LICENSE("GPL");
-diff -urN linux-2.6.22-rc5/drivers/usb/gadget/at91_udc.c linux-2.6.22-rc5.new/drivers/usb/gadget/at91_udc.c
---- linux-2.6.22-rc5/drivers/usb/gadget/at91_udc.c     2007-06-17 04:09:12.000000000 +0200
-+++ linux-2.6.22-rc5.new/drivers/usb/gadget/at91_udc.c 2007-07-29 05:55:39.000000000 +0200
-@@ -1803,7 +1803,7 @@
+Index: linux-2.6.22.19/drivers/usb/gadget/at91_udc.c
+===================================================================
+--- linux-2.6.22.19.orig/drivers/usb/gadget/at91_udc.c
++++ linux-2.6.22.19/drivers/usb/gadget/at91_udc.c
+@@ -1803,7 +1803,7 @@ static int at91udc_suspend(struct platfo
          */
         if ((!udc->suspended && udc->addr)
                         || !wake
          */
         if ((!udc->suspended && udc->addr)
                         || !wake
@@ -9021,10 +9085,11 @@ diff -urN linux-2.6.22-rc5/drivers/usb/gadget/at91_udc.c linux-2.6.22-rc5.new/dr
                 pullup(udc, 0);
                 wake = 0;
         } else
                 pullup(udc, 0);
                 wake = 0;
         } else
-diff -urN linux-2.6.22-rc5/drivers/usb/host/ohci-at91.c linux-2.6.22-rc5.new/drivers/usb/host/ohci-at91.c
---- linux-2.6.22-rc5/drivers/usb/host/ohci-at91.c      2007-06-17 04:09:12.000000000 +0200
-+++ linux-2.6.22-rc5.new/drivers/usb/host/ohci-at91.c  2007-07-29 05:55:39.000000000 +0200
-@@ -299,7 +299,7 @@
+Index: linux-2.6.22.19/drivers/usb/host/ohci-at91.c
+===================================================================
+--- linux-2.6.22.19.orig/drivers/usb/host/ohci-at91.c
++++ linux-2.6.22.19/drivers/usb/host/ohci-at91.c
+@@ -299,7 +299,7 @@ ohci_hcd_at91_drv_suspend(struct platfor
          *
          * REVISIT: some boards will be able to turn VBUS off...
          */
          *
          * REVISIT: some boards will be able to turn VBUS off...
          */
@@ -9033,9 +9098,10 @@ diff -urN linux-2.6.22-rc5/drivers/usb/host/ohci-at91.c linux-2.6.22-rc5.new/dri
                 ohci_usb_reset (ohci);
                 at91_stop_clock();
         }
                 ohci_usb_reset (ohci);
                 at91_stop_clock();
         }
-diff -urN linux-2.6.22-rc5/drivers/video/backlight/kb920x_bl.c linux-2.6.22-rc5.new/drivers/video/backlight/kb920x_bl.c
---- linux-2.6.22-rc5/drivers/video/backlight/kb920x_bl.c       1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.22-rc5.new/drivers/video/backlight/kb920x_bl.c   2007-07-29 05:55:39.000000000 +0200
+Index: linux-2.6.22.19/drivers/video/backlight/kb920x_bl.c
+===================================================================
+--- /dev/null
++++ linux-2.6.22.19/drivers/video/backlight/kb920x_bl.c
  @@ -0,0 +1,164 @@
  +/*
  + * Backlight Driver for KB9202
  @@ -0,0 +1,164 @@
  +/*
  + * Backlight Driver for KB9202
@@ -9201,10 +9267,11 @@ diff -urN linux-2.6.22-rc5/drivers/video/backlight/kb920x_bl.c linux-2.6.22-rc5.
  +MODULE_AUTHOR("KwikByte <kb9200_dev@kwikbyte.com>");
  +MODULE_DESCRIPTION("KB9202 Backlight Driver");
  +MODULE_LICENSE("GPL");
  +MODULE_AUTHOR("KwikByte <kb9200_dev@kwikbyte.com>");
  +MODULE_DESCRIPTION("KB9202 Backlight Driver");
  +MODULE_LICENSE("GPL");
-diff -urN linux-2.6.22-rc5/drivers/video/backlight/Kconfig linux-2.6.22-rc5.new/drivers/video/backlight/Kconfig
---- linux-2.6.22-rc5/drivers/video/backlight/Kconfig   2007-06-17 04:09:12.000000000 +0200
-+++ linux-2.6.22-rc5.new/drivers/video/backlight/Kconfig       2007-07-29 05:55:39.000000000 +0200
-@@ -71,3 +71,11 @@
+Index: linux-2.6.22.19/drivers/video/backlight/Kconfig
+===================================================================
+--- linux-2.6.22.19.orig/drivers/video/backlight/Kconfig
++++ linux-2.6.22.19/drivers/video/backlight/Kconfig
+@@ -71,3 +71,11 @@ config BACKLIGHT_CARILLO_RANCH
         help
           If you have a Intel LE80578 (Carillo Ranch) say Y to enable the
           backlight driver.
         help
           If you have a Intel LE80578 (Carillo Ranch) say Y to enable the
           backlight driver.
@@ -9216,18 +9283,20 @@ diff -urN linux-2.6.22-rc5/drivers/video/backlight/Kconfig linux-2.6.22-rc5.new/
  +      help
  +        If you have a KwikByte KB9202 board, say Y to enable the
  +        backlight driver.
  +      help
  +        If you have a KwikByte KB9202 board, say Y to enable the
  +        backlight driver.
-diff -urN linux-2.6.22-rc5/drivers/video/backlight/Makefile linux-2.6.22-rc5.new/drivers/video/backlight/Makefile
---- linux-2.6.22-rc5/drivers/video/backlight/Makefile  2007-06-17 04:09:12.000000000 +0200
-+++ linux-2.6.22-rc5.new/drivers/video/backlight/Makefile      2007-07-29 05:55:39.000000000 +0200
-@@ -7,3 +7,4 @@
+Index: linux-2.6.22.19/drivers/video/backlight/Makefile
+===================================================================
+--- linux-2.6.22.19.orig/drivers/video/backlight/Makefile
++++ linux-2.6.22.19/drivers/video/backlight/Makefile
+@@ -7,3 +7,4 @@ obj-$(CONFIG_BACKLIGHT_HP680)  += hp680_b
   obj-$(CONFIG_BACKLIGHT_LOCOMO)        += locomolcd.o
   obj-$(CONFIG_BACKLIGHT_PROGEAR) += progear_bl.o
   obj-$(CONFIG_BACKLIGHT_CARILLO_RANCH) += cr_bllcd.o
  +obj-$(CONFIG_BACKLIGHT_KB920x)        += kb920x_bl.o
   obj-$(CONFIG_BACKLIGHT_LOCOMO)        += locomolcd.o
   obj-$(CONFIG_BACKLIGHT_PROGEAR) += progear_bl.o
   obj-$(CONFIG_BACKLIGHT_CARILLO_RANCH) += cr_bllcd.o
  +obj-$(CONFIG_BACKLIGHT_KB920x)        += kb920x_bl.o
-diff -urN linux-2.6.22-rc5/drivers/video/Kconfig linux-2.6.22-rc5.new/drivers/video/Kconfig
---- linux-2.6.22-rc5/drivers/video/Kconfig     2007-06-17 04:09:12.000000000 +0200
-+++ linux-2.6.22-rc5.new/drivers/video/Kconfig 2007-07-29 05:55:39.000000000 +0200
-@@ -822,6 +822,17 @@
+Index: linux-2.6.22.19/drivers/video/Kconfig
+===================================================================
+--- linux-2.6.22.19.orig/drivers/video/Kconfig
++++ linux-2.6.22.19/drivers/video/Kconfig
+@@ -822,6 +822,17 @@ config FB_EPSON1355
           framebuffer.  Product specs at
           <http://www.erd.epson.com/vdc/html/products.htm>.
   
           framebuffer.  Product specs at
           <http://www.erd.epson.com/vdc/html/products.htm>.
   
@@ -9245,7 +9314,7 @@ diff -urN linux-2.6.22-rc5/drivers/video/Kconfig linux-2.6.22-rc5.new/drivers/vi
   config FB_S1D13XXX
         tristate "Epson S1D13XXX framebuffer support"
         depends on FB
   config FB_S1D13XXX
         tristate "Epson S1D13XXX framebuffer support"
         depends on FB
-@@ -835,7 +846,7 @@
+@@ -835,7 +846,7 @@ config FB_S1D13XXX
   
   config FB_ATMEL
         tristate "AT91/AT32 LCD Controller support"
   
   config FB_ATMEL
         tristate "AT91/AT32 LCD Controller support"
@@ -9254,10 +9323,11 @@ diff -urN linux-2.6.22-rc5/drivers/video/Kconfig linux-2.6.22-rc5.new/drivers/vi
         select FB_CFB_FILLRECT
         select FB_CFB_COPYAREA
         select FB_CFB_IMAGEBLIT
         select FB_CFB_FILLRECT
         select FB_CFB_COPYAREA
         select FB_CFB_IMAGEBLIT
-diff -urN linux-2.6.22-rc5/drivers/video/Makefile linux-2.6.22-rc5.new/drivers/video/Makefile
---- linux-2.6.22-rc5/drivers/video/Makefile    2007-06-17 04:09:12.000000000 +0200
-+++ linux-2.6.22-rc5.new/drivers/video/Makefile        2007-07-29 05:55:39.000000000 +0200
-@@ -87,7 +87,8 @@
+Index: linux-2.6.22.19/drivers/video/Makefile
+===================================================================
+--- linux-2.6.22.19.orig/drivers/video/Makefile
++++ linux-2.6.22.19/drivers/video/Makefile
+@@ -87,7 +87,8 @@ obj-$(CONFIG_FB_G364)             += g36
   obj-$(CONFIG_FB_SA1100)           += sa1100fb.o
   obj-$(CONFIG_FB_HIT)              += hitfb.o
   obj-$(CONFIG_FB_EPSON1355)      += epson1355fb.o
   obj-$(CONFIG_FB_SA1100)           += sa1100fb.o
   obj-$(CONFIG_FB_HIT)              += hitfb.o
   obj-$(CONFIG_FB_EPSON1355)      += epson1355fb.o
@@ -9267,9 +9337,10 @@ diff -urN linux-2.6.22-rc5/drivers/video/Makefile linux-2.6.22-rc5.new/drivers/v
   obj-$(CONFIG_FB_PVR2)             += pvr2fb.o
   obj-$(CONFIG_FB_VOODOO1)          += sstfb.o
   obj-$(CONFIG_FB_ARMCLCD)        += amba-clcd.o
   obj-$(CONFIG_FB_PVR2)             += pvr2fb.o
   obj-$(CONFIG_FB_VOODOO1)          += sstfb.o
   obj-$(CONFIG_FB_ARMCLCD)        += amba-clcd.o
-diff -urN linux-2.6.22-rc5/drivers/video/s1d15605fb.c linux-2.6.22-rc5.new/drivers/video/s1d15605fb.c
---- linux-2.6.22-rc5/drivers/video/s1d15605fb.c        1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.22-rc5.new/drivers/video/s1d15605fb.c    2007-07-29 05:55:39.000000000 +0200
+Index: linux-2.6.22.19/drivers/video/s1d15605fb.c
+===================================================================
+--- /dev/null
++++ linux-2.6.22.19/drivers/video/s1d15605fb.c
  @@ -0,0 +1,659 @@
  +/*
  + *  drivers/video/s1d15605.c
  @@ -0,0 +1,659 @@
  +/*
  + *  drivers/video/s1d15605.c
diff --git a/target/linux/at91/patches-2.6.22/001-vlink-machine.patch b/target/linux/at91/patches-2.6.22/001-vlink-machine.patch

index d52c452..c750904 100644 (file)
--- a/target/linux/at91/patches-2.6.22/001-vlink-machine.patch
+++ b/target/linux/at91/patches-2.6.22/001-vlink-machine.patch
@@ -1,6 +1,7 @@
-diff -urN linux-2.6.22.1.old/arch/arm/boot/compressed/head-at91rm9200.S linux-2.6.22.1/arch/arm/boot/compressed/head-at91rm9200.S
---- linux-2.6.22.1.old/arch/arm/boot/compressed/head-at91rm9200.S      2007-07-29 06:33:09.000000000 +0200
-+++ linux-2.6.22.1/arch/arm/boot/compressed/head-at91rm9200.S  2007-07-29 06:39:45.000000000 +0200
+Index: linux-2.6.22.19/arch/arm/boot/compressed/head-at91rm9200.S
+===================================================================
+--- linux-2.6.22.19.orig/arch/arm/boot/compressed/head-at91rm9200.S
++++ linux-2.6.22.19/arch/arm/boot/compressed/head-at91rm9200.S
  @@ -67,6 +67,12 @@
                 cmp     r7, r3
                 beq     99f
  @@ -67,6 +67,12 @@
                 cmp     r7, r3
                 beq     99f
@@ -14,9 +15,10 @@ diff -urN linux-2.6.22.1.old/arch/arm/boot/compressed/head-at91rm9200.S linux-2.
                 @ Ajeco 1ARM : 1075
                 mov     r3,     #(MACH_TYPE_ONEARM & 0xff)
                 orr     r3, r3, #(MACH_TYPE_ONEARM & 0xff00)
                 @ Ajeco 1ARM : 1075
                 mov     r3,     #(MACH_TYPE_ONEARM & 0xff)
                 orr     r3, r3, #(MACH_TYPE_ONEARM & 0xff00)
-diff -urN linux-2.6.22.1.old/arch/arm/mach-at91/board-vlink.c linux-2.6.22.1/arch/arm/mach-at91/board-vlink.c
---- linux-2.6.22.1.old/arch/arm/mach-at91/board-vlink.c        1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.22.1/arch/arm/mach-at91/board-vlink.c    2007-07-29 06:40:47.000000000 +0200
+Index: linux-2.6.22.19/arch/arm/mach-at91/board-vlink.c
+===================================================================
+--- /dev/null
++++ linux-2.6.22.19/arch/arm/mach-at91/board-vlink.c
  @@ -0,0 +1,191 @@
  +/*
  + * linux/arch/arm/mach-at91/board-vlink.c
  @@ -0,0 +1,191 @@
  +/*
  + * linux/arch/arm/mach-at91/board-vlink.c
@@ -209,10 +211,11 @@ diff -urN linux-2.6.22.1.old/arch/arm/mach-at91/board-vlink.c linux-2.6.22.1/arc
  +      .init_irq       = vlink_init_irq,
  +      .init_machine   = vlink_board_init,
  +MACHINE_END
  +      .init_irq       = vlink_init_irq,
  +      .init_machine   = vlink_board_init,
  +MACHINE_END
-diff -urN linux-2.6.22.1.old/arch/arm/mach-at91/Kconfig linux-2.6.22.1/arch/arm/mach-at91/Kconfig
---- linux-2.6.22.1.old/arch/arm/mach-at91/Kconfig      2007-07-29 06:33:09.000000000 +0200
-+++ linux-2.6.22.1/arch/arm/mach-at91/Kconfig  2007-07-29 06:42:19.000000000 +0200
-@@ -103,6 +103,12 @@
+Index: linux-2.6.22.19/arch/arm/mach-at91/Kconfig
+===================================================================
+--- linux-2.6.22.19.orig/arch/arm/mach-at91/Kconfig
++++ linux-2.6.22.19/arch/arm/mach-at91/Kconfig
+@@ -103,6 +103,12 @@ config MACH_CHUB
         help
           Select this if you are using Promwad's Chub board.
   
         help
           Select this if you are using Promwad's Chub board.
   
@@ -225,10 +228,11 @@ diff -urN linux-2.6.22.1.old/arch/arm/mach-at91/Kconfig linux-2.6.22.1/arch/arm/
   endif
   
   # ----------------------------------------------------------
   endif
   
   # ----------------------------------------------------------
-diff -urN linux-2.6.22.1.old/arch/arm/mach-at91/Makefile linux-2.6.22.1/arch/arm/mach-at91/Makefile
---- linux-2.6.22.1.old/arch/arm/mach-at91/Makefile     2007-07-29 06:33:09.000000000 +0200
-+++ linux-2.6.22.1/arch/arm/mach-at91/Makefile 2007-07-29 06:43:36.000000000 +0200
-@@ -29,6 +29,7 @@
+Index: linux-2.6.22.19/arch/arm/mach-at91/Makefile
+===================================================================
+--- linux-2.6.22.19.orig/arch/arm/mach-at91/Makefile
++++ linux-2.6.22.19/arch/arm/mach-at91/Makefile
+@@ -29,6 +29,7 @@ obj-$(CONFIG_MACH_KB9200)    += board-kb920
   obj-$(CONFIG_MACH_ATEB9200)   += board-eb9200.o
   obj-$(CONFIG_MACH_KAFA)               += board-kafa.o
   obj-$(CONFIG_MACH_CHUB)               += board-chub.o
   obj-$(CONFIG_MACH_ATEB9200)   += board-eb9200.o
   obj-$(CONFIG_MACH_KAFA)               += board-kafa.o
   obj-$(CONFIG_MACH_CHUB)               += board-chub.o
@@ -236,7 +240,7 @@ diff -urN linux-2.6.22.1.old/arch/arm/mach-at91/Makefile linux-2.6.22.1/arch/arm
   obj-$(CONFIG_MACH_PICOTUX2XX) += board-picotux200.o
   
   # AT91SAM9260 board-specific support
   obj-$(CONFIG_MACH_PICOTUX2XX) += board-picotux200.o
   
   # AT91SAM9260 board-specific support
-@@ -52,6 +53,7 @@
+@@ -52,6 +53,7 @@ led-$(CONFIG_MACH_CSB337)    += leds.o
   led-$(CONFIG_MACH_CSB637)     += leds.o
   led-$(CONFIG_MACH_KB9200)     += leds.o
   led-$(CONFIG_MACH_KAFA)               += leds.o
   led-$(CONFIG_MACH_CSB637)     += leds.o
   led-$(CONFIG_MACH_KB9200)     += leds.o
   led-$(CONFIG_MACH_KAFA)               += leds.o
diff --git a/target/linux/at91/patches-2.6.22/002-led-driver.patch b/target/linux/at91/patches-2.6.22/002-led-driver.patch

index 29956f4..481c0f0 100644 (file)
--- a/target/linux/at91/patches-2.6.22/002-led-driver.patch
+++ b/target/linux/at91/patches-2.6.22/002-led-driver.patch
@@ -1,7 +1,8 @@
-diff -urN linux-2.6.22.1.old/arch/arm/mach-at91/Makefile linux-2.6.22.1/arch/arm/mach-at91/Makefile
---- linux-2.6.22.1.old/arch/arm/mach-at91/Makefile     2007-07-29 06:46:13.000000000 +0200
-+++ linux-2.6.22.1/arch/arm/mach-at91/Makefile 2007-07-29 06:54:19.000000000 +0200
-@@ -53,7 +53,7 @@
+Index: linux-2.6.22.19/arch/arm/mach-at91/Makefile
+===================================================================
+--- linux-2.6.22.19.orig/arch/arm/mach-at91/Makefile
++++ linux-2.6.22.19/arch/arm/mach-at91/Makefile
+@@ -53,7 +53,7 @@ led-$(CONFIG_MACH_CSB337)    += leds.o
   led-$(CONFIG_MACH_CSB637)     += leds.o
   led-$(CONFIG_MACH_KB9200)     += leds.o
   led-$(CONFIG_MACH_KAFA)               += leds.o
   led-$(CONFIG_MACH_CSB637)     += leds.o
   led-$(CONFIG_MACH_KB9200)     += leds.o
   led-$(CONFIG_MACH_KAFA)               += leds.o
@@ -10,9 +11,10 @@ diff -urN linux-2.6.22.1.old/arch/arm/mach-at91/Makefile linux-2.6.22.1/arch/arm
   obj-$(CONFIG_LEDS) += $(led-y)
   
   # VGA support
   obj-$(CONFIG_LEDS) += $(led-y)
   
   # VGA support
-diff -urN linux-2.6.22.1.old/arch/arm/mach-at91/vlink_leds.c linux-2.6.22.1/arch/arm/mach-at91/vlink_leds.c
---- linux-2.6.22.1.old/arch/arm/mach-at91/vlink_leds.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.22.1/arch/arm/mach-at91/vlink_leds.c     2007-07-29 06:54:58.000000000 +0200
+Index: linux-2.6.22.19/arch/arm/mach-at91/vlink_leds.c
+===================================================================
+--- /dev/null
++++ linux-2.6.22.19/arch/arm/mach-at91/vlink_leds.c
  @@ -0,0 +1,105 @@
  +/*
  + * LED driver for Atmel AT91-based boards.
  @@ -0,0 +1,105 @@
  +/*
  + * LED driver for Atmel AT91-based boards.
diff --git a/target/linux/at91/patches-2.6.22/003-gpio-driver.patch b/target/linux/at91/patches-2.6.22/003-gpio-driver.patch

index 766f962..8d37824 100644 (file)
--- a/target/linux/at91/patches-2.6.22/003-gpio-driver.patch
+++ b/target/linux/at91/patches-2.6.22/003-gpio-driver.patch
@@ -1,6 +1,7 @@
-diff -urN linux-2.6.22.1.old/arch/arm/mach-at91/gpio.c linux-2.6.22.1/arch/arm/mach-at91/gpio.c
---- linux-2.6.22.1.old/arch/arm/mach-at91/gpio.c       2007-07-10 20:56:30.000000000 +0200
-+++ linux-2.6.22.1/arch/arm/mach-at91/gpio.c   2007-07-29 07:03:30.000000000 +0200
+Index: linux-2.6.22.19/arch/arm/mach-at91/gpio.c
+===================================================================
+--- linux-2.6.22.19.orig/arch/arm/mach-at91/gpio.c
++++ linux-2.6.22.19/arch/arm/mach-at91/gpio.c
  @@ -27,6 +27,7 @@
   
   static struct at91_gpio_bank *gpio;
  @@ -27,6 +27,7 @@
   
   static struct at91_gpio_bank *gpio;
@@ -9,7 +10,7 @@ diff -urN linux-2.6.22.1.old/arch/arm/mach-at91/gpio.c linux-2.6.22.1/arch/arm/m
   
   
   static inline void __iomem *pin_to_controller(unsigned pin)
   
   
   static inline void __iomem *pin_to_controller(unsigned pin)
-@@ -71,9 +72,13 @@
+@@ -71,9 +72,13 @@ int __init_or_module at91_set_GPIO_perip
   {
         void __iomem    *pio = pin_to_controller(pin);
         unsigned        mask = pin_to_mask(pin);
   {
         void __iomem    *pio = pin_to_controller(pin);
         unsigned        mask = pin_to_mask(pin);
@@ -23,7 +24,7 @@ diff -urN linux-2.6.22.1.old/arch/arm/mach-at91/gpio.c linux-2.6.22.1/arch/arm/m
         __raw_writel(mask, pio + PIO_IDR);
         __raw_writel(mask, pio + (use_pullup ? PIO_PUER : PIO_PUDR));
         __raw_writel(mask, pio + PIO_PER);
         __raw_writel(mask, pio + PIO_IDR);
         __raw_writel(mask, pio + (use_pullup ? PIO_PUER : PIO_PUDR));
         __raw_writel(mask, pio + PIO_PER);
-@@ -130,10 +135,13 @@
+@@ -130,10 +135,13 @@ int __init_or_module at91_set_gpio_input
   {
         void __iomem    *pio = pin_to_controller(pin);
         unsigned        mask = pin_to_mask(pin);
   {
         void __iomem    *pio = pin_to_controller(pin);
         unsigned        mask = pin_to_mask(pin);
@@ -37,7 +38,7 @@ diff -urN linux-2.6.22.1.old/arch/arm/mach-at91/gpio.c linux-2.6.22.1/arch/arm/m
         __raw_writel(mask, pio + PIO_IDR);
         __raw_writel(mask, pio + (use_pullup ? PIO_PUER : PIO_PUDR));
         __raw_writel(mask, pio + PIO_ODR);
         __raw_writel(mask, pio + PIO_IDR);
         __raw_writel(mask, pio + (use_pullup ? PIO_PUER : PIO_PUDR));
         __raw_writel(mask, pio + PIO_ODR);
-@@ -151,10 +159,13 @@
+@@ -151,10 +159,13 @@ int __init_or_module at91_set_gpio_outpu
   {
         void __iomem    *pio = pin_to_controller(pin);
         unsigned        mask = pin_to_mask(pin);
   {
         void __iomem    *pio = pin_to_controller(pin);
         unsigned        mask = pin_to_mask(pin);
@@ -51,7 +52,7 @@ diff -urN linux-2.6.22.1.old/arch/arm/mach-at91/gpio.c linux-2.6.22.1/arch/arm/m
         __raw_writel(mask, pio + PIO_IDR);
         __raw_writel(mask, pio + PIO_PUDR);
         __raw_writel(mask, pio + (value ? PIO_SODR : PIO_CODR));
         __raw_writel(mask, pio + PIO_IDR);
         __raw_writel(mask, pio + PIO_PUDR);
         __raw_writel(mask, pio + (value ? PIO_SODR : PIO_CODR));
-@@ -262,6 +273,18 @@
+@@ -262,6 +273,18 @@ int at91_get_gpio_value(unsigned pin)
   }
   EXPORT_SYMBOL(at91_get_gpio_value);
   
   }
   EXPORT_SYMBOL(at91_get_gpio_value);
   
@@ -70,10 +71,11 @@ diff -urN linux-2.6.22.1.old/arch/arm/mach-at91/gpio.c linux-2.6.22.1/arch/arm/m
   /*--------------------------------------------------------------------------*/
   
   #ifdef CONFIG_PM
   /*--------------------------------------------------------------------------*/
   
   #ifdef CONFIG_PM
-diff -urN linux-2.6.22.1.old/drivers/char/Kconfig linux-2.6.22.1/drivers/char/Kconfig
---- linux-2.6.22.1.old/drivers/char/Kconfig    2007-07-29 06:46:13.000000000 +0200
-+++ linux-2.6.22.1/drivers/char/Kconfig        2007-07-29 07:05:30.000000000 +0200
-@@ -1099,5 +1099,12 @@
+Index: linux-2.6.22.19/drivers/char/Kconfig
+===================================================================
+--- linux-2.6.22.19.orig/drivers/char/Kconfig
++++ linux-2.6.22.19/drivers/char/Kconfig
+@@ -1099,5 +1099,12 @@ config AT91_SPIDEV
           The SPI driver gives user mode access to this serial
           bus on the AT91RM9200 processor.
   
           The SPI driver gives user mode access to this serial
           bus on the AT91RM9200 processor.
   
@@ -86,10 +88,11 @@ diff -urN linux-2.6.22.1.old/drivers/char/Kconfig linux-2.6.22.1/drivers/char/Kc
  +
   endmenu
   
  +
   endmenu
   
-diff -urN linux-2.6.22.1.old/drivers/char/Makefile linux-2.6.22.1/drivers/char/Makefile
---- linux-2.6.22.1.old/drivers/char/Makefile   2007-07-29 06:46:13.000000000 +0200
-+++ linux-2.6.22.1/drivers/char/Makefile       2007-07-29 07:06:06.000000000 +0200
-@@ -95,6 +95,7 @@
+Index: linux-2.6.22.19/drivers/char/Makefile
+===================================================================
+--- linux-2.6.22.19.orig/drivers/char/Makefile
++++ linux-2.6.22.19/drivers/char/Makefile
+@@ -95,6 +95,7 @@ obj-$(CONFIG_GPIO_TB0219)    += tb0219.o
   obj-$(CONFIG_TELCLOCK)                += tlclk.o
   obj-$(CONFIG_AT91_SPI)                += at91_spi.o
   obj-$(CONFIG_AT91_SPIDEV)     += at91_spidev.o
   obj-$(CONFIG_TELCLOCK)                += tlclk.o
   obj-$(CONFIG_AT91_SPI)                += at91_spi.o
   obj-$(CONFIG_AT91_SPIDEV)     += at91_spidev.o
@@ -97,9 +100,10 @@ diff -urN linux-2.6.22.1.old/drivers/char/Makefile linux-2.6.22.1/drivers/char/M
   
   obj-$(CONFIG_WATCHDOG)                += watchdog/
   obj-$(CONFIG_MWAVE)           += mwave/
   
   obj-$(CONFIG_WATCHDOG)                += watchdog/
   obj-$(CONFIG_MWAVE)           += mwave/
-diff -urN linux-2.6.22.1.old/drivers/char/vlink_giu.c linux-2.6.22.1/drivers/char/vlink_giu.c
---- linux-2.6.22.1.old/drivers/char/vlink_giu.c        1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.22.1/drivers/char/vlink_giu.c    2007-07-29 07:06:33.000000000 +0200
+Index: linux-2.6.22.19/drivers/char/vlink_giu.c
+===================================================================
+--- /dev/null
++++ linux-2.6.22.19/drivers/char/vlink_giu.c
  @@ -0,0 +1,256 @@
  +/*
  + *  Driver for FDL Versalink GPIO
  @@ -0,0 +1,256 @@
  +/*
  + *  Driver for FDL Versalink GPIO
diff --git a/target/linux/at91/patches-2.6.22/007-mtd-partition.patch b/target/linux/at91/patches-2.6.22/007-mtd-partition.patch

index cd074cc..01794ac 100644 (file)
--- a/target/linux/at91/patches-2.6.22/007-mtd-partition.patch
+++ b/target/linux/at91/patches-2.6.22/007-mtd-partition.patch
@@ -1,7 +1,8 @@
-diff -urN linux-2.6.22.1.old/drivers/mtd/devices/at91_dataflash.c linux-2.6.22.1/drivers/mtd/devices/at91_dataflash.c
---- linux-2.6.22.1.old/drivers/mtd/devices/at91_dataflash.c    2007-07-29 07:50:05.000000000 +0200
-+++ linux-2.6.22.1/drivers/mtd/devices/at91_dataflash.c        2007-07-29 07:56:11.000000000 +0200
-@@ -173,7 +173,7 @@
+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
+@@ -173,7 +173,7 @@ static struct mtd_partition static_parti
   };
   #endif
   
   };
   #endif
   
@@ -10,10 +11,11 @@ diff -urN linux-2.6.22.1.old/drivers/mtd/devices/at91_dataflash.c linux-2.6.22.1
   
   #endif
   
   
   #endif
   
-diff -urN linux-2.6.22.1.old/drivers/mtd/Kconfig linux-2.6.22.1/drivers/mtd/Kconfig
---- linux-2.6.22.1.old/drivers/mtd/Kconfig     2007-07-29 07:54:27.000000000 +0200
-+++ linux-2.6.22.1/drivers/mtd/Kconfig 2007-07-29 07:55:21.000000000 +0200
-@@ -160,6 +160,12 @@
+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
+@@ -160,6 +160,12 @@ config MTD_AFS_PARTS
           for your particular device. It won't happen automatically. The
           'armflash' map driver (CONFIG_MTD_ARMFLASH) does this, for example.
   
           for your particular device. It won't happen automatically. The
           'armflash' map driver (CONFIG_MTD_ARMFLASH) does this, for example.
   
@@ -26,10 +28,11 @@ diff -urN linux-2.6.22.1.old/drivers/mtd/Kconfig linux-2.6.22.1/drivers/mtd/Kcon
   comment "User Modules And Translation Layers"
   
   config MTD_CHAR
   comment "User Modules And Translation Layers"
   
   config MTD_CHAR
-diff -urN linux-2.6.22.1.old/drivers/mtd/Makefile linux-2.6.22.1/drivers/mtd/Makefile
---- linux-2.6.22.1.old/drivers/mtd/Makefile    2007-07-10 20:56:30.000000000 +0200
-+++ linux-2.6.22.1/drivers/mtd/Makefile        2007-07-29 07:55:39.000000000 +0200
-@@ -11,6 +11,7 @@
+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
+@@ -11,6 +11,7 @@ obj-$(CONFIG_MTD_CONCAT)     += mtdconcat.o
   obj-$(CONFIG_MTD_REDBOOT_PARTS) += redboot.o
   obj-$(CONFIG_MTD_CMDLINE_PARTS) += cmdlinepart.o
   obj-$(CONFIG_MTD_AFS_PARTS)   += afs.o
   obj-$(CONFIG_MTD_REDBOOT_PARTS) += redboot.o
   obj-$(CONFIG_MTD_CMDLINE_PARTS) += cmdlinepart.o
   obj-$(CONFIG_MTD_AFS_PARTS)   += afs.o
diff --git a/target/linux/at91/patches-2.6.22/008-fdl-serial.patch b/target/linux/at91/patches-2.6.22/008-fdl-serial.patch

index 4258919..f95607a 100644 (file)
--- a/target/linux/at91/patches-2.6.22/008-fdl-serial.patch
+++ b/target/linux/at91/patches-2.6.22/008-fdl-serial.patch
@@ -1,6 +1,8 @@
---- linux-2.6.21.1.orig/drivers/serial/atmel_serial.c  2007-05-28 12:22:29.000000000 +0200
-+++ linux-2.6.21.1/drivers/serial/atmel_serial.c       2007-05-28 16:39:09.000000000 +0200
-@@ -174,7 +174,35 @@
+Index: linux-2.6.22.19/drivers/serial/atmel_serial.c
+===================================================================
+--- linux-2.6.22.19.orig/drivers/serial/atmel_serial.c
++++ linux-2.6.22.19/drivers/serial/atmel_serial.c
+@@ -174,7 +174,35 @@ static void atmel_set_mctrl(struct uart_
                                 at91_set_gpio_value(AT91_PIN_PA21, 0);
                         else
                                 at91_set_gpio_value(AT91_PIN_PA21, 1);
                                 at91_set_gpio_value(AT91_PIN_PA21, 0);
                         else
                                 at91_set_gpio_value(AT91_PIN_PA21, 1);
@@ -36,7 +38,7 @@
         }
   #endif
   
         }
   #endif
   
-@@ -211,8 +239,10 @@
+@@ -211,8 +239,10 @@ static u_int atmel_get_mctrl(struct uart
         /*
          * The control signals are active low.
          */
         /*
          * The control signals are active low.
          */
@@ -49,7 +51,7 @@
         if (!(status & ATMEL_US_CTS))
                 ret |= TIOCM_CTS;
         if (!(status & ATMEL_US_DSR))
         if (!(status & ATMEL_US_CTS))
                 ret |= TIOCM_CTS;
         if (!(status & ATMEL_US_DSR))
-@@ -220,6 +250,16 @@
+@@ -220,6 +250,16 @@ static u_int atmel_get_mctrl(struct uart
         if (!(status & ATMEL_US_RI))
                 ret |= TIOCM_RI;
   
         if (!(status & ATMEL_US_RI))
                 ret |= TIOCM_RI;
   
@@ -66,7 +68,7 @@
         return ret;
   }
   
         return ret;
   }
   
-@@ -511,6 +551,34 @@
+@@ -511,6 +551,34 @@ static void atmel_tx_chars(struct uart_p
   }
   
   /*
   }
   
   /*
@@ -101,7 +103,7 @@
    * Interrupt handler
    */
   static irqreturn_t atmel_interrupt(int irq, void *dev_id)
    * Interrupt handler
    */
   static irqreturn_t atmel_interrupt(int irq, void *dev_id)
-@@ -587,6 +655,23 @@
+@@ -587,6 +655,23 @@ static int atmel_startup(struct uart_por
                 return retval;
         }
   
                 return retval;
         }
   
@@ -125,7 +127,7 @@
         /*
          * Initialize DMA (if necessary)
          */
         /*
          * Initialize DMA (if necessary)
          */
-@@ -603,6 +688,10 @@
+@@ -603,6 +688,10 @@ static int atmel_startup(struct uart_por
                                         kfree(atmel_port->pdc_rx[0].buf);
                                 }
                                 free_irq(port->irq, port);
                                         kfree(atmel_port->pdc_rx[0].buf);
                                 }
                                 free_irq(port->irq, port);
@@ -136,7 +138,7 @@
                                 return -ENOMEM;
                         }
                         pdc->dma_addr = dma_map_single(port->dev, pdc->buf, PDC_BUFFER_SIZE, DMA_FROM_DEVICE);
                                 return -ENOMEM;
                         }
                         pdc->dma_addr = dma_map_single(port->dev, pdc->buf, PDC_BUFFER_SIZE, DMA_FROM_DEVICE);
-@@ -636,6 +725,10 @@
+@@ -636,6 +725,10 @@ static int atmel_startup(struct uart_por
                 retval = atmel_open_hook(port);
                 if (retval) {
                         free_irq(port->irq, port);
                 retval = atmel_open_hook(port);
                 if (retval) {
                         free_irq(port->irq, port);
@@ -147,7 +149,7 @@
                         return retval;
                 }
         }
                         return retval;
                 }
         }
-@@ -701,6 +794,10 @@
+@@ -701,6 +794,10 @@ static void atmel_shutdown(struct uart_p
          * Free the interrupt
          */
         free_irq(port->irq, port);
          * Free the interrupt
          */
         free_irq(port->irq, port);
diff --git a/target/linux/at91/patches-2.6.22/009-fdl-uartinit.patch b/target/linux/at91/patches-2.6.22/009-fdl-uartinit.patch

index f36f386..b9ceb72 100644 (file)
--- a/target/linux/at91/patches-2.6.22/009-fdl-uartinit.patch
+++ b/target/linux/at91/patches-2.6.22/009-fdl-uartinit.patch
@@ -1,7 +1,8 @@
-diff -urN linux-2.6.22.1.old/arch/arm/mach-at91/at91rm9200_devices.c linux-2.6.22.1/arch/arm/mach-at91/at91rm9200_devices.c
---- linux-2.6.22.1.old/arch/arm/mach-at91/at91rm9200_devices.c 2007-07-29 06:46:13.000000000 +0200
-+++ linux-2.6.22.1/arch/arm/mach-at91/at91rm9200_devices.c     2007-07-29 07:23:35.000000000 +0200
-@@ -721,6 +721,10 @@
+Index: linux-2.6.22.19/arch/arm/mach-at91/at91rm9200_devices.c
+===================================================================
+--- linux-2.6.22.19.orig/arch/arm/mach-at91/at91rm9200_devices.c
++++ linux-2.6.22.19/arch/arm/mach-at91/at91rm9200_devices.c
+@@ -721,6 +721,10 @@ static inline void configure_usart0_pins
          *  We need to drive the pin manually.  Default is off (RTS is active low).
          */
         at91_set_gpio_output(AT91_PIN_PA21, 1);
          *  We need to drive the pin manually.  Default is off (RTS is active low).
          */
         at91_set_gpio_output(AT91_PIN_PA21, 1);
@@ -12,7 +13,7 @@ diff -urN linux-2.6.22.1.old/arch/arm/mach-at91/at91rm9200_devices.c linux-2.6.2
   }
   
   static struct resource uart1_resources[] = {
   }
   
   static struct resource uart1_resources[] = {
-@@ -832,6 +836,12 @@
+@@ -832,6 +836,12 @@ static inline void configure_usart3_pins
   {
         at91_set_B_periph(AT91_PIN_PA5, 1);             /* TXD3 */
         at91_set_B_periph(AT91_PIN_PA6, 0);             /* RXD3 */
   {
         at91_set_B_periph(AT91_PIN_PA5, 1);             /* TXD3 */
         at91_set_B_periph(AT91_PIN_PA6, 0);             /* RXD3 */
diff --git a/target/linux/at91/patches-2.6.22/010-dm9161a-phyfix.patch b/target/linux/at91/patches-2.6.22/010-dm9161a-phyfix.patch

index 9ad8c42..120c32e 100644 (file)
--- a/target/linux/at91/patches-2.6.22/010-dm9161a-phyfix.patch
+++ b/target/linux/at91/patches-2.6.22/010-dm9161a-phyfix.patch
@@ -1,6 +1,8 @@
---- linux-2.6.21.1/drivers/net/arm/at91_ether.c.old    2007-06-04 18:15:49.000000000 +0200
-+++ linux-2.6.21.1/drivers/net/arm/at91_ether.c        2007-06-04 18:10:36.000000000 +0200
-@@ -146,6 +146,7 @@
+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_
         struct at91_private *lp = netdev_priv(dev);
         unsigned int bmsr, bmcr, lpa, mac_cfg;
         unsigned int speed, duplex;
         struct at91_private *lp = netdev_priv(dev);
         unsigned int bmsr, bmcr, lpa, mac_cfg;
         unsigned int speed, duplex;
@@ -8,7 +10,7 @@
   
         if (!mii_link_ok(&lp->mii)) {           /* no link */
                 netif_carrier_off(dev);
   
         if (!mii_link_ok(&lp->mii)) {           /* no link */
                 netif_carrier_off(dev);
-@@ -158,8 +159,15 @@
+@@ -158,8 +159,15 @@ static void update_linkspeed(struct net_
         read_phy(lp->phy_address, MII_BMSR, &bmsr);
         read_phy(lp->phy_address, MII_BMCR, &bmcr);
         if (bmcr & BMCR_ANENABLE) {                             /* AutoNegotiation is enabled */
         read_phy(lp->phy_address, MII_BMSR, &bmsr);
         read_phy(lp->phy_address, MII_BMCR, &bmcr);
         if (bmcr & BMCR_ANENABLE) {                             /* AutoNegotiation is enabled */
diff --git a/target/linux/at91/patches-2.6.22/014-initpartition.patch b/target/linux/at91/patches-2.6.22/014-initpartition.patch

index cfcd062..f6f1aa4 100644 (file)
--- a/target/linux/at91/patches-2.6.22/014-initpartition.patch
+++ b/target/linux/at91/patches-2.6.22/014-initpartition.patch
@@ -1,7 +1,8 @@
-diff -urN linux-2.6.22.1.old/drivers/mtd/devices/at91_dataflash.c linux-2.6.22.1/drivers/mtd/devices/at91_dataflash.c
---- linux-2.6.22.1.old/drivers/mtd/devices/at91_dataflash.c    2007-07-29 07:18:10.000000000 +0200
-+++ linux-2.6.22.1/drivers/mtd/devices/at91_dataflash.c        2007-07-29 07:32:52.000000000 +0200
-@@ -161,12 +161,12 @@
+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
+@@ -161,12 +161,12 @@ static struct mtd_partition static_parti
                 .mask_flags     = MTD_WRITEABLE,        /* read-only */
         },
         {
                 .mask_flags     = MTD_WRITEABLE,        /* read-only */
         },
         {
author	juhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73>
	Mon, 19 May 2008 06:35:41 +0000 (06:35 +0000)
committer	juhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73>
	Mon, 19 May 2008 06:35:41 +0000 (06:35 +0000)
target/linux/at91/patches-2.6.21/000-at91patches.patch		patch \| blob \| history
target/linux/at91/patches-2.6.21/001-vlink-machine.patch		patch \| blob \| history
target/linux/at91/patches-2.6.21/002-led-driver.patch		patch \| blob \| history
target/linux/at91/patches-2.6.21/003-gpio-driver.patch		patch \| blob \| history
target/linux/at91/patches-2.6.21/006-change-gpios.patch		patch \| blob \| history
target/linux/at91/patches-2.6.21/007-mtd-partition.patch		patch \| blob \| history
target/linux/at91/patches-2.6.21/008-fdl-serial.patch		patch \| blob \| history
target/linux/at91/patches-2.6.21/009-fdl-uartinit.patch		patch \| blob \| history
target/linux/at91/patches-2.6.21/010-dm9161a-phyfix.patch		patch \| blob \| history
target/linux/at91/patches-2.6.21/011-vlink-resetfix.patch		patch \| blob \| history
target/linux/at91/patches-2.6.21/012-at91-mmcfix.patch		patch \| blob \| history
target/linux/at91/patches-2.6.21/013-at91-mmc1wire.patch		patch \| blob \| history
target/linux/at91/patches-2.6.21/014-initpartition.patch		patch \| blob \| history
target/linux/at91/patches-2.6.21/015-simenable.patch		patch \| blob \| history
target/linux/at91/patches-2.6.21/016-v1-15-detect.patch		patch \| blob \| history
target/linux/at91/patches-2.6.22/000-at91.patch		patch \| blob \| history
target/linux/at91/patches-2.6.22/001-vlink-machine.patch		patch \| blob \| history
target/linux/at91/patches-2.6.22/002-led-driver.patch		patch \| blob \| history
target/linux/at91/patches-2.6.22/003-gpio-driver.patch		patch \| blob \| history
target/linux/at91/patches-2.6.22/007-mtd-partition.patch		patch \| blob \| history
target/linux/at91/patches-2.6.22/008-fdl-serial.patch		patch \| blob \| history
target/linux/at91/patches-2.6.22/009-fdl-uartinit.patch		patch \| blob \| history
target/linux/at91/patches-2.6.22/010-dm9161a-phyfix.patch		patch \| blob \| history
target/linux/at91/patches-2.6.22/014-initpartition.patch		patch \| blob \| history