--- adbe371ce0e667b3ae1487a34e8f7b84622d348d +++ c96933f357d8b7adadd16e01ec224ff5a0ea94eb @@ -204,6 +204,7 @@ static void sensor_power_on_vdd(int, int #define PCIE_PWR_EN_PMIC_GPIO 13 #define PCIE_RST_N_PMIC_MPP 1 + static int sec_tsp_synaptics_mode; static int lcd_tsp_panel_version; @@ -368,6 +369,7 @@ static struct i2c_board_info max77693_i2 }; #endif + #if defined(CONFIG_IR_REMOCON_FPGA) static void irda_wake_en(bool onoff) { @@ -1480,7 +1482,7 @@ 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) @@ -1515,12 +1517,11 @@ static void sii8240_hw_onoff(bool onoff) } usleep_range(10000, 20000); - if (system_rev >= 6) ice_gpiox_set(FPGA_GPIO_MHL_RST, 0); if (system_rev < 6) gpio_direction_output(GPIO_MHL_RST, 0); - if (system_rev >= 4 && system_rev < 6) + if (system_rev >= 4 && system_rev < 6) pm8xxx_gpio_config(GPIO_MHL_VSIL, &pmic_mhl_en_parm); } @@ -1547,12 +1548,10 @@ static void sii8240_hw_reset(void) if (gpio_direction_output(GPIO_MHL_RST, 1)) pr_err("%s error in making GPIO_MHL_RST HIGH\n", __func__); - usleep_range(5000, 20000); if (gpio_direction_output(GPIO_MHL_RST, 0)) pr_err("%s error in making GPIO_MHL_RST Low\n", __func__); - usleep_range(10000, 20000); if (gpio_direction_output(GPIO_MHL_RST, 1)) pr_err("%s error in making GPIO_MHL_RST HIGH\n", @@ -2258,7 +2257,6 @@ static int ice4_clock_en(int onoff) } return 0; } - static void barcode_emul_poweron(int onoff) { int ret; @@ -3138,9 +3136,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, };