--- 202c7b51e3537f268698d75747c11736cfb2e111
+++ 4997f2eb65a83bc47f043b0b1c3e13ff6cccfb20
@@ -1249,6 +1249,12 @@ 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,
@@ -1259,9 +1265,15 @@ 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 = 256000000, /*vote for 32Mhz dfab clk rate*/
+		.ib = 512000000, /*vote for 64Mhz dfab clk rate*/
 	},
 };
 
@@ -1457,7 +1469,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)
@@ -1546,7 +1558,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))
@@ -3206,14 +3218,14 @@ static struct msm_rpmrs_level msm_rpmrs_
 		MSM_PM_SLEEP_MODE_WAIT_FOR_INTERRUPT,
 		MSM_RPMRS_LIMITS(ON, ACTIVE, MAX, ACTIVE),
 		true,
-		1, 784, 180000, 100,
+		1, 650, 180000, 100,
 	},
 
 	{
 		MSM_PM_SLEEP_MODE_RETENTION,
 		MSM_RPMRS_LIMITS(ON, ACTIVE, MAX, ACTIVE),
 		true,
-		415, 715, 340827, 475,
+		415, 650, 340827, 475,
 	},
 
 	{
@@ -4284,7 +4296,7 @@ static struct msm_i2c_platform_data apq8
 };
 
 static struct msm_i2c_platform_data apq8064_i2c_qup_gsbi4_pdata = {
-	.clk_freq = 100000,
+	.clk_freq = 400000,
 	.src_clk_rate = 24000000,
 };
 
@@ -5178,7 +5190,15 @@ static void __init apq8064_common_init(v
 	apq8064_epm_adc_init();
 	msm_pm_set_tz_retention_flag(1);
 	samsung_sys_class_init();
-	
+
+#ifdef CONFIG_MFD_MAX77693
+	gpio_tlmm_config(GPIO_CFG(GPIO_IF_PMIC_IRQ,  0, GPIO_CFG_INPUT,
+		GPIO_CFG_NO_PULL, GPIO_CFG_2MA), GPIO_CFG_DISABLE);
+#endif
+#if defined(CONFIG_BATTERY_SAMSUNG)
+	msm8960_init_battery();
+#endif
+
 #if defined(CONFIG_TOUCHSCREEN_SYNAPTICS_I2C_RMI) || defined(CONFIG_TOUCHSCREEN_ATMEL_MXTS)
 	printk(KERN_DEBUG"[TSP] System revision, LPM mode : %d %d\n",
 				system_rev, poweroff_charging);
@@ -5199,11 +5219,6 @@ static void __init apq8064_common_init(v
 	if (ret)
 		pr_err("%s PMIC_GPIO_TKEY_INT config failed\n", __func__);
 #endif
-#ifdef CONFIG_MFD_MAX77693
-	gpio_tlmm_config(GPIO_CFG(GPIO_IF_PMIC_IRQ,  0, GPIO_CFG_INPUT,
-		GPIO_CFG_NO_PULL, GPIO_CFG_2MA), GPIO_CFG_DISABLE);
-#endif
-
 #ifdef CONFIG_BT_BCM4335
 	apq8064_bt_init();
 #endif
@@ -5284,9 +5299,6 @@ static void __init samsung_jf_init(void)
 #ifdef CONFIG_MSM_CAMERA
 	apq8064_init_cam();
 #endif
-#if defined(CONFIG_BATTERY_SAMSUNG)
-	msm8960_init_battery();
-#endif
 #ifdef CONFIG_SENSORS_SSP
 	clear_ssp_gpio();
 	sensor_power_on_vdd(SNS_PWR_ON, SNS_PWR_ON);