shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-08 03:40:35 +09:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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: Stephan Gerhold <stephan@gerhold.net>
Signed-off-by: Bjorn Andersson <andersson@kernel.org>
Link: https://lore.kernel.org/r/20230529-msm8916-pinctrl-v1-4-11f540b51c93@gerhold.net
This commit is contained in:
Stephan Gerhold
2023-05-30 09:15:25 +02:00
committed by Bjorn Andersson
parent 6528e4a90b
commit 0d3a93b102
5 changed files with 151 additions and 165 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
arch/arm64/boot/dts/qcom/apq8016-sbc.dts
View File

@@ -385,8 +385,8 @@
&sound {
status = "okay";
pinctrl-0 = <&cdc_pdm_lines_act &ext_sec_tlmm_lines_act>;
pinctrl-1 = <&cdc_pdm_lines_sus &ext_sec_tlmm_lines_sus>;
pinctrl-0 = <&cdc_pdm_default &sec_mi2s_default>;
pinctrl-1 = <&cdc_pdm_sleep &sec_mi2s_sleep>;
pinctrl-names = "default", "sleep";
model = "DB410c";
audio-routing =

4
arch/arm64/boot/dts/qcom/apq8039-t2.dts
View File

@@ -260,8 +260,8 @@
model = "apq8039-square-sndcard";
audio-routing = "AMIC2", "MIC BIAS Internal2";
pinctrl-names = "default", "sleep";
pinctrl-0 = <&cdc_pdm_lines_default>;
pinctrl-1 = <&cdc_pdm_lines_sleep>;
pinctrl-0 = <&cdc_pdm_default>;
pinctrl-1 = <&cdc_pdm_sleep>;
internal-codec-playback-dai-link {
link-name = "WCD";

4
arch/arm64/boot/dts/qcom/msm8916-huawei-g7.dts
View File

@@ -295,8 +295,8 @@
"AMIC3", "MIC BIAS External1";
pinctrl-names = "default", "sleep";
pinctrl-0 = <&cdc_pdm_lines_act>;
pinctrl-1 = <&cdc_pdm_lines_sus>;
pinctrl-0 = <&cdc_pdm_default>;
pinctrl-1 = <&cdc_pdm_sleep>;
primary-dai-link {
link-name = "WCD";

145
arch/arm64/boot/dts/qcom/msm8916-pins.dtsi
View File

@@ -374,95 +374,89 @@
};
};
cdc-pdm-lines-state {
cdc_pdm_lines_act: pdm-lines-on-pins {
pins = "gpio63", "gpio64", "gpio65", "gpio66",
"gpio67", "gpio68";
function = "cdc_pdm0";
cdc_pdm_default: cdc-pdm-default-state {
pins = "gpio63", "gpio64", "gpio65", "gpio66",
"gpio67", "gpio68";
function = "cdc_pdm0";
drive-strength = <8>;
bias-disable;
};
cdc_pdm_lines_sus: pdm-lines-off-pins {
pins = "gpio63", "gpio64", "gpio65", "gpio66",
"gpio67", "gpio68";
function = "cdc_pdm0";
drive-strength = <2>;
bias-pull-down;
};
drive-strength = <8>;
bias-disable;
};
ext-pri-tlmm-lines-state {
ext_pri_tlmm_lines_act: ext-pa-on-pins {
pins = "gpio113", "gpio114", "gpio115", "gpio116";
function = "pri_mi2s";
cdc_pdm_sleep: cdc-pdm-sleep-state {
pins = "gpio63", "gpio64", "gpio65", "gpio66",
"gpio67", "gpio68";
function = "cdc_pdm0";
drive-strength = <8>;
bias-disable;
};
ext_pri_tlmm_lines_sus: ext-pa-off-pins {
pins = "gpio113", "gpio114", "gpio115", "gpio116";
function = "pri_mi2s";
drive-strength = <2>;
bias-disable;
};
drive-strength = <2>;
bias-pull-down;
};
ext-pri-ws-line-state {
ext_pri_ws_act: ext-pa-on-pins {
pins = "gpio110";
function = "pri_mi2s_ws";
pri_mi2s_default: mi2s-pri-default-state {
pins = "gpio113", "gpio114", "gpio115", "gpio116";
function = "pri_mi2s";
drive-strength = <8>;
bias-disable;
};
ext_pri_ws_sus: ext-pa-off-pins {
pins = "gpio110";
function = "pri_mi2s_ws";
drive-strength = <2>;
bias-disable;
};
drive-strength = <8>;
bias-disable;
};
ext-mclk-tlmm-lines-state {
ext_mclk_tlmm_lines_act: mclk-lines-on-pins {
pins = "gpio116";
function = "pri_mi2s";
pri_mi2s_sleep: mi2s-pri-sleep-state {
pins = "gpio113", "gpio114", "gpio115", "gpio116";
function = "pri_mi2s";
drive-strength = <8>;
bias-disable;
};
ext_mclk_tlmm_lines_sus: mclk-lines-off-pins {
pins = "gpio116";
function = "pri_mi2s";
drive-strength = <2>;
bias-disable;
};
drive-strength = <2>;
bias-disable;
};
/* secondary Mi2S */
ext-sec-tlmm-lines-state {
ext_sec_tlmm_lines_act: tlmm-lines-on-pins {
pins = "gpio112", "gpio117", "gpio118", "gpio119";
function = "sec_mi2s";
pri_mi2s_ws_default: mi2s-pri-ws-default-state {
pins = "gpio110";
function = "pri_mi2s_ws";
drive-strength = <8>;
bias-disable;
};
ext_sec_tlmm_lines_sus: tlmm-lines-off-pins {
pins = "gpio112", "gpio117", "gpio118", "gpio119";
function = "sec_mi2s";
drive-strength = <2>;
bias-disable;
};
drive-strength = <8>;
bias-disable;
};
cdc_dmic_lines_act: cdc-dmic-lines-on-state {
pri_mi2s_ws_sleep: mi2s-pri-ws-sleep-state {
pins = "gpio110";
function = "pri_mi2s_ws";
drive-strength = <2>;
bias-disable;
};
pri_mi2s_mclk_default: mi2s-pri-mclk-default-state {
pins = "gpio116";
function = "pri_mi2s";
drive-strength = <8>;
bias-disable;
};
pri_mi2s_mclk_sleep: mi2s-pri-mclk-sleep-state {
pins = "gpio116";
function = "pri_mi2s";
drive-strength = <2>;
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;
};
cdc_dmic_default: cdc-dmic-default-state {
clk-pins {
pins = "gpio0";
function = "dmic0_clk";
@@ -476,7 +470,8 @@
drive-strength = <8>;
};
};
cdc_dmic_lines_sus: cdc-dmic-lines-off-state {
cdc_dmic_sleep: cdc-dmic-sleep-state {
clk-pins {
pins = "gpio0";
function = "dmic0_clk";

159
arch/arm64/boot/dts/qcom/msm8939.dtsi
View File

@@ -969,7 +969,37 @@
bias-disable;
};
cdc_pdm_lines_default: pdm-lines-default-state {
cdc_dmic_default: cdc-dmic-default-state {
clk-pins {
pins = "gpio0";
function = "dmic0_clk";
drive-strength = <8>;
};
data-pins {
pins = "gpio1";
function = "dmic0_data";
drive-strength = <8>;
};
};
cdc_dmic_sleep: cdc-dmic-sleep-state {
clk-pins {
pins = "gpio0";
function = "dmic0_clk";
drive-strength = <2>;
bias-disable;
};
data-pins {
pins = "gpio1";
function = "dmic0_data";
drive-strength = <2>;
bias-disable;
};
};
cdc_pdm_default: cdc-pdm-default-state {
pins = "gpio63", "gpio64", "gpio65", "gpio66",
"gpio67", "gpio68";
function = "cdc_pdm0";
@@ -977,7 +1007,7 @@
bias-disable;
};
cdc_pdm_lines_sleep: pdm-lines-suspend-state {
cdc_pdm_sleep: cdc-pdm-sleep-state {
pins = "gpio63", "gpio64", "gpio65", "gpio66",
"gpio67", "gpio68";
function = "cdc_pdm0";
@@ -985,99 +1015,60 @@
bias-pull-down;
};
cdc_dmic_lines_act: cdc-dmic-lines-on-state {
clk-pins {
pins = "gpio0";
function = "dmic0_clk";
drive-strength = <8>;
};
data-pins {
pins = "gpio1";
function = "dmic0_data";
drive-strength = <8>;
};
pri_mi2s_default: mi2s-pri-default-state {
pins = "gpio113", "gpio114", "gpio115", "gpio116";
function = "pri_mi2s";
drive-strength = <8>;
bias-disable;
};
cdc_dmic_lines_sus: cdc-dmic-lines-off-state {
clk-pins {
pins = "gpio0";
function = "dmic0_clk";
drive-strength = <2>;
bias-disable;
};
data-pins {
pins = "gpio1";
function = "dmic0_data";
drive-strength = <2>;
bias-disable;
};
pri_mi2s_sleep: mi2s-pri-sleep-state {
pins = "gpio113", "gpio114", "gpio115", "gpio116";
function = "pri_mi2s";
drive-strength = <2>;
bias-disable;
};
ext-mclk-tlmm-lines-state {
ext_mclk_tlmm_lines_act: mclk-lines-on-pins {
pins = "gpio116";
function = "pri_mi2s";
drive-strength = <8>;
bias-disable;
};
ext_mclk_tlmm_lines_sus: mclk-lines-off-pins {
pins = "gpio116";
function = "pri_mi2s";
drive-strength = <2>;
bias-disable;
};
pri_mi2s_mclk_default: mi2s-pri-mclk-default-state {
pins = "gpio116";
function = "pri_mi2s";
drive-strength = <8>;
bias-disable;
};
ext-pri-tlmm-lines-state {
ext_pri_tlmm_lines_act: ext-pa-on-pins {
pins = "gpio113", "gpio114", "gpio115", "gpio116";
function = "pri_mi2s";
drive-strength = <8>;
bias-disable;
};
ext_pri_tlmm_lines_sus: ext-pa-off-pins {
pins = "gpio113", "gpio114", "gpio115", "gpio116";
function = "pri_mi2s";
drive-strength = <2>;
bias-disable;
};
pri_mi2s_mclk_sleep: mi2s-pri-mclk-sleep-state {
pins = "gpio116";
function = "pri_mi2s";
drive-strength = <2>;
bias-disable;
};
ext-pri-ws-line-state {
ext_pri_ws_act: ext-pa-on-pins {
pins = "gpio110";
function = "pri_mi2s_ws";
drive-strength = <8>;
bias-disable;
};
ext_pri_ws_sus: ext-pa-off-pins {
pins = "gpio110";
function = "pri_mi2s_ws";
drive-strength = <2>;
bias-disable;
};
pri_mi2s_ws_default: mi2s-pri-ws-default-state {
pins = "gpio110";
function = "pri_mi2s_ws";
drive-strength = <8>;
bias-disable;
};
/* secondary Mi2S */
ext-sec-tlmm-lines-state {
ext_sec_tlmm_lines_act: tlmm-lines-on-pins {
pins = "gpio112", "gpio117", "gpio118", "gpio119";
function = "sec_mi2s";
drive-strength = <8>;
bias-disable;
};
pri_mi2s_ws_sleep: mi2s-pri-ws-sleep-state {
pins = "gpio110";
function = "pri_mi2s_ws";
drive-strength = <2>;
bias-disable;
};
ext_sec_tlmm_lines_sus: tlmm-lines-off-pins {
pins = "gpio112", "gpio117", "gpio118", "gpio119";
function = "sec_mi2s";
drive-strength = <2>;
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 {