Merge "ARM: dts: msm: Add initial device tree for khaje QRD"

This commit is contained in:
qctecmdr authored and Gerrit - the friendly Code Review server committed 2021-06-03 03:14:33 -07:00
commit 385d4b8c9d
11 files changed
+154 -90

No files matched your search

+1
View File
@@ -251,6 +251,7 @@ compatible = "qcom,bengal-idp"
compatible = "qcom,bengalp"
compatible = "qcom,bengalp-idp"
compatible = "qcom,khaje-idp"
compatible = "qcom,khaje-qrd"
compatible = "qcom,scuba-rumi"
compatible = "qcom,scuba-idp"
compatible = "qcom,scuba-qrd"
+3
View File
@@ -231,12 +231,15 @@ endif
ifeq ($(CONFIG_BUILD_ARM64_DT_OVERLAY),y)
dtbo-$(CONFIG_ARCH_KHAJE) += \
khaje-idp-overlay.dtbo \
khaje-qrd-overlay.dtbo \
khaje-idp-nopmi-overlay.dtbo
khaje-idp-overlay.dtbo-base := khaje.dtb
khaje-qrd-overlay.dtbo-base := khaje.dtb
khaje-idp-nopmi-overlay.dtbo-base := khaje.dtb
else
dtb-$(CONFIG_ARCH_KHAJE) += khaje-idp.dtb \
khaje-qrd.dtb \
khaje-idp-nopmi.dtb
endif
+24
View File
@@ -0,0 +1,24 @@
#include "bengal-qrd.dtsi"
&led_flash_rear {
/delete-property/ flash-source;
/delete-property/ torch-source;
/delete-property/ switch-source;
};
&led_flash_rear_aux {
/delete-property/ flash-source;
/delete-property/ torch-source;
/delete-property/ switch-source;
};
&led_flash_rear_aux2 {
/delete-property/ flash-source;
/delete-property/ torch-source;
/delete-property/ switch-source;
};
&sde_dsi {
/delete-property/ lab-supply;
/delete-property/ ibb-supply;
};
+2 -1
View File
@@ -1,8 +1,9 @@
/dts-v1/;
/plugin/;
#include "bengal-pmi632.dtsi"
#include "bengal-qrd.dtsi"
#include "bengal-qrd-pmi632.dtsi"
#include "bengal-thermal-pmi632-overlay.dtsi"
/ {
model = "Qualcomm Technologies, Inc. Bengal QRD";
+94
View File
@@ -0,0 +1,94 @@
#include "bengal-pmi632.dtsi"
&soc {
qrd_batterydata: qcom,battery-data {
qcom,batt-id-range-pct = <15>;
#include "qg-batterydata-atl466271_3300mAh.dtsi"
};
};
&pmi632_qg {
qcom,battery-data = <&qrd_batterydata>;
qcom,qg-iterm-ma = <100>;
qcom,hold-soc-while-full;
qcom,linearize-soc;
qcom,qg-use-s7-ocv;
};
&pmi632_charger {
qcom,battery-data = <&qrd_batterydata>;
qcom,suspend-input-on-debug-batt;
qcom,sw-jeita-enable;
qcom,step-charging-enable;
/* SMB1355 only */
qcom,sec-charger-config = <2>;
qcom,hvdcp2-max-icl-ua = <2000000>;
dpdm-supply = <&qusb_phy0>;
qcom,charger-temp-max = <800>;
qcom,smb-temp-max = <800>;
qcom,auto-recharge-soc = <98>;
qcom,flash-disable-soc = <10>;
qcom,hw-die-temp-mitigation;
qcom,hw-connector-mitigation;
qcom,connector-internal-pull-kohm = <100>;
qcom,float-option = <1>;
qcom,thermal-mitigation = <4200000 3500000 3000000
2500000 2000000 1500000 1000000 500000>;
};
&pmi632_gpios {
smb_en {
smb_en_default: smb_en_default {
pins = "gpio2";
function = "func1";
output-enable;
};
};
pmi632_sense {
/* GPIO 7 and 8 are external-sense pins for PMI632 */
pmi632_sense_default: pmi632_sense_default {
pins = "gpio7", "gpio8";
bias-high-impedance; /* disable the GPIO */
bias-disable; /* no-pull */
};
};
pmi632_ctm {
/* Disable GPIO1 for h/w base mitigation */
pmi632_ctm_default: pmi632_ctm_default {
pins = "gpio1";
bias-high-impedance; /* disable the GPIO */
bias-disable; /* no-pull */
};
};
};
&usb0 {
extcon = <&pmi632_charger>, <&eud>;
};
&smb1355 {
pinctrl-names = "default";
pinctrl-0 = <&smb_int_default>;
interrupt-parent = <&tlmm>;
interrupts = <105 IRQ_TYPE_LEVEL_LOW>;
status = "ok"
};
&smb1355_charger {
pinctrl-names = "default";
pinctrl-0 = <&smb_en_default &pmi632_sense_default &pmi632_ctm_default>;
qcom,parallel-mode = <1>;
qcom,disable-ctm;
qcom,hw-die-temp-mitigation;
status = "ok"
};
&dsi_td4330_truly_v2_video {
qcom,platform-bklight-en-gpio = <&pmi632_gpios 6 0>;
};
&dsi_td4330_truly_v2_cmd {
qcom,platform-bklight-en-gpio = <&pmi632_gpios 6 0>;
};
+2 -1
View File
@@ -1,8 +1,9 @@
/dts-v1/;
#include "bengal.dtsi"
#include "bengal-pmi632.dtsi"
#include "bengal-qrd.dtsi"
#include "bengal-qrd-pmi632.dtsi"
#include "bengal-thermal-pmi632-overlay.dtsi"
/ {
model = "Qualcomm Technologies, Inc. Bengal QRD";
-88
View File
@@ -2,7 +2,6 @@
#include <dt-bindings/iio/qcom,spmi-vadc.h>
#include <dt-bindings/input/input.h>
#include "bengal-thermal-overlay.dtsi"
#include "bengal-thermal-pmi632-overlay.dtsi"
#include "bengal-audio-overlay.dtsi"
#include "bengal-sde-display.dtsi"
#include "camera/bengal-camera-sensor-qrd.dtsi"
@@ -12,70 +11,6 @@
#include "smb1355.dtsi"
};
&soc {
qrd_batterydata: qcom,battery-data {
qcom,batt-id-range-pct = <15>;
#include "qg-batterydata-atl466271_3300mAh.dtsi"
};
};
&pmi632_qg {
qcom,battery-data = <&qrd_batterydata>;
qcom,qg-iterm-ma = <100>;
qcom,hold-soc-while-full;
qcom,linearize-soc;
qcom,qg-use-s7-ocv;
};
&pmi632_charger {
qcom,battery-data = <&qrd_batterydata>;
qcom,suspend-input-on-debug-batt;
qcom,sw-jeita-enable;
qcom,step-charging-enable;
/* SMB1355 only */
qcom,sec-charger-config = <2>;
qcom,hvdcp2-max-icl-ua = <2000000>;
dpdm-supply = <&qusb_phy0>;
qcom,charger-temp-max = <800>;
qcom,smb-temp-max = <800>;
qcom,auto-recharge-soc = <98>;
qcom,flash-disable-soc = <10>;
qcom,hw-die-temp-mitigation;
qcom,hw-connector-mitigation;
qcom,connector-internal-pull-kohm = <100>;
qcom,float-option = <1>;
qcom,thermal-mitigation = <4200000 3500000 3000000
2500000 2000000 1500000 1000000 500000>;
};
&pmi632_gpios {
smb_en {
smb_en_default: smb_en_default {
pins = "gpio2";
function = "func1";
output-enable;
};
};
pmi632_sense {
/* GPIO 7 and 8 are external-sense pins for PMI632 */
pmi632_sense_default: pmi632_sense_default {
pins = "gpio7", "gpio8";
bias-high-impedance; /* disable the GPIO */
bias-disable; /* no-pull */
};
};
pmi632_ctm {
/* Disable GPIO1 for h/w base mitigation */
pmi632_ctm_default: pmi632_ctm_default {
pins = "gpio1";
bias-high-impedance; /* disable the GPIO */
bias-disable; /* no-pull */
};
};
};
&pm6125_gpios {
key_vol_up {
key_vol_up_default: key_vol_up_default {
@@ -88,10 +23,6 @@
};
};
&usb0 {
extcon = <&pmi632_charger>, <&eud>;
};
&qusb_phy0 {
qcom,qusb-phy-init-seq = <0xf8 0x80
0xb3 0x84
@@ -261,23 +192,6 @@
};
};
&smb1355 {
pinctrl-names = "default";
pinctrl-0 = <&smb_int_default>;
interrupt-parent = <&tlmm>;
interrupts = <105 IRQ_TYPE_LEVEL_LOW>;
status = "ok"
};
&smb1355_charger {
pinctrl-names = "default";
pinctrl-0 = <&smb_en_default &pmi632_sense_default &pmi632_ctm_default>;
qcom,parallel-mode = <1>;
qcom,disable-ctm;
qcom,hw-die-temp-mitigation;
status = "ok"
};
&ufsphy_mem {
compatible = "qcom,ufs-phy-qmp-v3-660";
@@ -319,7 +233,6 @@
qcom,mdss-dsi-bl-min-level = <1>;
qcom,mdss-dsi-bl-max-level = <4095>;
qcom,platform-reset-gpio = <&tlmm 82 0>;
qcom,platform-bklight-en-gpio = <&pmi632_gpios 6 0>;
};
&dsi_td4330_truly_v2_cmd {
@@ -331,7 +244,6 @@
qcom,mdss-dsi-bl-max-level = <4095>;
qcom,platform-te-gpio = <&tlmm 81 0>;
qcom,platform-reset-gpio = <&tlmm 82 0>;
qcom,platform-bklight-en-gpio = <&pmi632_gpios 6 0>;
};
&sde_dsi {
+14
View File
@@ -0,0 +1,14 @@
/dts-v1/;
/plugin/;
#include <dt-bindings/interrupt-controller/arm-gic.h>
#include "khaje-qrd.dtsi"
#include "khaje-qrd-pm7250b.dtsi"
/ {
model = "Qualcomm Technologies, Inc. Khaje QRD";
compatible = "qcom,khaje-qrd", "qcom,khaje", "qcom,qrd";
qcom,msm-id = <518 0x10000>;
qcom,board-id = <0x1000B 0>;
qcom,pmic-id = <0x2D 0x2E 0x0 0x0>;
};
+1
View File
@@ -0,0 +1 @@
#include "khaje-pm7250b.dtsi"
+12
View File
@@ -0,0 +1,12 @@
/dts-v1/;
#include "khaje.dtsi"
#include "khaje-qrd.dtsi"
#include "khaje-qrd-pm7250b.dtsi"
/ {
model = "Qualcomm Technologies, Inc. KHAJE QRD";
compatible = "qcom,khaje-qrd", "qcom,khaje", "qcom,qrd";
qcom,board-id = <0x1000B 0>;
qcom,pmic-id = <0x2D 0x2E 0x0 0x0>;
};
+1
View File
@@ -0,0 +1 @@
#include "bengal-qrd-nopmi.dtsi"