Commit eaba4166 authored by Yang Xiwen's avatar Yang Xiwen Committed by Bjorn Andersson

arm64: dts: qcom: msm8916-ufi: Fix sim card selection pinctrl

The previous commit mistakenly introduced sim_ctrl_default as pinctrl,
this is incorrect, the interface for sim card selection varies between
different devices and should not be placed in the dtsi.

This commit selects external SIM card slot for ufi001c as default.
uf896 selects the correct SIM card slot automatically, thus does not need
this pinctrl node.

Fixes: faf69431 ("arm64: dts: qcom: msm8916-thwc: Add initial device trees")
Signed-off-by: default avatarYang Xiwen <forbidden405@foxmail.com>
Signed-off-by: default avatarBjorn Andersson <andersson@kernel.org>
Link: https://lore.kernel.org/r/tencent_7036BCA256055D05F8C49D86DF7F0E2D1A05@qq.com
parent 052750a4
...@@ -33,7 +33,3 @@ &button_default { ...@@ -33,7 +33,3 @@ &button_default {
&gpio_leds_default { &gpio_leds_default {
pins = "gpio81", "gpio82", "gpio83"; pins = "gpio81", "gpio82", "gpio83";
}; };
&sim_ctrl_default {
pins = "gpio1", "gpio2";
};
...@@ -25,6 +25,11 @@ &led_b { ...@@ -25,6 +25,11 @@ &led_b {
gpios = <&msmgpio 20 GPIO_ACTIVE_HIGH>; gpios = <&msmgpio 20 GPIO_ACTIVE_HIGH>;
}; };
&mpss {
pinctrl-0 = <&sim_ctrl_default>;
pinctrl-names = "default";
};
&button_default { &button_default {
pins = "gpio37"; pins = "gpio37";
bias-pull-down; bias-pull-down;
...@@ -34,6 +39,25 @@ &gpio_leds_default { ...@@ -34,6 +39,25 @@ &gpio_leds_default {
pins = "gpio20", "gpio21", "gpio22"; pins = "gpio20", "gpio21", "gpio22";
}; };
&sim_ctrl_default { /* This selects the external SIM card slot by default */
pins = "gpio1", "gpio2"; &msmgpio {
sim_ctrl_default: sim-ctrl-default-state {
esim-sel-pins {
pins = "gpio0", "gpio3";
bias-disable;
output-low;
};
sim-en-pins {
pins = "gpio1";
bias-disable;
output-low;
};
sim-sel-pins {
pins = "gpio2";
bias-disable;
output-high;
};
};
}; };
...@@ -92,9 +92,6 @@ &gcc { ...@@ -92,9 +92,6 @@ &gcc {
}; };
&mpss { &mpss {
pinctrl-0 = <&sim_ctrl_default>;
pinctrl-names = "default";
status = "okay"; status = "okay";
}; };
...@@ -240,11 +237,4 @@ gpio_leds_default: gpio-leds-default-state { ...@@ -240,11 +237,4 @@ gpio_leds_default: gpio-leds-default-state {
drive-strength = <2>; drive-strength = <2>;
bias-disable; bias-disable;
}; };
sim_ctrl_default: sim-ctrl-default-state {
function = "gpio";
drive-strength = <2>;
bias-disable;
output-low;
};
}; };
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment