mirror of
https://git.proxmox.com/git/mirror_ubuntu-kernels.git
synced 2025-12-30 14:06:39 +00: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
|
||
|---|---|---|
| .. | ||
| abx500 | ||
| arizona | ||
| da9052 | ||
| da9055 | ||
| da9063 | ||
| pcf50633 | ||
| pm8xxx | ||
| samsung | ||
| syscon | ||
| wm831x | ||
| wm8350 | ||
| wm8994 | ||
| 88pm80x.h | ||
| 88pm860x.h | ||
| aat2870.h | ||
| ab3100.h | ||
| abx500.h | ||
| adp5520.h | ||
| as3711.h | ||
| as3722.h | ||
| asic3.h | ||
| core.h | ||
| cros_ec_commands.h | ||
| cros_ec.h | ||
| da903x.h | ||
| davinci_voicecodec.h | ||
| db8500-prcmu.h | ||
| dbx500-prcmu.h | ||
| ds1wm.h | ||
| ezx-pcap.h | ||
| htc-egpio.h | ||
| htc-pasic3.h | ||
| intel_msic.h | ||
| janz.h | ||
| kempld.h | ||
| lm3533.h | ||
| lp3943.h | ||
| lp8788-isink.h | ||
| lp8788.h | ||
| lpc_ich.h | ||
| max8907.h | ||
| max8925.h | ||
| max8997-private.h | ||
| max8997.h | ||
| max8998-private.h | ||
| max8998.h | ||
| max14577-private.h | ||
| max14577.h | ||
| max77686-private.h | ||
| max77686.h | ||
| max77693-private.h | ||
| max77693.h | ||
| mc13xxx.h | ||
| mc13783.h | ||
| mc13892.h | ||
| mcp.h | ||
| menelaus.h | ||
| palmas.h | ||
| rc5t583.h | ||
| rdc321x.h | ||
| retu.h | ||
| rtsx_common.h | ||
| rtsx_pci.h | ||
| si476x-core.h | ||
| si476x-platform.h | ||
| si476x-reports.h | ||
| smsc.h | ||
| sta2x11-mfd.h | ||
| stmpe.h | ||
| stw481x.h | ||
| syscon.h | ||
| t7l66xb.h | ||
| tc3589x.h | ||
| tc6387xb.h | ||
| tc6393xb.h | ||
| ti_am335x_tscadc.h | ||
| ti_ssp.h | ||
| tmio.h | ||
| tps6105x.h | ||
| tps6507x.h | ||
| tps6586x.h | ||
| tps65090.h | ||
| tps65217.h | ||
| tps65910.h | ||
| tps65912.h | ||
| tps80031.h | ||
| twl4030-audio.h | ||
| twl6040.h | ||
| ucb1x00.h | ||
| viperboard.h | ||
| wl1273-core.h | ||
| wm8400-audio.h | ||
| wm8400-private.h | ||
| wm8400.h | ||