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

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

Promotion of kernel.lnx.4.4-161022. 

CRs      Change ID                                   Subject
--------------------------------------------------------------------------------------------------------------
1069108   Iffc380898eac33f6c30c3808eb38d7bb499f5769   driver: thermal: msm_lmh_dcvs: Match the hardware freque
1077693   I59d4472b49b67f481992867a34e6779a4589d035   fg-util: fix a possible buffer overflow
1079245   Iee80fd2bf4b549665a12791009f0cf5ecc7653b9   msm: gsi: add command stats
1080510   I2ddb8b3b96063be3c6a6cb6bc333998e007f9de7   sched/core_ctl: Move header file to global location
1072739   I1405a8561b1ecb2e3da87ed8b26fb087433a1c11   ARM: dts: msm: Change pinctrl settings for BLSP1 UART3 f
1069108   If042fdae3102390dca6d5b1e257b38504b14320f   defconfig: Enable generic cpu cooling device for msmcoba
1069108   I23762895d04dd6f1da8bb496f2a4cf22c1b34216   driver: thermal: msm_lmh_dcvs: Register LMH DCVS cooling
1080510   Iad0a9fc45f1ce87433995e8e549bfca80e8b9cb2   core_ctl: Add refcounting to boost api
1069108   I47960b002bf1bce1cd588de2892de46793a95562   drivers: thermal: cpu_cooling: allow platform freq mitig
1079061   Ia90832f9280f69c367c5d9f404b0d27c656e5c28   input: misc: pat9125: add sysfs for suspend-resume test

Change-Id: Ib2dcbeb2d85e602236c2196f3f306ab405b26f9f
CRs-Fixed: 1079061, 1072739, 1069108, 1079245, 1080510, 1077693
parents 8872faa0 876d5731

arch/arm/boot/dts/qcom/msmcobalt-blsp.dtsi

+4 −2
Original line number Diff line number Diff line
@@ -736,8 +736,10 @@ 
		clocks = <&clock_gcc clk_gcc_blsp1_uart3_apps_clk>,

		    <&clock_gcc clk_gcc_blsp1_ahb_clk>;

		pinctrl-names = "sleep", "default";

		pinctrl-0 = <&blsp1_uart3_sleep>;

		pinctrl-1 = <&blsp1_uart3_active>;

		pinctrl-0 = <&blsp1_uart3_tx_sleep>, <&blsp1_uart3_rxcts_sleep>,

					<&blsp1_uart3_rfr_sleep>;

		pinctrl-1 = <&blsp1_uart3_tx_active>,

			<&blsp1_uart3_rxcts_active>, <&blsp1_uart3_rfr_active>;



		qcom,msm-bus,name = "buart3";

		qcom,msm-bus,num-cases = <2>;

arch/arm/boot/dts/qcom/msmcobalt-pinctrl.dtsi

+71 −17
Original line number Diff line number Diff line
@@ -1223,32 +1223,86 @@ 
			};

		};



		blsp1_uart3_active: blsp1_uart3_active {

		blsp1_uart3: blsp1_uart3 {

			blsp1_uart3_tx_active: blsp1_uart3_tx_active {

				mux {

				pins = "gpio45", "gpio46", "gpio47", "gpio48";

					pins = "gpio45";

					function = "blsp_uart3_a";

				};



				config {

				pins = "gpio45", "gpio46", "gpio47", "gpio48";

					pins = "gpio45";

					drive-strength = <2>;

					bias-disable;

				};

			};



		blsp1_uart3_sleep: blsp1_uart3_sleep {

			blsp1_uart3_tx_sleep: blsp1_uart3_tx_sleep {

				mux {

				pins = "gpio45", "gpio46", "gpio47", "gpio48";

					pins = "gpio45";

					function = "gpio";

				};



				config {

				pins = "gpio45", "gpio46", "gpio47", "gpio48";

					pins = "gpio45";

					drive-strength = <2>;

					bias-pull-up;

				};

			};



			blsp1_uart3_rxcts_active: blsp1_uart3_rxcts_active {

				mux {

					pins = "gpio46", "gpio47";

					function = "blsp_uart3_a";

				};



				config {

					pins = "gpio46", "gpio47";

					drive-strength = <2>;

					bias-disable;

				};

			};



			blsp1_uart3_rxcts_sleep: blsp1_uart3_rxcts_sleep {

				mux {

					pins = "gpio46", "gpio47";

					function = "gpio";

				};



				config {

					pins = "gpio46", "gpio47";

					drive-strength = <2>;

					bias-no-pull;

				};

			};



			blsp1_uart3_rfr_active: blsp1_uart3_rfr_active {

				mux {

					pins = "gpio48";

					function = "blsp_uart3_a";

				};



				config {

					pins = "gpio48";

					drive-strength = <2>;

					bias-disable;

				};

			};



			blsp1_uart3_rfr_sleep: blsp1_uart3_rfr_sleep {

				mux {

					pins = "gpio48";

					function = "gpio";

				};



				config {

					pins = "gpio48";

					drive-strength = <2>;

					bias-no-pull;

				};

			};

		};



		cam_sensor_rear2_suspend: cam_sensor_rear2_suspend {

			/* RESET, STANDBY */

			mux {

arch/arm64/configs/msmcortex-perf_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -321,6 +321,7 @@ CONFIG_QPNP_SMB2=y 
CONFIG_SMB138X_CHARGER=y

CONFIG_QPNP_QNOVO=y

CONFIG_SENSORS_QPNP_ADC_VOLTAGE=y

CONFIG_CPU_THERMAL=y

CONFIG_LIMITS_MONITOR=y

CONFIG_LIMITS_LITE_HW=y

CONFIG_THERMAL_MONITOR=y

arch/arm64/configs/msmcortex_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -324,6 +324,7 @@ CONFIG_QPNP_SMB2=y 
CONFIG_SMB138X_CHARGER=y

CONFIG_QPNP_QNOVO=y

CONFIG_SENSORS_QPNP_ADC_VOLTAGE=y

CONFIG_CPU_THERMAL=y

CONFIG_LIMITS_MONITOR=y

CONFIG_LIMITS_LITE_HW=y

CONFIG_THERMAL_MONITOR=y

drivers/input/misc/ots_pat9125/pat9125_linux_driver.c

+29 −0
Original line number Diff line number Diff line
@@ -31,6 +31,10 @@ struct pixart_pat9125_data { 
	struct pinctrl_state *pinctrl_state_release;

};



/* Declaration of suspend and resume functions */

static int pat9125_suspend(struct device *dev);

static int pat9125_resume(struct device *dev);



static int pat9125_i2c_write(struct i2c_client *client, u8 reg, u8 *data,

		int len)

{
@@ -146,6 +150,27 @@ static irqreturn_t pat9125_irq(int irq, void *dev_data) 
	return IRQ_HANDLED;

}



static ssize_t pat9125_suspend_store(struct device *dev,

		struct device_attribute *attr, const char *buf, size_t count)

{

	struct pixart_pat9125_data *data =

		(struct pixart_pat9125_data *) dev_get_drvdata(dev);

	struct i2c_client *client = data->client;

	int mode;



	if (kstrtoint(buf, 10, &mode)) {

		dev_err(dev, "failed to read input for sysfs\n");

		return -EINVAL;

	}



	if (mode == 1)

		pat9125_suspend(&client->dev);

	else if (mode == 0)

		pat9125_resume(&client->dev);



	return count;

}



static ssize_t pat9125_test_store(struct device *dev,

		struct device_attribute *attr, const char *buf, size_t count)

{
@@ -191,11 +216,15 @@ static ssize_t pat9125_test_show(struct device *dev, 
{

	return 0;

}



static DEVICE_ATTR(suspend, S_IRUGO | S_IWUSR | S_IWGRP,

		NULL, pat9125_suspend_store);

static DEVICE_ATTR(test, S_IRUGO | S_IWUSR | S_IWGRP,

		pat9125_test_show, pat9125_test_store);



static struct attribute *pat9125_attr_list[] = {

	&dev_attr_test.attr,

	&dev_attr_suspend.attr,

	NULL,

};