Changeset 4711

Timestamp:

10/10/08 23:58:41 (5 years ago)

Author:

werner

Message:

• series, gta02-mmc-mci.patch: added platform glue to use the S3C MCI driver
• hif-direct-interrupt.patch: made use of direct interrupt configurable
• hif-direct-interrupt.patch: removed useless attempt to set ECSI (interrupt signaling even when nSS is inactive)

Location:

developers/werner/wlan-spi/patches

Files:

• gta02-mmc-mci.patch (added)
• hif-direct-interrupt.patch (modified) (9 diffs)
• series (modified) (1 diff)

developers/werner/wlan-spi/patches/hif-direct-interrupt.patch

@@ -10 +10 @@
 Index: korig/drivers/ar6000/hif/hif2.c
 ===================================================================
---- korig.orig/drivers/ar6000/hif/hif2.c        2008-10-07 13:00:55.000000000 -0200
-+++ korig/drivers/ar6000/hif/hif2.c     2008-10-07 13:00:57.000000000 -0200
+--- korig.orig/drivers/ar6000/hif/hif2.c        2008-10-07 13:06:47.000000000 -0200
++++ korig/drivers/ar6000/hif/hif2.c     2008-10-10 19:51:23.000000000 -0200
 @@ -21,9 +21,13 @@
  #include <linux/list.h>
@@ -73 +73 @@
  
 -#if 1
-+#if 0
++#ifndef CONFIG_AR6000_GTA02_DIRECT_IRQ
  
  /*
   * Volatile ought to be good enough to make gcc do the right thing on S3C24xx.
-@@ -393,69 +414,64 @@
+@@ -386,78 +407,76 @@
+                yield();
+ }
+ 
+-#endif
++#endif /* !CONFIG_AR6000_GTA02_DIRECT_IRQ */
+ 
+ /* ========================================================================= */
+ 
  /*
   * The code below is for handling interrupts signalled out-of-band.
@@ -83 +91 @@
 -#if 0
 -#define IRQ_GPIO S3C2410_GPE8 /* SDDAT1 */
+ 
++#ifdef CONFIG_AR6000_GTA02_DIRECT_IRQ
+ 
+-static atomic_t mask = ATOMIC_INIT(1);
+ 
 -
--
--static atomic_t mask = ATOMIC_INIT(1);
-+#if 1
- 
- 
 -static void sdio_ar6000_irq(struct sdio_func *func)
 +static void sdio_ar6000_work(struct work_struct *work)
@@ -173 +181 @@
 +       disable_irq(hif->irq);
  }
- #endif
- 
-@@ -503,6 +519,7 @@
-        struct device *dev = &func->dev;
-        int ret;
-        struct task_struct *task;
-+       u8 bus;
- 
-        dev_dbg(dev, "sdio_ar6000_probe\n");
-        BUG_ON(!htcCallbacks.deviceInsertedHandler);
-@@ -520,11 +537,46 @@
+-#endif
++
++#endif /* CONFIG_AR6000_GTA02_DIRECT_IRQ */
++
+ 
+ /* ========================================================================= */
+ 
+@@ -520,11 +539,31 @@
                 dev_err(dev, "sdio_set_block_size returns %d\n", ret);
                 /* @@@ cleanup */
         }
-+#if 0
++#ifndef CONFIG_AR6000_GTA02_DIRECT_IRQ
         ret = sdio_claim_irq(func, sdio_ar6000_irq);
         if (ret) {
@@ -193 +198 @@
                 /* @@@ cleanup */
         }
-+#else
++#else /* !CONFIG_AR6000_GTA02_DIRECT_IRQ */
 +       hif_device.irq = IRQ_EINT3;
 +       INIT_WORK(&hif_device.work, sdio_ar6000_work);
@@ -204 +209 @@
 +       /* driver wants to be in charge for enabling the interrupt */
 +       disable_irq(hif_device.irq);
-+       bus = sdio_f0_readb(func, SDIO_CCCR_IF, &ret);
-+       if (ret) {
-+               dev_err(dev, "sdio_f0_readb(SDIO_CCCR_IF) returns %d\n",
-+                   ret);
-+               /* @@@ cleanup */
-+       }
-+       printk(KERN_INFO "bus 0x%02x\n", bus);
-+       /* try to set ECSI. Note: SCSI is 0, so this probably has no effect. */
-+       bus |= 0x20;
-+       sdio_f0_writeb(func, bus, SDIO_CCCR_IF, &ret);
-+       if (ret) {
-+               dev_err(dev, "sdio_f0_writeb(SDIO_CCCR_IF) returns %d\n",
-+                   ret);
-+               /* @@@ cleanup */
-+       }
 +       sdio_f0_writeb(func, 3, SDIO_CCCR_IENx, &ret);
 +       if (ret) {
@@ -225 +215 @@
 +               /* @@@ cleanup */
 +       }
-+#endif
++#endif /* CONFIG_AR6000_GTA02_DIRECT_IRQ */
 +
  #if 0 /* only for hw SDIO */
@@ -232 +222 @@
 Index: korig/drivers/spi/spi_bitbang.c
 ===================================================================
---- korig.orig/drivers/spi/spi_bitbang.c        2008-10-07 13:00:55.000000000 -0200
-+++ korig/drivers/spi/spi_bitbang.c     2008-10-07 13:00:57.000000000 -0200
+--- korig.orig/drivers/spi/spi_bitbang.c        2008-10-07 13:06:31.000000000 -0200
++++ korig/drivers/spi/spi_bitbang.c     2008-10-07 13:06:47.000000000 -0200
 @@ -323,6 +323,9 @@
                          * selected ...)
@@ -254 +244 @@
                         bitbang->chipselect(spi, BITBANG_CS_INACTIVE);
                         ndelay(nsecs);
+Index: korig/drivers/ar6000/Kconfig
+===================================================================
+--- korig.orig/drivers/ar6000/Kconfig   2008-10-10 19:23:50.000000000 -0200
++++ korig/drivers/ar6000/Kconfig        2008-10-10 19:28:22.000000000 -0200
+@@ -5,3 +5,8 @@
+         default m
+         help
+           good luck.
++
++config AR6000_GTA02_DIRECT_IRQ
++       bool "Hack: use direct interrupt on GTA02"
++       depends on AR6000_WLAN && !AR6K_S3CMCI
++       default n

developers/werner/wlan-spi/patches/series

@@ -34 +34 @@
 hif-direct-interrupt.patch
 hif-can-do-async.patch
+gta02-mmc-mci.patch