--- 846938a143d564afc79c386c6b9ecff1625e66e3
+++ 084041fd493cb5ff0331c7748f6d36579a934e27
@@ -368,6 +368,7 @@ static struct i2c_board_info max77693_i2
 
 };
 #endif
+
 #if defined(CONFIG_IR_REMOCON_FPGA)
 static void irda_wake_en(bool onoff)
 {
@@ -1249,12 +1250,6 @@ static void __init apq8064_early_reserve
 static struct msm_bus_vectors hsic_init_vectors[] = {
 	{
 		.src = MSM_BUS_MASTER_SPS,
-		.dst = MSM_BUS_SLAVE_EBI_CH0,
-		.ab = 0,
-		.ib = 0,
-	},
-	{
-		.src = MSM_BUS_MASTER_SPS,
 		.dst = MSM_BUS_SLAVE_SPS,
 		.ab = 0,
 		.ib = 0,
@@ -1265,15 +1260,9 @@ static struct msm_bus_vectors hsic_init_
 static struct msm_bus_vectors hsic_max_vectors[] = {
 	{
 		.src = MSM_BUS_MASTER_SPS,
-		.dst = MSM_BUS_SLAVE_EBI_CH0,
-		.ab = 60000000,		/* At least 480Mbps on bus. */
-		.ib = 960000000,	/* MAX bursts rate */
-	},
-	{
-		.src = MSM_BUS_MASTER_SPS,
 		.dst = MSM_BUS_SLAVE_SPS,
 		.ab = 0,
-		.ib = 512000000, /*vote for 64Mhz dfab clk rate*/
+		.ib = 256000000, /*vote for 32Mhz dfab clk rate*/
 	},
 };
 
@@ -1469,7 +1458,7 @@ static void sii8240_hw_onoff(bool onoff)
 			if (mhl_l12 == NULL) {
 				mhl_l12 = regulator_get(NULL, "8921_l12");
 				if (IS_ERR(mhl_l12))
-					return;
+					return ;
 				rc = regulator_set_voltage(mhl_l12,
 							1200000, 1200000);
 				if (rc)
@@ -1492,7 +1481,8 @@ static void sii8240_hw_onoff(bool onoff)
 			if (IS_ERR(mhl_l32))
 				return ;
 			rc = regulator_set_voltage(mhl_l32,
-				3300000, 3300000);
+					3300000, 3300000);
+
 		}
 		rc = regulator_enable(mhl_l32);
 		if (rc)
@@ -1558,7 +1548,7 @@ static void sii8240_hw_reset(void)
 	if (system_rev < 6) {
 		if (gpio_direction_output(GPIO_MHL_RST, 1))
 			pr_err("%s error in making GPIO_MHL_RST HIGH\n",
-				__func__);
+			__func__);
 
 		usleep_range(5000, 20000);
 		if (gpio_direction_output(GPIO_MHL_RST, 0))
@@ -2273,7 +2263,6 @@ static int ice4_clock_en(int onoff)
 	}
 	return 0;
 }
-
 static void barcode_emul_poweron(int onoff)
 {
 	int ret;
@@ -3153,9 +3142,9 @@ static struct platform_device msm_tsens_
 };
 
 static struct msm_thermal_data msm_thermal_pdata = {
-	.sensor_id = 0,
+	.sensor_id = 7,
 	.poll_ms = 250,
-	.limit_temp_degC = 75,
+	.limit_temp_degC = 60,
 	.temp_hysteresis_degC = 10,
 	.freq_step = 2,
 };
@@ -3223,14 +3212,14 @@ static struct msm_rpmrs_level msm_rpmrs_
 		MSM_PM_SLEEP_MODE_WAIT_FOR_INTERRUPT,
 		MSM_RPMRS_LIMITS(ON, ACTIVE, MAX, ACTIVE),
 		true,
-		1, 650, 180000, 100,
+		1, 784, 180000, 100,
 	},
 
 	{
 		MSM_PM_SLEEP_MODE_RETENTION,
 		MSM_RPMRS_LIMITS(ON, ACTIVE, MAX, ACTIVE),
 		true,
-		415, 650, 340827, 475,
+		415, 715, 340827, 475,
 	},
 
 	{
@@ -4301,7 +4290,7 @@ static struct msm_i2c_platform_data apq8
 };
 
 static struct msm_i2c_platform_data apq8064_i2c_qup_gsbi4_pdata = {
-	.clk_freq = 400000,
+	.clk_freq = 100000,
 	.src_clk_rate = 24000000,
 };
 
@@ -4865,7 +4854,6 @@ static void __init register_i2c_devices(
 		apq8064_camera_board_info.board_info,
 		apq8064_camera_board_info.num_i2c_board_info,
 	};
-
 	struct i2c_registry apq8064_front_camera_i2c_devices = {
 		I2C_SURF | I2C_FFA | I2C_LIQUID | I2C_RUMI,
 		APQ_8064_GSBI7_QUP_I2C_BUS_ID,
@@ -5031,7 +5019,6 @@ static void sec_jack_init(void)
 			PM8921_GPIO_PM_TO_SYS(PMIC_GPIO_EAR_MICBIAS_EN),
 			&ear_micbiase);
 
-
 	if (system_rev >= BOARD_REV07) {
 		sec_jack_data.send_end_active_high = true;
 		sec_jack_data.zones = jack_zones_rev7;