119 lines
4.7 KiB
Diff
119 lines
4.7 KiB
Diff
From patchwork Fri Feb 16 10:55:33 2018
|
|
Content-Type: text/plain; charset="utf-8"
|
|
MIME-Version: 1.0
|
|
Content-Transfer-Encoding: 7bit
|
|
Subject: [V3, 1/2,
|
|
RESEND] dt-bindings: bcm283x: Fix register ranges of bcm2835-i2s
|
|
From: Stefan Wahren <stefan.wahren@i2se.com>
|
|
X-Patchwork-Id: 10224429
|
|
Message-Id: <1518778534-3328-2-git-send-email-stefan.wahren@i2se.com>
|
|
To: Rob Herring <robh+dt@kernel.org>, Mark Rutland <mark.rutland@arm.com>,
|
|
Eric Anholt <eric@anholt.net>
|
|
Cc: Stefan Wahren <stefan.wahren@i2se.com>, devicetree@vger.kernel.org,
|
|
alsa-devel@alsa-project.org, Liam Girdwood <lgirdwood@gmail.com>,
|
|
Mark Brown <broonie@kernel.org>, linux-rpi-kernel@lists.infradead.org,
|
|
linux-arm-kernel@lists.infradead.org
|
|
Date: Fri, 16 Feb 2018 11:55:33 +0100
|
|
|
|
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>
|
|
---
|
|
Documentation/devicetree/bindings/dma/brcm,bcm2835-dma.txt | 4 ++--
|
|
Documentation/devicetree/bindings/sound/brcm,bcm2835-i2s.txt | 9 ++++-----
|
|
2 files changed, 6 insertions(+), 7 deletions(-)
|
|
|
|
diff --git a/Documentation/devicetree/bindings/dma/brcm,bcm2835-dma.txt b/Documentation/devicetree/bindings/dma/brcm,bcm2835-dma.txt
|
|
index baf9b34..b6a8cc0 100644
|
|
--- 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 65783de..7bb0362 100644
|
|
--- 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>;
|
|
From patchwork Fri Feb 16 10:55:34 2018
|
|
Content-Type: text/plain; charset="utf-8"
|
|
MIME-Version: 1.0
|
|
Content-Transfer-Encoding: 7bit
|
|
Subject: [V3,2/2,RESEND] ARM: dts: bcm283x: Fix probing of bcm2835-i2s
|
|
From: Stefan Wahren <stefan.wahren@i2se.com>
|
|
X-Patchwork-Id: 10224427
|
|
Message-Id: <1518778534-3328-3-git-send-email-stefan.wahren@i2se.com>
|
|
To: Rob Herring <robh+dt@kernel.org>, Mark Rutland <mark.rutland@arm.com>,
|
|
Eric Anholt <eric@anholt.net>
|
|
Cc: Stefan Wahren <stefan.wahren@i2se.com>, devicetree@vger.kernel.org,
|
|
alsa-devel@alsa-project.org, Liam Girdwood <lgirdwood@gmail.com>,
|
|
Mark Brown <broonie@kernel.org>, linux-rpi-kernel@lists.infradead.org,
|
|
linux-arm-kernel@lists.infradead.org
|
|
Date: Fri, 16 Feb 2018 11:55:34 +0100
|
|
|
|
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.
|
|
|
|
Fixes: 517e7a1537a ("ASoC: bcm2835: move to use the clock framework")
|
|
Signed-off-by: Stefan Wahren <stefan.wahren@i2se.com>
|
|
Reviewed-by: Eric Anholt <eric@anholt.net>
|
|
Tested-by: Matthias Reichl <hias@horus.com>
|
|
---
|
|
arch/arm/boot/dts/bcm283x.dtsi | 4 ++--
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/arch/arm/boot/dts/bcm283x.dtsi b/arch/arm/boot/dts/bcm283x.dtsi
|
|
index 013431e..e08203c 100644
|
|
--- a/arch/arm/boot/dts/bcm283x.dtsi
|
|
+++ b/arch/arm/boot/dts/bcm283x.dtsi
|
|
@@ -396,8 +396,8 @@
|
|
|
|
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>;
|