On 21 October 2014 11:22, Sebastian Hesselbarth <sebastian.hesselbarth@xxxxxxxxx> wrote: > Now that sdhci-pxav3 driver allows to have more than one IP clock defined, > document both clocks and clock-names properties. > > Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@xxxxxxxxx> Thanks! Applied for next! Kind regards Uffe > --- > Cc: Chris Ball <chris@xxxxxxxxxx> > Cc: Ulf Hansson <ulf.hansson@xxxxxxxxxx> > Cc: "Antoine Ténart" <antoine.tenart@xxxxxxxxxxxxxxxxxx> > Cc: linux-mmc@xxxxxxxxxxxxxxx > Cc: devicetree@xxxxxxxxxxxxxxx > Cc: linux-arm-kernel@xxxxxxxxxxxxxxxxxxx > Cc: linux-kernel@xxxxxxxxxxxxxxx > --- > Documentation/devicetree/bindings/mmc/sdhci-pxa.txt | 7 +++++++ > 1 file changed, 7 insertions(+) > > diff --git a/Documentation/devicetree/bindings/mmc/sdhci-pxa.txt b/Documentation/devicetree/bindings/mmc/sdhci-pxa.txt > index 86223c3eda90..4dd6deb90719 100644 > --- a/Documentation/devicetree/bindings/mmc/sdhci-pxa.txt > +++ b/Documentation/devicetree/bindings/mmc/sdhci-pxa.txt > @@ -12,6 +12,10 @@ Required properties: > * for "marvell,armada-380-sdhci", two register areas. The first one > for the SDHCI registers themselves, and the second one for the > AXI/Mbus bridge registers of the SDHCI unit. > +- clocks: Array of clocks required for SDHCI; requires at least one for > + I/O clock. > +- clock-names: Array of names corresponding to clocks property; shall be > + "io" for I/O clock and "core" for optional core clock. > > Optional properties: > - mrvl,clk-delay-cycles: Specify a number of cycles to delay for tuning. > @@ -23,6 +27,8 @@ sdhci@d4280800 { > reg = <0xd4280800 0x800>; > bus-width = <8>; > interrupts = <27>; > + clocks = <&chip CLKID_SDIO1XIN>, <&chip CLKID_SDIO1>; > + clock-names = "io", "core"; > non-removable; > mrvl,clk-delay-cycles = <31>; > }; > @@ -32,5 +38,6 @@ sdhci@d8000 { > reg = <0xd8000 0x1000>, <0xdc000 0x100>; > interrupts = <0 25 0x4>; > clocks = <&gateclk 17>; > + clock-names = "io"; > mrvl,clk-delay-cycles = <0x1F>; > }; > -- > 2.1.1 > -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html