summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--arch/arm/boot/dts/qcom/Makefile4
-rw-r--r--arch/arm/boot/dts/qcom/apq8096pro-auto-cdp-overlay.dts23
-rw-r--r--arch/arm/boot/dts/qcom/apq8096pro-auto-cdp.dtsi37
-rw-r--r--arch/arm/boot/dts/qcom/apq8096pro-auto.dts23
-rw-r--r--arch/arm/boot/dts/qcom/apq8096pro-auto.dtsi72
-rw-r--r--arch/arm/boot/dts/qcom/msm8996-auto-cdp.dtsi42
-rw-r--r--arch/arm/boot/dts/qcom/msm8996-camera-sensor-auto-cdp.dtsi4
7 files changed, 174 insertions, 31 deletions
diff --git a/arch/arm/boot/dts/qcom/Makefile b/arch/arm/boot/dts/qcom/Makefile
index 2e9249199f85..123bb6b15ef2 100644
--- a/arch/arm/boot/dts/qcom/Makefile
+++ b/arch/arm/boot/dts/qcom/Makefile
@@ -4,7 +4,8 @@ dtbo-$(CONFIG_ARCH_MSM8996) += \
apq8096pro-v1.1-auto-adp-overlay.dtbo \
apq8096pro-v1.1-auto-adp-lite-overlay.dtbo \
msm8996pro-auto-adp-overlay.dtbo \
- msm8996pro-auto-adp-lite-overlay.dtbo
+ msm8996pro-auto-adp-lite-overlay.dtbo \
+ apq8096pro-auto-cdp-overlay.dtbo
msm8996-mtp-overlay.dtbo-base := msm8996pro-v1.1-pmi8996.dtb \
msm8996-v3-pmi8996.dtb \
@@ -13,6 +14,7 @@ apq8096pro-v1.1-auto-adp-overlay.dtbo-base := apq8096pro-v1.1-auto.dtb
apq8096pro-v1.1-auto-adp-lite-overlay.dtbo-base := apq8096pro-v1.1-auto.dtb
msm8996pro-auto-adp-overlay.dtbo-base := msm8996pro-auto.dtb
msm8996pro-auto-adp-lite-overlay.dtbo-base := msm8996pro-auto.dtb
+apq8096pro-auto-cdp-overlay.dtbo-base := apq8096pro-auto.dtb
else
dtb-$(CONFIG_ARCH_MSM8996) += msm8996-v2-pmi8994-cdp.dtb \
msm8996-v2-pmi8994-mtp.dtb \
diff --git a/arch/arm/boot/dts/qcom/apq8096pro-auto-cdp-overlay.dts b/arch/arm/boot/dts/qcom/apq8096pro-auto-cdp-overlay.dts
new file mode 100644
index 000000000000..001a39c02e91
--- /dev/null
+++ b/arch/arm/boot/dts/qcom/apq8096pro-auto-cdp-overlay.dts
@@ -0,0 +1,23 @@
+/* Copyright (c) 2019, The Linux Foundation. All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 and
+ * only version 2 as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ */
+
+/dts-v1/;
+/plugin/;
+
+#include "apq8096pro-auto-cdp.dtsi"
+
+/ {
+ model = "Qualcomm Technologies, Inc. APQ 8096 pro AUTO CDP";
+ compatible = "qcom,apq8096-cdp", "qcom,apq8096", "qcom,cdp";
+ qcom,msm-id = <387 0x10000>, <316 0x10000>;
+ qcom,board-id = <0x03010001 0>;
+};
diff --git a/arch/arm/boot/dts/qcom/apq8096pro-auto-cdp.dtsi b/arch/arm/boot/dts/qcom/apq8096pro-auto-cdp.dtsi
new file mode 100644
index 000000000000..e2bc0918e875
--- /dev/null
+++ b/arch/arm/boot/dts/qcom/apq8096pro-auto-cdp.dtsi
@@ -0,0 +1,37 @@
+/* Copyright (c) 2019, The Linux Foundation. All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 and
+ * only version 2 as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ */
+
+#include <dt-bindings/clock/msm-clocks-8996.h>
+#include "msm8996-pm8994.dtsi"
+#include "msm8996-auto-cdp.dtsi"
+
+&spi_9 {
+ status = "ok";
+ can-controller@0 {
+ compatible = "renesas,rh850";
+ reg = <0>;
+ interrupt-parent = <&tlmm>;
+ interrupts = <122 0>;
+ spi-max-frequency = <5000000>;
+ };
+};
+
+&soc {
+ qcom,msm-thermal {
+ qcom,hotplug-temp = <115>;
+ qcom,hotplug-temp-hysteresis = <25>;
+ qcom,therm-reset-temp = <119>;
+ };
+};
+
+/delete-node/ &qcom_pmi8994_3;
+/delete-node/ &qcom_pm8004_5;
diff --git a/arch/arm/boot/dts/qcom/apq8096pro-auto.dts b/arch/arm/boot/dts/qcom/apq8096pro-auto.dts
new file mode 100644
index 000000000000..f8dc6ee67a56
--- /dev/null
+++ b/arch/arm/boot/dts/qcom/apq8096pro-auto.dts
@@ -0,0 +1,23 @@
+/* Copyright (c) 2019, The Linux Foundation. All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 and
+ * only version 2 as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ */
+
+/dts-v1/;
+
+#include "apq8096pro-auto.dtsi"
+
+/ {
+ model = "Qualcomm Technologies, Inc. APQ 8096pro AUTO SoC";
+ compatible = "qcom,apq8096-cdp", "qcom,apq8096", "qcom,cdp";
+ qcom,msm-id = <387 0x10000>, <316 0x10000>;
+ qcom,pmic-id = <0x20009 0x0 0x0 0x0>;
+ qcom,board-id = <0 0>;
+};
diff --git a/arch/arm/boot/dts/qcom/apq8096pro-auto.dtsi b/arch/arm/boot/dts/qcom/apq8096pro-auto.dtsi
new file mode 100644
index 000000000000..7b6b0c993e4c
--- /dev/null
+++ b/arch/arm/boot/dts/qcom/apq8096pro-auto.dtsi
@@ -0,0 +1,72 @@
+/* Copyright (c) 2019, The Linux Foundation. All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 and
+ * only version 2 as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ */
+
+#include "apq8096pro.dtsi"
+#include "msm8996pro-auto.dtsi"
+#include "msm8996-auto.dtsi"
+
+&spmi_bus {
+ /delete-node/ qcom,pmi8994@2;
+ /delete-node/ qcom,pmi8994@3;
+ /delete-node/ qcom,pm8004@5;
+};
+
+&rpm_bus {
+ /delete-node/ rpm-regulator-bstb;
+ /delete-node/ rpm-regulator-bbyb;
+ /delete-node/ rpm-regulator-smpb1;
+};
+
+&slim_msm {
+ status = "disabled";
+};
+
+&mdss_dsi0 {
+ /delete-property/ lab-supply;
+ /delete-property/ ibb-supply;
+};
+
+&mdss_dsi1 {
+ /delete-property/ lab-supply;
+ /delete-property/ ibb-supply;
+};
+
+&usb_otg_switch {
+ /delete-property/ vin-supply;
+ /delete-property/ gpio;
+};
+
+&usb3 {
+ /delete-property/ vbus_dwc3-supply;
+};
+
+&pcie0 {
+ /delete-property/ qcom,l1-supported;
+ /delete-property/ qcom,l1ss-supported;
+ /delete-property/ qcom,aux-clk-sync;
+};
+
+&pcie1 {
+ /delete-property/ qcom,boot-option;
+ /delete-property/ qcom,l1-supported;
+ /delete-property/ qcom,l1ss-supported;
+ /delete-property/ qcom,aux-clk-sync;
+ /delete-property/ qcom,ep-wakeirq;
+};
+
+&pcie2 {
+ /delete-property/ qcom,boot-option;
+ /delete-property/ qcom,l1-supported;
+ /delete-property/ qcom,l1ss-supported;
+ /delete-property/ qcom,aux-clk-sync;
+ /delete-property/ qcom,ep-wakeirq;
+};
diff --git a/arch/arm/boot/dts/qcom/msm8996-auto-cdp.dtsi b/arch/arm/boot/dts/qcom/msm8996-auto-cdp.dtsi
index d053b24a2978..0a334c4b6aa4 100644
--- a/arch/arm/boot/dts/qcom/msm8996-auto-cdp.dtsi
+++ b/arch/arm/boot/dts/qcom/msm8996-auto-cdp.dtsi
@@ -10,12 +10,11 @@
* GNU General Public License for more details.
*/
-#include "msm8996-pinctrl.dtsi"
#include "msm8996-camera-sensor-auto-cdp.dtsi"
#include "msm8996-wsa881x.dtsi"
#include "msm8996-sde.dtsi"
-/ {
+&vendor {
bluetooth: bt_qca6174 {
compatible = "qca,qca6174";
qca,bt-reset-gpio = <&pm8994_gpios 19 0>; /* BT_EN */
@@ -195,17 +194,6 @@
qcom,hw-settle-time = <2>;
qcom,fast-avg-setup = <0>;
};
-
- chan@7c {
- label = "xo_therm_buf";
- reg = <0x7c>;
- qcom,decimation = <0>;
- qcom,pre-div-channel-scaling = <0>;
- qcom,calibration-type = "ratiometric";
- qcom,scale-function = <4>;
- qcom,hw-settle-time = <2>;
- qcom,fast-avg-setup = <0>;
- };
};
&pm8994_adc_tm {
@@ -526,7 +514,7 @@
qcom,panel-supply-entries = <&dsi_panel_pwr_supply>;
};
-/{
+&vendor {
mtp_batterydata: qcom,battery-data {
qcom,batt-id-range-pct = <15>;
#include "batterydata-itech-3000mah.dtsi"
@@ -1378,7 +1366,7 @@
status = "disabled";
};
-/delete-node/ &led_flash0;
+/delete-node/ &led_flash0;
&mdss_dsi0 {
/delete-property/ lab-supply;
@@ -1394,10 +1382,10 @@
qcom,camera@0 {
/delete-property/ qcom,led-flash-src;
};
+};
- qcom,camera@1 {
- /delete-property/ cam_vana-supply;
- };
+&qcom_camera_1 {
+ /delete-property/ cam_vana-supply;
};
&usb_otg_switch {
@@ -1455,16 +1443,14 @@
qcom,no-smr-check;
};
-/ {
- reserved-memory {
- early_camera_mem: early_camera_mem@b3fff000 {
- reg = <0 0xb3fff000 0 0x800000>;
- label = "early_camera_mem";
- };
- early_audio_mem: early_audio_mem@0xb5fff000 {
- reg = <0x0 0xb5fff000 0x0 0x3FFFFC>;
- label = "early_audio_mem";
- };
+&reserved_memory {
+ early_camera_mem: early_camera_mem@b3fff000 {
+ reg = <0 0xb3fff000 0 0x800000>;
+ label = "early_camera_mem";
+ };
+ early_audio_mem: early_audio_mem@0xb5fff000 {
+ reg = <0x0 0xb5fff000 0x0 0x3FFFFC>;
+ label = "early_audio_mem";
};
};
diff --git a/arch/arm/boot/dts/qcom/msm8996-camera-sensor-auto-cdp.dtsi b/arch/arm/boot/dts/qcom/msm8996-camera-sensor-auto-cdp.dtsi
index ce3cb19effbd..d161c0d2fd67 100644
--- a/arch/arm/boot/dts/qcom/msm8996-camera-sensor-auto-cdp.dtsi
+++ b/arch/arm/boot/dts/qcom/msm8996-camera-sensor-auto-cdp.dtsi
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015-2018, The Linux Foundation. All rights reserved.
+ * Copyright (c) 2015-2019, The Linux Foundation. All rights reserved.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 and
@@ -128,7 +128,7 @@
qcom,clock-rates = <19200000 0>;
};
- qcom,camera@1 {
+ qcom_camera_1: qcom,camera@1 {
cell-index = <1>;
compatible = "qcom,camera";
reg = <0x1>;
generated by cgit v1.2.3 (git 2.25.1) at 2025-10-24 14:04:29 +0000