Skip to content

L
linux
Commit 0d3a93b1 authored by Stephan Gerhold's avatar Stephan Gerhold Committed by Bjorn Andersson
Browse files
Options

arm64: dts: qcom: msm8916/39: Cleanup audio pinctrl 

The audio pinctrl in MSM8916/MSM8939 is very similar but still has
subtle differences, e.g. &cdc_pdm_lines_act on MSM8916 vs
&cdc_pdm_lines_default on MSM8939.

Make this consistent and use the chance to cleanup all of the audio
pinctrl: Drop unneeded outer nodes and replace the names taken over
from the vendor kernel with more clear ones that are similar to the
actual pinctrl function.

Cc: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
Signed-off-by: default avatarStephan Gerhold <stephan@gerhold.net>
Signed-off-by: default avatarBjorn Andersson <andersson@kernel.org>
Link: https://lore.kernel.org/r/20230529-msm8916-pinctrl-v1-4-11f540b51c93@gerhold.net
parent 6528e4a9
Hide whitespace changes
Inline Side-by-side
Showing with 133 additions and 147 deletions
arch/arm64/boot/dts/qcom/apq8016-sbc.dts
View file @ 0d3a93b1
...@@ -385,8 +385,8 @@ &sdhc_2 { ...@@ -385,8 +385,8 @@ &sdhc_2 {
&sound { &sound {
status = "okay"; status = "okay";
pinctrl-0 = <&cdc_pdm_lines_act &ext_sec_tlmm_lines_act>; pinctrl-0 = <&cdc_pdm_default &sec_mi2s_default>;
pinctrl-1 = <&cdc_pdm_lines_sus &ext_sec_tlmm_lines_sus>; pinctrl-1 = <&cdc_pdm_sleep &sec_mi2s_sleep>;
pinctrl-names = "default", "sleep"; pinctrl-names = "default", "sleep";
model = "DB410c"; model = "DB410c";
audio-routing = audio-routing =
......
arch/arm64/boot/dts/qcom/apq8039-t2.dts
View file @ 0d3a93b1
...@@ -260,8 +260,8 @@ &sound { ...@@ -260,8 +260,8 @@ &sound {
model = "apq8039-square-sndcard"; model = "apq8039-square-sndcard";
audio-routing = "AMIC2", "MIC BIAS Internal2"; audio-routing = "AMIC2", "MIC BIAS Internal2";
pinctrl-names = "default", "sleep"; pinctrl-names = "default", "sleep";
pinctrl-0 = <&cdc_pdm_lines_default>; pinctrl-0 = <&cdc_pdm_default>;
pinctrl-1 = <&cdc_pdm_lines_sleep>; pinctrl-1 = <&cdc_pdm_sleep>;
internal-codec-playback-dai-link { internal-codec-playback-dai-link {
link-name = "WCD"; link-name = "WCD";
......
arch/arm64/boot/dts/qcom/msm8916-huawei-g7.dts
View file @ 0d3a93b1
...@@ -295,8 +295,8 @@ &sound { ...@@ -295,8 +295,8 @@ &sound {
"AMIC3", "MIC BIAS External1"; "AMIC3", "MIC BIAS External1";
pinctrl-names = "default", "sleep"; pinctrl-names = "default", "sleep";
pinctrl-0 = <&cdc_pdm_lines_act>; pinctrl-0 = <&cdc_pdm_default>;
pinctrl-1 = <&cdc_pdm_lines_sus>; pinctrl-1 = <&cdc_pdm_sleep>;
primary-dai-link { primary-dai-link {
link-name = "WCD"; link-name = "WCD";
......
arch/arm64/boot/dts/qcom/msm8916-pins.dtsi
View file @ 0d3a93b1
...@@ -374,95 +374,89 @@ data-pins { ...@@ -374,95 +374,89 @@ data-pins {
}; };
}; };
cdc-pdm-lines-state { cdc_pdm_default: cdc-pdm-default-state {
cdc_pdm_lines_act: pdm-lines-on-pins { pins = "gpio63", "gpio64", "gpio65", "gpio66",
pins = "gpio63", "gpio64", "gpio65", "gpio66", "gpio67", "gpio68";
"gpio67", "gpio68"; function = "cdc_pdm0";
function = "cdc_pdm0";
drive-strength = <8>; drive-strength = <8>;
bias-disable; bias-disable;
}; };
cdc_pdm_lines_sus: pdm-lines-off-pins {
pins = "gpio63", "gpio64", "gpio65", "gpio66",
"gpio67", "gpio68";
function = "cdc_pdm0";
drive-strength = <2>; cdc_pdm_sleep: cdc-pdm-sleep-state {
bias-pull-down; pins = "gpio63", "gpio64", "gpio65", "gpio66",
}; "gpio67", "gpio68";
function = "cdc_pdm0";
drive-strength = <2>;
bias-pull-down;
}; };
ext-pri-tlmm-lines-state { pri_mi2s_default: mi2s-pri-default-state {
ext_pri_tlmm_lines_act: ext-pa-on-pins { pins = "gpio113", "gpio114", "gpio115", "gpio116";
pins = "gpio113", "gpio114", "gpio115", "gpio116"; function = "pri_mi2s";
function = "pri_mi2s";
drive-strength = <8>; drive-strength = <8>;
bias-disable; bias-disable;
}; };
ext_pri_tlmm_lines_sus: ext-pa-off-pins {
pins = "gpio113", "gpio114", "gpio115", "gpio116";
function = "pri_mi2s";
drive-strength = <2>; pri_mi2s_sleep: mi2s-pri-sleep-state {
bias-disable; pins = "gpio113", "gpio114", "gpio115", "gpio116";
}; function = "pri_mi2s";
drive-strength = <2>;
bias-disable;
}; };
ext-pri-ws-line-state { pri_mi2s_ws_default: mi2s-pri-ws-default-state {
ext_pri_ws_act: ext-pa-on-pins { pins = "gpio110";
pins = "gpio110"; function = "pri_mi2s_ws";
function = "pri_mi2s_ws";
drive-strength = <8>; drive-strength = <8>;
bias-disable; bias-disable;
}; };
ext_pri_ws_sus: ext-pa-off-pins {
pins = "gpio110";
function = "pri_mi2s_ws";
drive-strength = <2>; pri_mi2s_ws_sleep: mi2s-pri-ws-sleep-state {
bias-disable; pins = "gpio110";
}; function = "pri_mi2s_ws";
drive-strength = <2>;
bias-disable;
}; };
ext-mclk-tlmm-lines-state { pri_mi2s_mclk_default: mi2s-pri-mclk-default-state {
ext_mclk_tlmm_lines_act: mclk-lines-on-pins { pins = "gpio116";
pins = "gpio116"; function = "pri_mi2s";
function = "pri_mi2s";
drive-strength = <8>; drive-strength = <8>;
bias-disable; bias-disable;
}; };
ext_mclk_tlmm_lines_sus: mclk-lines-off-pins {
pins = "gpio116";
function = "pri_mi2s";
drive-strength = <2>; pri_mi2s_mclk_sleep: mi2s-pri-mclk-sleep-state {
bias-disable; pins = "gpio116";
}; function = "pri_mi2s";
drive-strength = <2>;
bias-disable;
}; };
/* secondary Mi2S */ sec_mi2s_default: mi2s-sec-default-state {
ext-sec-tlmm-lines-state { pins = "gpio112", "gpio117", "gpio118", "gpio119";
ext_sec_tlmm_lines_act: tlmm-lines-on-pins { function = "sec_mi2s";
pins = "gpio112", "gpio117", "gpio118", "gpio119";
function = "sec_mi2s";
drive-strength = <8>; drive-strength = <8>;
bias-disable; bias-disable;
}; };
ext_sec_tlmm_lines_sus: tlmm-lines-off-pins {
pins = "gpio112", "gpio117", "gpio118", "gpio119";
function = "sec_mi2s";
drive-strength = <2>; sec_mi2s_sleep: mi2s-sec-sleep-state {
bias-disable; pins = "gpio112", "gpio117", "gpio118", "gpio119";
}; function = "sec_mi2s";
drive-strength = <2>;
bias-disable;
}; };
cdc_dmic_lines_act: cdc-dmic-lines-on-state { cdc_dmic_default: cdc-dmic-default-state {
clk-pins { clk-pins {
pins = "gpio0"; pins = "gpio0";
function = "dmic0_clk"; function = "dmic0_clk";
...@@ -476,7 +470,8 @@ data-pins { ...@@ -476,7 +470,8 @@ data-pins {
drive-strength = <8>; drive-strength = <8>;
}; };
}; };
cdc_dmic_lines_sus: cdc-dmic-lines-off-state {
cdc_dmic_sleep: cdc-dmic-sleep-state {
clk-pins { clk-pins {
pins = "gpio0"; pins = "gpio0";
function = "dmic0_clk"; function = "dmic0_clk";
......
arch/arm64/boot/dts/qcom/msm8939.dtsi
View file @ 0d3a93b1
...@@ -969,23 +969,7 @@ cci0_default: cci0-default-state { ...@@ -969,23 +969,7 @@ cci0_default: cci0-default-state {
bias-disable; bias-disable;
}; };
cdc_pdm_lines_default: pdm-lines-default-state { cdc_dmic_default: cdc-dmic-default-state {
pins = "gpio63", "gpio64", "gpio65", "gpio66",
"gpio67", "gpio68";
function = "cdc_pdm0";
drive-strength = <8>;
bias-disable;
};
cdc_pdm_lines_sleep: pdm-lines-suspend-state {
pins = "gpio63", "gpio64", "gpio65", "gpio66",
"gpio67", "gpio68";
function = "cdc_pdm0";
drive-strength = <2>;
bias-pull-down;
};
cdc_dmic_lines_act: cdc-dmic-lines-on-state {
clk-pins { clk-pins {
pins = "gpio0"; pins = "gpio0";
function = "dmic0_clk"; function = "dmic0_clk";
...@@ -999,7 +983,7 @@ data-pins { ...@@ -999,7 +983,7 @@ data-pins {
}; };
}; };
cdc_dmic_lines_sus: cdc-dmic-lines-off-state { cdc_dmic_sleep: cdc-dmic-sleep-state {
clk-pins { clk-pins {
pins = "gpio0"; pins = "gpio0";
function = "dmic0_clk"; function = "dmic0_clk";
...@@ -1015,69 +999,76 @@ data-pins { ...@@ -1015,69 +999,76 @@ data-pins {
}; };
}; };
ext-mclk-tlmm-lines-state { cdc_pdm_default: cdc-pdm-default-state {
ext_mclk_tlmm_lines_act: mclk-lines-on-pins { pins = "gpio63", "gpio64", "gpio65", "gpio66",
pins = "gpio116"; "gpio67", "gpio68";
function = "pri_mi2s"; function = "cdc_pdm0";
drive-strength = <8>; drive-strength = <8>;
bias-disable; bias-disable;
}; };
ext_mclk_tlmm_lines_sus: mclk-lines-off-pins { cdc_pdm_sleep: cdc-pdm-sleep-state {
pins = "gpio116"; pins = "gpio63", "gpio64", "gpio65", "gpio66",
function = "pri_mi2s"; "gpio67", "gpio68";
drive-strength = <2>; function = "cdc_pdm0";
bias-disable; drive-strength = <2>;
}; bias-pull-down;
}; };
ext-pri-tlmm-lines-state { pri_mi2s_default: mi2s-pri-default-state {
ext_pri_tlmm_lines_act: ext-pa-on-pins { pins = "gpio113", "gpio114", "gpio115", "gpio116";
pins = "gpio113", "gpio114", "gpio115", "gpio116"; function = "pri_mi2s";
function = "pri_mi2s"; drive-strength = <8>;
drive-strength = <8>; bias-disable;
bias-disable; };
};
ext_pri_tlmm_lines_sus: ext-pa-off-pins { pri_mi2s_sleep: mi2s-pri-sleep-state {
pins = "gpio113", "gpio114", "gpio115", "gpio116"; pins = "gpio113", "gpio114", "gpio115", "gpio116";
function = "pri_mi2s"; function = "pri_mi2s";
drive-strength = <2>; drive-strength = <2>;
bias-disable; bias-disable;
};
}; };
ext-pri-ws-line-state { pri_mi2s_mclk_default: mi2s-pri-mclk-default-state {
ext_pri_ws_act: ext-pa-on-pins { pins = "gpio116";
pins = "gpio110"; function = "pri_mi2s";
function = "pri_mi2s_ws"; drive-strength = <8>;
drive-strength = <8>; bias-disable;
bias-disable; };
};
ext_pri_ws_sus: ext-pa-off-pins { pri_mi2s_mclk_sleep: mi2s-pri-mclk-sleep-state {
pins = "gpio110"; pins = "gpio116";
function = "pri_mi2s_ws"; function = "pri_mi2s";
drive-strength = <2>; drive-strength = <2>;
bias-disable; bias-disable;
};
}; };
/* secondary Mi2S */ pri_mi2s_ws_default: mi2s-pri-ws-default-state {
ext-sec-tlmm-lines-state { pins = "gpio110";
ext_sec_tlmm_lines_act: tlmm-lines-on-pins { function = "pri_mi2s_ws";
pins = "gpio112", "gpio117", "gpio118", "gpio119"; drive-strength = <8>;
function = "sec_mi2s"; bias-disable;
drive-strength = <8>; };
bias-disable;
};
ext_sec_tlmm_lines_sus: tlmm-lines-off-pins { pri_mi2s_ws_sleep: mi2s-pri-ws-sleep-state {
pins = "gpio112", "gpio117", "gpio118", "gpio119"; pins = "gpio110";
function = "sec_mi2s"; function = "pri_mi2s_ws";
drive-strength = <2>; drive-strength = <2>;
bias-disable; bias-disable;
}; };
sec_mi2s_default: mi2s-sec-default-state {
pins = "gpio112", "gpio117", "gpio118", "gpio119";
function = "sec_mi2s";
drive-strength = <8>;
bias-disable;
};
sec_mi2s_sleep: mi2s-sec-sleep-state {
pins = "gpio112", "gpio117", "gpio118", "gpio119";
function = "sec_mi2s";
drive-strength = <2>;
bias-disable;
}; };
sdc1_default: sdc1-default-state { sdc1_default: sdc1-default-state {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7