dt-bindings: bcm283x: Fix register ranges of bcm2835-i2s

Since 517e7a1537a ("ASoC: bcm2835: move to use the clock framework")
the bcm2835-i2s requires a clock as DT property. Unfortunately
the necessary DT change has never been applied. While we are at it
also fix the first PCM register range to cover the PCM_GRAY register.

This patch only fixes the affected dt-bindings.

Signed-off-by: Stefan Wahren <stefan.wahren@i2se.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Rob Herring <robh@kernel.org>
Signed-off-by: Eric Anholt <eric@anholt.net>

diff --git a/Documentation/devicetree/bindings/dma/brcm,bcm2835-dma.txt b/Documentation/devicetree/bindings/dma/brcm,bcm2835-dma.txt
index baf9b34d20bfb5b5493e0a69841362530c900a77..b6a8cc0978cd5ff91965b7b3cf93813b80972a3e 100644 (file)
--- a/Documentation/devicetree/bindings/dma/brcm,bcm2835-dma.txt
+++ b/Documentation/devicetree/bindings/dma/brcm,bcm2835-dma.txt
@@ -74,8 +74,8 @@ Example:
 
 bcm2835_i2s: i2s@7e203000 {
        compatible = "brcm,bcm2835-i2s";
-       reg = < 0x7e203000 0x20>,
-             < 0x7e101098 0x02>;
+       reg = < 0x7e203000 0x24>;
+       clocks = <&clocks BCM2835_CLOCK_PCM>;
 
        dmas = <&dma 2>,
               <&dma 3>;

diff --git a/Documentation/devicetree/bindings/sound/brcm,bcm2835-i2s.txt b/Documentation/devicetree/bindings/sound/brcm,bcm2835-i2s.txt
index 65783de0aedf3da79adc36fd077b7a89954ddb6b..7bb0362828ecbd6472a32457d2134b746b3182f2 100644 (file)
--- a/Documentation/devicetree/bindings/sound/brcm,bcm2835-i2s.txt
+++ b/Documentation/devicetree/bindings/sound/brcm,bcm2835-i2s.txt
@@ -2,9 +2,8 @@
 
 Required properties:
 - compatible: "brcm,bcm2835-i2s"
-- reg: A list of base address and size entries:
-       * The first entry should cover the PCM registers
-       * The second entry should cover the PCM clock registers
+- reg: Should contain PCM registers location and length.
+- clocks: the (PCM) clock to use
 - dmas: List of DMA controller phandle and DMA request line ordered pairs.
 - dma-names: Identifier string for each DMA request line in the dmas property.
   These strings correspond 1:1 with the ordered pairs in dmas.
@@ -16,8 +15,8 @@ Example:
 
 bcm2835_i2s: i2s@7e203000 {
        compatible = "brcm,bcm2835-i2s";
-       reg = <0x7e203000 0x20>,
-             <0x7e101098 0x02>;
+       reg = <0x7e203000 0x24>;
+       clocks = <&clocks BCM2835_CLOCK_PCM>;
 
        dmas = <&dma 2>,
               <&dma 3>;