aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLaxminath Kasam <lkasam@codeaurora.org>2019-09-20 11:42:17 +0530
committerGerrit - the friendly Code Review server <code-review@localhost>2019-09-24 06:54:01 -0700
commit1b8219acb2fec2957ca004f4e7dbe0ebce292706 (patch)
treef1a7a19d68ae600f908d0113b73f567939188705
parent896c4457aae16dc1b1612413964aebe323195d01 (diff)
ARM: dts: msm: Add bolero codec node in wsaLA.UM.8.9.r1-04400-SM6xx.0
Add bolero codec node in wsa so that wsa can register to bolero notification and take turn off sequence action for ssr notifications. Change-Id: If9b58556d19650426440c9c668758a1d203b44d8 Signed-off-by: Laxminath Kasam <lkasam@codeaurora.org>
-rw-r--r--Documentation/devicetree/bindings/sound/wcd_codec.txt13
-rw-r--r--arch/arm64/boot/dts/qcom/atoll-audio-overlay.dtsi4
-rw-r--r--arch/arm64/boot/dts/qcom/qcs405-wsa881x.dtsi6
-rw-r--r--arch/arm64/boot/dts/qcom/sm6150-audio-overlay.dtsi4
-rw-r--r--arch/arm64/boot/dts/qcom/trinket-audio-overlay.dtsi4
5 files changed, 29 insertions, 2 deletions
diff --git a/Documentation/devicetree/bindings/sound/wcd_codec.txt b/Documentation/devicetree/bindings/sound/wcd_codec.txt
index 6d51456a9b5c..e53a9dba3c3c 100644
--- a/Documentation/devicetree/bindings/sound/wcd_codec.txt
+++ b/Documentation/devicetree/bindings/sound/wcd_codec.txt
@@ -461,6 +461,16 @@ Required properties:
required to be configured to receive interrupts
in BCL block of WSA macro
+WSA slave device as child of Bolero codec
+
+Required properties:
+ - compatible = "qcom,wsa881x";
+ - reg: Specifies the WSA slave device base address.
+ - qcom,spkr-sd-n-gpio: speaker reset gpio
+
+Optional properties:
+ - qcom,bolero-handle: phandle to bolero codec
+
Example:
&bolero {
@@ -479,6 +489,7 @@ Example:
compatible = "qcom,wsa881x";
reg = <0x00 0x20170212>;
qcom,spkr-sd-n-gpio = <&tlmm 80 0>;
+ qcom,bolero-handle = <&bolero>;
};
};
};
@@ -798,4 +809,4 @@ Example:
<&clock_audio_wsa_1 0>, <&clock_audio_wsa_2 0>,
<&clock_audio_va_1 0>, <&clock_audio_va_2 0>;
};
-}; \ No newline at end of file
+};
diff --git a/arch/arm64/boot/dts/qcom/atoll-audio-overlay.dtsi b/arch/arm64/boot/dts/qcom/atoll-audio-overlay.dtsi
index 1a66851b8ec7..a231cb8a0d45 100644
--- a/arch/arm64/boot/dts/qcom/atoll-audio-overlay.dtsi
+++ b/arch/arm64/boot/dts/qcom/atoll-audio-overlay.dtsi
@@ -155,24 +155,28 @@
compatible = "qcom,wsa881x";
reg = <0x0 0x20170211>;
qcom,spkr-sd-n-node = <&wsa_spkr_en1>;
+ qcom,bolero-handle = <&bolero>;
};
wsa881x_0212: wsa881x@20170212 {
compatible = "qcom,wsa881x";
reg = <0x0 0x20170212>;
qcom,spkr-sd-n-node = <&wsa_spkr_en2>;
+ qcom,bolero-handle = <&bolero>;
};
wsa881x_0213: wsa881x@21170213 {
compatible = "qcom,wsa881x";
reg = <0x0 0x21170213>;
qcom,spkr-sd-n-node = <&wsa_spkr_en1>;
+ qcom,bolero-handle = <&bolero>;
};
wsa881x_0214: wsa881x@21170214 {
compatible = "qcom,wsa881x";
reg = <0x0 0x21170214>;
qcom,spkr-sd-n-node = <&wsa_spkr_en2>;
+ qcom,bolero-handle = <&bolero>;
};
};
diff --git a/arch/arm64/boot/dts/qcom/qcs405-wsa881x.dtsi b/arch/arm64/boot/dts/qcom/qcs405-wsa881x.dtsi
index cbcfc52bea80..4b421f592d64 100644
--- a/arch/arm64/boot/dts/qcom/qcs405-wsa881x.dtsi
+++ b/arch/arm64/boot/dts/qcom/qcs405-wsa881x.dtsi
@@ -1,4 +1,4 @@
-/* Copyright (c) 2018, The Linux Foundation. All rights reserved.
+/* Copyright (c) 2018-2019, The Linux Foundation. All rights reserved.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 and
@@ -38,24 +38,28 @@
compatible = "qcom,wsa881x";
reg = <0x0 0x20170211>;
qcom,spkr-sd-n-node = <&wsa_spkr_en_1_2>;
+ qcom,bolero-handle = <&bolero>;
};
wsa881x_0212: wsa881x@20170212 {
compatible = "qcom,wsa881x";
reg = <0x0 0x20170212>;
qcom,spkr-sd-n-node = <&wsa_spkr_en_1_2>;
+ qcom,bolero-handle = <&bolero>;
};
wsa881x_0213: wsa881x@21170213 {
compatible = "qcom,wsa881x";
reg = <0x0 0x21170213>;
qcom,spkr-sd-n-node = <&wsa_spkr_en_1_2>;
+ qcom,bolero-handle = <&bolero>;
};
wsa881x_0214: wsa881x@21170214 {
compatible = "qcom,wsa881x";
reg = <0x0 0x21170214>;
qcom,spkr-sd-n-node = <&wsa_spkr_en_1_2>;
+ qcom,bolero-handle = <&bolero>;
};
};
};
diff --git a/arch/arm64/boot/dts/qcom/sm6150-audio-overlay.dtsi b/arch/arm64/boot/dts/qcom/sm6150-audio-overlay.dtsi
index 4316c8b35d56..c7ad8e030eba 100644
--- a/arch/arm64/boot/dts/qcom/sm6150-audio-overlay.dtsi
+++ b/arch/arm64/boot/dts/qcom/sm6150-audio-overlay.dtsi
@@ -116,24 +116,28 @@
compatible = "qcom,wsa881x";
reg = <0x0 0x20170211>;
qcom,spkr-sd-n-node = <&wsa_spkr_en1>;
+ qcom,bolero-handle = <&bolero>;
};
wsa881x_0212: wsa881x@20170212 {
compatible = "qcom,wsa881x";
reg = <0x0 0x20170212>;
qcom,spkr-sd-n-node = <&wsa_spkr_en2>;
+ qcom,bolero-handle = <&bolero>;
};
wsa881x_0213: wsa881x@21170213 {
compatible = "qcom,wsa881x";
reg = <0x0 0x21170213>;
qcom,spkr-sd-n-node = <&wsa_spkr_en1>;
+ qcom,bolero-handle = <&bolero>;
};
wsa881x_0214: wsa881x@21170214 {
compatible = "qcom,wsa881x";
reg = <0x0 0x21170214>;
qcom,spkr-sd-n-node = <&wsa_spkr_en2>;
+ qcom,bolero-handle = <&bolero>;
};
};
diff --git a/arch/arm64/boot/dts/qcom/trinket-audio-overlay.dtsi b/arch/arm64/boot/dts/qcom/trinket-audio-overlay.dtsi
index 2568fab8077b..af8ecc159b6d 100644
--- a/arch/arm64/boot/dts/qcom/trinket-audio-overlay.dtsi
+++ b/arch/arm64/boot/dts/qcom/trinket-audio-overlay.dtsi
@@ -114,24 +114,28 @@
compatible = "qcom,wsa881x";
reg = <0x0 0x20170211>;
qcom,spkr-sd-n-node = <&wsa_spkr_en1>;
+ qcom,bolero-handle = <&bolero>;
};
wsa881x_0212: wsa881x@20170212 {
compatible = "qcom,wsa881x";
reg = <0x0 0x20170212>;
qcom,spkr-sd-n-node = <&wsa_spkr_en1>;
+ qcom,bolero-handle = <&bolero>;
};
wsa881x_0213: wsa881x@21170213 {
compatible = "qcom,wsa881x";
reg = <0x0 0x21170213>;
qcom,spkr-sd-n-node = <&wsa_spkr_en1>;
+ qcom,bolero-handle = <&bolero>;
};
wsa881x_0214: wsa881x@21170214 {
compatible = "qcom,wsa881x";
reg = <0x0 0x21170214>;
qcom,spkr-sd-n-node = <&wsa_spkr_en1>;
+ qcom,bolero-handle = <&bolero>;
};
};
};