* [PATCH 1/2] arm64: dts: qcom: msm8996-tone: Enable SDHCI1
@ 2022-12-10 14:09 Konrad Dybcio
2022-12-10 14:10 ` [PATCH 2/2] arm64: dts: qcom: msm8996-tone: Move status last Konrad Dybcio
2022-12-28 4:36 ` (subset) [PATCH 1/2] arm64: dts: qcom: msm8996-tone: Enable SDHCI1 Bjorn Andersson
0 siblings, 2 replies; 3+ messages in thread
From: Konrad Dybcio @ 2022-12-10 14:09 UTC (permalink / raw
To: linux-arm-msm, andersson, agross, krzysztof.kozlowski
Cc: patches, Konrad Dybcio, Konrad Dybcio, Rob Herring,
Krzysztof Kozlowski, devicetree, linux-kernel
With the recent patch that allowed us to reset the SDHCI controller from
Linux, things started working properly. Enable SDHCI1, and by extension
eMMC. Also, remove the now-useless cmdline SDHCI quirks.
Signed-off-by: Konrad Dybcio <konrad.dybcio@somainline.org>
Signed-off-by: Konrad Dybcio <konrad.dybcio@linaro.org>
---
arch/arm64/boot/dts/qcom/msm8996-sony-xperia-tone.dtsi | 9 ++-------
1 file changed, 2 insertions(+), 7 deletions(-)
diff --git a/arch/arm64/boot/dts/qcom/msm8996-sony-xperia-tone.dtsi b/arch/arm64/boot/dts/qcom/msm8996-sony-xperia-tone.dtsi
index dec361b93cce..c9be32b81d36 100644
--- a/arch/arm64/boot/dts/qcom/msm8996-sony-xperia-tone.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8996-sony-xperia-tone.dtsi
@@ -24,11 +24,7 @@ / {
qcom,board-id = <8 0>;
chosen {
- /*
- * Due to an unknown-for-a-few-years regression,
- * SDHCI only works on MSM8996 in PIO (lame) mode.
- */
- bootargs = "sdhci.debug_quirks=0x40 sdhci.debug_quirks2=0x4 maxcpus=2";
+ bootargs = "maxcpus=2";
};
reserved-memory {
@@ -825,8 +821,7 @@ pm8994_l32: l32 {
};
&sdhc1 {
- /* eMMC doesn't seem to cooperate even in PIO mode.. */
- status = "disabled";
+ status = "okay";
vmmc-supply = <&pm8994_l20>;
vqmmc-supply = <&pm8994_s4>;
--
2.38.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [PATCH 2/2] arm64: dts: qcom: msm8996-tone: Move status last
2022-12-10 14:09 [PATCH 1/2] arm64: dts: qcom: msm8996-tone: Enable SDHCI1 Konrad Dybcio
@ 2022-12-10 14:10 ` Konrad Dybcio
2022-12-28 4:36 ` (subset) [PATCH 1/2] arm64: dts: qcom: msm8996-tone: Enable SDHCI1 Bjorn Andersson
1 sibling, 0 replies; 3+ messages in thread
From: Konrad Dybcio @ 2022-12-10 14:10 UTC (permalink / raw
To: linux-arm-msm, andersson, agross, krzysztof.kozlowski
Cc: patches, Konrad Dybcio, Konrad Dybcio, Rob Herring,
Krzysztof Kozlowski, devicetree, linux-kernel
Align the style with other boards.
Signed-off-by: Konrad Dybcio <konrad.dybcio@linaro.org>
---
.../dts/qcom/msm8996-sony-xperia-tone.dtsi | 26 ++++++++-----------
1 file changed, 11 insertions(+), 15 deletions(-)
diff --git a/arch/arm64/boot/dts/qcom/msm8996-sony-xperia-tone.dtsi b/arch/arm64/boot/dts/qcom/msm8996-sony-xperia-tone.dtsi
index c9be32b81d36..40b28489d3f5 100644
--- a/arch/arm64/boot/dts/qcom/msm8996-sony-xperia-tone.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8996-sony-xperia-tone.dtsi
@@ -100,8 +100,8 @@ wlan_en: wlan-en-1-8v {
};
&blsp1_i2c3 {
- status = "okay";
clock-frequency = <355000>;
+ status = "okay";
tof_sensor: vl53l0x@29 {
compatible = "st,vl53l0x";
@@ -114,15 +114,15 @@ &blsp1_uart2 {
};
&blsp2_i2c5 {
- status = "okay";
clock-frequency = <355000>;
+ status = "okay";
/* FUSB301 USB-C controller */
};
&blsp2_i2c6 {
- status = "okay";
clock-frequency = <355000>;
+ status = "okay";
synaptics@2c {
compatible = "syna,rmi4-i2c";
@@ -179,11 +179,10 @@ &camera2_rst {
};
&hsusb_phy1 {
- status = "okay";
-
vdd-supply = <&pm8994_l28>;
vdda-pll-supply = <&pm8994_l12>;
vdda-phy-dpdm-supply = <&pm8994_l24>;
+ status = "okay";
};
&mmcc {
@@ -191,18 +190,17 @@ &mmcc {
};
&pcie0 {
- status = "okay";
perst-gpios = <&tlmm 35 GPIO_ACTIVE_LOW>;
wake-gpios = <&tlmm 37 GPIO_ACTIVE_HIGH>;
vddpe-3v3-supply = <&wlan_en>;
vdda-supply = <&pm8994_l28>;
+ status = "okay";
};
&pcie_phy {
- status = "okay";
-
vdda-phy-supply = <&pm8994_l28>;
vdda-pll-supply = <&pm8994_l12>;
+ status = "okay";
};
&pm8994_gpios {
@@ -474,8 +472,8 @@ rf-id-mpp-pins {
};
&pm8994_resin {
- status = "okay";
linux,code = <KEY_VOLUMEUP>;
+ status = "okay";
};
&pmi8994_gpios {
@@ -619,9 +617,9 @@ pmi8994_s2: s2 {
};
&pmi8994_wled {
- status = "okay";
default-brightness = <512>;
qcom,num-strings = <3>;
+ status = "okay";
};
&rpm_requests {
@@ -821,20 +819,18 @@ pm8994_l32: l32 {
};
&sdhc1 {
- status = "okay";
-
vmmc-supply = <&pm8994_l20>;
vqmmc-supply = <&pm8994_s4>;
mmc-hs400-1_8v;
mmc-hs200-1_8v;
+ status = "okay";
};
&sdhc2 {
- status = "okay";
-
cd-gpios = <&tlmm 40 GPIO_ACTIVE_HIGH>;
vmmc-supply = <&pm8994_l21>;
vqmmc-supply = <&pm8994_l13>;
+ status = "okay";
};
&tlmm {
@@ -943,8 +939,8 @@ touch_int_sleep: touch-int-sleep-state {
* 6 minutes to wake up (nothing interesting in kernel logs), but then it works as it should.
*/
&usb3 {
- status = "okay";
qcom,select-utmi-as-pipe-clk;
+ status = "okay";
};
&usb3_dwc3 {
--
2.38.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: (subset) [PATCH 1/2] arm64: dts: qcom: msm8996-tone: Enable SDHCI1
2022-12-10 14:09 [PATCH 1/2] arm64: dts: qcom: msm8996-tone: Enable SDHCI1 Konrad Dybcio
2022-12-10 14:10 ` [PATCH 2/2] arm64: dts: qcom: msm8996-tone: Move status last Konrad Dybcio
@ 2022-12-28 4:36 ` Bjorn Andersson
1 sibling, 0 replies; 3+ messages in thread
From: Bjorn Andersson @ 2022-12-28 4:36 UTC (permalink / raw
To: krzysztof.kozlowski, agross, linux-arm-msm, konrad.dybcio
Cc: konrad.dybcio, krzysztof.kozlowski+dt, linux-kernel, robh+dt,
devicetree, patches
On Sat, 10 Dec 2022 15:09:59 +0100, Konrad Dybcio wrote:
> With the recent patch that allowed us to reset the SDHCI controller from
> Linux, things started working properly. Enable SDHCI1, and by extension
> eMMC. Also, remove the now-useless cmdline SDHCI quirks.
>
>
Applied, thanks!
[1/2] arm64: dts: qcom: msm8996-tone: Enable SDHCI1
commit: b860ba9e42538f2a490925121071c215c23d1863
[2/2] arm64: dts: qcom: msm8996-tone: Move status last
commit: 6152ab29a39131328a310b578aae693d3ec74a9d
Best regards,
--
Bjorn Andersson <andersson@kernel.org>
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2022-12-28 4:37 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-12-10 14:09 [PATCH 1/2] arm64: dts: qcom: msm8996-tone: Enable SDHCI1 Konrad Dybcio
2022-12-10 14:10 ` [PATCH 2/2] arm64: dts: qcom: msm8996-tone: Move status last Konrad Dybcio
2022-12-28 4:36 ` (subset) [PATCH 1/2] arm64: dts: qcom: msm8996-tone: Enable SDHCI1 Bjorn Andersson
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.