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

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

Promotion of kernel.lnx.4.4-170117.1. 

CRs      Change ID                                   Subject
--------------------------------------------------------------------------------------------------------------
1109927   Ic99b10abe662088c2c030526135689f7c78c595a   sound: usb: Map interface context information to interfa
1110958   Iebc0871220547c2d6f026db1dffafe30b854b199   soc: qcom: service-notifier: fix object corruption
1110268   I4b3420a91108eca844206789d8f1e478526afd62   icnss: Increase QMI timeout value
1111861   Id32285c346167c4a0bf1ab9101d336fa664febbf   ARM: dts: msm: Enable icnss device node for SDM660
1107652   Ia6c4a305eb42c014a928bad36491e6e5f6eac9d5   soc: qcom: glink: Change cleanup sequence in remote clos
1111867   Ife776c32c82bb9167a413fda62798000d5174170   ARM: dts: msm: add battery data information for SDM660/S
1111918   Ib76ef7a4fd5362f8cb972f1e4e070157a59c2c27   ARM: dts: msm: Vote for BIMC GFX clock for SDM660 GPU
1091972   I15258a8afea51421bc39d554ec96e2134924a3a6   ARM: dts: msm: Add LMH DCVSh mitigation support for KTM
1111395   I356e47de585ae81bd27859f790f673b31ae5ba72   drivers: thermal: lmh_dcvs: Update Low threshold with hi
1111378   I60868f2cb0194b61000946e1d524fa27342dec6b   arm64: kaslr: keep modules close to the kernel when DYNA
1108299   I83a98342c554db6e70d569485a70fdc4e323265e   msm: camera: avoid invalid memory access
1091972   I6cd07ef4825aaa57cf3d58ea239c9fbc05c4e442   ARM: dts: msm: Enable LMH DCVSh driver for sdm660
1111378   I35f8d8960c0a3f6cecf0690e8f93fce339ed8838   arm64: insn: remove BUG_ON from codegen
1112070   I217f13eb4bff321ae1b7583f5d2614b6c9589987   soc: qcom: Return actual return code when piltz_resc_ini
1111133   I45d5e45ea82bafa78ef83638f1b374e03bb43145   ARM: dts: msm: Add support for msm8998 QRD SKUK EVT3 boa
1102288   I405ca6c7fcb0afa112e0851907b5dca805ac5411   seemp: use local stack mem when encoding params
1110776   I6a79dde638e751998ac37948f826639a161ff4a2   msm: ADSPRPC: add profiling counters
1111901   I64d4e1ee379b2a3110ecd403e7ed838948df6ca3   ARM: dts: msm: configure default CMA region for sdm660
1100412   Ic1853ef5143cadd95f0a6df474b35ad45fa918e1   scsi: ufs: fix deadlock between clock scaling and shutdo
1091972   Ie6cf0498bd7ad869640efc602d2573b6def7d5b7   ARM: dts: msm: Add BCL mitigation configuration for sdm6

Change-Id: I0cf526e24b07eebdc3dfe9d4e71289d042aa194e
CRs-Fixed: 1111918, 1111133, 1110776, 1110958, 1111901, 1110268, 1111395, 1109927, 1112070, 1100412, 1111378, 1091972, 1111861, 1108299, 1102288, 1111867, 1107652
parents 155bb7cb a51b7f60

arch/arm/boot/dts/qcom/msm-pm660l.dtsi

+2 −2
Original line number Diff line number Diff line 
/* Copyright (c) 2016, The Linux Foundation. All rights reserved.

/* Copyright (c) 2016-2017, 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
@@ -37,7 +37,7 @@ 
		qcom,temp-alarm@2400 {

			compatible = "qcom,qpnp-temp-alarm";

			reg = <0x2400 0x100>;

			interrupts = <0x0 0x24 0x0 IRQ_TYPE_EDGE_RISING>;

			interrupts = <0x2 0x24 0x0 IRQ_TYPE_EDGE_RISING>;

			label = "pm660l_tz";

		};

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

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

 * Copyright (c) 2017, 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.

 */



&soc {

	led_flash0: qcom,camera-flash@0 {

		cell-index = <0>;

		compatible = "qcom,camera-flash";

		qcom,flash-source = <&pmi8998_flash0 &pmi8998_flash1>;

		qcom,torch-source = <&pmi8998_torch0 &pmi8998_torch1>;

		qcom,switch-source = <&pmi8998_switch0>;

		status = "ok";

	};



	led_flash1: qcom,camera-flash@1 {

		cell-index = <1>;

		compatible = "qcom,camera-flash";

		qcom,flash-source = <&pmi8998_flash2>;

		qcom,torch-source = <&pmi8998_torch2>;

		qcom,switch-source = <&pmi8998_switch1>;

		status = "ok";

	};



	rear_vana_regulator:fixed_regulator@0 {

		compatible = "regulator-fixed";

		regulator-name = "rear_vana_regulator";

		regulator-min-microvolt = <2800000>;

		regulator-max-microvolt = <2800000>;

		enable-active-high;

		gpio = <&tlmm 27 0>;

		vin-supply = <&pmi8998_bob>;

	};



	vaf1_gpio_supply:fixed_regulator@1 {

		compatible = "regulator-fixed";

		regulator-name = "vaf1_gpio_supply";

		regulator-min-microvolt = <2800000>;

		regulator-max-microvolt = <2800000>;

		enable-active-high;

		gpio = <&tlmm 29 0>;

		vin-supply = <&pmi8998_bob>;

	};



	vaf2_gpio_supply:fixed_regulator@2 {

		compatible = "regulator-fixed";

		regulator-name = "vaf2_gpio_supply";

		regulator-min-microvolt = <2800000>;

		regulator-max-microvolt = <2800000>;

		enable-active-high;

		gpio = <&tlmm 27 0>;

		vin-supply = <&pmi8998_bob>;

	};

};



&tlmm{

	cam_sensor_front_active: cam_sensor_front_active {

		/* RESET */

		mux {

			pins = "gpio9";

			function = "gpio";

		};



		config {

			pins = "gpio9";

			bias-disable; /* No PULL */

			drive-strength = <2>; /* 2 MA */

		};

	};



	cam_sensor_front_suspend: cam_sensor_front_suspend {

		/* RESET */

		mux {

			pins = "gpio9";

			function = "gpio";

		};



		config {

			pins = "gpio9";

			bias-disable; /* No PULL */

			drive-strength = <2>; /* 2 MA */

		};

	};



	cam_sensor_rear2_active: cam_sensor_rear2_active {

		/* RESET, STANDBY */

		mux {

			pins = "gpio28";

			function = "gpio";

		};



		config {

			pins = "gpio28";

			bias-disable; /* No PULL */

			drive-strength = <2>; /* 2 MA */

		};

	};



	cam_sensor_rear2_suspend: cam_sensor_rear2_suspend {

		/* RESET, STANDBY */

		mux {

			pins = "gpio28";

			function = "gpio";

		};



		config {

			pins = "gpio28";

			bias-disable; /* No PULL */

			drive-strength = <2>; /* 2 MA */

		};

	};



	cam_sensor_rear_active: cam_sensor_rear_active {

		/* RESET, STANDBY */

		mux {

			pins = "gpio30";

			function = "gpio";

		};



		config {

			pins = "gpio30";

			bias-disable; /* No PULL */

			drive-strength = <2>; /* 2 MA */

		};

	};



	cam_sensor_rear_suspend: cam_sensor_rear_suspend {

		/* RESET, STANDBY */

		mux {

			pins = "gpio30";

			function = "gpio";

		};



		config {

			pins = "gpio30";

			bias-disable; /* No PULL */

			drive-strength = <2>; /* 2 MA */

		};

	};

};



&cci {

	actuator0: qcom,actuator@0 {

		cell-index = <0>;

		reg = <0x0>;

		compatible = "qcom,actuator";

		qcom,cci-master = <0>;

		cam_vaf-supply = <&vaf1_gpio_supply>;

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

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

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

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

	};



	actuator1: qcom,actuator@1 {

		cell-index = <1>;

		reg = <0x1>;

		compatible = "qcom,actuator";

		qcom,cci-master = <1>;

		cam_vaf-supply = <&vaf2_gpio_supply>;

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

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

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

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

	};



	ois0: qcom,ois@0 {

		cell-index = <0>;

		reg = <0x0>;

		compatible = "qcom,ois";

		qcom,cci-master = <0>;

		cam_vaf-supply = <&vaf2_gpio_supply>;

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

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

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

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

		status = "disabled";

	};



	eeprom0: qcom,eeprom@0 {

		cell-index = <0>;

		reg = <0>;

		compatible = "qcom,eeprom";

		cam_vio-supply = <&pm8998_lvs1>;

		cam_vana-supply = <&rear_vana_regulator>;

		cam_vdig-supply = <&pm8998_s3>;

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

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

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

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

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

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

		pinctrl-0 = <&cam_sensor_mclk0_active

				 &cam_sensor_rear_active>;

		pinctrl-1 = <&cam_sensor_mclk0_suspend

				 &cam_sensor_rear_suspend>;

		gpios = <&tlmm 13 0>,

			<&tlmm 30 0>,

			<&pm8998_gpios 20 0>;

		qcom,gpio-reset = <1>;

		qcom,gpio-vdig = <2>;

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

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

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

					"CAM_RESET0",

					"CAM_VDIG";

		qcom,sensor-position = <0>;

		qcom,sensor-mode = <0>;

		qcom,cci-master = <0>;

		status = "ok";

		clocks = <&clock_mmss clk_mclk0_clk_src>,

				<&clock_mmss clk_mmss_camss_mclk0_clk>;

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

		qcom,clock-rates = <24000000 0>;

	};



	eeprom1: qcom,eeprom@1 {

		cell-index = <1>;

		reg = <0x1>;

		compatible = "qcom,eeprom";

		cam_vio-supply = <&pm8998_lvs1>;

		cam_vana-supply = <&rear_vana_regulator>;

		cam_vdig-supply = <&pm8998_s3>;

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

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

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

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

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

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

		pinctrl-0 = <&cam_sensor_mclk1_active

						&cam_sensor_rear2_active>;

		pinctrl-1 = <&cam_sensor_mclk1_suspend

						&cam_sensor_rear2_suspend>;

		gpios = <&tlmm 14 0>,

				<&tlmm 28 0>,

				<&pm8998_gpios 20 0>;

		qcom,gpio-reset = <1>;

		qcom,gpio-vdig = <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_VDIG";

		qcom,sensor-position = <0>;

		qcom,sensor-mode = <0>;

		qcom,cci-master = <1>;

		status = "ok";

		clocks = <&clock_mmss clk_mclk1_clk_src>,

			<&clock_mmss clk_mmss_camss_mclk1_clk>;

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

		qcom,clock-rates = <24000000 0>;

	};



	eeprom2: qcom,eeprom@2 {

		cell-index = <2>;

		reg = <0x2>;

		compatible = "qcom,eeprom";

		cam_vio-supply = <&pm8998_lvs1>;

		cam_vana-supply = <&pm8998_l22>;

		cam_vdig-supply = <&pm8998_s3>;

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

		qcom,cam-vreg-min-voltage =

			<0 2864000 1352000>;

		qcom,cam-vreg-max-voltage =

			<0 2864000 1352000>;

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

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

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

		pinctrl-0 = <&cam_sensor_mclk2_active

				 &cam_sensor_front_active>;

		pinctrl-1 = <&cam_sensor_mclk2_suspend

				 &cam_sensor_front_suspend>;

		gpios = <&tlmm 15 0>,

			<&tlmm 9 0>,

			<&pm8998_gpios 9 0>;

		qcom,gpio-reset = <1>;

		qcom,gpio-vdig = <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_VDIG";

		qcom,sensor-position = <1>;

		qcom,sensor-mode = <0>;

		qcom,cci-master = <1>;

		status = "ok";

		clocks = <&clock_mmss clk_mclk2_clk_src>,

			<&clock_mmss clk_mmss_camss_mclk2_clk>;

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

		qcom,clock-rates = <24000000 0>;

	};



	qcom,camera@0 {

		cell-index = <0>;

		compatible = "qcom,camera";

		reg = <0x0>;

		qcom,special-support-sensors = "imx362_gt24c64a",

					"s5k3m3sm", "s5k2l7sx";

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

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

		qcom,mount-angle = <270>;

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

		qcom,actuator-src = <&actuator0>;

		qcom,eeprom-src = <&eeprom0>;

		cam_vio-supply = <&pm8998_lvs1>;

		cam_vana-supply = <&rear_vana_regulator>;

		cam_vdig-supply = <&pm8998_s3>;

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

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

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

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

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

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

		pinctrl-0 = <&cam_sensor_mclk0_active

				 &cam_sensor_rear_active>;

		pinctrl-1 = <&cam_sensor_mclk0_suspend

				 &cam_sensor_rear_suspend>;

		gpios = <&tlmm 13 0>,

			<&tlmm 30 0>,

			<&pm8998_gpios 20 0>;

		qcom,gpio-reset = <1>;

		qcom,gpio-vdig = <2>;

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

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

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

					"CAM_RESET0",

					"CAM_VDIG";

		qcom,sensor-position = <0>;

		qcom,sensor-mode = <0>;

		qcom,cci-master = <0>;

		status = "ok";

		clocks = <&clock_mmss clk_mclk0_clk_src>,

				<&clock_mmss clk_mmss_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>;

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

		qcom,actuator-src = <&actuator1>;

		qcom,eeprom-src = <&eeprom1>;

		qcom,ois-src = <&ois0>;

		cam_vio-supply = <&pm8998_lvs1>;

		cam_vana-supply = <&rear_vana_regulator>;

		cam_vdig-supply = <&pm8998_s3>;

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

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

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

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

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

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

		pinctrl-0 = <&cam_sensor_mclk1_active

						&cam_sensor_rear2_active>;

		pinctrl-1 = <&cam_sensor_mclk1_suspend

						&cam_sensor_rear2_suspend>;

		gpios = <&tlmm 14 0>,

				<&tlmm 28 0>,

				<&pm8998_gpios 20 0>;

		qcom,gpio-reset = <1>;

		qcom,gpio-vdig = <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_VDIG";

		qcom,sensor-position = <0>;

		qcom,sensor-mode = <0>;

		qcom,cci-master = <1>;

		status = "ok";

		clocks = <&clock_mmss clk_mclk1_clk_src>,

			<&clock_mmss clk_mmss_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 = <2>;

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

		qcom,mount-angle = <90>;

		qcom,eeprom-src = <&eeprom2>;

		cam_vio-supply = <&pm8998_lvs1>;

		cam_vana-supply = <&pm8998_l22>;

		cam_vdig-supply = <&pm8998_s3>;

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

		qcom,cam-vreg-min-voltage =

			<0 2864000 1352000>;

		qcom,cam-vreg-max-voltage =

			<0 2864000 1352000>;

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

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

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

		pinctrl-0 = <&cam_sensor_mclk2_active

						&cam_sensor_front_active>;

		pinctrl-1 = <&cam_sensor_mclk2_suspend

						&cam_sensor_front_suspend>;

		gpios = <&tlmm 15 0>,

			<&tlmm 9 0>,

			<&pm8998_gpios 9 0>;

		qcom,gpio-reset = <1>;

		qcom,gpio-vdig = <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_VDIG";

		qcom,sensor-position = <1>;

		qcom,sensor-mode = <0>;

		qcom,cci-master = <1>;

		status = "ok";

		clocks = <&clock_mmss clk_mclk2_clk_src>,

			<&clock_mmss clk_mmss_camss_mclk2_clk>;

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

		qcom,clock-rates = <24000000 0>;

	};

};



&pm8998_gpios {

	gpio@c800 { /* GPIO 9 - CAMERA SENSOR 2 VDIG */

		qcom,mode = <1>;		/* Output */

		qcom,pull = <5>;		/* No Pull */

		qcom,vin-sel = <0>;		/* VIN1 GPIO_LV */

		qcom,src-sel = <0>;		/* GPIO */

		qcom,invert = <0>;		/* Invert */

		qcom,master-en = <1>;		/* Enable GPIO */

		status = "ok";

	};



	gpio@d300 { /* GPIO 20 - CAMERA SENSOR 0/1 VDIG */

		qcom,mode = <1>;		/* Output */

		qcom,pull = <5>;		/* No Pull */

		qcom,vin-sel = <1>;		/* VIN1 GPIO_MV */

		qcom,src-sel = <0>;		/* GPIO */

		qcom,invert = <0>;		/* Invert */

		qcom,master-en = <1>;		/* Enable GPIO */

		status = "ok";

	};

};

arch/arm/boot/dts/qcom/msm8998-qrd-skuk.dts

+2 −1
Original line number Diff line number Diff line 
/* Copyright (c) 2016, The Linux Foundation. All rights reserved.

/* Copyright (c) 2016-2017, 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
@@ -15,6 +15,7 @@ 


#include "msm8998.dtsi"

#include "msm8998-qrd-skuk.dtsi"

#include "msm8998-camera-sensor-skuk.dtsi"



/ {

	model = "Qualcomm Technologies, Inc. MSM 8998 SKUK";

arch/arm/boot/dts/qcom/msm8998-qrd-skuk.dtsi

+0 −1
Original line number Diff line number Diff line
@@ -13,7 +13,6 @@ 
#include <dt-bindings/interrupt-controller/irq.h>

#include "msm8998-pinctrl.dtsi"

#include "msm8998-audio.dtsi"

#include "msm8998-camera-sensor-skuk.dtsi"



/ {

	bluetooth: bt_wcn3990 {

arch/arm/boot/dts/qcom/msm8998-v2-qrd-skuk-evt3.dts

+2 −1
Original line number Diff line number Diff line 
/* Copyright (c) 2016, The Linux Foundation. All rights reserved.

/* Copyright (c) 2016-2017, 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
@@ -15,6 +15,7 @@ 


#include "msm8998-v2.dtsi"

#include "msm8998-qrd-skuk.dtsi"

#include "msm8998-camera-sensor-skuk-evt3.dtsi"



/ {

	model = "Qualcomm Technologies, Inc. MSM 8998 V2 SKUK EVT3";