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

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

Merge b200c39c on remote branch 

Change-Id: Ic9e716ed6e511262c374c84496768f57f76a5780
parents 324e070e b200c39c

bindings/thermal/qcom,rpm-smd-cdev.txt

0 → 100644
+27 −0
Original line number Diff line number Diff line 
Qualcomm Technologies, Inc. RPM SMD cooling device



The RPM shared memory(SMD) cooling device, will be used to set

different thermal band level to RPM hardware. When threshold violation

occurs, RPM SMD cooling device sends pre-configured thermal band level

to RPM hardware via SMD.



Required Parameters:

- compatible:

	Usage: required

	Value type: <string>

	Definition: should be "qcom,rpm-smd-cooling-device"



- #cooling-cells:

	Usage: required

	Value type: <integer>

	Definition: Must be 2. This is required by of-thermal and refer the doc

		<devicetree/bindings/thermal/thermal.txt> for more details.



Example:



&rpm_bus {

	rpm_smd_cdev: rpm-smd-cdev {

		compatible = "qcom,rpm-smd-cooling-device";

		#cooling-cells = <2>;

	};

};

bindings/vendor-prefixes.txt

+1 −0
Original line number Diff line number Diff line
@@ -52,6 +52,7 @@ avago Avago Technologies 
avia	avia semiconductor

avic	Shanghai AVIC Optoelectronics Co., Ltd.

avnet	Avnet, Inc.

awinic  Shanghai Awinic Electronic Technology Co., LTD.

axentia	Axentia Technologies AB

axis	Axis Communications AB

bananapi BIPAI KEJI LIMITED

qcom/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -57,6 +57,7 @@ dtb-$(CONFIG_ARCH_KONA) += kona-rumi.dtb \ 
        kona-v2.1-xrfusion-ult.dtb \

        kona-v2.1-arglass.dtb \

        qrb5165-iot-rb5.dtb \

        qrb5165n-iot-rb5.dtb \

        kona-v2.1-iot-rb5.dtb

endif

qcom/khaje-atp.dtsi

+1 −0
Original line number Diff line number Diff line
@@ -89,6 +89,7 @@ 
	vcc-supply = <&L24A>;

	vcc-voltage-level = <2950000 2960000>;

	vccq2-supply = <&L11A>;

	vccq2-voltage-level = <1800000 1800000>;

	vcc-max-microamp = <800000>;

	vccq2-max-microamp = <800000>;

	vccq2-pwr-collapse-sup;

qcom/khaje-idp.dtsi

+45 −0
Original line number Diff line number Diff line
@@ -118,6 +118,50 @@ 
	vdd-supply = <&vdda_usb_ss_dp_core>;

};



&qupv3_se1_i2c {

	awinic@64 {

		compatible = "awinic,aw2016_led";

		reg = <0x64>;



		awinic,red {

			awinic,name = "red";

			awinic,id = <0>;

			awinic,imax = <2>;

			awinic,led-current = <3>;

			awinic,max-brightness = <255>;

			awinic,rise-time-ms = <6>;

			awinic,hold-time-ms = <0>;

			awinic,fall-time-ms = <6>;

			awinic,off-time-ms = <4>;

		};



		awinic,green {

			awinic,name = "green";

			awinic,id = <1>;

			awinic,imax = <2>;

			awinic,led-current = <3>;

			awinic,max-brightness = <255>;

			awinic,rise-time-ms = <6>;

			awinic,hold-time-ms = <0>;

			awinic,fall-time-ms = <6>;

			awinic,off-time-ms = <4>;

		};



		awinic,blue {

			awinic,name = "blue";

			awinic,id = <2>;

			awinic,imax = <2>;

			awinic,led-current = <3>;

			awinic,max-brightness = <255>;

			awinic,rise-time-ms = <6>;

			awinic,hold-time-ms = <0>;

			awinic,fall-time-ms = <6>;

			awinic,off-time-ms = <4>;

		};



	};

};



&qupv3_se1_i2c {

	status = "ok";

	#address-cells = <1>;
@@ -199,6 +243,7 @@ 
	vcc-supply = <&L24A>;

	vcc-voltage-level = <2950000 2960000>;

	vccq2-supply = <&L11A>;

	vccq2-voltage-level = <1800000 1800000>;

	vcc-max-microamp = <800000>;

	vccq2-max-microamp = <800000>;

	vccq2-pwr-collapse-sup;