]> Git Repo - linux.git/commitdiff
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
authorPaul Mundt <[email protected]>
Sun, 23 May 2010 23:52:55 +0000 (08:52 +0900)
committerPaul Mundt <[email protected]>
Sun, 23 May 2010 23:52:55 +0000 (08:52 +0900)
1  2 
MAINTAINERS
drivers/dma/Kconfig
drivers/dma/shdma.c
drivers/video/Kconfig

diff --combined MAINTAINERS
index 552e0b692f25e2c0458e55b16c4f27c85c7b7fe8,a8fe9b461e09c64df9e4cf618ced7f588a4fea7b..9a5537b4e4a0223343dbc22be4b5e219df471801
@@@ -131,19 -131,12 +131,12 @@@ L:      [email protected]
  S:    Maintained
  F:    drivers/net/typhoon*
  
- 3W-9XXX SATA-RAID CONTROLLER DRIVER
- M:    Adam Radford <linuxraid@amcc.com>
+ 3WARE SAS/SATA-RAID SCSI DRIVERS (3W-XXXX, 3W-9XXX, 3W-SAS)
+ M:    Adam Radford <linuxraid@lsi.com>
  L:    [email protected]
- W:    http://www.amcc.com
+ W:    http://www.lsi.com
  S:    Supported
- F:    drivers/scsi/3w-9xxx*
- 3W-XXXX ATA-RAID CONTROLLER DRIVER
- M:    Adam Radford <[email protected]>
- L:    [email protected]
- W:    http://www.amcc.com
- S:    Supported
- F:    drivers/scsi/3w-xxxx*
+ F:    drivers/scsi/3w-*
  
  53C700 AND 53C700-66 SCSI DRIVER
  M:    "James E.J. Bottomley" <[email protected]>
@@@ -955,9 -948,8 +948,9 @@@ ARM/SHMOBILE ARM ARCHITECTUR
  M:    Paul Mundt <[email protected]>
  M:    Magnus Damm <[email protected]>
  L:    [email protected]
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/lethal/genesis-2.6.git
  W:    http://oss.renesas.com
 +Q:    http://patchwork.kernel.org/project/linux-sh/list/
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/lethal/genesis-2.6.git
  S:    Supported
  F:    arch/arm/mach-shmobile/
  F:    drivers/sh/
@@@ -1522,9 -1514,10 +1515,10 @@@ M:    Andy Whitcroft <[email protected]
  S:    Supported
  F:    scripts/checkpatch.pl
  
- CISCO 10G ETHERNET DRIVER
+ CISCO VIC ETHERNET NIC DRIVER
  M:    Scott Feldman <[email protected]>
- M:    Joe Eykholt <[email protected]>
+ M:    Vasanthy Kolluri <[email protected]>
+ M:    Roopa Prabhu <[email protected]>
  S:    Supported
  F:    drivers/net/enic/
  
@@@ -1750,6 -1743,20 +1744,20 @@@ W:    http://www.openfabrics.or
  S:    Supported
  F:    drivers/infiniband/hw/cxgb3/
  
+ CXGB4 ETHERNET DRIVER (CXGB4)
+ M:    Dimitris Michailidis <[email protected]>
+ L:    [email protected]
+ W:    http://www.chelsio.com
+ S:    Supported
+ F:    drivers/net/cxgb4/
+ CXGB4 IWARP RNIC DRIVER (IW_CXGB4)
+ M:    Steve Wise <[email protected]>
+ L:    [email protected]
+ W:    http://www.openfabrics.org
+ S:    Supported
+ F:    drivers/infiniband/hw/cxgb4/
  CYBERPRO FB DRIVER
  M:    Russell King <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
@@@ -2688,16 -2695,12 +2696,12 @@@ F:   Documentation/timers/hpet.tx
  F:    drivers/char/hpet.c
  F:    include/linux/hpet.h
  
- HPET: i386
- M:    "Venkatesh Pallipadi (Venki)" <venkatesh.pallipadi@intel.com>
+ HPET: x86
+ M:    "Venkatesh Pallipadi (Venki)" <venki@google.com>
  S:    Maintained
  F:    arch/x86/kernel/hpet.c
  F:    arch/x86/include/asm/hpet.h
  
- HPET: x86_64
- M:    Vojtech Pavlik <[email protected]>
- S:    Maintained
  HPET: ACPI
  M:    Bob Picco <[email protected]>
  S:    Maintained
@@@ -2738,6 -2741,7 +2742,7 @@@ M:      "Ben Dooks (embedded platforms)" <be
  L:    [email protected]
  W:    http://i2c.wiki.kernel.org/
  T:    quilt kernel.org/pub/linux/kernel/people/jdelvare/linux-2.6/jdelvare-i2c/
+ T:    git git://git.fluff.org/bjdooks/linux.git
  S:    Maintained
  F:    Documentation/i2c/
  F:    drivers/i2c/
@@@ -3034,10 -3038,9 +3039,9 @@@ F:     net/ipv4/netfilter/ipt_MASQUERADE.
  IP1000A 10/100/1000 GIGABIT ETHERNET DRIVER
  M:    Francois Romieu <[email protected]>
  M:    Sorbica Shieh <[email protected]>
- M:    Jesse Huang <[email protected]>
  L:    [email protected]
  S:    Maintained
- F:    drivers/net/ipg.c
+ F:    drivers/net/ipg.*
  
  IPATH DRIVER
  M:    Ralph Campbell <[email protected]>
@@@ -3316,15 -3319,17 +3320,17 @@@ F:   include/linux/key-type.
  F:    include/keys/
  F:    security/keys/
  
- KGDB
+ KGDB / KDB /debug_core
  M:    Jason Wessel <[email protected]>
+ W:    http://kgdb.wiki.kernel.org/
  L:    [email protected]
  S:    Maintained
  F:    Documentation/DocBook/kgdb.tmpl
  F:    drivers/misc/kgdbts.c
  F:    drivers/serial/kgdboc.c
+ F:    include/linux/kdb.h
  F:    include/linux/kgdb.h
- F:    kernel/kgdb.c
+ F:    kernel/debug/
  
  KMEMCHECK
  M:    Vegard Nossum <[email protected]>
@@@ -3885,7 -3890,6 +3891,6 @@@ M:      Ramkrishna Vepa <[email protected]
  M:    Rastapur Santosh <[email protected]>
  M:    Sivakumar Subramani <[email protected]>
  M:    Sreenivasa Honnur <[email protected]>
- M:    Anil Murthy <[email protected]>
  L:    [email protected]
  W:    http://trac.neterion.com/cgi-bin/trac.cgi/wiki/Linux?Anonymous
  W:    http://trac.neterion.com/cgi-bin/trac.cgi/wiki/X3100Linux?Anonymous
@@@ -3990,6 -3994,7 +3995,7 @@@ F:      net/rfkill
  F:    net/wireless/
  F:    include/net/ieee80211*
  F:    include/linux/wireless.h
+ F:    include/linux/iw_handler.h
  F:    drivers/net/wireless/
  
  NETWORKING DRIVERS
@@@ -4611,6 -4616,14 +4617,14 @@@ S:    Supporte
  F:    Documentation/scsi/LICENSE.qla2xxx
  F:    drivers/scsi/qla2xxx/
  
+ QLOGIC QLA4XXX iSCSI DRIVER
+ M:    Ravi Anand <[email protected]>
+ M:    Vikas Chaudhary <[email protected]>
+ M:    [email protected]
+ L:    [email protected]
+ S:    Supported
+ F:    drivers/scsi/qla4xxx/
  QLOGIC QLA3XXX NETWORK DRIVER
  M:    Ron Mercer <[email protected]>
  M:    [email protected]
@@@ -4621,6 -4634,7 +4635,7 @@@ F:      drivers/net/qla3xxx.
  
  QLOGIC QLCNIC (1/10)Gb ETHERNET DRIVER
  M:    Amit Kumar Salecha <[email protected]>
+ M:    Anirban Chakraborty <[email protected]>
  M:    [email protected]
  L:    [email protected]
  S:    Supported
@@@ -4750,6 -4764,12 +4765,12 @@@ S:    Maintaine
  F:    Documentation/rfkill.txt
  F:    net/rfkill/
  
+ RICOH SMARTMEDIA/XD DRIVER
+ M:    Maxim Levitsky <[email protected]>
+ S:    Maintained
+ F:    drivers/mtd/nand/r822.c
+ F:    drivers/mtd/nand/r822.h
  RISCOM8 DRIVER
  S:    Orphan
  F:    Documentation/serial/riscom8.txt
@@@ -5954,7 -5974,7 +5975,7 @@@ M:      Laurent Pinchart <laurent.pinchart@s
  L:    [email protected] (subscribers-only)
  L:    [email protected]
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6.git
- W:    http://linux-uvc.berlios.de
+ W:    http://www.ideasonboard.org/uvc/
  S:    Maintained
  F:    drivers/media/video/uvc/
  
diff --combined drivers/dma/Kconfig
index 9d8ca990dde6e02782476e2121ed6411ae8bd778,1b8877922fb05885efe6c8ed36bca850012cd98d..dab6f17fbbc7d60d03368d1071c1b894bafaf0ee
@@@ -128,7 -128,7 +128,7 @@@ config TXX9_DMA
  
  config SH_DMAE
        tristate "Renesas SuperH DMAC support"
 -      depends on SUPERH && SH_DMA
 +      depends on (SUPERH && SH_DMA) || (ARM && ARCH_SHMOBILE)
        depends on !SH_DMA_API
        select DMA_ENGINE
        help
@@@ -141,6 -141,13 +141,13 @@@ config COH90131
        help
          Enable support for ST-Ericsson COH 901 318 DMA.
  
+ config STE_DMA40
+       bool "ST-Ericsson DMA40 support"
+       depends on ARCH_U8500
+       select DMA_ENGINE
+       help
+         Support for ST-Ericsson DMA40 controller
  config AMCC_PPC440SPE_ADMA
        tristate "AMCC PPC440SPe ADMA support"
        depends on 440SPe || 440SP
        help
          Enable support for the AMCC PPC440SPe RAID engines.
  
+ config TIMB_DMA
+       tristate "Timberdale FPGA DMA support"
+       depends on MFD_TIMBERDALE || HAS_IOMEM
+       select DMA_ENGINE
+       help
+         Enable support for the Timberdale FPGA DMA engine.
  config ARCH_HAS_ASYNC_TX_FIND_CHANNEL
        bool
  
diff --combined drivers/dma/shdma.c
index c2b0172a7589905adcd3bf52ce2798b110ee221f,a1727522343e914ee63a5bf064ede9544374abdc..a2585c90a13993fd93e6ed441f559ccee6a37ac0
@@@ -597,12 -597,17 +597,17 @@@ static struct dma_async_tx_descriptor *
                               direction, flags);
  }
  
- static void sh_dmae_terminate_all(struct dma_chan *chan)
+ static int sh_dmae_control(struct dma_chan *chan, enum dma_ctrl_cmd cmd,
+                          unsigned long arg)
  {
        struct sh_dmae_chan *sh_chan = to_sh_chan(chan);
  
+       /* Only supports DMA_TERMINATE_ALL */
+       if (cmd != DMA_TERMINATE_ALL)
+               return -ENXIO;
        if (!chan)
-               return;
+               return -EINVAL;
  
        dmae_halt(sh_chan);
  
        spin_unlock_bh(&sh_chan->desc_lock);
  
        sh_dmae_chan_ld_cleanup(sh_chan, true);
+       return 0;
  }
  
  static dma_async_tx_callback __ld_cleanup(struct sh_dmae_chan *sh_chan, bool all)
@@@ -749,10 -756,9 +756,9 @@@ static void sh_dmae_memcpy_issue_pendin
        sh_chan_xfer_ld_queue(sh_chan);
  }
  
- static enum dma_status sh_dmae_is_complete(struct dma_chan *chan,
+ static enum dma_status sh_dmae_tx_status(struct dma_chan *chan,
                                        dma_cookie_t cookie,
-                                       dma_cookie_t *done,
-                                       dma_cookie_t *used)
+                                       struct dma_tx_state *txstate)
  {
        struct sh_dmae_chan *sh_chan = to_sh_chan(chan);
        dma_cookie_t last_used;
        last_used = chan->cookie;
        last_complete = sh_chan->completed_cookie;
        BUG_ON(last_complete < 0);
-       if (done)
-               *done = last_complete;
-       if (used)
-               *used = last_used;
+       dma_set_tx_state(txstate, last_complete, last_used, 0);
  
        spin_lock_bh(&sh_chan->desc_lock);
  
@@@ -811,7 -812,7 +812,7 @@@ static irqreturn_t sh_dmae_interrupt(in
        return ret;
  }
  
 -#if defined(CONFIG_CPU_SH4)
 +#if defined(CONFIG_CPU_SH4) || defined(CONFIG_ARCH_SHMOBILE)
  static irqreturn_t sh_dmae_err(int irq, void *data)
  {
        struct sh_dmae_device *shdev = (struct sh_dmae_device *)data;
@@@ -1041,18 -1042,18 +1042,18 @@@ static int __init sh_dmae_probe(struct 
                = sh_dmae_alloc_chan_resources;
        shdev->common.device_free_chan_resources = sh_dmae_free_chan_resources;
        shdev->common.device_prep_dma_memcpy = sh_dmae_prep_memcpy;
-       shdev->common.device_is_tx_complete = sh_dmae_is_complete;
+       shdev->common.device_tx_status = sh_dmae_tx_status;
        shdev->common.device_issue_pending = sh_dmae_memcpy_issue_pending;
  
        /* Compulsory for DMA_SLAVE fields */
        shdev->common.device_prep_slave_sg = sh_dmae_prep_slave_sg;
-       shdev->common.device_terminate_all = sh_dmae_terminate_all;
+       shdev->common.device_control = sh_dmae_control;
  
        shdev->common.dev = &pdev->dev;
        /* Default transfer size of 32 bytes requires 32-byte alignment */
        shdev->common.copy_align = LOG2_DEFAULT_XFER_SIZE;
  
 -#if defined(CONFIG_CPU_SH4)
 +#if defined(CONFIG_CPU_SH4) || defined(CONFIG_ARCH_SHMOBILE)
        chanirq_res = platform_get_resource(pdev, IORESOURCE_IRQ, 1);
  
        if (!chanirq_res)
  
  #else
        chanirq_res = errirq_res;
 -#endif /* CONFIG_CPU_SH4 */
 +#endif /* CONFIG_CPU_SH4 || CONFIG_ARCH_SHMOBILE */
  
        if (chanirq_res->start == chanirq_res->end &&
            !platform_get_resource(pdev, IORESOURCE_IRQ, 1)) {
  chan_probe_err:
        sh_dmae_chan_remove(shdev);
  eirqres:
 -#if defined(CONFIG_CPU_SH4)
 +#if defined(CONFIG_CPU_SH4) || defined(CONFIG_ARCH_SHMOBILE)
        free_irq(errirq, shdev);
  eirq_err:
  #endif
diff --combined drivers/video/Kconfig
index 773c4a68de89d96128c9c500517a34dcbbe00fbe,1e6fec487973c45a0407326f09a62f6015c39589..3dc10381e0c28ebfc9cfef7a8c9f0e3fe180f17f
@@@ -1511,6 -1511,7 +1511,7 @@@ config FB_VI
         select FB_CFB_IMAGEBLIT
         select I2C_ALGOBIT
         select I2C
+        select GPIOLIB
         help
          This is the frame buffer device driver for Graphics chips of VIA
          UniChrome (Pro) Family (CLE266,PM800/CN400,P4M800CE/P4M800Pro/
  
          To compile this driver as a module, choose M here: the
          module will be called viafb.
+ if FB_VIA
+ config FB_VIA_DIRECT_PROCFS
+       bool "direct hardware access via procfs (DEPRECATED)(DANGEROUS)"
+       depends on FB_VIA
+       default n
+       help
+         Allow direct hardware access to some output registers via procfs.
+         This is dangerous but may provide the only chance to get the
+         correct output device configuration.
+         Its use is strongly discouraged.
+ endif
  config FB_NEOMAGIC
        tristate "NeoMagic display support"
        depends on FB && PCI
@@@ -1879,13 -1895,6 +1895,13 @@@ config FB_W10
  
          If unsure, say N.
  
 +config SH_MIPI_DSI
 +      tristate
 +      depends on (SUPERH || ARCH_SHMOBILE) && HAVE_CLK
 +
 +config SH_LCD_MIPI_DSI
 +      bool
 +
  config FB_SH_MOBILE_LCDC
        tristate "SuperH Mobile LCDC framebuffer support"
        depends on FB && (SUPERH || ARCH_SHMOBILE) && HAVE_CLK
        select FB_SYS_IMAGEBLIT
        select FB_SYS_FOPS
        select FB_DEFERRED_IO
 +      select SH_MIPI_DSI if SH_LCD_MIPI_DSI
        ---help---
          Frame buffer driver for the on-chip SH-Mobile LCD controller.
  
@@@ -2194,7 -2202,6 +2210,6 @@@ config FB_MS
        select FB_CFB_FILLRECT
        select FB_CFB_COPYAREA
        select FB_CFB_IMAGEBLIT
-       default y
  
  config FB_MX3
        tristate "MX3 Framebuffer support"
This page took 0.123919 seconds and 4 git commands to generate.