aboutsummaryrefslogtreecommitdiffstats
path: root/meta-agl-bsp/meta-rcar-gen3/recipes-kernel/linux/files
diff options
context:
space:
mode:
authorRonan Le Martret <ronan.lemartret@iot.bzh>2019-02-13 09:32:48 +0000
committerRonan Le Martret <ronan.lemartret@iot.bzh>2019-03-12 16:50:47 +0100
commit4232903d06ebc92dff71e943e7a74b198adfd389 (patch)
treeb6d9fb29e673fa497e00b57fbc7444e7ca7db5a6 /meta-agl-bsp/meta-rcar-gen3/recipes-kernel/linux/files
parent200888e15747feb6caadbf4267021b025ba679c8 (diff)
[RCAR] Fix patch on kernel dts
* For RCAR BSP v3.15.0, we need to fix this patch Bug-AGL: SPEC-2185 Change-Id: Iadf40e6bfe964c3881d411cbdaab956ce524bc76 Signed-off-by: Ronan Le Martret <ronan.lemartret@iot.bzh>
Diffstat (limited to 'meta-agl-bsp/meta-rcar-gen3/recipes-kernel/linux/files')
-rw-r--r--meta-agl-bsp/meta-rcar-gen3/recipes-kernel/linux/files/0004-ADSP-enable-and-add-sound-hardware-abstraction.patch20
1 files changed, 12 insertions, 8 deletions
diff --git a/meta-agl-bsp/meta-rcar-gen3/recipes-kernel/linux/files/0004-ADSP-enable-and-add-sound-hardware-abstraction.patch b/meta-agl-bsp/meta-rcar-gen3/recipes-kernel/linux/files/0004-ADSP-enable-and-add-sound-hardware-abstraction.patch
index e0e726994..966b006a2 100644
--- a/meta-agl-bsp/meta-rcar-gen3/recipes-kernel/linux/files/0004-ADSP-enable-and-add-sound-hardware-abstraction.patch
+++ b/meta-agl-bsp/meta-rcar-gen3/recipes-kernel/linux/files/0004-ADSP-enable-and-add-sound-hardware-abstraction.patch
@@ -9,16 +9,17 @@ single binaries to be used between the two boards.
Future work will incorporate the h3ulcb and Salvator boards into the
abstraction.
+Signed-off-by: Ronan Le Martret <ronan.lemartret@iot.bzh>
Signed-off-by: Mark Farrugia <mark.farrugia@fiberdyne.com.au>
---
diff --git a/arch/arm64/boot/dts/renesas/r8a7796-m3ulcb-kf.dts b/arch/arm64/boot/dts/renesas/r8a7796-m3ulcb-kf.dts
index de2390f009e7..4ccfa8315d17 100644
--- a/arch/arm64/boot/dts/renesas/r8a7796-m3ulcb-kf.dts
+++ b/arch/arm64/boot/dts/renesas/r8a7796-m3ulcb-kf.dts
-@@ -17,3 +17,35 @@
- compatible = "shimafuji,kingfisher", "renesas,m3ulcb",
- "renesas,r8a7796";
+@@ -15,6 +15,39 @@
+ "renesas,r8a7796";
};
+
+
+&adsp {
+
@@ -43,7 +44,7 @@ index de2390f009e7..4ccfa8315d17 100644
+ channels = <8>;
+ pin-share-ssi = <3>;
+ };
-+
++
+ adsp,ports {
+ port@0 {
+ playback = <&adsp_playback0>;
@@ -51,12 +52,15 @@ index de2390f009e7..4ccfa8315d17 100644
+ };
+ };
+};
-\ No newline at end of file
++
+ &du {
+ ports {
+ port@0 {
diff --git a/arch/arm64/boot/dts/renesas/r8a7796-m3ulcb.dts b/arch/arm64/boot/dts/renesas/r8a7796-m3ulcb.dts
index 1cd64c1b3b31..71e59da3528d 100644
--- a/arch/arm64/boot/dts/renesas/r8a7796-m3ulcb.dts
+++ b/arch/arm64/boot/dts/renesas/r8a7796-m3ulcb.dts
-@@ -45,11 +45,18 @@
+@@ -42,11 +42,18 @@
reg = <0x00000000 0x54000000 0x0 0x03000000>;
};
@@ -66,9 +70,9 @@ index 1cd64c1b3b31..71e59da3528d 100644
+ reusable;
+ reg = <0x00000000 0x57000000 0x0 0x01000000>;
+ };
-+
++
/* global autoconfigured region for contiguous allocations */
- linux,cma {
+ linux,cma@57000000 {
compatible = "shared-dma-pool";
reusable;
- reg = <0x00000000 0x57000000 0x0 0x19000000>;