clean up patch

SVN-Revision: 10963

diff --git a/target/linux/avr32/patches/100-git_sync.patch b/target/linux/avr32/patches/100-git_sync.patch
index e2cf6ca20cdb2696a9af91b1ad848a60514bb66a..ee5417b2bb3bfe3d14539a95a934469aa0ef391e 100644 (file)
--- a/target/linux/avr32/patches/100-git_sync.patch
+++ b/target/linux/avr32/patches/100-git_sync.patch
@@ -1,113 +1,3 @@
-diff -urN linux-2.6.24.3/arch/arm/mach-at91/at91sam9261_devices.c avr32-2.6/arch/arm/mach-at91/at91sam9261_devices.c
---- linux-2.6.24.3/arch/arm/mach-at91/at91sam9261_devices.c    2008-02-26 01:20:20.000000000 +0100
-+++ avr32-2.6/arch/arm/mach-at91/at91sam9261_devices.c 2008-04-23 20:12:35.000000000 +0200
-@@ -530,6 +530,20 @@
-       at91_set_B_periph(AT91_PIN_PB27, 0);    /* LCDD22 */
-       at91_set_B_periph(AT91_PIN_PB28, 0);    /* LCDD23 */
- 
-+#ifdef CONFIG_FB_INTSRAM
-+      {
-+              void __iomem *fb;
-+              struct resource *fb_res = &lcdc_resources[2];
-+              size_t fb_len = fb_res->end - fb_res->start + 1;
-+
-+              fb = ioremap_writecombine(fb_res->start, fb_len);
-+              if (fb) {
-+                      memset(fb, 0, fb_len);
-+                      iounmap(fb, fb_len);
-+              }
-+      }
-+#endif
-+
-       lcdc_data = *data;
-       platform_device_register(&at91_lcdc_device);
- }
-diff -urN linux-2.6.24.3/arch/arm/mach-at91/at91sam9rl_devices.c avr32-2.6/arch/arm/mach-at91/at91sam9rl_devices.c
---- linux-2.6.24.3/arch/arm/mach-at91/at91sam9rl_devices.c     2008-02-26 01:20:20.000000000 +0100
-+++ avr32-2.6/arch/arm/mach-at91/at91sam9rl_devices.c  2008-04-23 20:12:35.000000000 +0200
-@@ -375,6 +375,20 @@
-       at91_set_B_periph(AT91_PIN_PC24, 0);    /* LCDD22 */
-       at91_set_B_periph(AT91_PIN_PC25, 0);    /* LCDD23 */
- 
-+#ifdef CONFIG_FB_INTSRAM
-+      {
-+              void __iomem *fb;
-+              struct resource *fb_res = &lcdc_resources[2];
-+              size_t fb_len = fb_res->end - fb_res->start + 1;
-+
-+              fb = ioremap_writecombine(fb_res->start, fb_len);
-+              if (fb) {
-+                      memset(fb, 0, fb_len);
-+                      iounmap(fb, fb_len);
-+              }
-+      }
-+#endif
-+
-       lcdc_data = *data;
-       platform_device_register(&at91_lcdc_device);
- }
-diff -urN linux-2.6.24.3/arch/arm/mach-at91/board-sam9261ek.c avr32-2.6/arch/arm/mach-at91/board-sam9261ek.c
---- linux-2.6.24.3/arch/arm/mach-at91/board-sam9261ek.c        2008-02-26 01:20:20.000000000 +0100
-+++ avr32-2.6/arch/arm/mach-at91/board-sam9261ek.c     2008-04-23 20:12:35.000000000 +0200
-@@ -322,6 +322,7 @@
- 
- /* Driver datas */
- static struct atmel_lcdfb_info __initdata ek_lcdc_data = {
-+      .lcdcon_is_backlight            = true,
-       .default_bpp                    = 16,
-       .default_dmacon                 = ATMEL_LCDC_DMAEN,
-       .default_lcdcon2                = AT91SAM9261_DEFAULT_LCDCON2,
-diff -urN linux-2.6.24.3/arch/arm/mach-at91/board-sam9263ek.c avr32-2.6/arch/arm/mach-at91/board-sam9263ek.c
---- linux-2.6.24.3/arch/arm/mach-at91/board-sam9263ek.c        2008-02-26 01:20:20.000000000 +0100
-+++ avr32-2.6/arch/arm/mach-at91/board-sam9263ek.c     2008-04-23 20:12:35.000000000 +0200
-@@ -250,6 +250,7 @@
- 
- /* Driver datas */
- static struct atmel_lcdfb_info __initdata ek_lcdc_data = {
-+      .lcdcon_is_backlight            = true,
-       .default_bpp                    = 16,
-       .default_dmacon                 = ATMEL_LCDC_DMAEN,
-       .default_lcdcon2                = AT91SAM9263_DEFAULT_LCDCON2,
-diff -urN linux-2.6.24.3/arch/arm/mach-at91/Kconfig avr32-2.6/arch/arm/mach-at91/Kconfig
---- linux-2.6.24.3/arch/arm/mach-at91/Kconfig  2008-02-26 01:20:20.000000000 +0100
-+++ avr32-2.6/arch/arm/mach-at91/Kconfig       2008-04-23 20:12:35.000000000 +0200
-@@ -219,6 +219,36 @@
-         Select this if you need to program one or more of the PCK0..PCK3
-         programmable clock outputs.
- 
-+choice
-+      prompt "Select a UART for early kernel messages"
-+
-+config AT91_EARLY_DBGU
-+      bool "DBGU"
-+
-+config AT91_EARLY_USART0
-+      bool "USART0"
-+
-+config AT91_EARLY_USART1
-+      bool "USART1"
-+
-+config AT91_EARLY_USART2
-+      bool "USART2"
-+      depends on ! ARCH_AT91X40
-+
-+config AT91_EARLY_USART3
-+      bool "USART3"
-+      depends on (ARCH_AT91RM9200 || ARCH_AT91SAM9RL || ARCH_AT91SAM9260)
-+
-+config AT91_EARLY_USART4
-+      bool "USART4"
-+      depends on ARCH_AT91SAM9260
-+
-+config AT91_EARLY_USART5
-+      bool "USART5"
-+      depends on ARCH_AT91SAM9260
-+
-+endchoice
-+
- endmenu
- 
- endif

 diff -urN linux-2.6.24.3/arch/avr32/boards/atngw100/Kconfig avr32-2.6/arch/avr32/boards/atngw100/Kconfig
 --- linux-2.6.24.3/arch/avr32/boards/atngw100/Kconfig  1970-01-01 01:00:00.000000000 +0100
 +++ avr32-2.6/arch/avr32/boards/atngw100/Kconfig       2008-04-23 19:33:28.000000000 +0200
 diff -urN linux-2.6.24.3/arch/avr32/boards/atngw100/Kconfig avr32-2.6/arch/avr32/boards/atngw100/Kconfig
 --- linux-2.6.24.3/arch/avr32/boards/atngw100/Kconfig  1970-01-01 01:00:00.000000000 +0100
 +++ avr32-2.6/arch/avr32/boards/atngw100/Kconfig       2008-04-23 19:33:28.000000000 +0200


@@ -18511,139 +18401,6 @@ diff -urN linux-2.6.24.3/drivers/watchdog/Kconfig avr32-2.6/drivers/watchdog/Kco
        help
          Watchdog timer embedded into AT32AP700x devices. This will reboot
          your system when the timeout is reached.
        help
          Watchdog timer embedded into AT32AP700x devices. This will reboot
          your system when the timeout is reached.

-diff -urN linux-2.6.24.3/include/asm-arm/arch-at91/at91rm9200.h avr32-2.6/include/asm-arm/arch-at91/at91rm9200.h
---- linux-2.6.24.3/include/asm-arm/arch-at91/at91rm9200.h      2008-02-26 01:20:20.000000000 +0100
-+++ avr32-2.6/include/asm-arm/arch-at91/at91rm9200.h   2008-04-23 19:33:48.000000000 +0200
-@@ -93,6 +93,11 @@
- #define AT91_RTC      (0xfffffe00 - AT91_BASE_SYS)    /* Real-Time Clock */
- #define AT91_MC               (0xffffff00 - AT91_BASE_SYS)    /* Memory Controllers */
- 
-+#define AT91_USART0   AT91RM9200_BASE_US0
-+#define AT91_USART1   AT91RM9200_BASE_US1
-+#define AT91_USART2   AT91RM9200_BASE_US2
-+#define AT91_USART3   AT91RM9200_BASE_US3
-+
- #define AT91_MATRIX   0       /* not supported */
- 
- /*
-diff -urN linux-2.6.24.3/include/asm-arm/arch-at91/at91sam9260.h avr32-2.6/include/asm-arm/arch-at91/at91sam9260.h
---- linux-2.6.24.3/include/asm-arm/arch-at91/at91sam9260.h     2008-02-26 01:20:20.000000000 +0100
-+++ avr32-2.6/include/asm-arm/arch-at91/at91sam9260.h  2008-04-23 19:33:48.000000000 +0200
-@@ -99,6 +99,13 @@
- #define AT91_WDT      (0xfffffd40 - AT91_BASE_SYS)
- #define AT91_GPBR     (0xfffffd50 - AT91_BASE_SYS)
- 
-+#define AT91_USART0   AT91SAM9260_BASE_US0
-+#define AT91_USART1   AT91SAM9260_BASE_US1
-+#define AT91_USART2   AT91SAM9260_BASE_US2
-+#define AT91_USART3   AT91SAM9260_BASE_US3
-+#define AT91_USART4   AT91SAM9260_BASE_US4
-+#define AT91_USART5   AT91SAM9260_BASE_US5
-+
- 
- /*
-  * Internal Memory.
-diff -urN linux-2.6.24.3/include/asm-arm/arch-at91/at91sam9261.h avr32-2.6/include/asm-arm/arch-at91/at91sam9261.h
---- linux-2.6.24.3/include/asm-arm/arch-at91/at91sam9261.h     2008-02-26 01:20:20.000000000 +0100
-+++ avr32-2.6/include/asm-arm/arch-at91/at91sam9261.h  2008-04-23 19:33:48.000000000 +0200
-@@ -84,6 +84,10 @@
- #define AT91_WDT      (0xfffffd40 - AT91_BASE_SYS)
- #define AT91_GPBR     (0xfffffd50 - AT91_BASE_SYS)
- 
-+#define AT91_USART0   AT91SAM9261_BASE_US0
-+#define AT91_USART1   AT91SAM9261_BASE_US1
-+#define AT91_USART2   AT91SAM9261_BASE_US2
-+
- 
- /*
-  * Internal Memory.
-diff -urN linux-2.6.24.3/include/asm-arm/arch-at91/at91sam9263.h avr32-2.6/include/asm-arm/arch-at91/at91sam9263.h
---- linux-2.6.24.3/include/asm-arm/arch-at91/at91sam9263.h     2008-02-26 01:20:20.000000000 +0100
-+++ avr32-2.6/include/asm-arm/arch-at91/at91sam9263.h  2008-04-23 19:33:48.000000000 +0200
-@@ -101,6 +101,10 @@
- #define AT91_RTT1     (0xfffffd50 - AT91_BASE_SYS)
- #define AT91_GPBR     (0xfffffd60 - AT91_BASE_SYS)
- 
-+#define AT91_USART0   AT91SAM9263_BASE_US0
-+#define AT91_USART1   AT91SAM9263_BASE_US1
-+#define AT91_USART2   AT91SAM9263_BASE_US2
-+
- #define AT91_SMC      AT91_SMC0
- 
- /*
-diff -urN linux-2.6.24.3/include/asm-arm/arch-at91/at91sam9rl.h avr32-2.6/include/asm-arm/arch-at91/at91sam9rl.h
---- linux-2.6.24.3/include/asm-arm/arch-at91/at91sam9rl.h      2008-02-26 01:20:20.000000000 +0100
-+++ avr32-2.6/include/asm-arm/arch-at91/at91sam9rl.h   2008-04-23 19:33:48.000000000 +0200
-@@ -94,6 +94,11 @@
- #define AT91_GPBR     (0xfffffd60 - AT91_BASE_SYS)
- #define AT91_RTC      (0xfffffe00 - AT91_BASE_SYS)
- 
-+#define AT91_USART0   AT91SAM9RL_BASE_US0
-+#define AT91_USART1   AT91SAM9RL_BASE_US1
-+#define AT91_USART2   AT91SAM9RL_BASE_US2
-+#define AT91_USART3   AT91SAM9RL_BASE_US3
-+
- 
- /*
-  * Internal Memory.
-diff -urN linux-2.6.24.3/include/asm-arm/arch-at91/uncompress.h avr32-2.6/include/asm-arm/arch-at91/uncompress.h
---- linux-2.6.24.3/include/asm-arm/arch-at91/uncompress.h      2008-02-26 01:20:20.000000000 +0100
-+++ avr32-2.6/include/asm-arm/arch-at91/uncompress.h   2008-04-23 19:33:48.000000000 +0200
-@@ -22,7 +22,23 @@
- #define __ASM_ARCH_UNCOMPRESS_H
- 
- #include <asm/io.h>
--#include <asm/arch/at91_dbgu.h>
-+#include <linux/atmel_serial.h>
-+
-+#if defined(CONFIG_AT91_EARLY_DBGU)
-+#define UART_OFFSET (AT91_DBGU + AT91_BASE_SYS)
-+#elif defined(CONFIG_AT91_EARLY_USART0)
-+#define UART_OFFSET AT91_USART0
-+#elif defined(CONFIG_AT91_EARLY_USART1)
-+#define UART_OFFSET AT91_USART1
-+#elif defined(CONFIG_AT91_EARLY_USART2)
-+#define UART_OFFSET AT91_USART2
-+#elif defined(CONFIG_AT91_EARLY_USART3)
-+#define UART_OFFSET AT91_USART3
-+#elif defined(CONFIG_AT91_EARLY_USART4)
-+#define UART_OFFSET AT91_USART4
-+#elif defined(CONFIG_AT91_EARLY_USART5)
-+#define UART_OFFSET AT91_USART5
-+#endif
- 
- /*
-  * The following code assumes the serial port has already been
-@@ -33,22 +49,22 @@
-  */
- static void putc(int c)
- {
--#ifdef AT91_DBGU
--      void __iomem *sys = (void __iomem *) AT91_BASE_SYS;     /* physical address */
-+#ifdef UART_OFFSET
-+      void __iomem *sys = (void __iomem *) UART_OFFSET;       /* physical address */
- 
--      while (!(__raw_readl(sys + AT91_DBGU_SR) & AT91_DBGU_TXRDY))
-+      while (!(__raw_readl(sys + ATMEL_US_CSR) & ATMEL_US_TXRDY))
-               barrier();
--      __raw_writel(c, sys + AT91_DBGU_THR);
-+      __raw_writel(c, sys + ATMEL_US_THR);
- #endif
- }
- 
- static inline void flush(void)
- {
--#ifdef AT91_DBGU
--      void __iomem *sys = (void __iomem *) AT91_BASE_SYS;     /* physical address */
-+#ifdef UART_OFFSET
-+      void __iomem *sys = (void __iomem *) UART_OFFSET;       /* physical address */
- 
-       /* wait for transmission to complete */
--      while (!(__raw_readl(sys + AT91_DBGU_SR) & AT91_DBGU_TXEMPTY))
-+      while (!(__raw_readl(sys + ATMEL_US_CSR) & ATMEL_US_TXEMPTY))
-               barrier();
- #endif
- }

 diff -urN linux-2.6.24.3/include/asm-avr32/arch-at32ap/at32ap7000.h avr32-2.6/include/asm-avr32/arch-at32ap/at32ap7000.h
 --- linux-2.6.24.3/include/asm-avr32/arch-at32ap/at32ap7000.h  2008-02-26 01:20:20.000000000 +0100
 +++ avr32-2.6/include/asm-avr32/arch-at32ap/at32ap7000.h       1970-01-01 01:00:00.000000000 +0100
 diff -urN linux-2.6.24.3/include/asm-avr32/arch-at32ap/at32ap7000.h avr32-2.6/include/asm-avr32/arch-at32ap/at32ap7000.h
 --- linux-2.6.24.3/include/asm-avr32/arch-at32ap/at32ap7000.h  2008-02-26 01:20:20.000000000 +0100
 +++ avr32-2.6/include/asm-avr32/arch-at32ap/at32ap7000.h       1970-01-01 01:00:00.000000000 +0100


@@ -20028,11 +19785,6 @@ diff -urN linux-2.6.24.3/kernel/ptrace.c avr32-2.6/kernel/ptrace.c
                goto out;
        }
  
                goto out;
        }
  

-diff -urN linux-2.6.24.3/localversion-atmel avr32-2.6/localversion-atmel
---- linux-2.6.24.3/localversion-atmel  1970-01-01 01:00:00.000000000 +0100
-+++ avr32-2.6/localversion-atmel       2008-04-23 20:12:47.000000000 +0200
-@@ -0,0 +1 @@
-+.atmel.3

 diff -urN linux-2.6.24.3/MAINTAINERS avr32-2.6/MAINTAINERS
 --- linux-2.6.24.3/MAINTAINERS 2008-02-26 01:20:20.000000000 +0100
 +++ avr32-2.6/MAINTAINERS      2008-04-23 20:12:35.000000000 +0200
 diff -urN linux-2.6.24.3/MAINTAINERS avr32-2.6/MAINTAINERS
 --- linux-2.6.24.3/MAINTAINERS 2008-02-26 01:20:20.000000000 +0100
 +++ avr32-2.6/MAINTAINERS      2008-04-23 20:12:35.000000000 +0200