0b5d87fd30
As usual, this patches were taken (and rebased) from https://github.com/raspberrypi/linux/commits/rpi-4.1.y Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com> SVN-Revision: 46853
50 lines
1.5 KiB
Diff
50 lines
1.5 KiB
Diff
From 717b0ba4c783ec760698843cfaca991917a6b018 Mon Sep 17 00:00:00 2001
|
|
From: Robert Tiemann <rtie@gmx.de>
|
|
Date: Mon, 20 Jul 2015 11:01:25 +0200
|
|
Subject: [PATCH 126/171] BCM2835_DT: Fix I2S register map
|
|
|
|
---
|
|
Documentation/devicetree/bindings/dma/brcm,bcm2835-dma.txt | 4 ++--
|
|
Documentation/devicetree/bindings/sound/brcm,bcm2835-i2s.txt | 4 ++--
|
|
arch/arm/boot/dts/bcm2835.dtsi | 4 ++--
|
|
3 files changed, 6 insertions(+), 6 deletions(-)
|
|
|
|
--- a/Documentation/devicetree/bindings/dma/brcm,bcm2835-dma.txt
|
|
+++ b/Documentation/devicetree/bindings/dma/brcm,bcm2835-dma.txt
|
|
@@ -48,8 +48,8 @@ Example:
|
|
|
|
bcm2835_i2s: i2s@7e203000 {
|
|
compatible = "brcm,bcm2835-i2s";
|
|
- reg = < 0x7e203000 0x20>,
|
|
- < 0x7e101098 0x02>;
|
|
+ reg = < 0x7e203000 0x24>,
|
|
+ < 0x7e101098 0x08>;
|
|
|
|
dmas = <&dma 2>,
|
|
<&dma 3>;
|
|
--- a/Documentation/devicetree/bindings/sound/brcm,bcm2835-i2s.txt
|
|
+++ b/Documentation/devicetree/bindings/sound/brcm,bcm2835-i2s.txt
|
|
@@ -16,8 +16,8 @@ Example:
|
|
|
|
bcm2835_i2s: i2s@7e203000 {
|
|
compatible = "brcm,bcm2835-i2s";
|
|
- reg = <0x7e203000 0x20>,
|
|
- <0x7e101098 0x02>;
|
|
+ reg = <0x7e203000 0x24>,
|
|
+ <0x7e101098 0x08>;
|
|
|
|
dmas = <&dma 2>,
|
|
<&dma 3>;
|
|
--- a/arch/arm/boot/dts/bcm2835.dtsi
|
|
+++ b/arch/arm/boot/dts/bcm2835.dtsi
|
|
@@ -101,8 +101,8 @@
|
|
|
|
i2s: i2s@7e203000 {
|
|
compatible = "brcm,bcm2835-i2s";
|
|
- reg = <0x7e203000 0x20>,
|
|
- <0x7e101098 0x02>;
|
|
+ reg = <0x7e203000 0x24>,
|
|
+ <0x7e101098 0x08>;
|
|
|
|
dmas = <&dma 2>,
|
|
<&dma 3>;
|