--- arch/arm/mach-msm/board-jf_usc.c

+++ arch/arm/mach-msm/board-jf_usc.c

@@ -204,7 +204,6 @@ 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;

@@ -369,7 +368,6 @@ static struct i2c_board_info max77693_i2

};

#endif

-

#if defined(CONFIG_IR_REMOCON_FPGA)

static void irda_wake_en(bool onoff)

{

@@ -1482,7 +1480,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)

@@ -1517,11 +1515,12 @@ 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);

}

@@ -1548,10 +1547,12 @@ 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",

@@ -2257,6 +2258,7 @@ static int ice4_clock_en(int onoff)

}

return 0;

}

+

static void barcode_emul_poweron(int onoff)

{

int ret;

@@ -3136,9 +3138,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,

};