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

Commit 6fa8bfa7 authored by shaohanlin(127659)'s avatar shaohanlin(127659) Committed by Gerrit Code Review
Browse files

Merge "Merge branch gms into release" into 8901-fairphone-p-release

parents f4769ba6 8f4ad7f6

Documentation/devicetree/bindings/qseecom/qseecom.txt

+3 −0
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ Optional properties: 
  - qcom,qsee-reentrancy-support: indicates the qsee reentrancy phase supported by the target

  - qcom,commonlib64-loaded-by-uefi: indicates commonlib64 is loaded by uefi already

  - qcom,fde-key-size: indicates which FDE key size is used in device.

  - qcom,enable-key-wrap-in-ks: enables wrapping of ICE key with KS key.



Example:

	qcom,qseecom@fe806000 {
@@ -40,6 +41,7 @@ Example: 
		qcom,hlos-ce-hw-instance = <1 2>;

		qcom,qsee-ce-hw-instance = <0>;

		qcom,support-fde;

		qcom,enable-key-wrap-in-ks;

		qcom,support-pfe;

		qcom,msm_bus,name = "qseecom-noc";

		qcom,msm_bus,num_cases = <4>;
@@ -64,6 +66,7 @@ Example: The following dts setup is the same as the example above. 
		reg = <0x7f00000 0x500000>;

		reg-names = "secapp-region";

		qcom,support-fde;

		qcom,enable-key-wrap-in-ks;

		qcom,full-disk-encrypt-info = <0 1 2>, <0 2 2>;

		qcom,support-pfe;

		qcom,per-file-encrypt-info = <0 1 0>, <0 2 0>;

arch/arm64/boot/dts/qcom/msm8909w-pm660-regulator.dtsi

+31 −4
Original line number Diff line number Diff line
@@ -329,16 +329,43 @@ 


/* CPR controlled regulator */

&soc {

	/delete-node/ regulator@1942130;

	mem_acc_vreg_corner: regulator@1942130 {

		compatible = "qcom,mem-acc-regulator";

		reg = <0x1942130 0x4>;

		reg-names = "acc-sel-l1";

		regulator-name = "mem_acc_corner";

		regulator-min-microvolt = <1>;

		regulator-max-microvolt = <3>;



		qcom,acc-sel-l1-bit-pos = <0>;

		qcom,corner-acc-map = <0 1 1>;

		qcom,acc-reg-addr-list =

				<0x1942130 0x1942120>;



		qcom,acc-init-reg-config = <1 0x1>, <2 0x0>;

		qcom,num-acc-corners = <3>;

		qcom,boot-acc-corner = <2>;



		qcom,corner1-reg-config =

			/* SVS => SVS */

			<(-1) (-1)>,     <(-1) (-1)>,   <(-1) (-1)>,

			/* SVS => NOM */

			<  1 0x0 >, <  2  0x09240000>,	< 1 0x1 >,

			/* SVS => TURBO */

			<  1 0x1 >, <  2  0x0>,	< (-1) (-1) >;



		qcom,corner2-reg-config =

			/* NOM => SVS */

			<  1 0x0 >, <  2  0x09240000>,	< 2 0x0 >,

			/* NOM => NOM */

			<(-1) (-1)>,     <(-1) (-1)>,  <(-1) (-1)>,

			/* NOM => TURBO */

			<  1 0x1 >, <  2  0x08200000>,	< 2  0x0 >;



		qcom,corner3-reg-config =

			/* TURBO => SVS */

			<  1 0x0 >, <  2  0x0>,	< (-1) (-1) >,

			/* TURBO => NOM */

			<  1 0x1 >, <  2  0x08200000>,	< 2  0x09240000 >,

			/* TURBO => TURBO */

			<(-1) (-1)>,     <(-1) (-1)>,   <(-1) (-1)>;

	};



	apc_vreg_corner: regulator@b018000 {

arch/arm64/boot/dts/qcom/msm8937-camera-sensor-cdp.dtsi

0 → 100644
+292 −0
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2015-2016, 2019, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and

 * only version 2 as published by the Free Software Foundation.

 *

 * This program is distributed in the hope that it will be useful,

 * but WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 * GNU General Public License for more details.

 */



&cci {

	actuator0: qcom,actuator@0 {

		cell-index = <0>;

		reg = <0x0>;

		compatible = "qcom,actuator";

		qcom,cci-master = <0>;

		cam_vaf-supply = <&pm8937_l17>;

		qcom,cam-vreg-name = "cam_vaf";

		qcom,cam-vreg-min-voltage = <2850000>;

		qcom,cam-vreg-max-voltage = <2850000>;

		qcom,cam-vreg-op-mode = <80000>;

	};



	actuator1: qcom,actuator@1 {

		cell-index = <1>;

		reg = <0x1>;

		compatible = "qcom,actuator";

		qcom,cci-master = <0>;

		cam_vaf-supply = <&pm8937_l17>;

		qcom,cam-vreg-name = "cam_vaf";

		qcom,cam-vreg-min-voltage = <2850000>;

		qcom,cam-vreg-max-voltage = <2850000>;

		qcom,cam-vreg-op-mode = <80000>;

	};



	eeprom0: qcom,eeprom@0 {

		cell-index = <0>;

		compatible = "qcom,eeprom";

		qcom,cci-master = <0>;

		reg = <0x0>;

		cam_vana-supply = <&pm8937_l22>;

		cam_vio-supply = <&pm8937_l6>;

		cam_vaf-supply = <&pm8937_l17>;

		qcom,cam-vreg-name = "cam_vio", "cam_vana", "cam_vaf";

		qcom,cam-vreg-min-voltage = <0 2800000 2850000>;

		qcom,cam-vreg-max-voltage = <0 2800000 2850000>;

		qcom,cam-vreg-op-mode = <0 80000 100000>;

		pinctrl-names = "cam_default", "cam_suspend";

		pinctrl-0 = <&cam_sensor_mclk0_default

				&cam_sensor_rear_reset

				&cam_sensor_rear_standby

				&cam_sensor_rear_vdig>;

		pinctrl-1 = <&cam_sensor_mclk0_sleep

				&cam_sensor_rear_reset_sleep

				&cam_sensor_rear_standby_sleep

				&cam_sensor_rear_vdig_sleep>;

		gpios = <&tlmm 26 0>,

			<&tlmm 36 0>,

			<&tlmm 35 0>,

			<&tlmm 62 0>;

		qcom,gpio-reset = <1>;

		qcom,gpio-standby = <2>;

		qcom,gpio-vdig = <3>;

		qcom,gpio-req-tbl-num = <0 1 2 3>;

		qcom,gpio-req-tbl-flags = <1 0 0 0>;

		qcom,gpio-req-tbl-label = "CAMIF_MCLK0",

			"CAM_RESET0",

			"CAM_STANDBY0",

			"CAM_VDIG";

		status = "ok";

		clocks = <&clock_gcc clk_mclk0_clk_src>,

				<&clock_gcc clk_gcc_camss_mclk0_clk>;

		clock-names = "cam_src_clk", "cam_clk";

		qcom,clock-rates = <19200000 0>;

	};



	eeprom1: qcom,eeprom@1 {

		cell-index = <1>;

		reg = <0x1>;

		qcom,eeprom-name = "sunny_8865";

		compatible = "qcom,eeprom";

		qcom,slave-addr = <0x6c>;

		qcom,cci-master = <0>;

		qcom,num-blocks = <8>;



		qcom,page0 = <1 0x0100 2 0x01 1 1>;

		qcom,poll0 = <0 0x0 2 0x0 1 0>;

		qcom,mem0 = <0 0x0 2 0x0 1 0>;



		qcom,page1 = <1 0x5002 2 0x00 1 0>;

		qcom,poll1 = <0 0x0 2 0x0 1 0>;

		qcom,mem1 = <0 0x0 2 0x0 1 0>;



		qcom,page2 = <1 0x3d84 2 0xc0 1 0>;

		qcom,poll2 = <0 0x0 2 0x0 1 0>;

		qcom,mem2 = <0 0x0 2 0x0 1 0>;



		qcom,page3 = <1 0x3d88 2 0x70 1 0>;

		qcom,poll3 = <0 0x0 2 0x0 1 0>;

		qcom,mem3 = <0 0x0 2 0x0 1 0>;



		qcom,page4 = <1 0x3d89 2 0x10 1 0>;

		qcom,poll4 = <0 0x0 2 0x0 1 0>;

		qcom,mem4 = <0 0x0 2 0x0 1 0>;



		qcom,page5 = <1 0x3d8a 2 0x70 1 0>;

		qcom,poll5 = <0 0x0 2 0x0 1 0>;

		qcom,mem5 = <0 0x0 2 0x0 1 0>;



		qcom,page6 = <1 0x3d8b 2 0xf4 1 0>;

		qcom,poll6 = <0 0x0 2 0x0 1 0>;

		qcom,mem6 = <0 0x0 2 0x0 1 0>;



		qcom,page7 = <1 0x3d81 2 0x01 1 10>;

		qcom,poll7 = <0 0x0 2 0x0 1 1>;

		qcom,mem7 = <1536 0x7010 2 0 1 0>;



		cam_vdig-supply = <&pm8937_l23>;

		cam_vana-supply = <&pm8937_l22>;

		cam_vio-supply = <&pm8937_l6>;

		cam_vaf-supply = <&pm8937_l17>;

		qcom,cam-vreg-name = "cam_vdig", "cam_vio", "cam_vana",

			"cam_vaf";

		qcom,cam-vreg-min-voltage = <1200000 0 2800000 2850000>;

		qcom,cam-vreg-max-voltage = <1200000 0 2800000 2850000>;

		qcom,cam-vreg-op-mode = <105000 0 80000 100000>;

		qcom,gpio-no-mux = <0>;

		pinctrl-names = "cam_default", "cam_suspend";

		pinctrl-0 = <&cam_sensor_mclk2_default

			&cam_sensor_front1_default>;

		pinctrl-1 = <&cam_sensor_mclk2_sleep &cam_sensor_front1_sleep>;

		gpios = <&tlmm 28 0>,

			<&tlmm 40 0>,

			<&tlmm 39 0>;

		qcom,gpio-reset = <1>;

		qcom,gpio-standby = <2>;

		qcom,gpio-req-tbl-num = <0 1 2>;

		qcom,gpio-req-tbl-flags = <1 0 0>;

		qcom,gpio-req-tbl-label = "CAMIF_MCLK2",

					  "CAM_RESET2",

					  "CAM_STANDBY2";

		qcom,cam-power-seq-type = "sensor_vreg", "sensor_vreg",

			"sensor_vreg",

			"sensor_gpio", "sensor_gpio" , "sensor_clk";

		qcom,cam-power-seq-val = "cam_vdig", "cam_vana", "cam_vio",

			"sensor_gpio_reset", "sensor_gpio_standby",

			"sensor_cam_mclk";

		qcom,cam-power-seq-cfg-val = <1 1 1 1 1 24000000>;

		qcom,cam-power-seq-delay = <1 1 1 30 30 5>;

		status = "ok";

		clocks = <&clock_gcc clk_mclk2_clk_src>,

			<&clock_gcc clk_gcc_camss_mclk2_clk>;

		clock-names = "cam_src_clk", "cam_clk";

		qcom,clock-rates = <19200000 0>;

	};



	qcom,camera@0 {

		cell-index = <0>;

		compatible = "qcom,camera";

		reg = <0x0>;

		qcom,csiphy-sd-index = <0>;

		qcom,csid-sd-index = <0>;

		qcom,mount-angle = <270>;

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

		qcom,eeprom-src = <&eeprom0>;

		qcom,actuator-src = <&actuator0>;

		cam_vana-supply = <&pm8937_l22>;

		cam_vio-supply = <&pm8937_l6>;

		cam_vaf-supply = <&pm8937_l17>;

		qcom,cam-vreg-name = "cam_vio", "cam_vana", "cam_vaf";

		qcom,cam-vreg-min-voltage = <0 2800000 2850000>;

		qcom,cam-vreg-max-voltage = <0 2800000 2850000>;

		qcom,cam-vreg-op-mode = <0 80000 100000>;

		pinctrl-names = "cam_default", "cam_suspend";

		pinctrl-0 = <&cam_sensor_mclk0_default

				&cam_sensor_rear_reset

				&cam_sensor_rear_standby

				&cam_sensor_rear_vdig>;

		pinctrl-1 = <&cam_sensor_mclk0_sleep

				&cam_sensor_rear_reset_sleep

				&cam_sensor_rear_standby_sleep

				&cam_sensor_rear_vdig_sleep>;

		gpios = <&tlmm 26 0>,

			<&tlmm 36 0>,

			<&tlmm 35 0>,

			<&tlmm 62 0>;

		qcom,gpio-reset = <1>;

		qcom,gpio-standby = <2>;

		qcom,gpio-vdig = <3>;

		qcom,gpio-req-tbl-num = <0 1 2 3>;

		qcom,gpio-req-tbl-flags = <1 0 0 0>;

		qcom,gpio-req-tbl-label = "CAMIF_MCLK0",

			"CAM_RESET0",

			"CAM_STANDBY0",

			"CAM_VDIG";

		qcom,sensor-position = <0>;

		qcom,sensor-mode = <0>;

		qcom,cci-master = <0>;

		status = "ok";

		clocks = <&clock_gcc clk_mclk0_clk_src>,

				<&clock_gcc clk_gcc_camss_mclk0_clk>;

		clock-names = "cam_src_clk", "cam_clk";

		qcom,clock-rates = <24000000 0>;

	};



	qcom,camera@1 {

		cell-index = <1>;

		compatible = "qcom,camera";

		reg = <0x1>;

		qcom,csiphy-sd-index = <1>;

		qcom,csid-sd-index = <1>;

		qcom,mount-angle = <90>;

		cam_vdig-supply = <&pm8937_l23>;

		cam_vana-supply = <&pm8937_l22>;

		cam_vio-supply = <&pm8937_l6>;

		cam_vaf-supply = <&pm8937_l17>;

		qcom,cam-vreg-name = "cam_vdig", "cam_vio", "cam_vana",

							"cam_vaf";

		qcom,cam-vreg-min-voltage = <1200000 0 2800000 2850000>;

		qcom,cam-vreg-max-voltage = <1200000 0 2800000 2850000>;

		qcom,cam-vreg-op-mode = <200000 0 80000 100000>;

		pinctrl-names = "cam_default", "cam_suspend";

		pinctrl-0 = <&cam_sensor_mclk1_default

				&cam_sensor_front_default>;

		pinctrl-1 = <&cam_sensor_mclk1_sleep

				&cam_sensor_front_sleep>;

		gpios = <&tlmm 27 0>,

			<&tlmm 38 0>,

			<&tlmm 50 0>;

		qcom,gpio-reset = <1>;

		qcom,gpio-standby = <2>;

		qcom,gpio-req-tbl-num = <0 1 2>;

		qcom,gpio-req-tbl-flags = <1 0 0>;

		qcom,gpio-req-tbl-label = "CAMIF_MCLK1",

			"CAM_RESET1",

			"CAM_STANDBY1";

		qcom,sensor-position = <0x100>;

		qcom,sensor-mode = <1>;

		qcom,cci-master = <1>;

		clocks = <&clock_gcc clk_mclk1_clk_src>,

				<&clock_gcc clk_gcc_camss_mclk1_clk>;

		clock-names = "cam_src_clk", "cam_clk";

		qcom,clock-rates = <24000000 0>;

	};



	qcom,camera@2 {

		cell-index = <2>;

		compatible = "qcom,camera";

		reg = <0x02>;

		qcom,csiphy-sd-index = <1>;

		qcom,csid-sd-index = <1>;

		qcom,mount-angle = <90>;

		qcom,eeprom-src = <&eeprom1>;

		qcom,actuator-src = <&actuator1>;

		cam_vdig-supply = <&pm8937_l23>;

		cam_vana-supply = <&pm8937_l22>;

		cam_vio-supply = <&pm8937_l6>;

		cam_vaf-supply = <&pm8937_l17>;

		qcom,cam-vreg-name = "cam_vdig", "cam_vio", "cam_vana",

					"cam_vaf";

		qcom,cam-vreg-min-voltage = <1200000 0 2800000 2850000>;

		qcom,cam-vreg-max-voltage = <1200000 0 2800000 2850000>;

		qcom,cam-vreg-op-mode = <105000 0 80000 100000>;

		qcom,gpio-no-mux = <0>;

		pinctrl-names = "cam_default", "cam_suspend";

		pinctrl-0 = <&cam_sensor_mclk2_default

				&cam_sensor_front1_default>;

		pinctrl-1 = <&cam_sensor_mclk2_sleep

				&cam_sensor_front1_sleep>;

		gpios = <&tlmm 28 0>,

			<&tlmm 40 0>,

			<&tlmm 39 0>;

		qcom,gpio-reset = <1>;

		qcom,gpio-standby = <2>;

		qcom,gpio-req-tbl-num = <0 1 2>;

		qcom,gpio-req-tbl-flags = <1 0 0>;

		qcom,gpio-req-tbl-label = "CAMIF_MCLK2",

					  "CAM_RESET2",

					  "CAM_STANDBY2";

		qcom,sensor-position = <1>;

		qcom,sensor-mode = <0>;

		qcom,cci-master = <0>;

		status = "ok";

		clocks = <&clock_gcc clk_mclk2_clk_src>,

			<&clock_gcc clk_gcc_camss_mclk2_clk>;

		clock-names = "cam_src_clk", "cam_clk";

		qcom,clock-rates = <24000000 0>;

	};

};

arch/arm64/boot/dts/qcom/msm8937-cdp.dtsi

+1 −0
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ 
 */



#include <dt-bindings/clock/msm-clocks-8952.h>

#include "msm8937-camera-sensor-cdp.dtsi"



&soc {

	gpio_keys {

arch/arm64/boot/dts/qcom/qm215-regulator.dtsi

+7 −1
Original line number Diff line number Diff line 
/* Copyright (c) 2013-2015, 2018, The Linux Foundation. All rights reserved.

/* Copyright (c) 2013-2015, 2018-2019, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -549,9 +549,15 @@ 
		qcom,cpr-voltage-scaling-factor-max = <0 2000 2000>;

		qcom,cpr-scaled-init-voltage-as-ceiling;

		qcom,cpr-fuse-revision = <69 39 3 0>;

		qcom,pvs-version-fuse-sel = <37 40 3 0>; /* foundry */

		qcom,cpr-fuse-version-map =

			<(-1)       1     (-1)    (-1)    (-1)    (-1)>,

			<(-1)     (-1)    (-1)    (-1)    (-1)    (-1)>;

		qcom,cpr-quotient-adjustment =

				<30      20      0>,

				<50      40     50>;

		qcom,cpr-init-voltage-adjustment =

				<0       0          0>,

				<30000   5000   10000>;

		qcom,cpr-enable;

	};