--- 5e43dec4d11c67fef214c8fea180a472523de378
+++ 760df5e5bd77508961f29af5df720fc7e266ac77
@@ -50,7 +50,6 @@
 #ifdef CONFIG_VIBETONZ
 #include <linux/vibrator.h>
 #endif
-
 #include <linux/power_supply.h>
 #ifdef CONFIG_SND_SOC_ES325
 #include <linux/i2c/esxxx.h>
@@ -89,7 +88,6 @@
 #include <mach/msm_iomap.h>
 #include <linux/sec_jack.h>
 #include "clock.h"
-
 #include <mach/apq8064-gpio.h>
 
 #ifdef CONFIG_KEYBOARD_CYPRESS_TOUCH_236
@@ -1208,7 +1206,7 @@ static struct i2c_board_info touchkey_i2
 
 
 static struct i2c_gpio_platform_data  cypress_touchkey_i2c_gpio_data = {
-	.sda_pin		= GPIO_TOUCHKEY_SDA,	
+	.sda_pin		= GPIO_TOUCHKEY_SDA,
 	.scl_pin		= GPIO_TOUCHKEY_SCL,
 	.udelay			= 0,
 	.sda_is_open_drain	= 0,
@@ -1304,6 +1302,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,
@@ -1314,9 +1318,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*/
 	},
 };
 
@@ -1447,12 +1457,12 @@ static void msm8960_mhl_gpio_init(void)
 		ice_gpiox_set(FPGA_GPIO_MHL_RST, 0);
 		ice_gpiox_set(FPGA_VSIL_A_1P2_EN, 0);
 	} else if (system_rev < 6) {
-	ret = gpio_request(GPIO_MHL_RST, "mhl_rst");
-	if (ret < 0) {
-		pr_err("mhl_rst gpio_request is failed\n");
-		return;
+		ret = gpio_request(GPIO_MHL_RST, "mhl_rst");
+		if (ret < 0) {
+			pr_err("mhl_rst gpio_request is failed\n");
+			return;
+		}
 	}
-}
 	if (system_rev >= 4 && system_rev < 6) {
 		ret = gpio_request(GPIO_MHL_VSIL, "mhl_vsil");
 		if (ret < 0) {
@@ -1502,8 +1512,8 @@ static void sii8240_hw_onoff(bool onoff)
 {
 	int rc = 0;
 	/*VPH_PWR : mhl_power_source
-	  VMHL_3.3V, VSIL_A_1.2V, VMHL_1.8V
-	  just power control with HDMI_EN pin or control Regulator12*/
+	VMHL_3.3V, VSIL_A_1.2V, VMHL_1.8V
+	just power control with HDMI_EN pin or control Regulator12*/
 	pr_info("%s: onoff =%d\n", __func__, onoff);
 	if (mhl_hw_onoff == onoff) {
 		pr_info("mhl_hw_onoff already %d\n", onoff);
@@ -1520,7 +1530,7 @@ static void sii8240_hw_onoff(bool onoff)
 				if (IS_ERR(mhl_l12))
 					return;
 				rc = regulator_set_voltage(mhl_l12,
-						1200000, 1200000);
+							1200000, 1200000);
 				if (rc)
 					pr_err("error: setting for mhl_l12\n");
 			}
@@ -1554,7 +1564,6 @@ static void sii8240_hw_onoff(bool onoff)
 			ice_gpiox_set(FPGA_VSIL_A_1P2_EN, 1);
 		if (system_rev >= 4 && system_rev < 6)
 			gpio_direction_output(PM8921_GPIO_PM_TO_SYS(32), 1);
-
 	} else {
 		if (system_rev >= 6)
 			ice_gpiox_set(FPGA_VSIL_A_1P2_EN, 0);
@@ -3293,14 +3302,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,
 	},
 
 	{
@@ -4946,6 +4955,7 @@ 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,
@@ -5227,7 +5237,7 @@ static void __init apq8064_common_init(v
 			machine_is_mpq8064_dtv()))
 		platform_add_devices(common_not_mpq_devices,
 			ARRAY_SIZE(common_not_mpq_devices));
-	
+
 #ifdef CONFIG_KEYBOARD_CYPRESS_TOUCH_236
 	if (system_rev < 9)
 		platform_device_register(&touchkey_i2c_gpio_device);
@@ -5275,7 +5285,7 @@ static void __init apq8064_common_init(v
 	msm_spm_l2_init(msm_spm_l2_data);
 	BUG_ON(msm_pm_boot_init(&msm_pm_boot_pdata));
 	apq8064_epm_adc_init();
-	msm_pm_set_tz_retention_flag(1);	
+	msm_pm_set_tz_retention_flag(1);
 	samsung_sys_class_init();
 
 #ifdef CONFIG_MFD_MAX77693