* [PATCH 1/3] arm64: dts: qcom: sm6125: Move sdc2 pinctrl from seine-pdx201 to sm6125
@ 2022-05-08 10:03 Marijn Suijten
2022-05-08 10:03 ` [PATCH 2/3] arm64: dts: qcom: sm6125: Append -state suffix to pinctrl nodes Marijn Suijten
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Marijn Suijten @ 2022-05-08 10:03 UTC (permalink / raw)
To: phone-devel
Cc: ~postmarketos/upstreaming, AngeloGioacchino Del Regno,
Konrad Dybcio, Martin Botka, Marijn Suijten, Andy Gross,
Bjorn Andersson, Rob Herring, Krzysztof Kozlowski, linux-arm-msm,
devicetree, linux-kernel
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>
---
.../qcom/sm6125-sony-xperia-seine-pdx201.dts | 34 +++++--------------
arch/arm64/boot/dts/qcom/sm6125.dtsi | 24 +++++++++++--
2 files changed, 30 insertions(+), 28 deletions(-)
diff --git a/arch/arm64/boot/dts/qcom/sm6125-sony-xperia-seine-pdx201.dts b/arch/arm64/boot/dts/qcom/sm6125-sony-xperia-seine-pdx201.dts
index 871ccbba445b..4916e6c8b625 100644
--- a/arch/arm64/boot/dts/qcom/sm6125-sony-xperia-seine-pdx201.dts
+++ b/arch/arm64/boot/dts/qcom/sm6125-sony-xperia-seine-pdx201.dts
@@ -91,8 +91,16 @@ &hsusb_phy1 {
&sdc2_state_off {
sd-cd {
pins = "gpio98";
+ drive-strength = <2>;
bias-disable;
+ };
+};
+
+&sdc2_state_on {
+ sd-cd {
+ pins = "gpio98";
drive-strength = <2>;
+ bias-pull-up;
};
};
@@ -102,32 +110,6 @@ &sdhc_1 {
&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 {
diff --git a/arch/arm64/boot/dts/qcom/sm6125.dtsi b/arch/arm64/boot/dts/qcom/sm6125.dtsi
index e81b2a7794fb..3fadf5196c4d 100644
--- a/arch/arm64/boot/dts/qcom/sm6125.dtsi
+++ b/arch/arm64/boot/dts/qcom/sm6125.dtsi
@@ -389,20 +389,40 @@ tlmm: pinctrl@500000 {
sdc2_state_off: sdc2-off {
clk {
pins = "sdc2_clk";
- bias-disable;
drive-strength = <2>;
+ bias-disable;
};
cmd {
pins = "sdc2_cmd";
+ drive-strength = <2>;
bias-pull-up;
+ };
+
+ data {
+ pins = "sdc2_data";
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;
- drive-strength = <2>;
};
};
};
--
2.36.0
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH 2/3] arm64: dts: qcom: sm6125: Append -state suffix to pinctrl nodes
2022-05-08 10:03 [PATCH 1/3] arm64: dts: qcom: sm6125: Move sdc2 pinctrl from seine-pdx201 to sm6125 Marijn Suijten
@ 2022-05-08 10:03 ` Marijn Suijten
2022-05-08 10:03 ` [PATCH 3/3] arm64: dts: qcom: sm6125: Add DLL/DDR configuration on SDHCI 1/2 Marijn Suijten
2022-07-07 2:31 ` [PATCH 1/3] arm64: dts: qcom: sm6125: Move sdc2 pinctrl from seine-pdx201 to sm6125 Bjorn Andersson
2 siblings, 0 replies; 4+ messages in thread
From: Marijn Suijten @ 2022-05-08 10:03 UTC (permalink / raw)
To: phone-devel
Cc: ~postmarketos/upstreaming, AngeloGioacchino Del Regno,
Konrad Dybcio, Martin Botka, Marijn Suijten, Andy Gross,
Bjorn Andersson, Rob Herring, Krzysztof Kozlowski, linux-arm-msm,
devicetree, linux-kernel
According to qcom,sm6125-pinctrl.yaml all nodes inside the tlmm must be
suffixed by -state:
qcom/sm6125-sony-xperia-seine-pdx201.dtb: pinctrl@500000: 'sdc2-off', 'sdc2-on' do not match any of the regexes: '-state$', 'pinctrl-[0-9]+'
The label names have been updated to match, going from sdc2_state_X to
sdc2_X_state.
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>
---
.../boot/dts/qcom/sm6125-sony-xperia-seine-pdx201.dts | 4 ++--
arch/arm64/boot/dts/qcom/sm6125.dtsi | 8 ++++----
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/arch/arm64/boot/dts/qcom/sm6125-sony-xperia-seine-pdx201.dts b/arch/arm64/boot/dts/qcom/sm6125-sony-xperia-seine-pdx201.dts
index 4916e6c8b625..038970c0b68e 100644
--- a/arch/arm64/boot/dts/qcom/sm6125-sony-xperia-seine-pdx201.dts
+++ b/arch/arm64/boot/dts/qcom/sm6125-sony-xperia-seine-pdx201.dts
@@ -88,7 +88,7 @@ &hsusb_phy1 {
status = "okay";
};
-&sdc2_state_off {
+&sdc2_off_state {
sd-cd {
pins = "gpio98";
drive-strength = <2>;
@@ -96,7 +96,7 @@ sd-cd {
};
};
-&sdc2_state_on {
+&sdc2_on_state {
sd-cd {
pins = "gpio98";
drive-strength = <2>;
diff --git a/arch/arm64/boot/dts/qcom/sm6125.dtsi b/arch/arm64/boot/dts/qcom/sm6125.dtsi
index 3fadf5196c4d..e601b9bfdc04 100644
--- a/arch/arm64/boot/dts/qcom/sm6125.dtsi
+++ b/arch/arm64/boot/dts/qcom/sm6125.dtsi
@@ -386,7 +386,7 @@ tlmm: pinctrl@500000 {
interrupt-controller;
#interrupt-cells = <2>;
- sdc2_state_off: sdc2-off {
+ sdc2_off_state: sdc2-off-state {
clk {
pins = "sdc2_clk";
drive-strength = <2>;
@@ -406,7 +406,7 @@ data {
};
};
- sdc2_state_on: sdc2-on {
+ sdc2_on_state: sdc2-on-state {
clk {
pins = "sdc2_clk";
drive-strength = <16>;
@@ -490,8 +490,8 @@ sdhc_2: sdhci@4784000 {
<&xo_board>;
clock-names = "iface", "core", "xo";
- pinctrl-0 = <&sdc2_state_on>;
- pinctrl-1 = <&sdc2_state_off>;
+ pinctrl-0 = <&sdc2_on_state>;
+ pinctrl-1 = <&sdc2_off_state>;
pinctrl-names = "default", "sleep";
power-domains = <&rpmpd SM6125_VDDCX>;
--
2.36.0
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH 3/3] arm64: dts: qcom: sm6125: Add DLL/DDR configuration on SDHCI 1/2
2022-05-08 10:03 [PATCH 1/3] arm64: dts: qcom: sm6125: Move sdc2 pinctrl from seine-pdx201 to sm6125 Marijn Suijten
2022-05-08 10:03 ` [PATCH 2/3] arm64: dts: qcom: sm6125: Append -state suffix to pinctrl nodes Marijn Suijten
@ 2022-05-08 10:03 ` Marijn Suijten
2022-07-07 2:31 ` [PATCH 1/3] arm64: dts: qcom: sm6125: Move sdc2 pinctrl from seine-pdx201 to sm6125 Bjorn Andersson
2 siblings, 0 replies; 4+ messages in thread
From: Marijn Suijten @ 2022-05-08 10:03 UTC (permalink / raw)
To: phone-devel
Cc: ~postmarketos/upstreaming, AngeloGioacchino Del Regno,
Konrad Dybcio, Martin Botka, Marijn Suijten, Andy Gross,
Bjorn Andersson, Rob Herring, Krzysztof Kozlowski, linux-arm-msm,
devicetree, linux-kernel
These config values have been extracted from CodeLinaro's most recent
trinket/sm6125 tag:
https://git.codelinaro.org/clo/la/kernel/msm-4.14/-/blob/LA.UM.9.11.r1-05600-NICOBAR.QSSI12.0/arch/arm64/boot/dts/qcom/trinket.dtsi
Signed-off-by: Marijn Suijten <marijn.suijten@somainline.org>
---
arch/arm64/boot/dts/qcom/sm6125.dtsi | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/arch/arm64/boot/dts/qcom/sm6125.dtsi b/arch/arm64/boot/dts/qcom/sm6125.dtsi
index e601b9bfdc04..c9e4706c1785 100644
--- a/arch/arm64/boot/dts/qcom/sm6125.dtsi
+++ b/arch/arm64/boot/dts/qcom/sm6125.dtsi
@@ -471,6 +471,9 @@ sdhc_1: sdhci@4744000 {
power-domains = <&rpmpd SM6125_VDDCX>;
+ qcom,dll-config = <0x000f642c>;
+ qcom,ddr-config = <0x80040873>;
+
bus-width = <8>;
non-removable;
status = "disabled";
@@ -496,6 +499,9 @@ sdhc_2: sdhci@4784000 {
power-domains = <&rpmpd SM6125_VDDCX>;
+ qcom,dll-config = <0x0007642c>;
+ qcom,ddr-config = <0x80040873>;
+
bus-width = <4>;
status = "disabled";
};
--
2.36.0
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH 1/3] arm64: dts: qcom: sm6125: Move sdc2 pinctrl from seine-pdx201 to sm6125
2022-05-08 10:03 [PATCH 1/3] arm64: dts: qcom: sm6125: Move sdc2 pinctrl from seine-pdx201 to sm6125 Marijn Suijten
2022-05-08 10:03 ` [PATCH 2/3] arm64: dts: qcom: sm6125: Append -state suffix to pinctrl nodes Marijn Suijten
2022-05-08 10:03 ` [PATCH 3/3] arm64: dts: qcom: sm6125: Add DLL/DDR configuration on SDHCI 1/2 Marijn Suijten
@ 2022-07-07 2:31 ` Bjorn Andersson
2 siblings, 0 replies; 4+ messages in thread
From: Bjorn Andersson @ 2022-07-07 2:31 UTC (permalink / raw)
To: phone-devel, Marijn Suijten
Cc: linux-arm-msm, AngeloGioacchino Del Regno,
~postmarketos/upstreaming, Konrad Dybcio, Andy Gross,
Martin Botka, devicetree, Rob Herring, Krzysztof Kozlowski,
linux-kernel
On Sun, 8 May 2022 12:03:33 +0200, Marijn Suijten wrote:
> 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.
>
> [...]
Applied, thanks!
[1/3] arm64: dts: qcom: sm6125: Move sdc2 pinctrl from seine-pdx201 to sm6125
commit: 6990640a93ba4e76dd62ca3ea1082a7354db09d7
[2/3] arm64: dts: qcom: sm6125: Append -state suffix to pinctrl nodes
commit: cbfb5668aece448877fa7826cde81c9d06f4a4ac
[3/3] arm64: dts: qcom: sm6125: Add DLL/DDR configuration on SDHCI 1/2
commit: e5de51e264e147d4bf882a464fb89501e9c87e14
Best regards,
--
Bjorn Andersson <bjorn.andersson@linaro.org>
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2022-07-07 2:31 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-05-08 10:03 [PATCH 1/3] arm64: dts: qcom: sm6125: Move sdc2 pinctrl from seine-pdx201 to sm6125 Marijn Suijten
2022-05-08 10:03 ` [PATCH 2/3] arm64: dts: qcom: sm6125: Append -state suffix to pinctrl nodes Marijn Suijten
2022-05-08 10:03 ` [PATCH 3/3] arm64: dts: qcom: sm6125: Add DLL/DDR configuration on SDHCI 1/2 Marijn Suijten
2022-07-07 2:31 ` [PATCH 1/3] arm64: dts: qcom: sm6125: Move sdc2 pinctrl from seine-pdx201 to sm6125 Bjorn Andersson
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).