Changeset 4733


Ignore:
Timestamp:
10/30/08 02:08:10 (9 years ago)
Author:
werner
Message:

Rebase to latest stable-tracking.

Location:
developers/werner/wlan-spi/patches-tracking
Files:
1 deleted
11 edited

Legend:

Unmodified
Added
Removed
  • developers/werner/wlan-spi/patches-tracking/ar6k-without-sdio.patch

    r4714 r4733  
    1414Index: ktrack/arch/arm/Kconfig 
    1515=================================================================== 
    16 --- ktrack.orig/arch/arm/Kconfig        2008-10-15 11:12:12.000000000 -0200 
    17 +++ ktrack/arch/arm/Kconfig     2008-10-15 21:49:07.000000000 -0200 
    18 @@ -1220,7 +1220,7 @@ 
     16--- ktrack.orig/arch/arm/Kconfig        2008-10-29 03:31:30.000000000 -0200 
     17+++ ktrack/arch/arm/Kconfig     2008-10-29 03:31:36.000000000 -0200 
     18@@ -1270,7 +1270,7 @@ 
    1919  
    20  source "drivers/usb/Kconfig" 
     20 source "drivers/uwb/Kconfig" 
    2121  
    2222-source "drivers/sdio/Kconfig" 
     
    2727Index: ktrack/drivers/Makefile 
    2828=================================================================== 
    29 --- ktrack.orig/drivers/Makefile        2008-10-15 11:12:12.000000000 -0200 
    30 +++ ktrack/drivers/Makefile     2008-10-15 21:49:36.000000000 -0200 
    31 @@ -85,6 +85,7 @@ 
     29--- ktrack.orig/drivers/Makefile        2008-10-29 03:31:30.000000000 -0200 
     30+++ ktrack/drivers/Makefile     2008-10-29 03:31:36.000000000 -0200 
     31@@ -86,6 +86,7 @@ 
    3232 obj-$(CONFIG_MMC)              += mmc/ 
    3333 obj-$(CONFIG_MEMSTICK)         += memstick/ 
     
    4040=================================================================== 
    4141--- /dev/null   1970-01-01 00:00:00.000000000 +0000 
    42 +++ ktrack/drivers/ar6000/Kconfig       2008-10-15 21:49:07.000000000 -0200 
     42+++ ktrack/drivers/ar6000/Kconfig       2008-10-29 03:31:36.000000000 -0200 
    4343@@ -0,0 +1,7 @@ 
    4444+config AR6000_WLAN 
     
    5151Index: ktrack/drivers/ar6000/Makefile 
    5252=================================================================== 
    53 --- ktrack.orig/drivers/ar6000/Makefile 2008-10-15 11:12:12.000000000 -0200 
    54 +++ ktrack/drivers/ar6000/Makefile      2008-10-15 21:49:07.000000000 -0200 
     53--- ktrack.orig/drivers/ar6000/Makefile 2008-10-29 03:31:30.000000000 -0200 
     54+++ ktrack/drivers/ar6000/Makefile      2008-10-29 03:31:36.000000000 -0200 
    5555@@ -13,7 +13,7 @@ 
    5656  
  • developers/werner/wlan-spi/patches-tracking/gta02-mmc-mci.patch

    r4716 r4733  
    66Index: ktrack/arch/arm/mach-s3c2440/Kconfig 
    77=================================================================== 
    8 --- ktrack.orig/arch/arm/mach-s3c2440/Kconfig   2008-10-15 23:10:08.000000000 -0200 
    9 +++ ktrack/arch/arm/mach-s3c2440/Kconfig        2008-10-16 01:31:08.000000000 -0200 
    10 @@ -120,6 +120,10 @@ 
     8--- ktrack.orig/arch/arm/mach-s3c2440/Kconfig   2008-10-29 03:47:18.000000000 -0200 
     9+++ ktrack/arch/arm/mach-s3c2440/Kconfig        2008-10-29 03:47:21.000000000 -0200 
     10@@ -122,6 +122,10 @@ 
    1111                  This functionality requires that SPI0 is wired to 
    1212                  the WLAN SDIO interface. 
     
    2121Index: ktrack/arch/arm/mach-s3c2440/mach-gta02.c 
    2222=================================================================== 
    23 --- ktrack.orig/arch/arm/mach-s3c2440/mach-gta02.c      2008-10-15 23:10:08.000000000 -0200 
    24 +++ ktrack/arch/arm/mach-s3c2440/mach-gta02.c   2008-10-16 01:31:08.000000000 -0200 
    25 @@ -1693,6 +1693,11 @@ 
    26         mangle_glamo_res_by_system_rev(); 
    27         platform_device_register(&gta02_glamo_dev); 
     23--- ktrack.orig/arch/arm/mach-s3c2440/mach-gta02.c      2008-10-29 03:47:18.000000000 -0200 
     24+++ ktrack/arch/arm/mach-s3c2440/mach-gta02.c   2008-10-29 03:47:21.000000000 -0200 
     25@@ -1723,6 +1723,11 @@ 
     26  
     27        mangle_pmu_pdata_by_system_rev(); 
    2828  
    2929+#ifdef CONFIG_AR6K_S3CMCI 
  • developers/werner/wlan-spi/patches-tracking/gta02-mmc-spi-bitbang.patch

    r4715 r4733  
    1414Index: ktrack/arch/arm/mach-s3c2440/Kconfig 
    1515=================================================================== 
    16 --- ktrack.orig/arch/arm/mach-s3c2440/Kconfig   2008-10-15 22:30:39.000000000 -0200 
    17 +++ ktrack/arch/arm/mach-s3c2440/Kconfig        2008-10-15 23:09:15.000000000 -0200 
    18 @@ -99,6 +99,20 @@ 
     16--- ktrack.orig/arch/arm/mach-s3c2440/Kconfig   2008-10-29 00:57:06.000000000 -0200 
     17+++ ktrack/arch/arm/mach-s3c2440/Kconfig        2008-10-29 03:39:59.000000000 -0200 
     18@@ -101,6 +101,20 @@ 
    1919           Say Y here if you are using an early hardware revision 
    2020           of the FIC/Openmoko Neo1973 GTA02 GSM Phone. 
     
    3939Index: ktrack/arch/arm/mach-s3c2440/mach-gta02.c 
    4040=================================================================== 
    41 --- ktrack.orig/arch/arm/mach-s3c2440/mach-gta02.c      2008-10-15 22:30:39.000000000 -0200 
    42 +++ ktrack/arch/arm/mach-s3c2440/mach-gta02.c   2008-10-15 23:09:56.000000000 -0200 
     41--- ktrack.orig/arch/arm/mach-s3c2440/mach-gta02.c      2008-10-29 03:33:37.000000000 -0200 
     42+++ ktrack/arch/arm/mach-s3c2440/mach-gta02.c   2008-10-29 03:41:13.000000000 -0200 
    4343@@ -37,6 +37,7 @@ 
    4444 #include <linux/spi/spi.h> 
     
    4949  
    5050 #include <linux/mtd/mtd.h> 
    51 @@ -1223,6 +1224,87 @@ 
     51@@ -1238,6 +1239,87 @@ 
    5252        }, 
    5353 }; 
     
    137137        { 
    138138                .name   = "gta02-power:orange", 
    139 @@ -1638,7 +1720,13 @@ 
     139@@ -1668,6 +1750,12 @@ 
    140140        s3c2410_gpio_pullup(S3C2410_GPF3, 1); 
    141141        s3c2410_gpio_pullup(S3C2410_GPG2, 1); 
    142142  
    143 -       platform_device_register(&s3c_device_spi_acc); 
    144143+#ifdef CONFIG_AR6K_SPI_S3C24XX_GPIO 
    145144+       s3c2410_gpio_setpin(S3C2410_GPE10, 1);  /* nSS */ 
     
    148147+#endif /* CONFIG_AR6K_SPI_S3C24XX_GPIO */ 
    149148+ 
    150 +//     platform_device_register(&s3c_device_spi_acc); 
    151         platform_device_register(&gta02_button_dev); 
    152         platform_device_register(&gta02_pm_gsm_dev); 
    153         platform_device_register(&gta02_pm_usbhost_dev); 
     149        platform_add_devices(gta02_devices, ARRAY_SIZE(gta02_devices)); 
     150  
     151        s3c2410_pm_init(); 
  • developers/werner/wlan-spi/patches-tracking/gta02-mmc-spi.patch

    r4715 r4733  
    1313Index: ktrack/arch/arm/mach-s3c2440/Kconfig 
    1414=================================================================== 
    15 --- ktrack.orig/arch/arm/mach-s3c2440/Kconfig   2008-10-15 23:09:15.000000000 -0200 
    16 +++ ktrack/arch/arm/mach-s3c2440/Kconfig        2008-10-15 23:10:08.000000000 -0200 
    17 @@ -111,6 +111,15 @@ 
     15--- ktrack.orig/arch/arm/mach-s3c2440/Kconfig   2008-10-29 03:39:59.000000000 -0200 
     16+++ ktrack/arch/arm/mach-s3c2440/Kconfig        2008-10-29 03:42:30.000000000 -0200 
     17@@ -113,6 +113,15 @@ 
    1818                 bool "GPIO bit-banging SPI" 
    1919                 select MMC_SPI 
     
    3333Index: ktrack/arch/arm/mach-s3c2440/mach-gta02.c 
    3434=================================================================== 
    35 --- ktrack.orig/arch/arm/mach-s3c2440/mach-gta02.c      2008-10-15 23:09:56.000000000 -0200 
    36 +++ ktrack/arch/arm/mach-s3c2440/mach-gta02.c   2008-10-15 23:10:08.000000000 -0200 
    37 @@ -1228,9 +1228,7 @@ 
     35--- ktrack.orig/arch/arm/mach-s3c2440/mach-gta02.c      2008-10-29 03:41:13.000000000 -0200 
     36+++ ktrack/arch/arm/mach-s3c2440/mach-gta02.c   2008-10-29 03:44:38.000000000 -0200 
     37@@ -1243,9 +1243,7 @@ 
    3838 /* ----- AR6000 WLAN interface --------------------------------------------- */ 
    3939  
     
    4646 static struct spi_board_info gta02_spi_mmc_bdinfo[] = { 
    4747        { 
    48 @@ -1243,7 +1241,18 @@ 
     48@@ -1258,7 +1256,18 @@ 
    4949        } 
    5050 }; 
     
    6666  
    6767 #ifdef CONFIG_AR6K_SPI_S3C24XX_GPIO 
    68 @@ -1750,6 +1759,13 @@ 
    69         } 
    70  #endif 
     68@@ -1756,6 +1765,13 @@ 
     69        platform_device_register(&gta02_spi_wlan); 
     70 #endif /* CONFIG_AR6K_SPI_S3C24XX_GPIO */ 
    7171  
    7272+#ifdef CONFIG_AR6K_SPI_S3C24XX 
     
    7777+#endif /* CONFIG_AR6K_SPI_S3C24XX */ 
    7878+ 
    79          i2c_register_board_info(0, gta02_i2c_devs, 
    80                  ARRAY_SIZE(gta02_i2c_devs)); 
     79        platform_add_devices(gta02_devices, ARRAY_SIZE(gta02_devices)); 
    8180  
     81        s3c2410_pm_init(); 
  • developers/werner/wlan-spi/patches-tracking/gta02-remove-sdio.patch

    r4714 r4733  
    99Index: ktrack/arch/arm/mach-s3c2440/mach-gta02.c 
    1010=================================================================== 
    11 --- ktrack.orig/arch/arm/mach-s3c2440/mach-gta02.c      2008-10-15 21:35:29.000000000 -0200 
    12 +++ ktrack/arch/arm/mach-s3c2440/mach-gta02.c   2008-10-15 21:51:04.000000000 -0200 
    13 @@ -813,36 +813,6 @@ 
     11--- ktrack.orig/arch/arm/mach-s3c2440/mach-gta02.c      2008-10-29 03:31:14.000000000 -0200 
     12+++ ktrack/arch/arm/mach-s3c2440/mach-gta02.c   2008-10-29 03:33:37.000000000 -0200 
     13@@ -876,36 +876,6 @@ 
    1414 }; 
    1515  
     
    4848        .name           = "s3c24xx_pwm", 
    4949        .num_resources  = 0, 
    50 @@ -1678,9 +1648,6 @@ 
    51         platform_device_register(&gta02_vibrator_dev); 
    52         platform_device_register(&gta02_led_dev); 
    53   
    54 - 
    55 -       platform_device_register(&gta02_sdio_dev); 
    56 - 
    57         platform_add_devices(gta02_devices, ARRAY_SIZE(gta02_devices)); 
    58   
    59  #ifdef CONFIG_GTA02_HDQ 
     50@@ -1582,7 +1552,6 @@ 
     51        &gta01_pm_gps_dev, 
     52        &gta01_pm_bt_dev, 
     53        &gta02_pm_gsm_dev, 
     54-       &gta02_sdio_dev, 
     55        &gta02_pm_usbhost_dev, 
     56        &s3c_device_spi_acc1, /* input 2 */ 
     57        &s3c_device_spi_acc2, /* input 3 */ 
  • developers/werner/wlan-spi/patches-tracking/hack-disable-ecc.patch

    r4713 r4733  
    11Index: ktrack/drivers/mtd/nand/nand_base.c 
    22=================================================================== 
    3 --- ktrack.orig/drivers/mtd/nand/nand_base.c    2008-10-15 11:47:50.000000000 -0200 
    4 +++ ktrack/drivers/mtd/nand/nand_base.c 2008-10-15 11:58:06.000000000 -0200 
     3--- ktrack.orig/drivers/mtd/nand/nand_base.c    2008-10-29 00:57:08.000000000 -0200 
     4+++ ktrack/drivers/mtd/nand/nand_base.c 2008-10-29 03:17:39.000000000 -0200 
    55@@ -775,6 +775,7 @@ 
    66        uint32_t *eccpos = chip->ecc.layout->eccpos; 
     
    2121Index: ktrack/drivers/mtd/nand/nand_ecc.c 
    2222=================================================================== 
    23 --- ktrack.orig/drivers/mtd/nand/nand_ecc.c     2008-10-15 11:48:20.000000000 -0200 
    24 +++ ktrack/drivers/mtd/nand/nand_ecc.c  2008-10-15 11:55:50.000000000 -0200 
    25 @@ -146,6 +146,7 @@ 
    26  { 
    27         uint8_t s0, s1, s2; 
     23--- ktrack.orig/drivers/mtd/nand/nand_ecc.c     2008-10-29 00:57:08.000000000 -0200 
     24+++ ktrack/drivers/mtd/nand/nand_ecc.c  2008-10-29 03:17:56.000000000 -0200 
     25@@ -434,6 +434,7 @@ 
     26        const uint32_t eccsize_mult = 
     27                        (((struct nand_chip *)mtd->priv)->ecc.size) >> 8; 
    2828  
    2929+       return 0; 
    30  #ifdef CONFIG_MTD_NAND_ECC_SMC 
    31         s0 = calc_ecc[0] ^ read_ecc[0]; 
    32         s1 = calc_ecc[1] ^ read_ecc[1]; 
     30        /* 
     31         * b0 to b2 indicate which bit is faulty (if any) 
     32         * we might need the xor result  more than once, 
  • developers/werner/wlan-spi/patches-tracking/hack-mmc-spi-coexistence.patch

    r4714 r4733  
    1010Index: ktrack/arch/arm/mach-s3c2440/mach-gta02.c 
    1111=================================================================== 
    12 --- ktrack.orig/arch/arm/mach-s3c2440/mach-gta02.c      2008-10-15 13:23:37.000000000 -0200 
    13 +++ ktrack/arch/arm/mach-s3c2440/mach-gta02.c   2008-10-15 22:04:28.000000000 -0200 
    14 @@ -1632,6 +1632,42 @@ 
    15         mangle_glamo_res_by_system_rev(); 
    16         platform_device_register(&gta02_glamo_dev); 
     12--- ktrack.orig/arch/arm/mach-s3c2440/mach-gta02.c      2008-10-29 00:57:06.000000000 -0200 
     13+++ ktrack/arch/arm/mach-s3c2440/mach-gta02.c   2008-10-29 03:21:52.000000000 -0200 
     14@@ -1663,6 +1663,42 @@ 
     15  
     16        mangle_pmu_pdata_by_system_rev(); 
    1717  
    1818+#ifdef CONFIG_AR6K_SPI_S3C24XX 
     
    3939+       /* disable all pull-downs on SD/MMC and SPI  */ 
    4040+ 
    41 +       s3c2410_gpio_pullup(S3C2410_GPE5, 1);   /* SD/MMC block */ 
     41+       s3c2410_gpio_pullup(S3C2410_GPE5, 1);   /* SD/MMC block */ 
    4242+       s3c2410_gpio_pullup(S3C2410_GPE6, 1); 
    4343+       s3c2410_gpio_pullup(S3C2410_GPE7, 1); 
     
    4646+       s3c2410_gpio_pullup(S3C2410_GPE10, 1); 
    4747+ 
    48 +       s3c2410_gpio_pullup(S3C2410_GPE11, 1);  /* SPI block */ 
     48+       s3c2410_gpio_pullup(S3C2410_GPE11, 1);  /* SPI block */ 
    4949+       s3c2410_gpio_pullup(S3C2410_GPE12, 1); 
    5050+       s3c2410_gpio_pullup(S3C2410_GPE13, 1); 
     
    5252+       s3c2410_gpio_pullup(S3C2410_GPG2, 1); 
    5353+ 
    54         platform_device_register(&s3c_device_spi_acc); 
    55         platform_device_register(&gta02_button_dev); 
    56         platform_device_register(&gta02_pm_gsm_dev); 
     54        platform_add_devices(gta02_devices, ARRAY_SIZE(gta02_devices)); 
     55  
     56        s3c2410_pm_init(); 
  • developers/werner/wlan-spi/patches-tracking/hif-direct-interrupt.patch

    r4716 r4733  
    1010Index: ktrack/drivers/ar6000/hif/hif2.c 
    1111=================================================================== 
    12 --- ktrack.orig/drivers/ar6000/hif/hif2.c       2008-10-16 01:13:51.000000000 -0200 
    13 +++ ktrack/drivers/ar6000/hif/hif2.c    2008-10-16 01:21:50.000000000 -0200 
     12--- ktrack.orig/drivers/ar6000/hif/hif2.c       2008-10-29 23:48:33.000000000 -0200 
     13+++ ktrack/drivers/ar6000/hif/hif2.c    2008-10-29 23:50:44.000000000 -0200 
    1414@@ -21,9 +21,13 @@ 
    1515 #include <linux/list.h> 
     
    188188 /* ========================================================================= */ 
    189189  
    190 @@ -521,11 +540,31 @@ 
     190@@ -521,11 +540,32 @@ 
    191191                dev_err(dev, "sdio_set_block_size returns %d\n", ret); 
    192192                /* @@@ cleanup */ 
    193193        } 
     194+ 
    194195+#ifndef CONFIG_AR6000_GTA02_DIRECT_IRQ 
    195196        ret = sdio_claim_irq(func, sdio_ar6000_irq); 
     
    217218+#endif /* CONFIG_AR6000_GTA02_DIRECT_IRQ */ 
    218219+ 
    219  #if 0 /* only for hw SDIO */ 
    220         sdio_f0_writeb(func, SDIO_BUS_CD_DISABLE | SDIO_BUS_WIDTH_4BIT, 
    221             SDIO_CCCR_IF, &ret); 
     220        /* Set SDIO_BUS_CD_DISABLE in SDIO_CCCR_IF ? */ 
     221 #if 0 
     222        sdio_f0_writeb(func, SDIO_CCCR_CAP_E4MI, SDIO_CCCR_CAPS, &ret); 
    222223Index: ktrack/drivers/spi/spi_bitbang.c 
    223224=================================================================== 
    224 --- ktrack.orig/drivers/spi/spi_bitbang.c       2008-10-16 01:13:51.000000000 -0200 
    225 +++ ktrack/drivers/spi/spi_bitbang.c    2008-10-16 01:15:26.000000000 -0200 
     225--- ktrack.orig/drivers/spi/spi_bitbang.c       2008-10-29 23:48:33.000000000 -0200 
     226+++ ktrack/drivers/spi/spi_bitbang.c    2008-10-29 23:49:18.000000000 -0200 
    226227@@ -323,6 +323,9 @@ 
    227228                         * selected ...) 
     
    246247Index: ktrack/drivers/ar6000/Kconfig 
    247248=================================================================== 
    248 --- ktrack.orig/drivers/ar6000/Kconfig  2008-10-16 01:13:51.000000000 -0200 
    249 +++ ktrack/drivers/ar6000/Kconfig       2008-10-16 01:15:26.000000000 -0200 
     249--- ktrack.orig/drivers/ar6000/Kconfig  2008-10-29 23:48:33.000000000 -0200 
     250+++ ktrack/drivers/ar6000/Kconfig       2008-10-29 23:49:18.000000000 -0200 
    250251@@ -5,3 +5,8 @@ 
    251252         default m 
  • developers/werner/wlan-spi/patches-tracking/s3c-mmc-sdio-int.patch

    r4726 r4733  
    1919Index: ktrack/drivers/mmc/host/s3cmci.c 
    2020=================================================================== 
    21 --- ktrack.orig/drivers/mmc/host/s3cmci.c       2008-10-17 05:32:34.000000000 -0200 
    22 +++ ktrack/drivers/mmc/host/s3cmci.c    2008-10-17 05:46:43.000000000 -0200 
    23 @@ -195,7 +195,11 @@ 
     21--- ktrack.orig/drivers/mmc/host/s3cmci.c       2008-10-29 00:57:08.000000000 -0200 
     22+++ ktrack/drivers/mmc/host/s3cmci.c    2008-10-29 03:48:44.000000000 -0200 
     23@@ -198,7 +198,11 @@ 
    2424  
    2525 static inline void clear_imask(struct s3cmci_host *host) 
     
    3434  
    3535 static inline int get_data_buffer(struct s3cmci_host *host, 
    36 @@ -347,6 +351,7 @@ 
     36@@ -383,6 +387,7 @@ 
    3737        struct s3cmci_host *host = (struct s3cmci_host *) data; 
    3838  
     
    4242        if (host->pio_active == XFER_WRITE) 
    4343                do_pio_write(host); 
    44 @@ -367,8 +372,12 @@ 
     44@@ -403,8 +408,12 @@ 
    4545                } 
    4646  
     
    5656  
    5757 /* 
    58 @@ -405,6 +414,7 @@ 
     58@@ -441,6 +450,7 @@ 
    5959        u32 mci_csta, mci_dsta, mci_fsta, mci_dcnt, mci_imsk; 
    6060        u32 mci_cclear, mci_dclear; 
     
    6464        spin_lock_irqsave(&host->complete_lock, iflags); 
    6565  
    66 @@ -416,6 +426,13 @@ 
     66@@ -452,6 +462,13 @@ 
    6767        mci_cclear = 0; 
    6868        mci_dclear = 0; 
     
    7878            (host->complete_what == COMPLETION_FINALIZE)) { 
    7979                host->status = "nothing to complete"; 
    80 @@ -585,6 +602,11 @@ 
     80@@ -621,6 +638,11 @@ 
    8181            mci_csta, mci_dsta, mci_fsta, mci_dcnt, host->status); 
    8282  
     
    9090 } 
    9191  
    92 @@ -653,7 +675,7 @@ 
     92@@ -689,7 +711,7 @@ 
    9393 fail_request: 
    9494        host->mrq->data->error = -EINVAL; 
     
    9999  
    100100 } 
    101 @@ -698,7 +720,7 @@ 
     101@@ -734,7 +756,7 @@ 
    102102        writel(0, host->base + S3C2410_SDICMDARG); 
    103103        writel(S3C2410_SDIDCON_STOP, host->base + S3C2410_SDIDCON); 
     
    108108        if (cmd->data && cmd->error) 
    109109                cmd->data->error = cmd->error; 
    110 @@ -1010,7 +1032,10 @@ 
     110@@ -1045,7 +1067,10 @@ 
    111111        s3cmci_send_command(host, cmd); 
    112112  
     
    120120  
    121121 static int s3cmci_card_present(struct mmc_host *mmc) 
    122 @@ -1103,9 +1128,9 @@ 
     122@@ -1145,9 +1170,9 @@ 
    123123  
    124124        /* Set CLOCK_ENABLE */ 
     
    132132        writel(mci_con, host->base + S3C2410_SDICON); 
    133133  
    134 @@ -1145,11 +1170,27 @@ 
     134@@ -1187,11 +1212,27 @@ 
    135135        return ret; 
    136136 } 
     
    160160  
    161161 static struct s3c24xx_mci_pdata s3cmci_def_pdata = { 
    162 @@ -1242,6 +1283,7 @@ 
     162@@ -1339,6 +1380,7 @@ 
    163163         * ensure we don't lock the system with un-serviceable requests. */ 
    164164  
     
    168168        host->irq_cd = s3c2410_gpio_getirq(host->pdata->gpio_detect); 
    169169  
    170 @@ -1287,7 +1329,7 @@ 
     170@@ -1384,7 +1426,7 @@ 
    171171  
    172172        mmc->ops        = &s3cmci_ops; 
     
    179179Index: ktrack/drivers/mmc/host/s3cmci.h 
    180180=================================================================== 
    181 --- ktrack.orig/drivers/mmc/host/s3cmci.h       2008-10-17 05:46:53.000000000 -0200 
    182 +++ ktrack/drivers/mmc/host/s3cmci.h    2008-10-17 05:47:06.000000000 -0200 
    183 @@ -67,4 +67,6 @@ 
    184   
     181--- ktrack.orig/drivers/mmc/host/s3cmci.h       2008-10-29 00:57:08.000000000 -0200 
     182+++ ktrack/drivers/mmc/host/s3cmci.h    2008-10-29 03:49:21.000000000 -0200 
     183@@ -68,6 +68,8 @@ 
    185184        unsigned int            ccnt, dcnt; 
    186185        struct tasklet_struct   pio_tasklet; 
     186  
     187+       int                     irq_disabled; 
    187188+ 
    188 +       int                     irq_disabled; 
    189  }; 
     189 #ifdef CONFIG_CPU_FREQ 
     190        struct notifier_block   freq_transition; 
     191 #endif 
  • developers/werner/wlan-spi/patches-tracking/s3c-spi-from-int-to-poll.patch

    r4716 r4733  
    77Index: ktrack/drivers/spi/spi_s3c24xx.c 
    88=================================================================== 
    9 --- ktrack.orig/drivers/spi/spi_s3c24xx.c       2008-10-15 23:14:27.000000000 -0200 
    10 +++ ktrack/drivers/spi/spi_s3c24xx.c    2008-10-16 00:36:32.000000000 -0200 
     9--- ktrack.orig/drivers/spi/spi_s3c24xx.c       2008-10-29 03:47:03.000000000 -0200 
     10+++ ktrack/drivers/spi/spi_s3c24xx.c    2008-10-29 03:47:04.000000000 -0200 
    1111@@ -56,7 +56,7 @@ 
    1212        struct s3c2410_spi_info *pdata; 
     
    7070  
    7171 static irqreturn_t s3c24xx_spi_irq(int irq, void *dev) 
    72 @@ -352,6 +362,7 @@ 
     72@@ -355,6 +365,7 @@ 
    7373                goto err_no_iomap; 
    7474        } 
     
    7878        if (hw->irq < 0) { 
    7979                dev_err(&pdev->dev, "No IRQ specified\n"); 
    80 @@ -364,6 +375,7 @@ 
     80@@ -367,6 +378,7 @@ 
    8181                dev_err(&pdev->dev, "Cannot claim IRQ\n"); 
    8282                goto err_no_irq; 
     
    8686        hw->clk = clk_get(&pdev->dev, "spi"); 
    8787        if (IS_ERR(hw->clk)) { 
    88 @@ -399,7 +411,7 @@ 
     88@@ -402,7 +414,7 @@ 
    8989        clk_put(hw->clk); 
    9090  
     
    9595  err_no_irq: 
    9696        iounmap(hw->regs); 
    97 @@ -427,7 +439,7 @@ 
     97@@ -430,7 +442,7 @@ 
    9898        clk_disable(hw->clk); 
    9999        clk_put(hw->clk); 
  • developers/werner/wlan-spi/patches-tracking/series

    r4726 r4733  
    66# mv sdio/function/wlan/ar6000 . 
    77# rm -rf sdio ../include/linux/sdio 
     8# 
     9# Alternative procedure: 
     10# 
     11# rm -rf drivers/ar6000         # in case this operation is repeated 
     12# git mv drivers/sdio/function/wlan/ar6000 drivers/ar6000 
     13# git rm -r drivers/sdio include/linux/sdio 
     14# git commit -m "Remove Atheros SDIO stack." 
     15# rm -rf drivers/sdio 
    816# 
    917 
     
    1725s3c-spi-fix-int-mode.patch  
    1826s3c-spi-from-int-to-poll.patch 
     27 
     28# broken in recent stable-tracking 
     29 
    1930gta02-mmc-mci.patch 
    2031 
     
    2233 
    2334# didn't survive the move to 2.6.27 :-( 
    24 #hack-dont-poll-irq.patch  
    25 #hif-direct-interrupt.patch 
    26 #hif-can-do-async.patch 
    27 s3c-mmc-hdrmig-fix.patch 
     35hack-dont-poll-irq.patch  
     36hif-direct-interrupt.patch 
     37hif-can-do-async.patch 
     38 
     39# still needs a bit more love ... 
    2840s3c-mmc-sdio-int.patch 
Note: See TracChangeset for help on using the changeset viewer.