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

diff --git a/arch/arm64/boot/dts/qcom/apq8016-sbc.dts b/arch/arm64/boot/dts/qcom/apq8016-sbc.dts
index b8537fe576a8b5ca2ceb2cf3dffd21dfb1f4ee7c..23e3b86186acdbe8290790d2a230c88de65ce194 100644 (file)
--- a/arch/arm64/boot/dts/qcom/apq8016-sbc.dts
+++ b/arch/arm64/boot/dts/qcom/apq8016-sbc.dts
@@ -370,18 +370,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>;
 
        cd-gpios = <&tlmm 38 GPIO_ACTIVE_LOW>;
 };

diff --git a/arch/arm64/boot/dts/qcom/apq8039-t2.dts b/arch/arm64/boot/dts/qcom/apq8039-t2.dts
index e783b0af355e1cbfeb85f2eb37dc75a621a63628..107795bf7e5c2f5f852a577a04a5022cb76d9cbc 100644 (file)
--- a/arch/arm64/boot/dts/qcom/apq8039-t2.dts
+++ b/arch/arm64/boot/dts/qcom/apq8039-t2.dts
@@ -253,9 +253,6 @@
 };
 
 &sdhc_1 {
-       pinctrl-names = "default", "sleep";
-       pinctrl-0 = <&sdc1_default_state>;
-       pinctrl-1 = <&sdc1_sleep_state>;
        status = "okay";
 };
 

diff --git a/arch/arm64/boot/dts/qcom/msm8916-acer-a1-724.dts b/arch/arm64/boot/dts/qcom/msm8916-acer-a1-724.dts
index 9846584daf647f912f09f860ee89796f80331dc0..5ad49fe999dba5f103a467e08afe6871504895d2 100644 (file)
--- a/arch/arm64/boot/dts/qcom/msm8916-acer-a1-724.dts
+++ b/arch/arm64/boot/dts/qcom/msm8916-acer-a1-724.dts
@@ -133,17 +133,13 @@
 };
 
 &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>;
 

diff --git a/arch/arm64/boot/dts/qcom/msm8916-alcatel-idol347.dts b/arch/arm64/boot/dts/qcom/msm8916-alcatel-idol347.dts
index 4ad7d36cf35063d3fd25c036e02a3d313ea34911..1c43f3d6a0b4b63160690ce2711a7baf32ebeaff 100644 (file)
--- a/arch/arm64/boot/dts/qcom/msm8916-alcatel-idol347.dts
+++ b/arch/arm64/boot/dts/qcom/msm8916-alcatel-idol347.dts
@@ -171,18 +171,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>;
 
        cd-gpios = <&tlmm 38 GPIO_ACTIVE_LOW>;
 };

diff --git a/arch/arm64/boot/dts/qcom/msm8916-asus-z00l.dts b/arch/arm64/boot/dts/qcom/msm8916-asus-z00l.dts
index 33ca4e157cd593016dcf2b9630bdf13d9d1d8d3f..92f695481769216eae316d4fa4ba3d4457020fed 100644 (file)
--- a/arch/arm64/boot/dts/qcom/msm8916-asus-z00l.dts
+++ b/arch/arm64/boot/dts/qcom/msm8916-asus-z00l.dts
@@ -139,10 +139,6 @@
 
 &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 @@
        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>;
 };
 

diff --git a/arch/arm64/boot/dts/qcom/msm8916-gplus-fl8005a.dts b/arch/arm64/boot/dts/qcom/msm8916-gplus-fl8005a.dts
index 0d387d9507c33e9dad38c2300f48593c0671f703..f4dbc515c47adba3cb52a092915831d87ffdacea 100644 (file)
--- a/arch/arm64/boot/dts/qcom/msm8916-gplus-fl8005a.dts
+++ b/arch/arm64/boot/dts/qcom/msm8916-gplus-fl8005a.dts
@@ -128,16 +128,12 @@
 };
 
 &sdhc_1 {
-       pinctrl-0 = <&sdc1_clk_on &sdc1_cmd_on &sdc1_data_on>;
-       pinctrl-1 = <&sdc1_clk_off &sdc1_cmd_off &sdc1_data_off>;
-       pinctrl-names = "default", "sleep";
-
        status = "okay";
 };
 
 &sdhc_2 {
-       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>;
        pinctrl-names = "default", "sleep";
 
        cd-gpios = <&tlmm 38 GPIO_ACTIVE_LOW>;

diff --git a/arch/arm64/boot/dts/qcom/msm8916-huawei-g7.dts b/arch/arm64/boot/dts/qcom/msm8916-huawei-g7.dts
index 39be7b6b1695c6b153616300751f565079298b61..abd409f10cfed6842f60d7fdb52e890cc14bfa0c 100644 (file)
--- 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>.

diff --git a/arch/arm64/boot/dts/qcom/msm8916-longcheer-l8150.dts b/arch/arm64/boot/dts/qcom/msm8916-longcheer-l8150.dts
index 9560ba632c6fb8b3683535662fd456d25493f627..97262b8519b36c90a4be37ad50021822dc4e0c49 100644 (file)
--- a/arch/arm64/boot/dts/qcom/msm8916-longcheer-l8150.dts
+++ b/arch/arm64/boot/dts/qcom/msm8916-longcheer-l8150.dts
@@ -242,19 +242,10 @@
 
 &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>;
-       pinctrl-1 = <&sdc2_clk_off &sdc2_cmd_off &sdc2_data_off>;
-
        non-removable;
 };
 

diff --git a/arch/arm64/boot/dts/qcom/msm8916-longcheer-l8910.dts b/arch/arm64/boot/dts/qcom/msm8916-longcheer-l8910.dts
index 04e598a436cb3b5750e912cbe2c4e91e4572cfbf..9757182fba3e64b970d5e35592dd3ab20c6a4e1a 100644 (file)
--- a/arch/arm64/boot/dts/qcom/msm8916-longcheer-l8910.dts
+++ b/arch/arm64/boot/dts/qcom/msm8916-longcheer-l8910.dts
@@ -125,18 +125,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>;
 
        cd-gpios = <&tlmm 38 GPIO_ACTIVE_LOW>;
 };

diff --git a/arch/arm64/boot/dts/qcom/msm8916-pins.dtsi b/arch/arm64/boot/dts/qcom/msm8916-pins.dtsi
index c2149bcf53c424c5e665c771847a7b102e1e13fa..cbf0f3d311af05aebda71597a091823babef5bcc 100644 (file)
--- 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;

diff --git a/arch/arm64/boot/dts/qcom/msm8916-samsung-a2015-common.dtsi b/arch/arm64/boot/dts/qcom/msm8916-samsung-a2015-common.dtsi
index 3c145a0aac99b668867c8bb6dc91824bcf423abc..019bf73178fa603db76f58c3a7e63c4f55f1f762 100644 (file)
--- a/arch/arm64/boot/dts/qcom/msm8916-samsung-a2015-common.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8916-samsung-a2015-common.dtsi
@@ -263,18 +263,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>;
 
        cd-gpios = <&tlmm 38 GPIO_ACTIVE_LOW>;
 };

diff --git a/arch/arm64/boot/dts/qcom/msm8916-samsung-gt5-common.dtsi b/arch/arm64/boot/dts/qcom/msm8916-samsung-gt5-common.dtsi
index 057ce62c03055422e70a05ccab9aab3cc742748b..7943bb619116309137082c1b40b6520ec53ddc4f 100644 (file)
--- a/arch/arm64/boot/dts/qcom/msm8916-samsung-gt5-common.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8916-samsung-gt5-common.dtsi
@@ -135,16 +135,12 @@
 };
 
 &sdhc_1 {
-       pinctrl-0 = <&sdc1_clk_on &sdc1_cmd_on &sdc1_data_on>;
-       pinctrl-1 = <&sdc1_clk_off &sdc1_cmd_off &sdc1_data_off>;
-       pinctrl-names = "default", "sleep";
-
        status = "okay";
 };
 
 &sdhc_2 {
-       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>;
        pinctrl-names = "default", "sleep";
 
        cd-gpios = <&tlmm 38 GPIO_ACTIVE_LOW>;

diff --git a/arch/arm64/boot/dts/qcom/msm8916-samsung-j5-common.dtsi b/arch/arm64/boot/dts/qcom/msm8916-samsung-j5-common.dtsi
index 36233a31b98be89834d10e19b0051f062bb4c92e..f4fd5d72b28bcec028c115a1cb7651efc1c4b4d8 100644 (file)
--- a/arch/arm64/boot/dts/qcom/msm8916-samsung-j5-common.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8916-samsung-j5-common.dtsi
@@ -97,18 +97,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>;
 
        cd-gpios = <&tlmm 38 GPIO_ACTIVE_LOW>;
 };

diff --git a/arch/arm64/boot/dts/qcom/msm8916-samsung-serranove.dts b/arch/arm64/boot/dts/qcom/msm8916-samsung-serranove.dts
index 3637e7d80d0a053a882a10e44472a111f2bda322..15dc246e84e2bdeffcf11b9b5da0813990633676 100644 (file)
--- a/arch/arm64/boot/dts/qcom/msm8916-samsung-serranove.dts
+++ b/arch/arm64/boot/dts/qcom/msm8916-samsung-serranove.dts
@@ -276,19 +276,10 @@
 
 &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>;
-       pinctrl-1 = <&sdc2_clk_off &sdc2_cmd_off &sdc2_data_off>;
-
        non-removable;
 
        /*

diff --git a/arch/arm64/boot/dts/qcom/msm8916-ufi.dtsi b/arch/arm64/boot/dts/qcom/msm8916-ufi.dtsi
index dafa5bd823289343a8804ad38dbcbcf32cf3924d..004a129a2ee2b1f1e7d04f46715b5799e5d8aae6 100644 (file)
--- a/arch/arm64/boot/dts/qcom/msm8916-ufi.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8916-ufi.dtsi
@@ -101,10 +101,6 @@
 };
 
 &sdhc_1 {
-       pinctrl-0 = <&sdc1_clk_on &sdc1_cmd_on &sdc1_data_on>;
-       pinctrl-1 = <&sdc1_clk_off &sdc1_cmd_off &sdc1_data_off>;
-       pinctrl-names = "default", "sleep";
-
        status = "okay";
 };
 

diff --git a/arch/arm64/boot/dts/qcom/msm8916-wingtech-wt88047.dts b/arch/arm64/boot/dts/qcom/msm8916-wingtech-wt88047.dts
index 733917531218cef5d691432d1c1e421a6c11327b..c94d36b3865179de1f1b8da343893f520376840a 100644 (file)
--- a/arch/arm64/boot/dts/qcom/msm8916-wingtech-wt88047.dts
+++ b/arch/arm64/boot/dts/qcom/msm8916-wingtech-wt88047.dts
@@ -173,19 +173,10 @@
 
 &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>;
-       pinctrl-1 = <&sdc2_clk_off &sdc2_cmd_off &sdc2_data_off>;
-
        non-removable;
 };
 

diff --git a/arch/arm64/boot/dts/qcom/msm8916.dtsi b/arch/arm64/boot/dts/qcom/msm8916.dtsi
index cc5d3cf647213586e5e8faa7f8f60a60763eef81..d777a4559d1db7aad6ecd67c84472a4a6fad8510 100644 (file)
--- a/arch/arm64/boot/dts/qcom/msm8916.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8916.dtsi
@@ -1561,6 +1561,9 @@
                                 <&gcc GCC_SDCC1_APPS_CLK>,
                                 <&xo_board>;
                        clock-names = "iface", "core", "xo";
+                       pinctrl-0 = <&sdc1_default>;
+                       pinctrl-1 = <&sdc1_sleep>;
+                       pinctrl-names = "default", "sleep";
                        mmc-ddr-1_8v;
                        bus-width = <8>;
                        non-removable;
@@ -1579,6 +1582,9 @@
                                 <&gcc GCC_SDCC2_APPS_CLK>,
                                 <&xo_board>;
                        clock-names = "iface", "core", "xo";
+                       pinctrl-0 = <&sdc2_default>;
+                       pinctrl-1 = <&sdc2_sleep>;
+                       pinctrl-names = "default", "sleep";
                        bus-width = <4>;
                        status = "disabled";
                };

diff --git a/arch/arm64/boot/dts/qcom/msm8939-sony-xperia-kanuti-tulip.dts b/arch/arm64/boot/dts/qcom/msm8939-sony-xperia-kanuti-tulip.dts
index 80e4f0a6eea1c8403e5cebc026a91f268be7b4df..a9df8dab5481f8980649e3ad2f4eacdb567fbed6 100644 (file)
--- a/arch/arm64/boot/dts/qcom/msm8939-sony-xperia-kanuti-tulip.dts
+++ b/arch/arm64/boot/dts/qcom/msm8939-sony-xperia-kanuti-tulip.dts
@@ -158,15 +158,12 @@
 };
 
 &sdhc_1 {
-       pinctrl-0 = <&sdc1_default_state>;
-       pinctrl-1 = <&sdc1_sleep_state>;
-       pinctrl-names = "default", "sleep";
        status = "okay";
 };
 
 &sdhc_2 {
-       pinctrl-0 = <&sdc2_default_state &sdc2_cd_default>;
-       pinctrl-1 = <&sdc2_sleep_state &sdc2_cd_default>;
+       pinctrl-0 = <&sdc2_default &sdc2_cd_default>;
+       pinctrl-1 = <&sdc2_sleep &sdc2_cd_default>;
        pinctrl-names = "default", "sleep";
        cd-gpios = <&tlmm 38 GPIO_ACTIVE_HIGH>;
        status = "okay";

diff --git a/arch/arm64/boot/dts/qcom/msm8939.dtsi b/arch/arm64/boot/dts/qcom/msm8939.dtsi
index 2cbd4baa9b959f49b0534fd9ba7995f6e64e9f4f..1f79444bc250cf775ed912ffbf4b9a18617fbb74 100644 (file)
--- a/arch/arm64/boot/dts/qcom/msm8939.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8939.dtsi
@@ -1080,7 +1080,7 @@
                                };
                        };
 
-                       sdc1_default_state: sdc1-default-state {
+                       sdc1_default: sdc1-default-state {
                                clk-pins {
                                        pins = "sdc1_clk";
                                        bias-disable;
@@ -1100,7 +1100,7 @@
                                };
                        };
 
-                       sdc1_sleep_state: sdc1-sleep-state {
+                       sdc1_sleep: sdc1-sleep-state {
                                clk-pins {
                                        pins = "sdc1_clk";
                                        bias-disable;
@@ -1120,7 +1120,7 @@
                                };
                        };
 
-                       sdc2_default_state: sdc2-default-state {
+                       sdc2_default: sdc2-default-state {
                                clk-pins {
                                        pins = "sdc2_clk";
                                        bias-disable;
@@ -1140,7 +1140,7 @@
                                };
                        };
 
-                       sdc2_sleep_state: sdc2-sleep-state {
+                       sdc2_sleep: sdc2-sleep-state {
                                clk-pins {
                                        pins = "sdc2_clk";
                                        bias-disable;
@@ -1632,6 +1632,9 @@
                                 <&rpmcc RPM_SMD_XO_CLK_SRC>;
                        clock-names = "iface", "core", "xo";
                        resets = <&gcc GCC_SDCC1_BCR>;
+                       pinctrl-0 = <&sdc1_default>;
+                       pinctrl-1 = <&sdc1_sleep>;
+                       pinctrl-names = "default", "sleep";
                        mmc-ddr-1_8v;
                        bus-width = <8>;
                        non-removable;
@@ -1651,6 +1654,9 @@
                                 <&rpmcc RPM_SMD_XO_CLK_SRC>;
                        clock-names =  "iface", "core", "xo";
                        resets = <&gcc GCC_SDCC2_BCR>;
+                       pinctrl-0 = <&sdc2_default>;
+                       pinctrl-1 = <&sdc2_sleep>;
+                       pinctrl-names = "default", "sleep";
                        bus-width = <4>;
                        status = "disabled";
                };