diff options
| author |  David S. Miller <davem@davemloft.net>
| 2016-09-23 06:46:57 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net>
| 2016-09-23 06:46:57 -0400 |
| commit | d6989d4bbe6c4d1c2a76696833a07f044e85694d (patch) | |
| tree | 2d9a70d0feee4d4a20568be1b39a961fa0d27d81 /Documentation/devicetree | |
| parent | xen-netback: switch to threaded irq for control ring (diff) | |
| parent | Merge tag 'media/v4.8-7' of git://git.kernel.org/pub/scm/linux/kernel/git/mch... (diff) | |
| download | linux-d6989d4bbe6c4d1c2a76696833a07f044e85694d.tar.gz linux-d6989d4bbe6c4d1c2a76696833a07f044e85694d.tar.bz2 linux-d6989d4bbe6c4d1c2a76696833a07f044e85694d.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'Documentation/devicetree')
| -rw-r--r-- | Documentation/devicetree/bindings/mmc/sdhci-st.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/devicetree/bindings/mmc/sdhci-st.txt b/Documentation/devicetree/bindings/mmc/sdhci-st.txt index 88faa91125bf..3cd4c43a3260 100644 --- a/Documentation/devicetree/bindings/mmc/sdhci-st.txt +++ b/Documentation/devicetree/bindings/mmc/sdhci-st.txt @@ -10,7 +10,7 @@ Required properties: subsystem (mmcss) inside the FlashSS (available in STiH407 SoC family). -- clock-names: Should be "mmc". +- clock-names: Should be "mmc" and "icn". (NB: The latter is not compulsory) See: Documentation/devicetree/bindings/resource-names.txt - clocks: Phandle to the clock. See: Documentation/devicetree/bindings/clock/clock-bindings.txt |