On Fri, 11 Oct 2019 at 12:33, Ludovic Desroches <ludovic.desroches@xxxxxxxxxxxxx> wrote: > > There is a new compatible string for the SAM9X60 sdhci device. It involves > an update of the properties about the clocks stuff. > > Signed-off-by: Ludovic Desroches <ludovic.desroches@xxxxxxxxxxxxx> This doesn't apply any more, can you please re-spin it? Kind regards Uffe > --- > > Changes: > - v2: remove the extra example and fix node label > > This patch conflicts with Nicolas' one: "dt-bindings: sdhci-of-at91: add > the microchip,sdcal-inverted property". Let me know which one has to be > rebased or you can handle it. > > Ludovic > > > .../devicetree/bindings/mmc/sdhci-atmel.txt | 15 ++++++++++++--- > 1 file changed, 12 insertions(+), 3 deletions(-) > > diff --git a/Documentation/devicetree/bindings/mmc/sdhci-atmel.txt b/Documentation/devicetree/bindings/mmc/sdhci-atmel.txt > index 1b662d7171a0..5d541ad4d4eb 100644 > --- a/Documentation/devicetree/bindings/mmc/sdhci-atmel.txt > +++ b/Documentation/devicetree/bindings/mmc/sdhci-atmel.txt > @@ -5,17 +5,26 @@ Documentation/devicetree/bindings/mmc/mmc.txt and the properties used by the > sdhci-of-at91 driver. > > Required properties: > -- compatible: Must be "atmel,sama5d2-sdhci". > +- compatible: Must be "atmel,sama5d2-sdhci" or "microchip,sam9x60-sdhci". > - clocks: Phandlers to the clocks. > -- clock-names: Must be "hclock", "multclk", "baseclk"; > +- clock-names: Must be "hclock", "multclk", "baseclk" for > + "atmel,sama5d2-sdhci". > + Must be "hclock", "multclk" for "microchip,sam9x60-sdhci". > + > +Optional properties: > +- assigned-clocks: The same with "multclk". > +- assigned-clock-rates The rate of "multclk" in order to not rely on the > + gck configuration set by previous components. > > > Example: > > -sdmmc0: sdio-host@a0000000 { > +mmc0: sdio-host@a0000000 { > compatible = "atmel,sama5d2-sdhci"; > reg = <0xa0000000 0x300>; > interrupts = <31 IRQ_TYPE_LEVEL_HIGH 0>; > clocks = <&sdmmc0_hclk>, <&sdmmc0_gclk>, <&main>; > clock-names = "hclock", "multclk", "baseclk"; > + assigned-clocks = <&sdmmc0_gclk>; > + assigned-clock-rates = <480000000>; > }; > -- > 2.23.0 >