--- arch/arm/mach-msm/board-jf_lgt.c
+++ arch/arm/mach-msm/board-jf_lgt.c
@@ -1494,7 +1494,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)
@@ -1583,7 +1583,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))
@@ -2215,7 +2215,7 @@ static void irda_led_poweron(int onoff)
int ret;
static struct regulator *reg_l10;
if (system_rev >= BOARD_REV08 ) {
- if(onoff) {
+ if(onoff) {
if (!reg_l10) {
reg_l10 = regulator_get(NULL, "8921_l10");
ret = regulator_set_voltage(reg_l10, 3300000, 3300000);
@@ -2223,13 +2223,13 @@ static void irda_led_poweron(int onoff)
if (IS_ERR(reg_l10)) {
printk(KERN_ERR"could not get 8921_l10, rc = %ld\n",
PTR_ERR(reg_l10));
- }
- }
+ }
+ }
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) ) {
+ if (regulator_is_enabled(reg_l10)) {
ret = regulator_disable(reg_l10);
if (ret)
printk(KERN_ERR"disable l10 failed, rc=%d\n", ret);
@@ -2244,10 +2244,10 @@ static int ice4_clock_en(int onoff)
return 0;
if (system_rev <= BOARD_REV09) {
- if (onoff)
- msm_xo_mode_vote(fpga_xo, MSM_XO_MODE_ON);
- else
- msm_xo_mode_vote(fpga_xo, MSM_XO_MODE_OFF);
+ if (onoff)
+ msm_xo_mode_vote(fpga_xo, MSM_XO_MODE_ON);
+ else
+ msm_xo_mode_vote(fpga_xo, MSM_XO_MODE_OFF);
} else if (system_rev >= BOARD_REV10) {
static struct clk *fpga_main_clk;
if (!fpga_main_clk)
@@ -2264,6 +2264,7 @@ static int ice4_clock_en(int onoff)
}
return 0;
}
+
static void barcode_emul_poweron(int onoff)
{
int ret;
@@ -2283,8 +2284,7 @@ static void barcode_emul_poweron(int ono
}
if (system_rev >= BOARD_REV02) {
if (barcode_vreg_l33 == NULL) {
- barcode_vreg_l33 = regulator_get(NULL,
- "8917_l33");
+ barcode_vreg_l33 = regulator_get(NULL, "8917_l33");
if (IS_ERR(barcode_vreg_l33))
return ;
ret = regulator_set_voltage(barcode_vreg_l33,
@@ -2321,7 +2321,8 @@ static void barcode_emul_poweron(int ono
if (system_rev > BOARD_REV03) {
fpga_xo = msm_xo_get(MSM_XO_TCXO_A0, "ice4_fpga");
if (IS_ERR(fpga_xo)) {
- printk(KERN_ERR "%s: Couldn't get TCXO_A0 vote for ice4_fpga\n",
+ printk(KERN_ERR \
+ "%s: Couldn't get TCXO_A0 vote for ice4_fpga\n",
__func__);
}
}
@@ -2345,15 +2346,15 @@ static void barcode_emul_poweron(int ono
__func__);
}
if (system_rev >= BOARD_REV03) {
- if (regulator_is_enabled(barcode_vreg_l33)) {
- ret = regulator_disable(barcode_vreg_l33);
- if (ret)
- pr_err("%s: error disabling regulator\n",
- __func__);
+ if (regulator_is_enabled(barcode_vreg_l33)) {
+ ret = regulator_disable(barcode_vreg_l33);
+ if (ret)
+ pr_err("%s: error disabling regulator\n",
+ __func__);
+ }
}
}
}
-}
static void barcode_gpio_config(void);
@@ -2397,7 +2398,6 @@ static void barcode_gpio_config(void)
pr_info("%s\n", __func__);
pm8xxx_gpio_config(PM8921_GPIO_PM_TO_SYS( \
PMIC_GPIO_FPGA_RST_N), &creset_b);
-
gpio_request_one(GPIO_FPGA_CDONE, GPIOF_IN, "FPGA_CDONE");
if (system_rev < BOARD_REV06)
gpio_request_one(GPIO_FPGA_SPI_EN, GPIOF_OUT_INIT_LOW,
@@ -3313,9 +3313,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,
};
@@ -3383,14 +3383,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,
},
{
@@ -4484,7 +4484,7 @@ static struct msm_i2c_platform_data apq8
#if !defined(CONFIG_TDMB)
static struct msm_i2c_platform_data apq8064_i2c_qup_gsbi4_pdata = {
- .clk_freq = 100000,
+ .clk_freq = 400000,
.src_clk_rate = 24000000,
};
#endif
projects / ziggy471-sgs4-jb.git / blobdiff