diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-09-19 10:12:41 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-09-19 10:12:41 +0300 |
| commit | c51f2ff0075b77f272da93b7155aa666a77c8fe7 (patch) | |
| tree | f229265a8d4b0407f2eaaa4fb6d1afb86ac380c5 /Documentation/devicetree | |
| parent | eddde288957957d45c42fcf51af9a059de7e0887 (diff) | |
| parent | 3be7988674ab33565700a37b210f502563d932e6 (diff) | |
| download | linux-c51f2ff0075b77f272da93b7155aa666a77c8fe7.tar.xz | |
Merge 4.8-rc7 into usb-next
We want/need the USB fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
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 |