From 78a837bf4e4cc30687a559e4a4a9691f0e5e9345 Mon Sep 17 00:00:00 2001
From: Aurelien Jarno <aurelien@aurel32.net>
Date: Tue, 23 Jun 2020 23:49:50 +0200
Subject: Update DTS patch for kernel 5.6
---
tas5825m-module/dts.patch | 35 ++++++++++++++++++++++-------------
1 file changed, 22 insertions(+), 13 deletions(-)
diff --git a/tas5825m-module/dts.patch b/tas5825m-module/dts.patch
index 6bfddcb..5d8f90e 100644
--- a/tas5825m-module/dts.patch
+++ b/tas5825m-module/dts.patch
@@ -1,19 +1,28 @@
--- bcm2837-rpi-3-b-plus.orig.dts
+++ bcm2837-rpi-3-b-plus.rpi-amp.dts
-@@ -368,6 +368,12 @@
+@@ -89,7 +89,7 @@
+ phandle = < 0x1c >;
+ };
+
+- gpio@7e200000 {
++ gpio: gpio@7e200000 {
+ compatible = "brcm,bcm2835-gpio";
+ reg = < 0x7e200000 0xb4 >;
+ interrupts = < 0x02 0x11 0x02 0x12 0x02 0x13 0x02 0x14 >;
+@@ -344,6 +344,12 @@
brcm,pins = < 0x04 0x05 0x07 0x08 0x09 0x0a 0x0b >;
brcm,function = < 0x04 >;
};
+
+ i2s_alt0: i2s_alt0 {
-+ brcm,pins = <18 19 20 21>;
++ brcm,pins = < 18 19 20 21 >;
+ brcm,function = < 0x04 >;
+ };
+
};
serial@7e201000 {
-@@ -401,13 +407,16 @@
+@@ -377,13 +383,16 @@
bus-width = < 0x04 >;
};
@@ -22,33 +31,33 @@
+ #sound-dai-cells= <0>;
compatible = "brcm,bcm2835-i2s";
reg = < 0x7e203000 0x24 >;
- clocks = < 0x04 0x1f >;
- dmas = < 0x0c 0x02 0x0c 0x03 >;
- dma-names = "tx\0rx";
+ clocks = < 0x06 0x1f >;
- status = "disabled";
+ dmas = < 0x0b 0x02 0x0b 0x03 >;
+ dma-names = "tx\0rx";
+ status = "okay";
+ pinctrl-names = "default";
+ pinctrl-0 = <&i2s_alt0>;
};
spi@7e204000 {
-@@ -582,6 +591,13 @@
+@@ -538,6 +547,13 @@
pinctrl-names = "default";
- pinctrl-0 = < 0x16 >;
+ pinctrl-0 = < 0x15 >;
clock-frequency = < 0x186a0 >;
+
+ tas5825m: tas5825m@4c {
+ compatible = "ti,tas5825m";
+ reg = < 0x4c >;
-+ pdn-gpios = < 0x18 0x1b 0x01 >;
++ pdn-gpios = < &gpio 27 0x01 >;
+ #sound-dai-cells = < 0x00 >;
+ };
};
- i2c@7e805000 {
-@@ -823,4 +839,20 @@
- reset-gpios = < 0x0b 0x01 0x01 >;
- phandle = < 0x15 >;
+ vec@7e806000 {
+@@ -837,4 +853,20 @@
+ reset-gpios = < 0x0a 0x01 0x01 >;
+ phandle = < 0x14 >;
};
+
+ sound {
--
cgit v1.2.3