Skip to contentSkip to conversation

Add support for the OnePlus 6 and 6T

PATCH New Caleb Connolly 4 participants 7 messages Jan 14, 2021 – Feb 26, 2021

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH v4 1/1 Add support for the OnePlus 6 and 6T

* Display panels and hardware accelerated graphics
* Touch screen with Synaptics RMI4
* Modem and other remoteprocessors
* WiFi / Bluetooth
* Buttons
* USB gadget mode

Both devices are almost identical, but use different display panels, with the 6T lacking a headphone jack and notification LED.

The panel driver for the devices is already upstream, however the driver doesn't seem to work on the 6T, all other functionality does however. I'm in the process of obtaining a device to get the driver fixed ASAP.
---
Changes since v1
* Remove unused pinctrl nodes
* Properly model touchscreen vio supply GPIO
* Improve comments
* Remove bq27541 battery as it doesn't work

Changes since v2
* Specify clock frequency of touchscreen i2c
* Remove tri-state-key nodes until a better solution can be found
* Cleaned up pinctrl nodes
* Remove unused regulators
* Improve formatting
* Address Bjorn's comments
* Remove unused regulators

Changes since v3
* Address Konrad's comments
---
Caleb Connolly (2):
arm64: dts: sdm845: add oneplus6/6t devices
dt-bindings: Document bindings for new SDM845 devices

Documentation/devicetree/bindings/arm/qcom.yaml  |   5 +
.../devicetree/bindings/vendor-prefixes.yaml     |   2 +
arch/arm64/boot/dts/qcom/Makefile                |   2 +
.../boot/dts/qcom/sdm845-oneplus-common.dtsi     | 622 +++++++++++++++++++
.../boot/dts/qcom/sdm845-oneplus-enchilada.dts   |  19 +
.../boot/dts/qcom/sdm845-oneplus-fajita.dts      |  23 +
6 files changed, 673 insertions(+)
#1 lore raw

PATCH v4 1/2 arm64: dts: sdm845: add oneplus6/6t devices

Add initial support for the OnePlus 6 (enchilada) and 6T (fajita) based on the sdm845-mtp DT with the following functionality:

* Touch
* Display
* GPU
* Wlan and Bluetooth
* USB peripheral mode
* Remoteproc

---
 arch/arm64/boot/dts/qcom/Makefile             |   2 +
 .../boot/dts/qcom/sdm845-oneplus-common.dtsi  | 622 ++++++++++++++++++
 .../dts/qcom/sdm845-oneplus-enchilada.dts     |  19 +
 .../boot/dts/qcom/sdm845-oneplus-fajita.dts   |  23 +
 4 files changed, 666 insertions(+)
 create mode 100644 arch/arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi
 create mode 100644 arch/arm64/boot/dts/qcom/sdm845-oneplus-enchilada.dts
 create mode 100644 arch/arm64/boot/dts/qcom/sdm845-oneplus-fajita.dts
arch/arm64/boot/dts/qcom/Makefile +2 -0
index 5113fac80b7a..b8934ec4e640 100644
@@ -43,6 +43,8 @@ dtb-$(CONFIG_ARCH_QCOM)	+= sdm845-cheza-r2.dtb
 dtb-$(CONFIG_ARCH_QCOM)	+= sdm845-cheza-r3.dtb
 dtb-$(CONFIG_ARCH_QCOM)	+= sdm845-db845c.dtb
 dtb-$(CONFIG_ARCH_QCOM)	+= sdm845-mtp.dtb
+dtb-$(CONFIG_ARCH_QCOM)	+= sdm845-oneplus-enchilada.dtb
+dtb-$(CONFIG_ARCH_QCOM)	+= sdm845-oneplus-fajita.dtb
 dtb-$(CONFIG_ARCH_QCOM)	+= sdm845-xiaomi-beryllium.dtb
 dtb-$(CONFIG_ARCH_QCOM)	+= sdm850-lenovo-yoga-c630.dtb
 dtb-$(CONFIG_ARCH_QCOM)	+= sm8150-hdk.dtb
arch/arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi new file +622 -0

622 lines not on this page · raw message

arch/arm64/boot/dts/qcom/sdm845-oneplus-enchilada.dts new file +19 -0
new file mode 100644
index 000000000000..72842c887617
@@ -0,0 +1,19 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * SDM845 OnePlus 6 (enchilada) device tree.
+ *
+ * Copyright (c) 2020, The Linux Foundation. All rights reserved.
+ */
+
+#include "sdm845-oneplus-common.dtsi"
+
+/ {
+	model = "OnePlus 6";
+	compatible = "oneplus,enchilada", "qcom,sdm845";
+};
+
+&display_panel {
+	status = "okay";
+
+	compatible = "samsung,sofef00";
+};
arch/arm64/boot/dts/qcom/sdm845-oneplus-fajita.dts new file +23 -0
new file mode 100644
index 000000000000..969b36dc9e2c
@@ -0,0 +1,23 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * SDM845 OnePlus 6T (fajita) device tree.
+ *
+ * Copyright (c) 2020, The Linux Foundation. All rights reserved.
+ */
+
+#include "sdm845-oneplus-common.dtsi"
+
+/ {
+	model = "OnePlus 6T";
+	compatible = "oneplus,fajita", "qcom,sdm845";
+};
+
+&display_panel {
+	status = "okay";
+
+	compatible = "samsung,s6e3fc2x01";
+};
+
+&rmi4_f12 {
+	touchscreen-y-mm = <148>;
+};
Signature · 1 line
2.29.2
Reviewed-by on v4 1/2
#2 lore raw

Re: [PATCH v4 1/2] arm64: dts: sdm845: add oneplus6/6t devices

Please move gpio-keys before reserved-memory to keep things sorted.

arch/arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi line 246

Quoted 6 lines
arch/arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi new file +6 -0
+		vreg_l25a_3p3: ldo25 {
+			regulator-min-microvolt = <3300000>;
+			regulator-max-microvolt = <3312000>;
+			regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
+		};
+		vdda_mipi_dsi0_1p2:

Add a newline between the "};" and "vdda_mipi_dsi0_1p2:" to keep it consistent.

After that, you can add:

#3 lore raw

Re: [PATCH v4 1/2] arm64: dts: sdm845: add oneplus6/6t devices

Quoted 4 lines · Konrad Dybcio

Please move gpio-keys before reserved-memory to keep things sorted.

Quoted 10 lines

arch/arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi line 246

Quoted 6 lines
arch/arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi new file +6 -0
+		vreg_l25a_3p3: ldo25 {
+			regulator-min-microvolt = <3300000>;
+			regulator-max-microvolt = <3312000>;
+			regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
+		};
+		vdda_mipi_dsi0_1p2:

Add a newline between the "};" and "vdda_mipi_dsi0_1p2:" to keep it consistent.

Done and merged.

Quoted 5 lines

After that, you can add:

Thanks for the patch and the review!

Regards,
Bjorn

#4 lore raw

PATCH v4 2/2 dt-bindings: Document bindings for new SDM845 devices

In reply to Caleb Connolly

Document compatible bindings for the new OnePlus 6/6T devices.

---
 Documentation/devicetree/bindings/arm/qcom.yaml        | 5 +++++
 Documentation/devicetree/bindings/vendor-prefixes.yaml | 2 ++
 2 files changed, 7 insertions(+)
Documentation/devicetree/bindings/arm/qcom.yaml +5 -0
index c97d4a580f47..f3ad845754d3 100644
@@ -171,6 +171,11 @@ properties:
           - enum:
               - qcom,ipq6018-cp01-c1
           - const: qcom,ipq6018
+      - items:
+          - enum:
+              - oneplus,enchilada
+              - oneplus,fajita
+          - const: qcom,sdm845
 
       - items:
           - enum:
Documentation/devicetree/bindings/vendor-prefixes.yaml +2 -0
index 041ae90b0d8f..aff440b18293 100644
@@ -800,6 +800,8 @@ patternProperties:
     description: OLIMEX Ltd.
   "^olpc,.*":
     description: One Laptop Per Child
+  "^oneplus,.*":
+    description: One Plus Technology (Shenzhen) Co., Ltd.
   "^onion,.*":
     description: Onion Corporation
   "^onnn,.*":
Signature · 1 line
2.29.2
maintainer Acked-by on v4 2/2
#5 lore raw

Re: [PATCH v4 2/2] dt-bindings: Document bindings for new SDM845 devices

Quoted 8 lines · Caleb Connolly

Document compatible bindings for the new OnePlus 6/6T devices.

---
 Documentation/devicetree/bindings/arm/qcom.yaml        | 5 +++++
 Documentation/devicetree/bindings/vendor-prefixes.yaml | 2 ++
 2 files changed, 7 insertions(+)
#6 lore raw

Re: [PATCH v4 2/2] dt-bindings: Document bindings for new SDM845 devices

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256

Hi,

Is this patch ready to be merged?

Regards,

Caleb

Quoted 10 lines · Rob Herring
Quoted 8 lines · Caleb Connolly

Document compatible bindings for the new OnePlus 6/6T devices.

---
  Documentation/devicetree/bindings/arm/qcom.yaml        | 5 +++++
  Documentation/devicetree/bindings/vendor-prefixes.yaml | 2 ++
  2 files changed, 7 insertions(+)

-----BEGIN PGP SIGNATURE-----
Version: ProtonMail

wsFmBAEBCAAQBQJgOWIgCRAFgzErGV9ktgAKCRAFgzErGV9ktk+xD/0fKnmh g6DDJRgcIdxgOqGCoZZDjYnuIsl1H89A2lJtoGB8x5Z6sQM6RgffkxWY+D9o P7rhEsSTnRKGaLR+fuSHuhrorafQ2LYAB0LB8R8ngvRGJoFhEEMzGAb3+j/j oBXveVU+bb8S+nQnDOdGZ4sJZ780gEpdm4yVWwwjmbBc2E2fJPgLRAeADcb8 3eG58dizoxtiEWkISIorX9aCVfHLgnGcl3UXumGN8SjKQR0b3tIoJy1heHXZ o0RZj407kYWgj2zl9bO93ki735x7kb5T4cwE1HBO6nxs2BsKJMcDS9Vdo+FQ EDsIfChWxHmSKDzeZCoG45qKBeFLxmqx7TpoJb7mMuHlTtaQxihhMoAefWDi 8AVb0N+IMwV0H1Ma7lnlW2Y71FrY/dVLYbE6wurCR7LYmz1yHZ0Fz5yiT6IO r7dW2BPFcX2Ex0+8OK3OXzgxtncNVxVbfRV/vV6daBe3clfb+73ZZTjHwHna BaGc3ShXLtoTZndb5f+kKW7q3nScOlQmLnlM+Hd05pKp41uzG5qwpE+dVF7R Kz+ekQka7tY8jFQoDE7ChR1+LBcCcwQ8/T+4pie86NeKDGO0NGseRSav1G/0 LJSk+hn/jm7iBDW9de/UKLhCoZAz8JrO95YiNell2G6tB5PdSdYphasS3vzT uy9b/O2m1rv1DeWoUg==
=rBzA
-----END PGP SIGNATURE-----