From: Konrad Dybcio <konrad.dybcio@somainline.org>
To: phone-devel@vger.kernel.org
Cc: ~postmarketos/upstreaming@lists.sr.ht,
martin.botka@somainline.org,
angelogioacchino.delregno@somainline.org,
marijn.suijten@somainline.org,
Konrad Dybcio <konrad.dybcio@somainline.org>,
Andy Gross <agross@kernel.org>,
Bjorn Andersson <bjorn.andersson@linaro.org>,
Amit Kucheria <amitk@kernel.org>, Zhang Rui <rui.zhang@intel.com>,
Daniel Lezcano <daniel.lezcano@linaro.org>,
Rob Herring <robh+dt@kernel.org>,
linux-arm-msm@vger.kernel.org, linux-pm@vger.kernel.org,
devicetree@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH 35/41] arm64: dts: qcom: sdm630-xperia: Retire sdm630-sony-xperia-ganges.dtsi
Date: Fri, 26 Feb 2021 21:04:05 +0100 [thread overview]
Message-ID: <20210226200414.167762-36-konrad.dybcio@somainline.org> (raw)
In-Reply-To: <20210226200414.167762-1-konrad.dybcio@somainline.org>
After further consideration, it is not worth to keep another
separate DTSI, as the differences between Nile and Ganges are
very minimal. Instead, let's just address the minimal differences
between Kirin and Mermaid.
Signed-off-by: Konrad Dybcio <konrad.dybcio@somainline.org>
---
.../qcom/sdm630-sony-xperia-ganges-kirin.dts | 12 +++++-
.../dts/qcom/sdm630-sony-xperia-ganges.dtsi | 40 -------------------
.../sdm630-sony-xperia-nile-discovery.dts | 1 +
.../qcom/sdm630-sony-xperia-nile-pioneer.dts | 1 +
.../qcom/sdm630-sony-xperia-nile-voyager.dts | 1 +
.../dts/qcom/sdm630-sony-xperia-nile.dtsi | 1 -
.../sdm636-sony-xperia-ganges-mermaid.dts | 14 ++++---
7 files changed, 23 insertions(+), 47 deletions(-)
delete mode 100644 arch/arm64/boot/dts/qcom/sdm630-sony-xperia-ganges.dtsi
diff --git a/arch/arm64/boot/dts/qcom/sdm630-sony-xperia-ganges-kirin.dts b/arch/arm64/boot/dts/qcom/sdm630-sony-xperia-ganges-kirin.dts
index 46a7f2b26e6b..aea949265a2d 100644
--- a/arch/arm64/boot/dts/qcom/sdm630-sony-xperia-ganges-kirin.dts
+++ b/arch/arm64/boot/dts/qcom/sdm630-sony-xperia-ganges-kirin.dts
@@ -5,9 +5,19 @@
/dts-v1/;
-#include "sdm630-sony-xperia-ganges.dtsi"
+#include "sdm630.dtsi"
+#include "sdm630-sony-xperia-nile.dtsi"
/ {
model = "Sony Xperia 10";
compatible = "sony,kirin-row", "qcom,sdm630";
+
+ chosen {
+ framebuffer@9d400000 {
+ reg = <0 0x9d400000 0 (2520 * 1080 * 4)>;
+ height = <2520>;
+ };
+ };
};
+
+/delete-node/ &vreg_l18a_1v8;
diff --git a/arch/arm64/boot/dts/qcom/sdm630-sony-xperia-ganges.dtsi b/arch/arm64/boot/dts/qcom/sdm630-sony-xperia-ganges.dtsi
deleted file mode 100644
index cf2e8b5d60e8..000000000000
--- a/arch/arm64/boot/dts/qcom/sdm630-sony-xperia-ganges.dtsi
+++ /dev/null
@@ -1,40 +0,0 @@
-// SPDX-License-Identifier: BSD-3-Clause
-/*
- * Copyright (c) 2020, Martin Botka
- */
-
-/dts-v1/;
-
-/* Ganges is very similar to Nile, but
- * there are some differences that will need
- * to be addresed when more peripherals are
- * enabled upstream. Hence the separate DTSI.
- */
-#include "sdm630-sony-xperia-nile.dtsi"
-
-/ {
- chosen {
- framebuffer@9d400000 {
- reg = <0 0x9d400000 0 (2520 * 1080 * 4)>;
- height = <2520>;
- };
- };
-
- /* Yes, this is intentional.
- * Ganges devices only use gpio-keys for
- * Volume Down, but currently there's an
- * issue with it that has to be resolved.
- * Until then, let's not make the kernel panic
- */
- /delete-node/ gpio-keys;
-
- soc {
-
- i2c@c175000 {
- status = "okay";
-
- /* Novatek touchscreen */
- };
- };
-
-};
diff --git a/arch/arm64/boot/dts/qcom/sdm630-sony-xperia-nile-discovery.dts b/arch/arm64/boot/dts/qcom/sdm630-sony-xperia-nile-discovery.dts
index 8fca0b69fa01..c574e430ba67 100644
--- a/arch/arm64/boot/dts/qcom/sdm630-sony-xperia-nile-discovery.dts
+++ b/arch/arm64/boot/dts/qcom/sdm630-sony-xperia-nile-discovery.dts
@@ -5,6 +5,7 @@
/dts-v1/;
+#include "sdm630.dtsi"
#include "sdm630-sony-xperia-nile.dtsi"
/ {
diff --git a/arch/arm64/boot/dts/qcom/sdm630-sony-xperia-nile-pioneer.dts b/arch/arm64/boot/dts/qcom/sdm630-sony-xperia-nile-pioneer.dts
index 90dcd4ebaaed..a93ff3ab1b6d 100644
--- a/arch/arm64/boot/dts/qcom/sdm630-sony-xperia-nile-pioneer.dts
+++ b/arch/arm64/boot/dts/qcom/sdm630-sony-xperia-nile-pioneer.dts
@@ -5,6 +5,7 @@
/dts-v1/;
+#include "sdm630.dtsi"
#include "sdm630-sony-xperia-nile.dtsi"
/ {
diff --git a/arch/arm64/boot/dts/qcom/sdm630-sony-xperia-nile-voyager.dts b/arch/arm64/boot/dts/qcom/sdm630-sony-xperia-nile-voyager.dts
index fae5f1bb6834..59a679c205e0 100644
--- a/arch/arm64/boot/dts/qcom/sdm630-sony-xperia-nile-voyager.dts
+++ b/arch/arm64/boot/dts/qcom/sdm630-sony-xperia-nile-voyager.dts
@@ -5,6 +5,7 @@
/dts-v1/;
+#include "sdm630.dtsi"
#include "sdm630-sony-xperia-nile.dtsi"
/ {
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 0da6dddd5768..deadd8f6ff3a 100644
--- a/arch/arm64/boot/dts/qcom/sdm630-sony-xperia-nile.dtsi
+++ b/arch/arm64/boot/dts/qcom/sdm630-sony-xperia-nile.dtsi
@@ -5,7 +5,6 @@
* <angelogioacchino.delregno@somainline.org>
*/
-#include "sdm630.dtsi"
#include "pm660.dtsi"
#include "pm660l.dtsi"
#include <dt-bindings/gpio/gpio.h>
diff --git a/arch/arm64/boot/dts/qcom/sdm636-sony-xperia-ganges-mermaid.dts b/arch/arm64/boot/dts/qcom/sdm636-sony-xperia-ganges-mermaid.dts
index 7c0830e6a48c..bba1c2bce213 100644
--- a/arch/arm64/boot/dts/qcom/sdm636-sony-xperia-ganges-mermaid.dts
+++ b/arch/arm64/boot/dts/qcom/sdm636-sony-xperia-ganges-mermaid.dts
@@ -5,16 +5,20 @@
/dts-v1/;
-/* Mermaid uses sdm636, but it's different ever so slightly
- * that we can ignore it for the time being. Sony also commonizes
- * the Ganges platform as a whole in downstream kernels.
- */
-#include "sdm630-sony-xperia-ganges.dtsi"
+#include "sdm630-sony-xperia-ganges-kirin.dts"
+#include "sdm636.dtsi"
/ {
model = "Sony Xperia 10 Plus";
compatible = "sony,mermaid-row", "qcom,sdm636";
+ /* SDM636 v1 */
qcom,msm-id = <345 0>;
qcom,pmic-id = <0x1001b 0x101011a 0x00 0x00 0x1001b 0x201011a 0x00 0x00 0x1001b 0x102001a 0x00 0x00>;
};
+
+&sdc2_state_on {
+ pinconf-clk {
+ drive-strength = <14>;
+ };
+};
--
2.30.1
next prev parent reply other threads:[~2021-02-26 20:18 UTC|newest]
Thread overview: 50+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-02-26 20:03 [PATCH 00/41] SDM630/636/660/Nile&Ganges DT feature enablement Konrad Dybcio
2021-02-26 20:03 ` [PATCH 01/41] arm64: dts: qcom: sdm630: Rewrite memory map Konrad Dybcio
2021-02-26 20:03 ` [PATCH 02/41] arm64: dts: qcom: sdm630: Add RPMPD nodes Konrad Dybcio
2021-02-26 20:03 ` [PATCH 03/41] arm64: dts: qcom: sdm630: Add MMCC node Konrad Dybcio
2021-02-26 20:03 ` [PATCH 04/41] arm64: dts: qcom: sdm630: Add interconnect provider nodes Konrad Dybcio
2021-02-26 20:03 ` [PATCH 05/41] arm64: dts: qcom: sdm630: Add MDSS nodes Konrad Dybcio
2021-02-26 20:03 ` [PATCH 06/41] arm64: dts: qcom: sdm630: Fix intc reg indentation Konrad Dybcio
2021-02-26 20:19 ` Konrad Dybcio
2021-02-26 20:03 ` [PATCH 07/41] arm64: dts: qcom: sdm630: Add qfprom subnodes Konrad Dybcio
2021-02-26 20:03 ` [PATCH 08/41] arm64: dts: qcom: sdm630: Add USB configuration Konrad Dybcio
2021-02-26 20:03 ` [PATCH 09/41] arm64: dts: qcom: sdm630: Fix TLMM node and pinctrl configuration Konrad Dybcio
2021-02-26 20:03 ` [PATCH 10/41] arm64: dts: qcom: sdm630: Add SDHCI2 node Konrad Dybcio
2021-02-26 20:03 ` [PATCH 11/41] arm64: dts: qcom: sdm630: Add interconnect and opp table to sdhc_1 Konrad Dybcio
2021-02-26 20:03 ` [PATCH 12/41] arm64: dts: qcom: sdm630: Add GPU Clock Controller node Konrad Dybcio
2021-02-26 20:03 ` [PATCH 13/41] arm64: dts: qcom: sdm630: Add clocks and power domains to SMMU nodes Konrad Dybcio
2021-02-26 20:03 ` [PATCH 14/41] arm64: dts: qcom: sdm630: Add qcom,adreno-smmu compatible Konrad Dybcio
2021-02-26 20:03 ` [PATCH 15/41] arm64: dts: qcom: sdm630: Add TSENS node Konrad Dybcio
2021-03-08 17:23 ` Rob Herring
2021-02-26 20:03 ` [PATCH 16/41] arm64: dts: qcom: sdm630: Add modem/ADSP SMP2P nodes Konrad Dybcio
2021-02-26 20:03 ` [PATCH 17/41] arm64: dts: qcom: sdm630: Add thermal-zones configuration Konrad Dybcio
2021-02-26 20:03 ` [PATCH 18/41] arm64: dts: qcom: sdm630: Add ADSP remoteproc configuration Konrad Dybcio
2021-02-26 20:03 ` [PATCH 19/41] arm64: dts: qcom: sdm630: Raise tcsr_mutex_regs size Konrad Dybcio
2021-02-26 20:03 ` [PATCH 20/41] arm64: dts: qcom: sdm630: Add Adreno 508 GPU configuration Konrad Dybcio
2021-02-26 21:09 ` Konrad Dybcio
2021-02-26 20:03 ` [PATCH 21/41] arm64: dts: qcom: pm660: Support SPMI regulators on PMIC sid 1 Konrad Dybcio
2021-02-26 20:03 ` [PATCH 22/41] arm64: dts: qcom: pm660l: Add WLED support Konrad Dybcio
2021-02-26 20:03 ` [PATCH 23/41] arm64: dts: qcom: pm660l: Support SPMI regulators on PMIC sid 3 Konrad Dybcio
2021-02-26 20:03 ` [PATCH 24/41] arm64: dts: qcom: pm660(l): Add VADC and temp alarm nodes Konrad Dybcio
2021-02-26 20:03 ` [PATCH 25/41] arm64: dts: qcom: sdm660: Make the DTS an overlay on top of 630 Konrad Dybcio
2021-02-26 21:08 ` Konrad Dybcio
2021-02-26 20:03 ` [PATCH 26/41] arm64: dts: qcom: Add device tree for SDM636 Konrad Dybcio
2021-02-26 21:08 ` Konrad Dybcio
2021-02-26 20:03 ` [PATCH 27/41] arm64: dts: qcom: sdm630: Add IMEM node Konrad Dybcio
2021-02-26 20:03 ` [PATCH 28/41] arm64: dts: qcom: sdm630: Configure the camera subsystem Konrad Dybcio
2021-02-26 20:03 ` [PATCH 29/41] arm64: dts: qcom: sdm660: Add required nodes for DSI1 Konrad Dybcio
2021-02-26 20:04 ` [PATCH 30/41] arm64: dts: qcom: sdm630-xperia-nile: Add all RPM and fixed regulators Konrad Dybcio
2021-02-26 20:04 ` [PATCH 31/41] arm64: dts: qcom: sdm630-nile: Use &labels Konrad Dybcio
2021-02-26 20:04 ` [PATCH 32/41] arm64: dts: qcom: sdm630-nile: Add USB Konrad Dybcio
2021-02-26 20:04 ` [PATCH 33/41] arm64: dts: qcom: sdm630-nile: Add Volume up key Konrad Dybcio
2021-02-26 20:04 ` [PATCH 34/41] arm64: dts: qcom: sdm630-nile: Configure WCN3990 Bluetooth Konrad Dybcio
2021-02-27 10:40 ` Konrad Dybcio
2021-02-27 11:02 ` Martin Botka
2021-03-08 23:07 ` Bjorn Andersson
2021-02-26 20:04 ` Konrad Dybcio [this message]
2021-02-26 20:04 ` [PATCH 36/41] arm64: dts: qcom: sdm630-nile: Add Synaptics touchscreen Konrad Dybcio
2021-02-26 20:04 ` [PATCH 37/41] arm64: dts: qcom: sdm630-nile: Specify ADSP firmware name Konrad Dybcio
2021-02-26 20:04 ` [PATCH 38/41] arm64: dts: qcom: sdm630-nile: Enable uSD card slot Konrad Dybcio
2021-02-26 20:04 ` [PATCH 39/41] arm64: dts: qcom: sdm630-nile: Remove gpio-keys autorepeat Konrad Dybcio
2021-02-26 20:04 ` [PATCH 40/41] arm64: dts: qcom: sdm630: Add I2C functions to I2C pins Konrad Dybcio
2021-02-26 20:04 ` [PATCH 41/41] arm64: dts: qcom: sdm630: Add DMA to I2C hosts Konrad Dybcio
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210226200414.167762-36-konrad.dybcio@somainline.org \
--to=konrad.dybcio@somainline.org \
--cc=agross@kernel.org \
--cc=amitk@kernel.org \
--cc=angelogioacchino.delregno@somainline.org \
--cc=bjorn.andersson@linaro.org \
--cc=daniel.lezcano@linaro.org \
--cc=devicetree@vger.kernel.org \
--cc=linux-arm-msm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
--cc=marijn.suijten@somainline.org \
--cc=martin.botka@somainline.org \
--cc=phone-devel@vger.kernel.org \
--cc=robh+dt@kernel.org \
--cc=rui.zhang@intel.com \
--cc=~postmarketos/upstreaming@lists.sr.ht \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).