Commit c943e4c5 authored by Stephan Gerhold's avatar Stephan Gerhold Committed by Bjorn Andersson
Browse files

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: 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-2-11f540b51c93@gerhold.net
parent dfbda20d

arch/arm64/boot/dts/qcom/apq8016-sbc.dts

+2 −6
Original line number Diff line number Diff line
@@ -370,18 +370,14 @@ pm8916_l17: l17 { 


&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>;



	cd-gpios = <&tlmm 38 GPIO_ACTIVE_LOW>;

};

arch/arm64/boot/dts/qcom/apq8039-t2.dts

+0 −3
Original line number Diff line number Diff line
@@ -253,9 +253,6 @@ pm8916_l18: l18 { 
};



&sdhc_1 {

	pinctrl-names = "default", "sleep";

	pinctrl-0 = <&sdc1_default_state>;

	pinctrl-1 = <&sdc1_sleep_state>;

	status = "okay";

};

arch/arm64/boot/dts/qcom/msm8916-acer-a1-724.dts

+2 −6
Original line number Diff line number Diff line
@@ -133,17 +133,13 @@ &pm8916_vib { 
};



&sdhc_1 {

	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>;



	status = "okay";

};



&sdhc_2 {

	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>;



	cd-gpios = <&tlmm 38 GPIO_ACTIVE_HIGH>;

arch/arm64/boot/dts/qcom/msm8916-alcatel-idol347.dts

+2 −6
Original line number Diff line number Diff line
@@ -171,18 +171,14 @@ &pm8916_vib { 


&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>;



	cd-gpios = <&tlmm 38 GPIO_ACTIVE_LOW>;

};

arch/arm64/boot/dts/qcom/msm8916-asus-z00l.dts

+2 −6
Original line number Diff line number Diff line
@@ -139,10 +139,6 @@ pm8916_l17: l17 { 


&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 {
@@ -150,8 +146,8 @@ &sdhc_2 { 
	vmmc-supply = <&reg_sd_vmmc>;



	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>;

	cd-gpios = <&tlmm 38 GPIO_ACTIVE_LOW>;

};