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

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

Merge 81cd5981 on remote branch 

Change-Id: I7ae2bef38ed2bbccc4303c19a093118948472a52
parents 2af43096 81cd5981

bindings/cnss/cnss-wlan.txt

+1 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ Required properties: 
                "qcom,cnss-qca6390" for QCA6390 device

                "qcom,cnss-qca6490" for QCA6490 device

                "qcom,cnss-wcn7850" for WCN7850 device

                "qcom,cnss-qcn9000" for QCN9000 device

                "qcom,cnss-qca-converged" for converged QCA devices

  - wlan-en-gpio: WLAN_EN GPIO signal specified by the chip specifications

  - vdd-wlan-supply: phandle to the regulator device tree node

bindings/usb/dwc3.txt

+3 −0
Original line number Diff line number Diff line
@@ -81,6 +81,9 @@ Optional properties: 
			before attempting a U3 exit handshake.

 - snps,is-utmi-l1-suspend: true when DWC3 asserts output signal

			utmi_l1_suspend_n, false when asserts utmi_sleep_n

 - snps,usb2-gadget-lpm-disable: Indicate if we don't want to enable USB2 HW

	LPM for gadget mode. This is a boolean type property when set the

	disable will be true.

 - snps,hird-threshold: HIRD threshold

 - snps,hsphy_interface: High-Speed PHY interface selection between "utmi" for

   UTMI+ and "ulpi" for ULPI when the DWC_USB3_HSPHY_INTERFACE has value 3.

qcom/blair-cdp.dtsi

+42 −0
Original line number Diff line number Diff line
@@ -392,4 +392,46 @@ 
	io-channel-names = "chg_type";

};



&qupv3_se10_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>;

		};



	};

};

qcom/blair-mtp.dtsi

+44 −0
Original line number Diff line number Diff line
@@ -199,5 +199,49 @@ 
	};

};



&qupv3_se10_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>;

		};



	};

};



#include "camera/blair-camera-sensor-mtp.dtsi"

qcom/blair-qrd.dtsi

+74 −24
Original line number Diff line number Diff line
@@ -231,7 +231,7 @@ 
		polling-delay = <0>;

		thermal-governor = "step_wise";

		thermal-sensors = <&pm6125_adc_tm ADC5_AMUX_THM2_100K_PU>;

		disable-thermal-zone;



		trips {

			battery_trip0: battery-trip0 {

				temperature = <42000>;
@@ -246,7 +246,7 @@ 
			};



			gold_trip: gold-trip {

				temperature = <43000>;

				temperature = <46000>;

				hysteresis = <0>;

				type = "passive";

			};
@@ -263,12 +263,6 @@ 
				type = "passive";

			};



			silver_trip: silver-trip {

				temperature = <45000>;

				hysteresis = <0>;

				type = "passive";

			};



			battery_trip2: battery-trip2 {

				temperature = <46000>;

				hysteresis = <2000>;
@@ -287,6 +281,18 @@ 
				type = "passive";

			};



			gpu_trip: gpu-trip {

				temperature = <48000>;

				hysteresis = <0>;

				type = "passive";

			};



			silver_trip: silver-trip {

				temperature = <50000>;

				hysteresis = <0>;

				type = "passive";

			};



			cx_trip: cx-trip {

				temperature = <55000>;

				hysteresis = <5000>;
@@ -301,46 +307,46 @@ 
			};



			gpu-cdev0 {

				trip = <&modem_skin_trip1>;

				trip = <&gpu_trip>;

				/* throttle to 650000000Hz */

				cooling-device = <&msm_gpu (THERMAL_MAX_LIMIT-4)

							(THERMAL_MAX_LIMIT-4)>;

				cooling-device = <&msm_gpu THERMAL_NO_LIMIT

							(THERMAL_MAX_LIMIT-3)>;

			};



			gpu-cdev1 {

				trip = <&cx_trip>;

				/* throttle to 565000000Hz */

				cooling-device = <&msm_gpu (THERMAL_MAX_LIMIT-3)

							(THERMAL_MAX_LIMIT-3)>;

				/* throttle to 390000000Hz */

				cooling-device = <&msm_gpu (THERMAL_MAX_LIMIT-1)

							(THERMAL_MAX_LIMIT-1)>;

			};



			silver-cdev {

				trip = <&silver_trip>;

				/* throttle to 1478400KHz */

				cooling-device = <&CPU0 (THERMAL_MAX_LIMIT-6)

				/* throttle to 1516800KHz */

				cooling-device = <&CPU0 THERMAL_NO_LIMIT

							(THERMAL_MAX_LIMIT-6)>;

			};



			gold-cdev {

				trip = <&gold_trip>;

				/* throttle to 1536000KHz */

				cooling-device = <&CPU6 (THERMAL_MAX_LIMIT-5)

							(THERMAL_MAX_LIMIT-5)>;

				/* throttle to 1516800KHz */

				cooling-device = <&CPU6 THERMAL_NO_LIMIT

							(THERMAL_MAX_LIMIT-4)>;

			};



			modem-skin-cdev0 {

				trip = <&modem_skin_trip0>;

				cooling-device = <&modem_skin 1 1>;

				cooling-device = <&modem_pa 1 1>;

			};



			modem-skin-cdev1 {

				trip = <&modem_skin_trip1>;

				cooling-device = <&modem_skin 2 2>;

				cooling-device = <&modem_pa 2 2>;

			};



			modem-skin-cdev2 {

				trip = <&cx_trip>;

				cooling-device = <&modem_skin 3 3>;

				cooling-device = <&modem_pa 3 3>;

			};

		};

	};
@@ -350,7 +356,7 @@ 
		polling-delay = <0>;

		thermal-governor = "step_wise";

		thermal-sensors = <&pm6125_adc_tm ADC5_AMUX_THM1_100K_PU>;

		disable-thermal-zone;



		trips {

			modem_trip0: modem-trip0 {

				temperature = <46000>;
@@ -394,7 +400,7 @@ 
		polling-delay = <0>;

		thermal-governor = "step_wise";

		thermal-sensors = <&pmk8350_adc_tm PMK8350_ADC7_AMUX_THM1_100K_PU>;

		disable-thermal-zone;



		trips {

			modem_pa_fr1_trip0: modem-pa-fr1-trip0 {

				temperature = <45000>;
@@ -481,4 +487,48 @@ 
	};

};



&qupv3_se10_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>;

		};



	};

};



#include "camera/blair-camera-sensor-qrd.dtsi"