Merge branch 'LA.UM.9.12.C10.11.00.00.840.535' via branch 'qcom-msm-4.19-7250' into android-msm-pixel-4.19

Bug: 272199761
Change-Id: I65439419b4c537d326b3a47c83dacbbd2dc4e726
Signed-off-by: JohnnLee <johnnlee@google.com>

5 files changed, 36 insertions, 6 deletions

diff --git a/arch/arm64/configs/vendor/sdm660_defconfig b/arch/arm64/configs/vendor/sdm660_defconfig
index 4252f63d015c..7a00bc5fcc70 100644
--- a/arch/arm64/configs/vendor/sdm660_defconfig
+++ b/arch/arm64/configs/vendor/sdm660_defconfig
@@ -623,7 +623,6 @@ CONFIG_MSM_PIL=y
 CONFIG_MSM_SYSMON_QMI_COMM=y
 CONFIG_MSM_PIL_SSR_GENERIC=y
 CONFIG_MSM_BOOT_STATS=y
-CONFIG_QCOM_DCC_V2=y
 CONFIG_QCOM_EUD=y
 CONFIG_QCOM_MINIDUMP=y
 CONFIG_MSM_CORE_HANG_DETECT=y
@@ -644,6 +643,7 @@ CONFIG_QCOM_SMCINVOKE=y
 CONFIG_MSM_EVENT_TIMER=y
 CONFIG_MSM_PM=y
 CONFIG_QTI_L2_REUSE=y
+CONFIG_QCOM_DCC=y
 CONFIG_QTI_RPM_STATS_LOG=y
 CONFIG_QTEE_SHM_BRIDGE=y
 CONFIG_MEM_SHARE_QMI_SERVICE=y
diff --git a/drivers/char/adsprpc.c b/drivers/char/adsprpc.c
index 2f0aa7de699c..b4a01a76fcd4 100644
--- a/drivers/char/adsprpc.c
+++ b/drivers/char/adsprpc.c
@@ -4256,8 +4256,8 @@ static int fastrpc_device_open(struct inode *inode, struct file *filp)
 	hlist_add_head(&fl->hn, &me->drivers);
 	spin_unlock(&me->hlock);
 	mutex_init(&fl->perf_mutex);
-	init_completion(&fl->shutdown);
 	mutex_init(&fl->pm_qos_mutex);
+	init_completion(&fl->shutdown);
 	return 0;
 }
 
diff --git a/drivers/clk/qcom/clk-debug.c b/drivers/clk/qcom/clk-debug.c
index 611562a67aba..8838c7072c07 100644
--- a/drivers/clk/qcom/clk-debug.c
+++ b/drivers/clk/qcom/clk-debug.c
@@ -276,9 +276,10 @@ static int clk_debug_measure_get(void *data, u64 *val)
 	enable_debug_clks(measure);
 	*val = clk_debug_mux_measure_rate(measure);
 
-	trace_clk_measure(clk_hw_get_name(hw), *val);
 	/* recursively calculate actual freq */
 	*val *= get_mux_divs(measure);
+	/* enable ftrace support */
+	trace_clk_measure(clk_hw_get_name(hw), *val);
 	disable_debug_clks(measure);
 exit:
 	if (meas->bus_cl_id)
diff --git a/drivers/misc/kxrctrl/aphost.c b/drivers/misc/kxrctrl/aphost.c
index bc6ceebd85ee..92cd21a7c2b6 100644
--- a/drivers/misc/kxrctrl/aphost.c
+++ b/drivers/misc/kxrctrl/aphost.c
@@ -226,6 +226,10 @@ static ssize_t jsrequest_show(struct device *dev,
 	} else {
 		size = scnprintf(buf, PAGE_SIZE, "no need to ack\n");
 	}
+	pinctrl_select_state(
+		gspi_client->pinctrl_info.pinctrl,
+		gspi_client->pinctrl_info.active);
+	gspi_client->js_ledl_state = 0;
 	mutex_unlock(&gspi_client->js_mutex);
 
 	return size;
@@ -244,6 +248,11 @@ static ssize_t jsrequest_store(struct device *dev,
 		return size;
 	}
 
+	pinctrl_select_state(
+		gspi_client->pinctrl_info.pinctrl,
+		gspi_client->pinctrl_info.suspend);
+	gspi_client->js_ledl_state = 1;
+
 	mutex_lock(&gspi_client->js_mutex);
 	err = kstrtouint(buf, 16, &input);
 	if (err) {
@@ -252,9 +261,21 @@ static ssize_t jsrequest_store(struct device *dev,
 		memset(&request, 0, sizeof(request_t));
 		request.requestHead.requestType =
 				((input & 0x7f000000) >> 24);
-		request.requestData[0] = (input & 0x000000ff);
-		request.requestData[1] = (input & 0x0000ff00);
-		request.requestData[2] = (input & 0x00ff0000);
+		if (request.requestHead.requestType == 0xc) {
+			request.requestData[0] =
+					(input & 0x000000ff);
+			request.requestData[1] =
+					((input & 0x0000ff00) >> 8);
+			request.requestData[2] =
+					((input & 0x00ff0000) >> 16);
+		} else {
+			request.requestData[0] =
+					(input & 0x000000ff);
+			request.requestData[1] =
+					(input & 0x0000ff00);
+			request.requestData[2] =
+					(input & 0x00ff0000);
+		}
 
 		switch (request.requestHead.requestType) {
 		case setVibStateRequest:
@@ -285,6 +306,7 @@ static ssize_t jsrequest_store(struct device *dev,
 		case getRightJoyStickProductNameRequest:
 		case getLeftJoyStickFwVersionRequest:
 		case getRightJoyStickFwVersionRequest:
+		case setControllerSleepMode:
 				atomic_set(&gspi_client->userRequest,
 					input);
 				atomic_inc(&gspi_client->dataflag);
@@ -466,6 +488,12 @@ static int js_thread(void *data)
 				spi_client->txbuffer[2] =
 					 (currentRequest.requestData[0]&0x01);
 				break;
+		case setControllerSleepMode:
+				spi_client->txbuffer[2] =
+					currentRequest.requestData[0];
+				spi_client->txbuffer[3] =
+					currentRequest.requestData[1];
+				break;
 		default:
 				break;
 		}
diff --git a/drivers/misc/kxrctrl/aphost.h b/drivers/misc/kxrctrl/aphost.h
index 2d7612fc73f8..cce7927ec512 100644
--- a/drivers/misc/kxrctrl/aphost.h
+++ b/drivers/misc/kxrctrl/aphost.h
@@ -109,6 +109,7 @@ typedef enum _requestType_t
 	getRightJoyStickProductNameRequest,
 	getLeftJoyStickFwVersionRequest,
 	getRightJoyStickFwVersionRequest,
+	setControllerSleepMode = 12,
 	invalidRequest,
 } requestType_t;