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

Commit ce160a56 authored by Linux Build Service Account's avatar Linux Build Service Account
Browse files

Merge 687e702b on remote branch 

Change-Id: Idf6ef4392fd9ce0923dda9926bada805b65bc79f
parents fe7fec2d 687e702b

bindings/interrupt-controller/qcom,mpm.txt

+1 −0
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ Properties: 
		"qcom,mpm-gic-bengal"

		"qcom,mpm-gic-scuba"

		"qcom,mpm-gic-sdm660"

		"qcom,mpm-gic-khaje"



- interrupts:

	Usage: required

qcom/Makefile

+3 −3
Original line number Diff line number Diff line
@@ -239,7 +239,7 @@ ifeq ($(CONFIG_BUILD_ARM64_DT_OVERLAY),y) 
		khaje-idp-overlay.dtbo \

		khaje-qrd-overlay.dtbo \

		khaje-qrd-hvdcp3p5-overlay.dtbo \

		khaje-qrd-wcd9368-overlay.dtbo \

		khaje-qrd-nowcd9375-overlay.dtbo \

		khaje-idp-nopmi-overlay.dtbo \

		khaje-idp-usbc-overlay.dtbo \

		khaje-qrd-nopmi-overlay.dtbo \
@@ -249,7 +249,7 @@ ifeq ($(CONFIG_BUILD_ARM64_DT_OVERLAY),y) 
khaje-idp-overlay.dtbo-base := khaje.dtb

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

khaje-qrd-hvdcp3p5-overlay.dtbo-base := khaje.dtb

khaje-qrd-wcd9368-overlay.dtbo-base := khaje.dtb

khaje-qrd-nowcd9375-overlay.dtbo-base := khaje.dtb

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

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

khaje-qrd-nopmi-overlay.dtbo-base := khaje.dtb
@@ -259,7 +259,7 @@ else 
dtb-$(CONFIG_ARCH_KHAJE) += khaje-idp.dtb \

		khaje-qrd.dtb \

		khaje-qrd-hvdcp3p5.dtb \

		khaje-qrd-wcd9368.dtb \

		khaje-qrd-nowcd9375.dtb \

		khaje-idp-nopmi.dtb \

		khaje-idp-usbc.dtb \

		khaje-qrd-nopmi.dtb \

qcom/bengal-thermal.dtsi

+28 −28
Original line number Diff line number Diff line
@@ -957,6 +957,30 @@ 
		};

	};



	mapss-lowc {

		polling-delay-passive = <0>;

		polling-delay = <0>;

		thermal-governor = "low_limits_cap";

		thermal-sensors = <&tsens0 0>;

		wake-capable-sensor;

		tracks-low;



		trips {

			mapss_cap_trip: mapss-cap-trip {

				temperature = <5000>;

				hysteresis = <5000>;

				type = "passive";

			};

		};



		cooling-maps {

			lmh_cpu_cdev {

				trip = <&mapss_cap_trip>;

				cooling-device = <&lmh_cpu_vdd 1 1>;

			};

		};

	};



	mapss-lowf {

		polling-delay-passive = <0>;

		polling-delay = <0>;
@@ -996,16 +1020,16 @@ 
		};

	};



	mapss-lowc {

	camera-lowc {

		polling-delay-passive = <0>;

		polling-delay = <0>;

		thermal-governor = "low_limits_cap";

		thermal-sensors = <&tsens0 0>;

		thermal-sensors = <&tsens0 3>;

		wake-capable-sensor;

		tracks-low;



		trips {

			mapss_cap_trip: mapss-cap-trip {

			camera_cap_trip: camera-cap-trip {

				temperature = <5000>;

				hysteresis = <5000>;

				type = "passive";
@@ -1014,7 +1038,7 @@ 


		cooling-maps {

			lmh_cpu_cdev {

				trip = <&mapss_cap_trip>;

				trip = <&camera_cap_trip>;

				cooling-device = <&lmh_cpu_vdd 1 1>;

			};

		};
@@ -1059,30 +1083,6 @@ 
		};

	};



	camera-lowc {

		polling-delay-passive = <0>;

		polling-delay = <0>;

		thermal-governor = "low_limits_cap";

		thermal-sensors = <&tsens0 3>;

		wake-capable-sensor;

		tracks-low;



		trips {

			camera_cap_trip: camera-cap-trip {

				temperature = <5000>;

				hysteresis = <5000>;

				type = "passive";

			};

		};



		cooling-maps {

			lmh_cpu_cdev {

				trip = <&camera_cap_trip>;

				cooling-device = <&lmh_cpu_vdd 1 1>;

			};

		};

	};



	quiet-therm-step {

		polling-delay-passive = <2000>;

		polling-delay = <0>;

qcom/khaje-qrd-wcd9368-overlay.dts→qcom/khaje-qrd-nowcd9375-overlay.dts

+2 −2
Original line number Diff line number Diff line
@@ -2,11 +2,11 @@ 
/plugin/;



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

#include "khaje-qrd-wcd9368.dtsi"

#include "khaje-qrd-nowcd9375.dtsi"

#include "khaje-qrd-pm7250b.dtsi"



/ {

	model = "Qualcomm Technologies, Inc. Khaje QRD WCD9368";

	model = "Qualcomm Technologies, Inc. Khaje QRD NOWCD9375";

	compatible = "qcom,khaje-qrd", "qcom,khaje", "qcom,qrd";

	qcom,msm-id = <518 0x10000>;

	qcom,board-id = <0x2010B 0>;

qcom/khaje-qrd-wcd9368.dts→qcom/khaje-qrd-nowcd9375.dts

+2 −2
Original line number Diff line number Diff line 
/dts-v1/;



#include "khaje.dtsi"

#include "khaje-qrd-wcd9368.dtsi"

#include "khaje-qrd-nowcd9375.dtsi"

#include "khaje-qrd-pm7250b.dtsi"



/ {

	model = "Qualcomm Technologies, Inc. KHAJE QRD WCD9368";

	model = "Qualcomm Technologies, Inc. KHAJE QRD NOWCD9375";

	compatible = "qcom,khaje-qrd", "qcom,khaje", "qcom,qrd";

	qcom,board-id = <0x2010B 0>;

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