diff options
| author | Guodong Xu <guodong.xu@linaro.org> | 2017-06-06 14:24:41 +0800 |
|---|---|---|
| committer | Guodong Xu <guodong.xu@linaro.org> | 2017-06-06 14:24:41 +0800 |
| commit | be3b229c743424b0e798eff24ff92a20fd70ccfc (patch) | |
| tree | 7f37635750e0cfc833704822726fff0f16a44f12 /Documentation/devicetree | |
| parent | 70f8468d13fbc9e9d74280117aef439c5516c86d (diff) | |
| parent | d6ecd4d6783b055bfc0f9ac818afaba296dac8fb (diff) | |
Merge branch 'working-hikey-tracking-mmc-v4.4' into working-hikey-mainline-rebase-v4.4-c2017-06-06-14-24-39
* working-hikey-tracking-mmc-v4.4:
mmc: dw_mmc: hikey: add this to support uhs mode sd card
mmc: dw_mmc: hikey: add MMC_CAP_CMD23
dwmmc: hikey: fix and improvement about reset
mmc: dw_mmc: add resets support to dw_mci_parse_dt()
Documentation: synopsys-dw-mshc: add binding for resets
Diffstat (limited to 'Documentation/devicetree')
| -rw-r--r-- | Documentation/devicetree/bindings/mmc/synopsys-dw-mshc.txt | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/Documentation/devicetree/bindings/mmc/synopsys-dw-mshc.txt b/Documentation/devicetree/bindings/mmc/synopsys-dw-mshc.txt index 8636f5ae97e5..9b4896c11716 100644 --- a/Documentation/devicetree/bindings/mmc/synopsys-dw-mshc.txt +++ b/Documentation/devicetree/bindings/mmc/synopsys-dw-mshc.txt @@ -39,6 +39,10 @@ Required Properties: Optional properties: +* resets: phandle + reset specifier pair, intended to represent hardware + reset signal present internally in some host controller IC designs. + See Documentation/devicetree/bindings/reset/reset.txt for details. + * clocks: from common clock binding: handle to biu and ciu clocks for the bus interface unit clock and the card interface unit clock. @@ -48,7 +52,7 @@ Optional properties: clock-frequency. It is an error to omit both the ciu clock and the clock-frequency. -* clock-frequency: should be the frequency (in Hz) of the ciu clock. If this +* clock-frequency: should be tke frequency (in Hz) of the ciu clock. If this is specified and the ciu clock is specified then we'll try to set the ciu clock to this at probe time. |