Changeset 1024

Show
Ignore:
Timestamp:
02/17/07 00:51:16 (3 years ago)
Author:
laforge
Message:

Get rid of the 2617-backport-to-2620 for s3c2410fb (thanks to Ben Dooks and Arnaud Patard)

Location:
trunk/src/target/kernel/patches
Files:
1 added
1 removed
4 modified

Legend:

Unmodified
Added
Removed

  • trunk/src/target/kernel/patches/gta01-core.patch

    r1004 r1024  
    44Index: linux-2.6.20/arch/arm/mach-s3c2410/Kconfig 
    55=================================================================== 
    6 --- linux-2.6.20.orig/arch/arm/mach-s3c2410/Kconfig     2007-02-15 17:08:30.000000000 +0100 
    7 +++ linux-2.6.20/arch/arm/mach-s3c2410/Kconfig  2007-02-15 17:08:32.000000000 +0100 
     6--- linux-2.6.20.orig/arch/arm/mach-s3c2410/Kconfig     2007-02-17 00:43:54.000000000 +0100 
     7+++ linux-2.6.20/arch/arm/mach-s3c2410/Kconfig  2007-02-17 00:44:17.000000000 +0100 
    88@@ -86,6 +86,13 @@ 
    99        help 
    … …  
    2222Index: linux-2.6.20/arch/arm/mach-s3c2410/Makefile 
    2323=================================================================== 
    24 --- linux-2.6.20.orig/arch/arm/mach-s3c2410/Makefile    2007-02-15 17:08:30.000000000 +0100 
    25 +++ linux-2.6.20/arch/arm/mach-s3c2410/Makefile 2007-02-15 17:08:32.000000000 +0100 
     24--- linux-2.6.20.orig/arch/arm/mach-s3c2410/Makefile    2007-02-17 00:43:54.000000000 +0100 
     25+++ linux-2.6.20/arch/arm/mach-s3c2410/Makefile 2007-02-17 00:44:17.000000000 +0100 
    2626@@ -89,5 +89,6 @@ 
    2727 obj-$(CONFIG_MACH_NEXCODER_2440) += mach-nexcoder.o 
    … …  
    3434=================================================================== 
    3535--- /dev/null   1970-01-01 00:00:00.000000000 +0000 
    36 +++ linux-2.6.20/arch/arm/mach-s3c2410/mach-gta01.c     2007-02-15 17:08:46.000000000 +0100 
    37 @@ -0,0 +1,507 @@ 
     36+++ linux-2.6.20/arch/arm/mach-s3c2410/mach-gta01.c     2007-02-17 00:45:51.000000000 +0100 
     37@@ -0,0 +1,495 @@ 
    3838+/* 
    3939+ * linux/arch/arm/mach-s3c2410/mach-gta01.c 
    … …  
    146146+static struct s3c2410fb_mach_info gta01_lcd_cfg __initdata = { 
    147147+       .regs   = { 
    148 + 
    149148+               .lcdcon1        = S3C2410_LCDCON1_TFT16BPP | 
    150149+                                 S3C2410_LCDCON1_TFT | 
    … …  
    170169+       }, 
    171170+ 
    172 +#if 0 
    173 +       /* currently setup by downloader */ 
    174 +       .gpccon         = 0xaa940659, 
    175 +       .gpccon_mask    = 0xffffffff, 
    176 +       .gpcup          = 0x0000ffff, 
    177 +       .gpcup_mask     = 0xffffffff, 
    178 +       .gpdcon         = 0xaa84aaa0, 
    179 +       .gpdcon_mask    = 0xffffffff, 
    180 +       .gpdup          = 0x0000faff, 
    181 +       .gpdup_mask     = 0xffffffff, 
    182 +#endif 
    183 + 
    184171+       .lpcsel         = ((0xCE6) & ~7) | 1<<4, 
     172+       .type           = S3C2410_LCDCON1_TFT, 
    185173+ 
    186174+       .width          = 480, 
    … …  
    546534=================================================================== 
    547535--- /dev/null   1970-01-01 00:00:00.000000000 +0000 
    548 +++ linux-2.6.20/include/asm-arm/arch-s3c2410/gta01.h   2007-02-15 17:08:32.000000000 +0100 
     536+++ linux-2.6.20/include/asm-arm/arch-s3c2410/gta01.h   2007-02-17 00:44:17.000000000 +0100 
    549537@@ -0,0 +1,60 @@ 
    550538+#ifndef _GTA01_H 

  • trunk/src/target/kernel/patches/qt2410-base.patch

    r1004 r1024  
    11Index: linux-2.6.20/arch/arm/mach-s3c2410/Kconfig 
    22=================================================================== 
    3 --- linux-2.6.20.orig/arch/arm/mach-s3c2410/Kconfig     2007-02-15 16:26:54.000000000 +0100 
    4 +++ linux-2.6.20/arch/arm/mach-s3c2410/Kconfig  2007-02-15 17:05:08.000000000 +0100 
     3--- linux-2.6.20.orig/arch/arm/mach-s3c2410/Kconfig     2007-02-17 00:43:51.000000000 +0100 
     4+++ linux-2.6.20/arch/arm/mach-s3c2410/Kconfig  2007-02-17 00:43:54.000000000 +0100 
    55@@ -80,6 +80,12 @@ 
    66           Say Y here if you are using the SMDK2410 or the derived module A9M2410 
    … …  
    1818Index: linux-2.6.20/arch/arm/mach-s3c2410/Makefile 
    1919=================================================================== 
    20 --- linux-2.6.20.orig/arch/arm/mach-s3c2410/Makefile    2007-02-15 16:26:54.000000000 +0100 
    21 +++ linux-2.6.20/arch/arm/mach-s3c2410/Makefile 2007-02-15 17:05:08.000000000 +0100 
     20--- linux-2.6.20.orig/arch/arm/mach-s3c2410/Makefile    2007-02-17 00:43:51.000000000 +0100 
     21+++ linux-2.6.20/arch/arm/mach-s3c2410/Makefile 2007-02-17 00:43:54.000000000 +0100 
    2222@@ -88,5 +88,6 @@ 
    2323 obj-$(CONFIG_MACH_OTOM)                += mach-otom.o 
    … …  
    3232=================================================================== 
    3333--- /dev/null   1970-01-01 00:00:00.000000000 +0000 
    34 +++ linux-2.6.20/arch/arm/mach-s3c2410/mach-qt2410.c    2007-02-15 17:07:34.000000000 +0100 
    35 @@ -0,0 +1,385 @@ 
     34+++ linux-2.6.20/arch/arm/mach-s3c2410/mach-qt2410.c    2007-02-17 00:44:07.000000000 +0100 
     35@@ -0,0 +1,386 @@ 
    3636+/* 
    3737+ * 
    … …  
    133133+ 
    134134+static struct s3c2410fb_mach_info qt2410_lcd_cfg __initdata = { 
     135+       .type = S3C2410_LCDCON1_TFT, 
    135136+       .regs   = { 
    136137+ 

  • trunk/src/target/kernel/patches/qt2410-biglcd.patch

    r598 r1024  
    1 Index: linux-2.6.17.14-fic4.test/arch/arm/mach-s3c2410/mach-qt2410.c 
     1Index: linux-2.6.20/arch/arm/mach-s3c2410/mach-qt2410.c 
    22=================================================================== 
    3 --- linux-2.6.17.14-fic4.test.orig/arch/arm/mach-s3c2410/mach-qt2410.c  2007-01-24 12:18:05.000000000 +0100 
    4 +++ linux-2.6.17.14-fic4.test/arch/arm/mach-s3c2410/mach-qt2410.c       2007-01-24 12:18:07.000000000 +0100 
    5 @@ -96,6 +96,133 @@ 
     3--- linux-2.6.20.orig/arch/arm/mach-s3c2410/mach-qt2410.c       2007-02-17 00:41:38.000000000 +0100 
     4+++ linux-2.6.20/arch/arm/mach-s3c2410/mach-qt2410.c    2007-02-17 00:43:47.000000000 +0100 
     5@@ -96,6 +96,135 @@ 
    66  
    77 /* LCD driver info */ 
    … …  
    99+/* Configuration for 640x480 SHARP LQ080V3DG01 */ 
    1010+static struct s3c2410fb_mach_info qt2410_biglcd_cfg __initdata = { 
     11+       .type   =  S3C2410_LCDCON1_TFT, 
    1112+       .regs   = { 
    1213+ 
    … …  
    7273+/* Configuration for 480x640 toppoly TD028TTEC1 */ 
    7374+static struct s3c2410fb_mach_info qt2410_prodlcd_cfg __initdata = { 
     75+       .type   = S3C2410_LCDCON1_TFT, 
    7476+       .regs   = { 
    7577+ 
    … …  
    135137+/* Config for 240x320 LCD */ 
    136138 static struct s3c2410fb_mach_info qt2410_lcd_cfg __initdata = { 
     139        .type = S3C2410_LCDCON1_TFT, 
    137140        .regs   = { 
    138   
    139 @@ -330,6 +457,17 @@ 
    140         .udc_command    = qt2410_udc_pullup, 
     141@@ -337,6 +466,17 @@ 
     142        .oversampling_shift = 2, 
    141143 }; 
    142144  
    … …  
    155157 { 
    156158        s3c24xx_init_io(qt2410_iodesc, ARRAY_SIZE(qt2410_iodesc)); 
    157 @@ -353,7 +491,20 @@ 
     159@@ -360,7 +500,20 @@ 
    158160        s3c2410_gpio_setpin(S3C2410_GPF7, 1); 
    159161  
    … …  
    175177+ 
    176178        s3c24xx_udc_set_platdata(&qt2410_udc_cfg); 
     179        set_s3c2410ts_info(&qt2410_ts_cfg); 
    177180  
    178         s3c2410_gpio_cfgpin(S3C2410_GPB5, S3C2410_GPIO_OUTPUT); 

  • trunk/src/target/kernel/patches/series

    r1004 r1024  
    55pm-debug_less_verbose.patch 
    66g_ether-highpower.patch 
    7 s3c2410fb_2617_backport.patch 
     72.6.20-s3c2410fb_uninitialized.patch 
    882.6.17-s3c2410-spi-mode23.patch 
    99s3c2410_serial-nodebug.patch