iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

arm64: dts: qcom: sm6125: Move sdc2 pinctrl from seine-pdx201 to sm6125

Browse Source 
[ Upstream commit 6990640a93ba4e76dd62ca3ea1082a7354db09d7 ]

Both the sdc2-on and sdc2-off pinctrl nodes are used by the
sdhci@4784000 node in sm6125.dtsi.  Surprisingly sdc2-off is defined in
sm6125, yet its sdc2-on counterpart is only defined in board-specific DT
for the Sony Seine PDX201 board/device resulting in an "undefined label
&sdc2_state_on" error if sm6125.dtsi were included elsewhere.
This sm6125 base dtsi should not rely on externally defined labels; the
properties referencing it should then also be written externally.
Since the sdc2-on pin configuration is board-independent just like
sdc2-off, move it from seine-pdx201.dts into sm6125.dtsi.

The SDCard-detect pin (gpio98) is however board-specific, and remains as
an overwrite in seine-pdx201.dts for both the on and off state.

As a drive-by cleanup, reorder bias- and drive-strength properties.

Fixes: cff4bbaf2a2d ("arm64: dts: qcom: Add support for SM6125")
Fixes: 82e1783890b7 ("arm64: dts: qcom: sm6125: Add support for Sony Xperia 10II")
Signed-off-by: Marijn Suijten <marijn.suijten@somainline.org>
Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
Link: https://lore.kernel.org/r/20220508100336.127176-1-marijn.suijten@somainline.org
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Marijn Suijten 2022-05-08 12:03:33 +02:00 committed by Greg Kroah-Hartman
parent 579ea4a0fa
commit eb007ca7cb
2 changed files with 32 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
arch/arm64/boot/dts/qcom/sm6125-sony-xperia-seine-pdx201.dts
View File

@ -91,8 +91,16 @@
&sdc2_state_off {
sd-cd {
pins = "gpio98";
bias-disable;
drive-strength = <2>;
bias-disable;
};
};
&sdc2_state_on {
sd-cd {
pins = "gpio98";
drive-strength = <2>;
bias-pull-up;
};
};
@ -102,32 +110,6 @@
&tlmm {
gpio-reserved-ranges = <22 2>, <28 6>;
sdc2_state_on: sdc2-on {
clk {
pins = "sdc2_clk";
bias-disable;
drive-strength = <16>;
};
cmd {
pins = "sdc2_cmd";
bias-pull-up;
drive-strength = <10>;
};
data {
pins = "sdc2_data";
bias-pull-up;
drive-strength = <10>;
};
sd-cd {
pins = "gpio98";
bias-pull-up;
drive-strength = <2>;
};
};
};
&usb3 {

26
arch/arm64/boot/dts/qcom/sm6125.dtsi
View File

@ -389,20 +389,40 @@
sdc2_state_off: sdc2-off {
clk {
pins = "sdc2_clk";
bias-disable;
drive-strength = <2>;
bias-disable;
};
cmd {
pins = "sdc2_cmd";
bias-pull-up;
drive-strength = <2>;
bias-pull-up;
};
data {
pins = "sdc2_data";
bias-pull-up;
drive-strength = <2>;
bias-pull-up;
};
};
sdc2_state_on: sdc2-on {
clk {
pins = "sdc2_clk";
drive-strength = <16>;
bias-disable;
};
cmd {
pins = "sdc2_cmd";
drive-strength = <10>;
bias-pull-up;
};
data {
pins = "sdc2_data";
drive-strength = <10>;
bias-pull-up;
};
};
};