diff options
| author | Stephan Gerhold <stephan@gerhold.net> | 2023-05-30 10:15:23 +0300 |
|---|---|---|
| committer | Bjorn Andersson <andersson@kernel.org> | 2023-06-14 02:27:47 +0300 |
| commit | c943e4c58b2ffb0dcd497f8b12f284f5e8fc477e (patch) | |
| tree | 3ffaa8c123370239fdc9de321d587f33069a8974 /arch/arm64/boot/dts/qcom/msm8916-huawei-g7.dts | |
| parent | dfbda20dabaa1f284abd550035db5887384c8e4c (diff) | |
| download | linux-c943e4c58b2ffb0dcd497f8b12f284f5e8fc477e.tar.xz | |
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-huawei-g7.dts')
| -rw-r--r-- | arch/arm64/boot/dts/qcom/msm8916-huawei-g7.dts | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/arch/arm64/boot/dts/qcom/msm8916-huawei-g7.dts b/arch/arm64/boot/dts/qcom/msm8916-huawei-g7.dts index 39be7b6b1695..abd409f10cfe 100644 --- a/arch/arm64/boot/dts/qcom/msm8916-huawei-g7.dts +++ b/arch/arm64/boot/dts/qcom/msm8916-huawei-g7.dts @@ -260,18 +260,14 @@ &sdhc_1 { status = "okay"; - - pinctrl-names = "default", "sleep"; - pinctrl-0 = <&sdc1_clk_on &sdc1_cmd_on &sdc1_data_on>; - pinctrl-1 = <&sdc1_clk_off &sdc1_cmd_off &sdc1_data_off>; }; &sdhc_2 { status = "okay"; pinctrl-names = "default", "sleep"; - pinctrl-0 = <&sdc2_clk_on &sdc2_cmd_on &sdc2_data_on &sdc2_cd_default>; - pinctrl-1 = <&sdc2_clk_off &sdc2_cmd_off &sdc2_data_off &sdc2_cd_default>; + pinctrl-0 = <&sdc2_default &sdc2_cd_default>; + pinctrl-1 = <&sdc2_sleep &sdc2_cd_default>; /* * The Huawei device tree sets cd-gpios = <&tlmm 38 GPIO_ACTIVE_HIGH>. |