--- 55565cf08a6365c3e181b2760840e477e5e0e22e +++ 7f3993bda67d5dcea5362046eabb18dcdbaddb5c @@ -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)) @@ -2220,8 +2232,8 @@ static void irda_led_poweron(int onoff) } } ret = regulator_enable(reg_l10); - if (ret) - printk(KERN_ERR"enable l10 failed, rc=%d\n", ret); + if (ret) + printk(KERN_ERR"enable l10 failed, rc=%d\n", ret); } else { if (regulator_is_enabled(reg_l10)) { ret = regulator_disable(reg_l10); @@ -3208,14 +3220,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, }, { @@ -4286,7 +4298,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, };