Merge remote-tracking branch 'mmc/mmc-next'

diff --combined Documentation/devicetree/bindings/mmc/synopsys-dw-mshc.txt
index 066a78b034ca8589e4de4d31183075768496f81a,fdbf6863b00b4a8cd8f41948da02e343558f273d..8f3f13315358028f20a5a79720e6a27266caf2be
--- 1/Documentation/devicetree/bindings/mmc/synopsys-dw-mshc.txt
--- 2/Documentation/devicetree/bindings/mmc/synopsis-dw-mshc.txt
+++ b/Documentation/devicetree/bindings/mmc/synopsys-dw-mshc.txt
@@@ -1,14 -1,14 +1,14 @@@
 -* Synopsis Designware Mobile Storage Host Controller
 +* Synopsys Designware Mobile Storage Host Controller
  
 -The Synopsis designware mobile storage host controller is used to interface
 +The Synopsys designware mobile storage host controller is used to interface
  a SoC with storage medium such as eMMC or SD/MMC cards. This file documents
  differences between the core mmc properties described by mmc.txt and the
 -properties used by the Synopsis Designware Mobile Storage Host Controller.
 +properties used by the Synopsys Designware Mobile Storage Host Controller.
  
  Required Properties:
  
  * compatible: should be
 -      - snps,dw-mshc: for controllers compliant with synopsis dw-mshc.
 +      - snps,dw-mshc: for controllers compliant with synopsys dw-mshc.
  * #address-cells: should be 1.
  * #size-cells: should be 0.
  
@@@ -52,6 -52,9 +52,9 @@@ Optional properties
    is specified and the ciu clock is specified then we'll try to set the ciu
    clock to this at probe time.
  
+ * clock-freq-min-max: Minimum and Maximum clock frequency for card output
+   clock(cclk_out). If it's not specified, max is 200MHZ and min is 400KHz by default.
+ 
  * num-slots: specifies the number of slots supported by the controller.
    The number of physical slots actually used could be equal or less than the
    value specified by num-slots. If this property is not specified, the value
@@@ -66,6 -69,10 +69,10 @@@
  
  * supports-highspeed: Enables support for high speed cards (up to 50MHz)
  
+ * caps2-mmc-hs200-1_8v: Supports mmc HS200 SDR 1.8V mode
+ 
+ * caps2-mmc-hs200-1_2v: Supports mmc HS200 SDR 1.2V mode
+ 
  * broken-cd: as documented in mmc core bindings.
  
  * vmmc-supply: The phandle to the regulator to use for vmmc.  If this is
@@@ -93,8 -100,10 +100,10 @@@ board specific portions as listed below
  
        dwmmc0@12200000 {
                clock-frequency = <400000000>;
+               clock-freq-min-max = <400000 200000000>;
                num-slots = <1>;
                supports-highspeed;
+               caps2-mmc-hs200-1_8v;
                broken-cd;
                fifo-depth = <0x80>;
                card-detect-delay = <200>;