diff options
| author | Stephan Gerhold <stephan@gerhold.net> | 2023-05-30 09:15:23 +0200 |
|---|---|---|
| committer | Bjorn Andersson <andersson@kernel.org> | 2023-06-13 16:27:47 -0700 |
| commit | c943e4c58b2ffb0dcd497f8b12f284f5e8fc477e (patch) | |
| tree | 3ffaa8c123370239fdc9de321d587f33069a8974 /arch/arm64/boot/dts/qcom/msm8916-pins.dtsi | |
| parent | dfbda20dabaa1f284abd550035db5887384c8e4c (diff) | |
arm64: dts: qcom: msm8916/39: Consolidate SDC pinctrl
MSM8939 has the SDC pinctrl consolidated in two &sdcN_default and
&sdcN_sleep states, while MSM8916 has all pins separated. Make this
consistent by consolidating them for MSM8916 well.
Use this as a chance to define default pinctrl in the SoC.dtsi and only
let boards that add additional definitions (such as cd-gpios) override it.
For MSM8939 just make the label consistent with the other pinctrl
definitions (they do not have a _state suffix).
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-2-11f540b51c93@gerhold.net
Diffstat (limited to 'arch/arm64/boot/dts/qcom/msm8916-pins.dtsi')
| -rw-r--r-- | arch/arm64/boot/dts/qcom/msm8916-pins.dtsi | 74 |
1 files changed, 34 insertions, 40 deletions
diff --git a/arch/arm64/boot/dts/qcom/msm8916-pins.dtsi b/arch/arm64/boot/dts/qcom/msm8916-pins.dtsi index c2149bcf53c4..cbf0f3d311af 100644 --- a/arch/arm64/boot/dts/qcom/msm8916-pins.dtsi +++ b/arch/arm64/boot/dts/qcom/msm8916-pins.dtsi @@ -290,44 +290,41 @@ bias-disable; }; - pmx-sdc1-clk-state { - sdc1_clk_on: clk-on-pins { + sdc1_default: sdc1-default-state { + clk-pins { pins = "sdc1_clk"; bias-disable; drive-strength = <16>; }; - sdc1_clk_off: clk-off-pins { - pins = "sdc1_clk"; - - bias-disable; - drive-strength = <2>; - }; - }; - - pmx-sdc1-cmd-state { - sdc1_cmd_on: cmd-on-pins { + cmd-pins { pins = "sdc1_cmd"; bias-pull-up; drive-strength = <10>; }; - sdc1_cmd_off: cmd-off-pins { - pins = "sdc1_cmd"; + data-pins { + pins = "sdc1_data"; bias-pull-up; - drive-strength = <2>; + drive-strength = <10>; }; }; - pmx-sdc1-data-state { - sdc1_data_on: data-on-pins { - pins = "sdc1_data"; + sdc1_sleep: sdc1-sleep-state { + clk-pins { + pins = "sdc1_clk"; + + bias-disable; + drive-strength = <2>; + }; + cmd-pins { + pins = "sdc1_cmd"; bias-pull-up; - drive-strength = <10>; + drive-strength = <2>; }; - sdc1_data_off: data-off-pins { + data-pins { pins = "sdc1_data"; bias-pull-up; @@ -335,44 +332,41 @@ }; }; - pmx-sdc2-clk-state { - sdc2_clk_on: clk-on-pins { + sdc2_default: sdc2-default-state { + clk-pins { pins = "sdc2_clk"; bias-disable; drive-strength = <16>; }; - sdc2_clk_off: clk-off-pins { - pins = "sdc2_clk"; - - bias-disable; - drive-strength = <2>; - }; - }; - - pmx-sdc2-cmd-state { - sdc2_cmd_on: cmd-on-pins { + cmd-pins { pins = "sdc2_cmd"; bias-pull-up; drive-strength = <10>; }; - sdc2_cmd_off: cmd-off-pins { - pins = "sdc2_cmd"; + data-pins { + pins = "sdc2_data"; bias-pull-up; - drive-strength = <2>; + drive-strength = <10>; }; }; - pmx-sdc2-data-state { - sdc2_data_on: data-on-pins { - pins = "sdc2_data"; + sdc2_sleep: sdc2-sleep-state { + clk-pins { + pins = "sdc2_clk"; + + bias-disable; + drive-strength = <2>; + }; + cmd-pins { + pins = "sdc2_cmd"; bias-pull-up; - drive-strength = <10>; + drive-strength = <2>; }; - sdc2_data_off: data-off-pins { + data-pins { pins = "sdc2_data"; bias-pull-up; |