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

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

Merge c16457d1 on remote branch 

Change-Id: Ib1a4e8556b277fcdab937db36be2f1fa55500105
parents c23307ee c16457d1

Documentation/devicetree/bindings/media/video/msm-cci.txt

+32 −0
Original line number Diff line number Diff line
@@ -205,6 +205,31 @@ Optional properties: 
   (in the same order).

- cam_vaf-supply : should contain regulator from which AF voltage is supplied



* Qualcomm Technologies, Inc. MSM LASER LED



Required properties:

- cell-index : should contain unique identifier to differentiate

    between multiple laser led modules

- reg : should contain i2c slave address of the laser led and length of

    data field which is 0x0

- compatible :

    - "qcom,laser-led"

- qcom,cci-master : should contain i2c master id to be used for this camera

    sensor

    - 0 -> MASTER 0

    - 1 -> MASTER 1



Optional properties:

- qcom,cam-vreg-name : should contain names of all regulators needed by this

   laser led

- qcom,cam-vreg-min-voltage : should contain minimum voltage level in microvolts

   for regulators mentioned in qcom,cam-vreg-name property (in the same order)

- qcom,cam-vreg-max-voltage : should contain maximum voltage level in microvolts

   for regulators mentioned in qcom,cam-vreg-name property (in the same order)

- qcom,cam-vreg-op-mode : should contain the maximum current in microamps

   required from the regulators mentioned in the qcom,cam-vreg-name property

   (in the same order).



* Qualcomm Technologies, Inc. MSM OIS



Required properties:
@@ -277,6 +302,13 @@ Example: 
		qcom,cam-vreg-op-mode = <100000>;

        };



	laserled0: qcom,laserled@0 {

		cell-index = <0>;

		reg = <0x0>;

		compatible = "qcom,laser-led";

		qcom,cci-master = <1>;

	};



	qcom,camera@0 {

		cell-index = <0>;

		compatible = "qcom,camera";

Documentation/devicetree/bindings/net/wireless/qcom,wcn3990-wifi.txt

+17 −0
Original line number Diff line number Diff line
@@ -11,13 +11,24 @@ Required properties: 
 - compatible: "qcom,wcn3990-wifi";

 - reg: Memory regions defined as starting address and size

 - reg-names: Names of the memory regions defined in reg entry

 - clocks: List of clock phandles

 - clock-names: List of clock names corresponding to the "clocks" property

 - interrupts: Copy engine interrupt table

Optional properties:

  - <supply-name>-supply: phandle to the regulator device tree node

			   optional "supply-name" is "vdd-0.8-cx-mx".

  - qcom,<supply>-config: Specifies voltage levels for supply. Should be

			   specified in pairs (min, max), units uV.  There can

			   be optional load in uA and Regulator settle delay in

			   uS.



Example:

	msm_ath10k_wlan: qcom,msm_ath10k_wlan@18800000 {

		compatible = "qcom,wcn3990-wifi";

		reg = <0x18800000 0x800000>;

		reg-names = "membase";

		clocks = <&clock_gcc clk_aggre2_noc_clk>;

		clock-names = "smmu_aggre2_noc_clk";

		interrupts =

			   <0 130 0 /* CE0 */ >,

			   <0 131 0 /* CE1 */ >,
@@ -31,4 +42,10 @@ Example: 
			   <0 139 0 /* CE9 */ >,

			   <0 140 0 /* CE10 */ >,

			   <0 141 0 /* CE11 */ >;

		vdd-0.8-cx-mx-supply = <&pm8998_l5>;

		vdd-1.8-xo-supply = <&pm8998_l7_pin_ctrl>;

		vdd-1.3-rfa-supply = <&pm8998_l17_pin_ctrl>;

		vdd-3.3-ch0-supply = <&pm8998_l25_pin_ctrl>;

		qcom,vdd-0.8-cx-mx-config = <800000 800000>;

		qcom,vdd-3.3-ch0-config = <3104000 3312000>;

	};

arch/arm/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -1776,7 +1776,7 @@ source "mm/Kconfig" 


choice

	prompt "Virtual Memory Reclaim"

	default NO_VM_RECLAIM

	default ENABLE_VMALLOC_SAVING

	help

	  Select the method of reclaiming virtual memory

arch/arm/boot/dts/qcom/apq8098-v2.1-mediabox.dts

+4 −0
Original line number Diff line number Diff line
@@ -101,6 +101,10 @@ 
	status = "disabled";

};



&pcie0 {

	qcom,boot-option = <0x0>;

};



&soc {

	qcom,msm-dai-mi2s {

		dai_mi2s3: qcom,msm-dai-q6-mi2s-quat {

arch/arm/boot/dts/qcom/msm8998-camera-sensor-mtp.dtsi

+8 −0
Original line number Diff line number Diff line
@@ -54,6 +54,13 @@ 
		qcom,cam-vreg-op-mode = <0>;

	};



	laserled0: qcom,laserled@0 {

		cell-index = <0>;

		reg = <0x0>;

		compatible = "qcom,laser-led";

		qcom,cci-master = <1>;

	};



	actuator1: qcom,actuator@1 {

		cell-index = <1>;

		reg = <0x1>;
@@ -322,6 +329,7 @@ 
		qcom,eeprom-src = <&eeprom2>;

		qcom,led-flash-src = <&led_flash1>;

		qcom,actuator-src = <&actuator1>;

		qcom,laserled-src = <&laserled0>;

		cam_vio-supply = <&pm8998_lvs1>;

		cam_vana-supply = <&pm8998_l22>;

		cam_vdig-supply = <&pm8998_s3>;