iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
linux/drivers/mmc/host
History
Linus Torvalds 57f2685c16 Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma 
* 'next' of git://git.infradead.org/users/vkoul/slave-dma: (53 commits)
  ARM: mach-shmobile: specify CHCLR registers on SH7372
  dma: shdma: fix runtime PM: clear channel buffers on reset
  dma/imx-sdma: save irq flags when use spin_lock in sdma_tx_submit
  dmaengine/ste_dma40: clear LNK on channel startup
  dmaengine: intel_mid_dma: remove legacy pm interface
  ASoC: mxs: correct 'direction' of device_prep_dma_cyclic
  dmaengine: intel_mid_dma: error path fix
  dmaengine: intel_mid_dma: locking and freeing fixes
  mtd: gpmi-nand: move to dma_transfer_direction
  mtd: fix compile error for gpmi-nand
  mmc: mxs-mmc: fix the dma_transfer_direction migration
  dmaengine: add DMA_TRANS_NONE to dma_transfer_direction
  dma: mxs-dma: Don't use CLKGATE bits in CTRL0 to disable DMA channels
  dma: mxs-dma: make mxs_dma_prep_slave_sg() multi user safe
  dma: mxs-dma: Always leave mxs_dma_init() with the clock disabled.
  dma: mxs-dma: fix a typo in comment
  DMA: PL330: Remove pm_runtime_xxx calls from pl330 probe/remove
  video i.MX IPU: Fix display connections
  i.MX IPU DMA: Fix wrong burstsize settings
  dmaengine/ste_dma40: allow fixed physical channel
  ...

Fix up conflicts in drivers/dma/{Kconfig,mxs-dma.c,pl330.c}

The conflicts looked pretty trivial, but I'll ask people to verify them.
2012-01-17 18:40:24 -08:00
..
at91_mci.c
MMC highlights for 3.3:
2012-01-13 20:41:15 -08:00
at91_mci.h
mmc: at91_mci: move register header from include/ to drivers/
2011-07-21 10:35:08 -04:00
atmel-mci-regs.h
mmc: atmel-mci: add pdc support and runtime capabilities detection
2011-10-26 15:43:26 -04:00
atmel-mci.c
Merge branch 'dma_slave_direction' into next_test_dirn
2011-11-17 14:54:57 +05:30
au1xmmc.c
MIPS: Alchemy: Au1300 SoC support
2011-12-07 22:02:05 +00:00
bfin_sdh.c
mmc: convert drivers/mmc/host/* to use module_platform_driver()
2012-01-11 23:58:42 -05:00
cb710-mmc.c
mmc: convert drivers/mmc/host/* to use module_platform_driver()
2012-01-11 23:58:42 -05:00
cb710-mmc.h
mmc: Driver for CB710/720 memory card reader (MMC part)
2009-06-13 22:42:58 +02:00
davinci_mmc.c
mmc: davinci: Add support for set_power callback
2011-09-17 15:53:23 +05:30
dw_mmc.c
mmc: dw_mmc: miscaculated the fifo-depth with wrong bit operation
2012-01-12 15:17:16 -05:00
dw_mmc.h
mmc: dw_mmc: fixed wrong bit operation for SDMMC_GET_FCNT()
2012-01-12 15:17:15 -05:00
imxmmc.c
mmc: replace printk with appropriate display macro
2011-10-26 16:32:22 -04:00
imxmmc.h
imxmmc: use readl/writel
2008-12-16 14:58:17 +01:00
jz4740_mmc.c
mmc: convert drivers/mmc/host/* to use module_platform_driver()
2012-01-11 23:58:42 -05:00
Kconfig
Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
2011-11-03 13:28:14 -07:00
Makefile
mmc: sdhci-pci: add platform data
2012-01-11 23:58:47 -05:00
mmc_spi.c
mmc: Remove redundant spi driver bus initialization
2012-01-11 23:58:42 -05:00
mmci.c
Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma
2012-01-17 18:40:24 -08:00
mmci.h
mmc: mmci: implement pre_req() and post_req()
2011-07-20 17:21:11 -04:00
msm_sdcc.c
mmc: remove the second argument of k[un]map_atomic()
2012-01-11 23:58:42 -05:00
msm_sdcc.h
mmc: msm_sdcc: Use MCI_INT_MASK0 for PIO interrupts
2011-10-26 15:43:37 -04:00
mvsdio.c
ARM: Orion: Get address map from plat-orion instead of via platform_data
2011-12-13 18:46:55 -05:00
mvsdio.h
mmc: SDIO driver for Marvell SoCs
2009-03-24 21:30:03 +01:00
mxcmmc.c
Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma
2012-01-17 18:40:24 -08:00
mxs-mmc.c
Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma
2012-01-17 18:40:24 -08:00
of_mmc_spi.c
mmc: of_mmc_spi: add NO_IRQ define to of_mmc_spi.c
2011-06-18 22:18:00 -04:00
omap_hsmmc.c
MMC highlights for 3.3:
2012-01-13 20:41:15 -08:00
omap.c
misc latin1 to utf8 conversions
2012-01-02 13:04:55 +01:00
pxamci.c
mmc: convert drivers/mmc/host/* to use module_platform_driver()
2012-01-11 23:58:42 -05:00
pxamci.h
…
s3cmci.c
mmc: convert drivers/mmc/host/* to use module_platform_driver()
2012-01-11 23:58:42 -05:00
s3cmci.h
s3cmci: DMA fixes
2009-10-01 16:11:15 -07:00
sdhci-cns3xxx.c
mmc: convert drivers/mmc/host/* to use module_platform_driver()
2012-01-11 23:58:42 -05:00
sdhci-dove.c
mmc: convert drivers/mmc/host/* to use module_platform_driver()
2012-01-11 23:58:42 -05:00
sdhci-esdhc-imx.c
mmc: convert drivers/mmc/host/* to use module_platform_driver()
2012-01-11 23:58:42 -05:00
sdhci-esdhc.h
mmc: sdhci-esdhc: Change delay after setting clock from 100ms to 1ms
2012-01-11 23:58:41 -05:00
sdhci-of-esdhc.c
mmc: convert drivers/mmc/host/* to use module_platform_driver()
2012-01-11 23:58:42 -05:00
sdhci-of-hlwd.c
mmc: convert drivers/mmc/host/* to use module_platform_driver()
2012-01-11 23:58:42 -05:00
sdhci-pci-data.c
mmc: sdhci-pci: add platform data
2012-01-11 23:58:47 -05:00
sdhci-pci.c
mmc: sdhci-pci: enable runtime PM for Medfield SDIO
2012-01-11 23:58:48 -05:00
sdhci-pltfm.c
mmc: sdhci: remove "state" argument from sdhci_suspend_host
2011-12-19 15:50:11 -08:00
sdhci-pltfm.h
mmc: sdhci: remove "state" argument from sdhci_suspend_host
2011-12-19 15:50:11 -08:00
sdhci-pxav2.c
mmc: convert drivers/mmc/host/* to use module_platform_driver()
2012-01-11 23:58:42 -05:00
sdhci-pxav3.c
mmc: convert drivers/mmc/host/* to use module_platform_driver()
2012-01-11 23:58:42 -05:00
sdhci-s3c.c
MMC highlights for 3.3:
2012-01-13 20:41:15 -08:00
sdhci-spear.c
mmc: sdhci-spear: Fix compilation error
2012-01-12 15:17:09 -05:00
sdhci-tegra.c
mmc: convert drivers/mmc/host/* to use module_platform_driver()
2012-01-11 23:58:42 -05:00
sdhci.c
mmc: sdhci: restore the enabled dma when do reset all
2012-01-12 15:17:17 -05:00
sdhci.h
mmc: host: Adds support for eMMC 4.5 HS200 mode
2012-01-12 15:17:16 -05:00
sdricoh_cs.c
mmc: Add module.h to drivers/mmc users assuming implicit presence.
2011-10-26 16:32:19 -04:00
sh_mmcif.c
Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma
2012-01-17 18:40:24 -08:00
sh_mobile_sdhi.c
mmc: convert drivers/mmc/host/* to use module_platform_driver()
2012-01-11 23:58:42 -05:00
tifm_sd.c
Autogenerated GPG tag for Rusty D1ADB8F1: 15EE 8D6C AB0E 7F0C F999 BFCB D920 0E6C D1AD B8F1
2012-01-14 12:32:16 -08:00
tmio_mmc_dma.c
mmc-host: move to dma_transfer_direction
2011-10-31 09:40:25 +05:30
tmio_mmc_pio.c
mmc: tmio_mmc: Hotplug code regrouping
2012-01-11 23:58:45 -05:00
tmio_mmc.c
mmc: convert drivers/mmc/host/* to use module_platform_driver()
2012-01-11 23:58:42 -05:00
tmio_mmc.h
mmc: remove the second argument of k[un]map_atomic()
2012-01-11 23:58:42 -05:00
ushc.c
USB: convert some miscellanies drivers to use module_usb_driver()
2011-11-18 09:52:10 -08:00
via-sdmmc.c
mmc: replace printk with appropriate display macro
2011-10-26 16:32:22 -04:00
vub300.c
module_param: make bool parameters really bool (drivers & misc)
2012-01-13 09:32:20 +10:30
wbsd.c
mmc: replace printk with appropriate display macro
2011-10-26 16:32:22 -04:00
wbsd.h
…