]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
arm64: dts: r8a7795: add sound MIX support
authorKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Tue, 6 Dec 2016 03:54:58 +0000 (03:54 +0000)
committerSimon Horman <horms+renesas@verge.net.au>
Tue, 3 Jan 2017 09:41:32 +0000 (10:41 +0100)
This patch adds MIX (= Mixer) support.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts
arch/arm64/boot/dts/renesas/r8a7795.dtsi

index 82a269a4f10d9ee99d91e336151a3306e9fe85cd..7a8986edcdc0d14da9e5bcec1f8b974f80ff2c4b 100644 (file)
@@ -413,6 +413,7 @@ &rcar_sound {
                 <&cpg CPG_MOD 1028>, <&cpg CPG_MOD 1029>,
                 <&cpg CPG_MOD 1030>, <&cpg CPG_MOD 1031>,
                 <&cpg CPG_MOD 1020>, <&cpg CPG_MOD 1021>,
+                <&cpg CPG_MOD 1020>, <&cpg CPG_MOD 1021>,
                 <&cpg CPG_MOD 1019>, <&cpg CPG_MOD 1018>,
                 <&audio_clk_a>, <&cs2000>,
                 <&audio_clk_c>,
index e09f5b7b874a56713d326e947f32a39f84a069ad..7e21491c6510ad4c0925a67bdf16e779e61379c6 100644 (file)
@@ -920,6 +920,7 @@ rcar_sound: sound@ec500000 {
                                 <&cpg CPG_MOD 1028>, <&cpg CPG_MOD 1029>,
                                 <&cpg CPG_MOD 1030>, <&cpg CPG_MOD 1031>,
                                 <&cpg CPG_MOD 1020>, <&cpg CPG_MOD 1021>,
+                                <&cpg CPG_MOD 1020>, <&cpg CPG_MOD 1021>,
                                 <&cpg CPG_MOD 1019>, <&cpg CPG_MOD 1018>,
                                 <&audio_clk_a>, <&audio_clk_b>,
                                 <&audio_clk_c>,
@@ -931,6 +932,7 @@ rcar_sound: sound@ec500000 {
                                      "src.9", "src.8", "src.7", "src.6",
                                      "src.5", "src.4", "src.3", "src.2",
                                      "src.1", "src.0",
+                                     "mix.1", "mix.0",
                                      "ctu.1", "ctu.0",
                                      "dvc.0", "dvc.1",
                                      "clk_a", "clk_b", "clk_c", "clk_i";
@@ -948,6 +950,11 @@ dvc1: dvc-1 {
                                };
                        };
 
+                       rcar_sound,mix {
+                               mix0: mix-0 { };
+                               mix1: mix-1 { };
+                       };
+
                        rcar_sound,ctu {
                                ctu00: ctu-0 { };
                                ctu01: ctu-1 { };