diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-01-26 14:00:41 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-01-26 14:00:41 -0500 |
commit | ccc039d65f24172eebab5e0160462d3417799af5 (patch) | |
tree | c02513223bebadd57da5b6648a497f99684111e2 /Documentation | |
parent | 1c2948380b699dfdbb25a7de740392dd9e6f0613 (diff) | |
parent | 945be38caa287b177b8c17ffaae7754cab6a658f (diff) |
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
Diffstat (limited to 'Documentation')
-rw-r--r-- | Documentation/devicetree/bindings/mmc/arasan,sdhci.txt | 27 | ||||
-rw-r--r-- | Documentation/devicetree/bindings/mmc/k3-dw-mshc.txt | 46 |
2 files changed, 73 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/mmc/arasan,sdhci.txt b/Documentation/devicetree/bindings/mmc/arasan,sdhci.txt new file mode 100644 index 000000000000..98ee2abbe138 --- /dev/null +++ b/Documentation/devicetree/bindings/mmc/arasan,sdhci.txt | |||
@@ -0,0 +1,27 @@ | |||
1 | Device Tree Bindings for the Arasan SDHCI Controller | ||
2 | |||
3 | The bindings follow the mmc[1], clock[2] and interrupt[3] bindings. Only | ||
4 | deviations are documented here. | ||
5 | |||
6 | [1] Documentation/devicetree/bindings/mmc/mmc.txt | ||
7 | [2] Documentation/devicetree/bindings/clock/clock-bindings.txt | ||
8 | [3] Documentation/devicetree/bindings/interrupt-controller/interrupts.txt | ||
9 | |||
10 | Required Properties: | ||
11 | - compatible: Compatibility string. Must be 'arasan,sdhci-8.9a' | ||
12 | - reg: From mmc bindings: Register location and length. | ||
13 | - clocks: From clock bindings: Handles to clock inputs. | ||
14 | - clock-names: From clock bindings: Tuple including "clk_xin" and "clk_ahb" | ||
15 | - interrupts: Interrupt specifier | ||
16 | - interrupt-parent: Phandle for the interrupt controller that services | ||
17 | interrupts for this device. | ||
18 | |||
19 | Example: | ||
20 | sdhci@e0100000 { | ||
21 | compatible = "arasan,sdhci-8.9a"; | ||
22 | reg = <0xe0100000 0x1000>; | ||
23 | clock-names = "clk_xin", "clk_ahb"; | ||
24 | clocks = <&clkc 21>, <&clkc 32>; | ||
25 | interrupt-parent = <&gic>; | ||
26 | interrupts = <0 24 4>; | ||
27 | } ; | ||
diff --git a/Documentation/devicetree/bindings/mmc/k3-dw-mshc.txt b/Documentation/devicetree/bindings/mmc/k3-dw-mshc.txt new file mode 100644 index 000000000000..b8653ea97957 --- /dev/null +++ b/Documentation/devicetree/bindings/mmc/k3-dw-mshc.txt | |||
@@ -0,0 +1,46 @@ | |||
1 | * Hisilicon specific extensions to the Synopsys Designware Mobile | ||
2 | Storage Host Controller | ||
3 | |||
4 | Read synopsys-dw-mshc.txt for more details | ||
5 | |||
6 | The Synopsys designware mobile storage host controller is used to interface | ||
7 | a SoC with storage medium such as eMMC or SD/MMC cards. This file documents | ||
8 | differences between the core Synopsys dw mshc controller properties described | ||
9 | by synopsys-dw-mshc.txt and the properties used by the Hisilicon specific | ||
10 | extensions to the Synopsys Designware Mobile Storage Host Controller. | ||
11 | |||
12 | Required Properties: | ||
13 | |||
14 | * compatible: should be one of the following. | ||
15 | - "hisilicon,hi4511-dw-mshc": for controllers with hi4511 specific extentions. | ||
16 | |||
17 | Example: | ||
18 | |||
19 | /* for Hi3620 */ | ||
20 | |||
21 | /* SoC portion */ | ||
22 | dwmmc_0: dwmmc0@fcd03000 { | ||
23 | compatible = "hisilicon,hi4511-dw-mshc"; | ||
24 | reg = <0xfcd03000 0x1000>; | ||
25 | interrupts = <0 16 4>; | ||
26 | #address-cells = <1>; | ||
27 | #size-cells = <0>; | ||
28 | clocks = <&mmc_clock HI3620_SD_CIUCLK>, <&clock HI3620_DDRC_PER_CLK>; | ||
29 | clock-names = "ciu", "biu"; | ||
30 | }; | ||
31 | |||
32 | /* Board portion */ | ||
33 | dwmmc0@fcd03000 { | ||
34 | num-slots = <1>; | ||
35 | vmmc-supply = <&ldo12>; | ||
36 | fifo-depth = <0x100>; | ||
37 | supports-highspeed; | ||
38 | pinctrl-names = "default"; | ||
39 | pinctrl-0 = <&sd_pmx_pins &sd_cfg_func1 &sd_cfg_func2>; | ||
40 | slot@0 { | ||
41 | reg = <0>; | ||
42 | bus-width = <4>; | ||
43 | disable-wp; | ||
44 | cd-gpios = <&gpio10 3 0>; | ||
45 | }; | ||
46 | }; | ||