Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0cfa2323 authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ARM: dts: qcom: move charger skin-therm thermal zone to bengal-pmi632"

parents a4c04ce1 d6e7ddec

qcom/Makefile

+3 −0
Original line number Diff line number Diff line
@@ -132,6 +132,7 @@ ifeq ($(CONFIG_BUILD_ARM64_DT_OVERLAY),y) 
                bengal-rumi-overlay.dtbo \

                bengal-qrd-overlay.dtbo \

                bengal-idp-overlay.dtbo \

                bengal-idp-nopmi-overlay.dtbo \

                bengal-idp-usbc-overlay.dtbo \

                bengalp-idp-overlay.dtbo \

                bengal-idp-1gb-overlay.dtbo \
@@ -150,6 +151,7 @@ ifeq ($(CONFIG_BUILD_ARM64_DT_OVERLAY),y) 
bengal-rumi-overlay.dtbo-base := bengal.dtb

bengal-qrd-overlay.dtbo-base := bengal.dtb

bengal-idp-overlay.dtbo-base := bengal.dtb

bengal-idp-nopmi-overlay.dtbo-base := bengal.dtb

bengal-idp-usbc-overlay.dtbo-base := bengal.dtb

bengalp-idp-overlay.dtbo-base := bengalp.dtb

bengal-idp-1gb-overlay.dtbo-base := bengal-1gb.dtb
@@ -168,6 +170,7 @@ else 
dtb-$(CONFIG_ARCH_BENGAL) += bengal-rumi.dtb \

                bengal-qrd.dtb \

		bengal-idp.dtb \

		bengal-idp-nopmi.dtb \

		bengal-idp-usbc.dtb \

		bengalp-idp.dtb \

		bengal-idp-1gb.dtb \

qcom/bengal-idp-low-ram.dtsi

+1 −0
Original line number Diff line number Diff line 
#include "bengal-idp.dtsi"

#include "bengal-idp-pmi632.dtsi"

qcom/bengal-idp-nopmi-overlay.dts

0 → 100644
+13 −0
Original line number Diff line number Diff line 
/dts-v1/;

/plugin/;



#include <dt-bindings/interrupt-controller/arm-gic.h>

#include "bengal-idp-nopmi.dtsi"



/ {

	model = "Qualcomm Technologies, Inc. BENGAL IDP nopmi";

	compatible = "qcom,bengal-idp", "qcom,bengal", "qcom,idp";

	qcom,msm-id = <417 0x10000>, <444 0x10000>;

	qcom,board-id = <34 0>;

	qcom,pmic-id = <0x2D 0x0 0x0 0x0>;

};

qcom/bengal-idp-nopmi.dts

0 → 100644
+11 −0
Original line number Diff line number Diff line 
/dts-v1/;



#include "bengal.dtsi"

#include "bengal-idp-nopmi.dtsi"



/ {

	model = "Qualcomm Technologies, Inc. BENGAL IDP nopmi";

	compatible = "qcom,bengal-idp", "qcom,bengal", "qcom,idp";

	qcom,board-id = <34 0>;

	qcom,pmic-id = <0x2D 0x0 0x0 0x0>;

};

qcom/bengal-idp-nopmi.dtsi

0 → 100644
+53 −0
Original line number Diff line number Diff line 
#include "bengal-idp.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;

};



&dsi_td4330_truly_v2_video {

	/delete-property/ qcom,esd-check-enabled;

};



&dsi_td4330_truly_v2_cmd {

	/delete-property/ qcom,esd-check-enabled;

};



&qupv3_se2_i2c {

	synaptics_tcm@20 {

		status = "disabled";

	};



	novatek@62 {

		status = "disabled";

	};



	focaltech@38 {

		status = "disabled";

	};

};



&usb0 {

	/delete-property/ extcon;

	dwc3@4e00000 {

		dr_mode = "peripheral";

	};

};