--- arch/arm/mach-msm/board-jf_vzw.c
+++ arch/arm/mach-msm/board-jf_vzw.c
@@ -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))
@@ -1928,11 +1940,12 @@ static void clear_ssp_gpio(void)
.inv_int_pol = 0,
};
struct pm_gpio ap_mcu_nrst_cfg = {
- .direction = PM_GPIO_DIR_IN,
- .pull = PM_GPIO_PULL_DN,
+ .direction = PM_GPIO_DIR_OUT,
+ .pull = PM_GPIO_PULL_NO,
.vin_sel = 2,
.function = PM_GPIO_FUNC_NORMAL,
.inv_int_pol = 0,
+ .out_strength = PM_GPIO_STRENGTH_HIGH,
};
pm8xxx_gpio_config(GPIO_AP_MCU_INT, &ap_mcu_int_cfg);
@@ -1940,6 +1953,7 @@ static void clear_ssp_gpio(void)
pm8xxx_gpio_config(GPIO_MCU_AP_INT_2, &mcu_ap_int_2_cfg);
if (system_rev >= 5)
pm8xxx_gpio_config(GPIO_MCU_NRST, &ap_mcu_nrst_cfg);
+ gpio_set_value_cansleep(GPIO_MCU_NRST, 0);
mdelay(1);
pr_info("[SSP] %s done\n", __func__);
}
@@ -1975,6 +1989,7 @@ static int initialize_ssp_gpio(void)
.vin_sel = 2,
.function = PM_GPIO_FUNC_NORMAL,
.inv_int_pol = 0,
+ .out_strength = PM_GPIO_STRENGTH_HIGH,
};
pr_info("[SSP]%s\n", __func__);
@@ -2217,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);
@@ -3135,9 +3150,9 @@ static struct platform_device msm_tsens_
};
static struct msm_thermal_data msm_thermal_pdata = {
- .sensor_id = 7,
+ .sensor_id = 0,
.poll_ms = 250,
- .limit_temp_degC = 60,
+ .limit_temp_degC = 75,
.temp_hysteresis_degC = 10,
.freq_step = 2,
};
@@ -3205,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,
},
{
@@ -4283,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,
};
@@ -5127,7 +5142,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 < 10)
platform_device_register(&touchkey_i2c_gpio_device);
projects / ziggy471-sgs4-jb.git / blobdiff