mirror of
https://mirrors.bfsu.edu.cn/git/linux.git
synced 2024-12-28 13:34:38 +08:00
ccc039d65f
Core:
- Avoid get_cd() on cards marked nonremovable.
Drivers:
- arasan: New driver for controllers found in e.g. Xilinx Zynq SoC.
- dwmmc: Support Hisilicon K3 SoC controllers.
- esdhc-imx: Support for HS200 mode, DDR modes on MX6, runtime PM.
- sdhci-pci: Support O2Micro/BayHubTech controllers used in laptops
like Lenovo ThinkPad W540, Dell Latitude E5440, Dell Latitude E6540.
- tegra: Support Tegra124 SoCs.
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.14 (GNU/Linux)
iQIcBAABAgAGBQJS5G3QAAoJEHNBYZ7TNxYMO2AP/j5JoGfNCga/Ub708yGdJJvm
/2j2dmfrjdAnohfhwkJI8gdQcaQylZi1QVEnbsyCYCRKo5575miywnHpj4dDyYxn
bKaYgxFZI3zK7NxOvomCm0GI1C3/bm/10+rS8bqgIGGczRo8owWK0wkipgUgeEIK
8UHIjSLsITXRCWuFSd9SemDY3kd1VobFRD1ujJmeBaovRjkkKjAzb4cBOjoWWJPW
YSZvbX4qm6eBrYz/pbpQX5RBUuGE91tcjD3yNtrMw/+tvg9G41vGg9iuinMmwJKh
3CqYpaNZPhl0QyJlyMjiAmfa/XEtuzhHS9Bly9ge7FzDfg7er5QqUSbmE3FxF6NZ
gAS49OKObT6mDdz1L7xxJQKFBE3zT+Kvz+l7ZdtFZInhhH0pdHfjva32JvBp8aEr
oJzJa5xzjtSLq18ZVlUpKkv73ClHGckuJUm41XN/xewuP5TcndKpzVDY/xpsl4lW
AaI12HME//uCgn9NMZUUfiMXQPTXwGF4NFQBCB+lWnAnLbuFGNPG/2Ioeh2raKEA
+ACwAvcxSW4PtVVbA8wCTqgL1B3GMllwQChtAqfA0twmf5MucoP0OMHRONU9TpDh
WnpbmVvI9i+ZGF4wHxcgTicDIipuzlZsBsvHuGvVhNOXe374Iyksdz4AILPmLD3m
7kZy0K5Ms9B2IUATiUdg
=wZBx
-----END PGP SIGNATURE-----
Merge tag 'mmc-updates-for-3.14-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc
Pull MMC updates from Chris Ball:
"MMC highlights for 3.14:
Core:
- Avoid get_cd() on cards marked nonremovable
Drivers:
- arasan: New driver for controllers found in e.g. Xilinx Zynq SoC
- dwmmc: Support Hisilicon K3 SoC controllers
- esdhc-imx: Support for HS200 mode, DDR modes on MX6, runtime PM
- sdhci-pci: Support O2Micro/BayHubTech controllers used in laptops
like Lenovo ThinkPad W540, Dell Latitude E5440, Dell Latitude E6540
- tegra: Support Tegra124 SoCs"
* tag 'mmc-updates-for-3.14-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc: (55 commits)
mmc: sdhci-pci: Fix possibility of chip->fixes being null
mmc: sdhci-pci: Fix BYT sd card getting stuck in runtime suspend
mmc: sdhci: Allow for long command timeouts
mmc: sdio: add a quirk for broken SDIO_CCCR_INTx polling
mmc: sdhci: fix lockdep error in tuning routine
mmc: dw_mmc: k3: remove clk_table
mmc: dw_mmc: fix dw_mci_get_cd
mmc: dw_mmc: fix sparse non static symbol warning
mmc: sdhci-esdhc-imx: fix warning during module remove function
mmc: sdhci-esdhc-imx: fix access hardirq-unsafe lock in atomic context
mmc: core: sd: implement proper support for sd3.0 au sizes
mmc: atmel-mci: add vmmc-supply support
mmc: sdhci-pci: add broken HS200 quirk for Intel Merrifield
mmc: sdhci: add quirk for broken HS200 support
mmc: arasan: Add driver for Arasan SDHCI
mmc: dw_mmc: add dw_mmc-k3 for k3 platform
mmc: dw_mmc: use slot-gpio to handle cd pin
mmc: sdhci-pci: add support of O2Micro/BayHubTech SD hosts
mmc: sdhci-pci: break out definitions to header file
mmc: tmio: fixup compile error
...
Conflicts:
MAINTAINERS
|
||
|---|---|---|
| .. | ||
| android-goldfish.c | ||
| atmel-mci-regs.h | ||
| atmel-mci.c | ||
| au1xmmc.c | ||
| bfin_sdh.c | ||
| cb710-mmc.c | ||
| cb710-mmc.h | ||
| davinci_mmc.c | ||
| dw_mmc-exynos.c | ||
| dw_mmc-k3.c | ||
| dw_mmc-pci.c | ||
| dw_mmc-pltfm.c | ||
| dw_mmc-pltfm.h | ||
| dw_mmc-socfpga.c | ||
| dw_mmc.c | ||
| dw_mmc.h | ||
| jz4740_mmc.c | ||
| Kconfig | ||
| Makefile | ||
| mmc_spi.c | ||
| mmci.c | ||
| mmci.h | ||
| msm_sdcc.c | ||
| msm_sdcc.h | ||
| mvsdio.c | ||
| mvsdio.h | ||
| mxcmmc.c | ||
| mxs-mmc.c | ||
| of_mmc_spi.c | ||
| omap_hsmmc.c | ||
| omap.c | ||
| pxamci.c | ||
| pxamci.h | ||
| rtsx_pci_sdmmc.c | ||
| s3cmci.c | ||
| s3cmci.h | ||
| sdhci-acpi.c | ||
| sdhci-bcm2835.c | ||
| sdhci-bcm-kona.c | ||
| sdhci-cns3xxx.c | ||
| sdhci-dove.c | ||
| sdhci-esdhc-imx.c | ||
| sdhci-esdhc.h | ||
| sdhci-of-arasan.c | ||
| sdhci-of-esdhc.c | ||
| sdhci-of-hlwd.c | ||
| sdhci-pci-data.c | ||
| sdhci-pci-o2micro.c | ||
| sdhci-pci-o2micro.h | ||
| sdhci-pci.c | ||
| sdhci-pci.h | ||
| sdhci-pltfm.c | ||
| sdhci-pltfm.h | ||
| sdhci-pxav2.c | ||
| sdhci-pxav3.c | ||
| sdhci-s3c-regs.h | ||
| sdhci-s3c.c | ||
| sdhci-sirf.c | ||
| sdhci-spear.c | ||
| sdhci-tegra.c | ||
| sdhci.c | ||
| sdhci.h | ||
| sdricoh_cs.c | ||
| sh_mmcif.c | ||
| sh_mobile_sdhi.c | ||
| tifm_sd.c | ||
| tmio_mmc_dma.c | ||
| tmio_mmc_pio.c | ||
| tmio_mmc.c | ||
| tmio_mmc.h | ||
| ushc.c | ||
| via-sdmmc.c | ||
| vub300.c | ||
| wbsd.c | ||
| wbsd.h | ||
| wmt-sdmmc.c | ||