On Sun, Dec 01, 2013 at 12:09:51PM -0700, Stephen Warren wrote: > On 11/29/2013 05:29 AM, Thierry Reding wrote: > > On Fri, Nov 15, 2013 at 01:53:58PM -0700, Stephen Warren wrote: > > [...] > >> diff --git > >> a/Documentation/devicetree/bindings/sound/nvidia,tegra20-ac97.txt > >> b/Documentation/devicetree/bindings/sound/nvidia,tegra20-ac97.txt > >> > >> > index 2b6817f6e40e..eaf00102d92c 100644 > >> --- > >> a/Documentation/devicetree/bindings/sound/nvidia,tegra20-ac97.txt > >> > >> > +++ b/Documentation/devicetree/bindings/sound/nvidia,tegra20-ac97.txt > >> @@ -4,14 +4,17 @@ Required properties: - compatible : > >> "nvidia,tegra20-ac97" - reg : Should contain AC97 controller > >> registers location and length - interrupts : Should contain AC97 > >> interrupt -- clocks : Must contain one entry, for the module > >> clock. - See ../clocks/clock-bindings.txt for details. - resets > >> : Must contain an entry for each entry in reset-names. See > >> ../reset/reset.txt for details. - reset-names : Must include the > >> following entries: - ac97 -- nvidia,dma-request-selector : The > >> Tegra DMA controller's phandle and - request selector for the > >> AC97 controller +- dmas : Must contain an entry for each entry in > >> clock-names. + See ../dma/dma.txt for details. +- dma-names : > >> Must include the following entries: + - rx + - tx +- clocks : > >> Must contain one entry, for the module clock. + See > >> ../clocks/clock-bindings.txt for details. > > > > Was this unintentionally moved? > > IIRC, at the end of the series, each binding describes reg, > interrupts, clocks, reset, dmas in that order, for consistency. Okay, that's fine then. I was just making sure this hadn't slipped through the cracks. > >> diff --git > >> a/Documentation/devicetree/bindings/spi/nvidia,tegra20-sflash.txt > >> b/Documentation/devicetree/bindings/spi/nvidia,tegra20-sflash.txt > >> > >> > index e144f144717f..bdf08e6dec9b 100644 > >> --- > >> a/Documentation/devicetree/bindings/spi/nvidia,tegra20-sflash.txt > >> > >> > +++ b/Documentation/devicetree/bindings/spi/nvidia,tegra20-sflash.txt > >> @@ -4,14 +4,17 @@ Required properties: - compatible : should be > >> "nvidia,tegra20-sflash". - reg: Should contain SFLASH registers > >> location and length. - interrupts: Should contain SFLASH > >> interrupts. -- nvidia,dma-request-selector : The Tegra DMA > >> controller's phandle and - request selector for this SFLASH > >> controller. - clocks : Must contain one entry, for the module > >> clock. > > > > But then this doesn't move it... perhaps it really is accidental > > in other places. =) > > The patch to that file does move the docs for the dmas property... My point was that the clocks and clock-names properties didn't move like they did for other hunks. But if all those changes end up making the bindings documentation more consistent, then I'm all for it. Thierry