[<prev] [next>] [day] [month] [year] [list]
Message-Id: <20210728222542.54269-31-konrad.dybcio@somainline.org>
Date: Thu, 29 Jul 2021 00:25:33 +0200
From: Konrad Dybcio <konrad.dybcio@...ainline.org>
To: ~postmarketos/upstreaming@...ts.sr.ht
Cc: martin.botka@...ainline.org,
angelogioacchino.delregno@...ainline.org,
marijn.suijten@...ainline.org, jamipkettunen@...ainline.org,
Konrad Dybcio <konrad.dybcio@...ainline.org>,
Andy Gross <agross@...nel.org>,
Bjorn Andersson <bjorn.andersson@...aro.org>,
Rob Herring <robh+dt@...nel.org>,
linux-arm-msm@...r.kernel.org, devicetree@...r.kernel.org,
linux-kernel@...r.kernel.org
Subject: [PATCH 30/39] arm64: dts: qcom: sdm630-nile: Use &labels
Refer to nodes by their labels to match the current
convention.
Signed-off-by: Konrad Dybcio <konrad.dybcio@...ainline.org>
---
.../dts/qcom/sdm630-sony-xperia-nile.dtsi | 61 +++++++++++--------
1 file changed, 35 insertions(+), 26 deletions(-)
diff --git a/arch/arm64/boot/dts/qcom/sdm630-sony-xperia-nile.dtsi b/arch/arm64/boot/dts/qcom/sdm630-sony-xperia-nile.dtsi
index b7f3da0d72e7..34a38bff09b8 100644
--- a/arch/arm64/boot/dts/qcom/sdm630-sony-xperia-nile.dtsi
+++ b/arch/arm64/boot/dts/qcom/sdm630-sony-xperia-nile.dtsi
@@ -5,8 +5,6 @@
* <angelogioacchino.delregno@...ainline.org>
*/
-/dts-v1/;
-
#include "sdm630.dtsi"
#include "pm660.dtsi"
#include "pm660l.dtsi"
@@ -150,40 +148,38 @@ removed_region@...00000 {
no-map;
};
};
+};
- soc {
- sdhci@...4000 {
- status = "okay";
+&blsp_i2c1 {
+ status = "okay";
- mmc-ddr-1_8v;
- /* SoMC Nile platform's eMMC doesn't support HS200 mode */
- mmc-hs400-1_8v;
- };
+ /* Synaptics touchscreen */
+};
- i2c@...5000 {
- status = "okay";
+&blsp_i2c2 {
+ status = "okay";
- /* Synaptics touchscreen */
- };
+ /* SMB1351 charger */
+};
- i2c@...6000 {
- status = "okay";
+/* I2C3, 4, 5, 7 and 8 are disabled on this board. */
- /* SMB1351 charger */
- };
+&blsp_i2c6 {
+ status = "okay";
- serial@...f000 {
- status = "okay";
- };
+ /* NXP NFC */
+};
- /* I2C3, 4, 5, 7 and 8 are disabled on this board. */
+&blsp1_uart2 {
+ status = "okay";
- i2c@...6000 {
- status = "okay";
+ /* MSM serial console */
+};
- /* NXP NFC */
- };
- };
+&blsp2_uart1 {
+ status = "okay";
+
+ /* HCI Bluetooth */
};
&rpm_requests {
@@ -503,6 +499,19 @@ vreg_l19a_3p3: l19 {
};
};
+&sdhc_1 {
+ status = "okay";
+ supports-cqe;
+
+ /* SoMC Nile platform's eMMC doesn't support HS200 mode */
+ mmc-ddr-1_8v;
+ mmc-hs400-1_8v;
+ mmc-hs400-enhanced-strobe;
+
+ vmmc-supply = <&vreg_l4b_29p5>;
+ vqmmc-supply = <&vreg_l8a_1p8>;
+};
+
&tlmm {
gpio-reserved-ranges = <8 4>;
--
2.32.0
Powered by blists - more mailing lists