forked from torvalds/linux
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge tag 'mmc-updates-for-3.16-rc1' of git://git.kernel.org/pub/scm/…
…linux/kernel/git/cjb/mmc Pull MMC update from Chris Ball: "MMC highlights for 3.16: Core: - support HS400 mode of eMMC 5.0, via DT bindings mmc-hs400-1_{2,8}v - if card init at 3.3v doesn't work, try 1.8v and 1.2v too Drivers: - moxart: New driver for MOXA ART SoCs - rtsx_usb_sdmmc: New driver for Realtek USB card readers - sdhci: Large rework around IRQ/regulator handling, remove card_tasklet - sdhci-pci-o2micro: Add SeaBird SeaEagle SD3 support - sunxi: New driver for Allwinner sunxi SoCs - usdhi6rol0: New driver for Renesas SD/SDIO controller" * tag 'mmc-updates-for-3.16-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc: (95 commits) mmc: sdhci-s3c: use mmc_of_parse and remove the card_tasklet mmc: add a driver for the Renesas usdhi6rol0 SD/SDIO host controller mmc: sdhci-of-esdhc: Fixup compile error mmc: tegra: fix reporting of base clock frequency mmc: tegra: disable UHS modes mmc: sdhci-dove: use mmc_of_parse() and remove card_tasklet CD handler MAINTAINERS: mmc: Add path to git tree mmc: dove: fix missing MACH_DOVE dependency mmc: sdhci: SD tuning is broken for some controllers mmc: sdhci-esdhc-imx: fix mmc ddr mode regression issue mmc: sdhci-pci-o2micro: Add SeaBird SeaEagle SD3 support mmc: omap_hsmmc: split omap-dma header file mmc: omap_hsmmc: fix cmd23 multiblock read/write mmc: omap_hsmmc: use devm_ioremap_resource mmc: omap_hsmmc: use devm_request_threaded_irq mmc: omap_hsmmc: use devm_request_irq mmc: omap_hsmmc: use devm_clk_get mmc: sunxi: Add driver for SD/MMC hosts found on Allwinner sunxi SoCs mmc: wmt-sdmmc: Use GFP_KERNEL instead of hard-coded value mmc: omap: Use DIV_ROUND_UP instead of open coded ...
- Loading branch information
Showing
65 changed files
with
4,107 additions
and
1,492 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,30 @@ | ||
MOXA ART MMC Host Controller Interface | ||
|
||
Inherits from mmc binding[1]. | ||
|
||
[1] Documentation/devicetree/bindings/mmc/mmc.txt | ||
|
||
Required properties: | ||
|
||
- compatible : Must be "moxa,moxart-mmc" or "faraday,ftsdc010" | ||
- reg : Should contain registers location and length | ||
- interrupts : Should contain the interrupt number | ||
- clocks : Should contain phandle for the clock feeding the MMC controller | ||
|
||
Optional properties: | ||
|
||
- dmas : Should contain two DMA channels, line request number must be 5 for | ||
both channels | ||
- dma-names : Must be "tx", "rx" | ||
|
||
Example: | ||
|
||
mmc: mmc@98e00000 { | ||
compatible = "moxa,moxart-mmc"; | ||
reg = <0x98e00000 0x5C>; | ||
interrupts = <5 0>; | ||
clocks = <&clk_apb>; | ||
dmas = <&dma 5>, | ||
<&dma 5>; | ||
dma-names = "tx", "rx"; | ||
}; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,33 @@ | ||
* Renesas usdhi6rol0 SD/SDIO host controller | ||
|
||
Required properties: | ||
|
||
- compatible: must be | ||
"renesas,usdhi6rol0" | ||
- interrupts: 3 interrupts, named "card detect", "data" and "SDIO" must be | ||
specified | ||
- clocks: a clock binding for the IMCLK input | ||
|
||
Optional properties: | ||
|
||
- vmmc-supply: a phandle of a regulator, supplying Vcc to the card | ||
- vqmmc-supply: a phandle of a regulator, supplying VccQ to the card | ||
|
||
Additionally any standard mmc bindings from mmc.txt can be used. | ||
|
||
Example: | ||
|
||
sd0: sd@ab000000 { | ||
compatible = "renesas,usdhi6rol0"; | ||
reg = <0xab000000 0x200>; | ||
interrupts = <0 23 0x4 | ||
0 24 0x4 | ||
0 25 0x4>; | ||
interrupt-names = "card detect", "data", "SDIO"; | ||
bus-width = <4>; | ||
max-frequency = <50000000>; | ||
cap-power-off-card; | ||
clocks = <&imclk>; | ||
vmmc-supply = <&vcc_sd0>; | ||
vqmmc-supply = <&vccq_sd0>; | ||
}; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -5974,6 +5974,7 @@ M: Chris Ball <[email protected]> | |
M: Ulf Hansson <[email protected]> | ||
L: [email protected] | ||
T: git git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc.git | ||
T: git git://git.linaro.org/people/ulf.hansson/mmc.git | ||
S: Maintained | ||
F: drivers/mmc/ | ||
F: include/linux/mmc/ | ||
|
@@ -9103,7 +9104,7 @@ F: include/linux/toshiba.h | |
F: include/uapi/linux/toshiba.h | ||
|
||
TMIO MMC DRIVER | ||
M: Ian Molton <ian@mnementh.co.uk> | ||
M: Ian Molton <ian.molton@codethink.co.uk> | ||
L: [email protected] | ||
S: Maintained | ||
F: drivers/mmc/host/tmio_mmc* | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.