Revert "ARM: dts: msm: update quat tdm multilane config on 815x platform"
This reverts commit be71a9581f478f63095ed863f4dcd50de7e793e5.
That commit changed the TDM lane configuration, and adds
additional GPIOs to tdm pincontrol groups, which breaks
edgesense behavior.
Bug: 152585178
Change-Id: I86251662a6d6415bdd518625b967252ec6392d43
Signed-off-by: JJ Lee <leejj@google.com>
diff --git a/arch/arm64/boot/dts/qcom/sa8155-audio.dtsi b/arch/arm64/boot/dts/qcom/sa8155-audio.dtsi
index b254823..8a0a1c7 100644
--- a/arch/arm64/boot/dts/qcom/sa8155-audio.dtsi
+++ b/arch/arm64/boot/dts/qcom/sa8155-audio.dtsi
@@ -273,7 +273,7 @@
qcom,msm-cpudai-tdm-group-num-ports = <5>;
qcom,msm-cpudai-tdm-group-port-id = <36912 36914 36916
36918 36926>;
- qcom,msm-cpudai-tdm-lane-mask = /bits/ 16 <10>;
+ qcom,msm-cpudai-tdm-lane-mask = /bits/ 16 <3>;
qcom,msm-cpudai-tdm-clk-rate = <24576000>;
qcom,msm-cpudai-tdm-clk-internal = <1>;
qcom,msm-cpudai-tdm-sync-mode = <1>;
@@ -322,7 +322,7 @@
qcom,msm-cpudai-tdm-group-num-ports = <5>;
qcom,msm-cpudai-tdm-group-port-id = <36913 36915 36917
36919 36927>;
- qcom,msm-cpudai-tdm-lane-mask = /bits/ 16 <5>;
+ qcom,msm-cpudai-tdm-lane-mask = /bits/ 16 <12>;
qcom,msm-cpudai-tdm-clk-rate = <24576000>;
qcom,msm-cpudai-tdm-clk-internal = <1>;
qcom,msm-cpudai-tdm-sync-mode = <1>;
diff --git a/arch/arm64/boot/dts/qcom/sm8150-pinctrl.dtsi b/arch/arm64/boot/dts/qcom/sm8150-pinctrl.dtsi
index b440709..ce80808 100644
--- a/arch/arm64/boot/dts/qcom/sm8150-pinctrl.dtsi
+++ b/arch/arm64/boot/dts/qcom/sm8150-pinctrl.dtsi
@@ -2701,12 +2701,12 @@
quat_tdm_din {
quat_tdm_din_sleep: quat_tdm_din_sleep {
mux {
- pins = "gpio139", "gpio141";
+ pins = "gpio139";
function = "gpio";
};
config {
- pins = "gpio139", "gpio141";
+ pins = "gpio139";
drive-strength = <2>; /* 2 mA */
bias-pull-down; /* PULL DOWN */
input-enable;
@@ -2715,12 +2715,12 @@
quat_tdm_din_active: quat_tdm_din_active {
mux {
- pins = "gpio139", "gpio141";
+ pins = "gpio139";
function = "qua_mi2s";
};
config {
- pins = "gpio139", "gpio141";
+ pins = "gpio139";
drive-strength = <4>; /* 4 mA */
bias-disable; /* NO PULL */
};
@@ -2730,12 +2730,12 @@
quat_tdm_dout {
quat_tdm_dout_sleep: quat_tdm_dout_sleep {
mux {
- pins = "gpio140", "gpio142";
+ pins = "gpio140";
function = "gpio";
};
config {
- pins = "gpio140", "gpio142";
+ pins = "gpio140";
drive-strength = <2>; /* 2 mA */
bias-pull-down; /* PULL DOWN */
input-enable;
@@ -2744,12 +2744,12 @@
quat_tdm_dout_active: quat_tdm_dout_active {
mux {
- pins = "gpio140", "gpio142";
+ pins = "gpio140";
function = "qua_mi2s";
};
config {
- pins = "gpio140", "gpio142";
+ pins = "gpio140";
drive-strength = <4>; /* 4 mA */
bias-disable; /* NO PULL */
output-high;
