--- arch/arm/mach-msm/board-jf_skt.c
+++ arch/arm/mach-msm/board-jf_skt.c
@@ -50,7 +50,6 @@
#ifdef CONFIG_VIBETONZ
#include <linux/vibrator.h>
#endif
-
#include <linux/power_supply.h>
#ifdef CONFIG_SND_SOC_ES325
#include <linux/i2c/esxxx.h>
@@ -89,7 +88,6 @@
#include <mach/msm_iomap.h>
#include <linux/sec_jack.h>
#include "clock.h"
-
#include <mach/apq8064-gpio.h>
#ifdef CONFIG_KEYBOARD_CYPRESS_TOUCH_236
@@ -1431,12 +1429,12 @@ static void msm8960_mhl_gpio_init(void)
ice_gpiox_set(FPGA_GPIO_MHL_RST, 0);
ice_gpiox_set(FPGA_VSIL_A_1P2_EN, 0);
} else if (system_rev < 6) {
- ret = gpio_request(GPIO_MHL_RST, "mhl_rst");
- if (ret < 0) {
- pr_err("mhl_rst gpio_request is failed\n");
- return;
+ ret = gpio_request(GPIO_MHL_RST, "mhl_rst");
+ if (ret < 0) {
+ pr_err("mhl_rst gpio_request is failed\n");
+ return;
+ }
}
-}
if (system_rev >= 4 && system_rev < 6) {
ret = gpio_request(GPIO_MHL_VSIL, "mhl_vsil");
if (ret < 0) {
@@ -1486,8 +1484,8 @@ static void sii8240_hw_onoff(bool onoff)
{
int rc = 0;
/*VPH_PWR : mhl_power_source
- VMHL_3.3V, VSIL_A_1.2V, VMHL_1.8V
- just power control with HDMI_EN pin or control Regulator12*/
+ VMHL_3.3V, VSIL_A_1.2V, VMHL_1.8V
+ just power control with HDMI_EN pin or control Regulator12*/
pr_info("%s: onoff =%d\n", __func__, onoff);
if (mhl_hw_onoff == onoff) {
pr_info("mhl_hw_onoff already %d\n", onoff);
@@ -1504,7 +1502,7 @@ static void sii8240_hw_onoff(bool onoff)
if (IS_ERR(mhl_l12))
return;
rc = regulator_set_voltage(mhl_l12,
- 1200000, 1200000);
+ 1200000, 1200000);
if (rc)
pr_err("error: setting for mhl_l12\n");
}
@@ -1538,7 +1536,6 @@ static void sii8240_hw_onoff(bool onoff)
ice_gpiox_set(FPGA_VSIL_A_1P2_EN, 1);
if (system_rev >= 4 && system_rev < 6)
gpio_direction_output(PM8921_GPIO_PM_TO_SYS(32), 1);
-
} else {
if (system_rev >= 6)
ice_gpiox_set(FPGA_VSIL_A_1P2_EN, 0);
@@ -2278,6 +2275,7 @@ static int ice4_clock_en(int onoff)
}
return 0;
}
+
static void barcode_emul_poweron(int onoff)
{
int ret;
@@ -2416,17 +2414,15 @@ static void barcode_gpio_config(void)
if (system_rev < BOARD_REV06)
gpio_request_one(GPIO_FPGA_SPI_EN, GPIOF_OUT_INIT_LOW,
"FPGA_SPI_EN");
- if (system_rev > BOARD_REV05) {
+ if (system_rev > BOARD_REV05)
pm8xxx_gpio_config(PM8921_GPIO_PM_TO_SYS( \
PMIC_GPIO_FPGA_CRESET_B), &creset_b);
- } else {
+ else
gpio_request_one(GPIO_FPGA_CRESET_B, GPIOF_OUT_INIT_LOW,
"FPGA_CRESET_B");
- }
- if (system_rev == BOARD_REV01 || system_rev == BOARD_REV02) {
+ if (system_rev == BOARD_REV01 || system_rev == BOARD_REV02)
gpio_request_one(gpio_rev(GPIO_FPGA_EN), GPIOF_OUT_INIT_LOW,
"FPGA_EN");
- }
if (system_rev > BOARD_REV03 && system_rev < BOARD_REV06)
barcode_emul_info.fw_type = ICE_19M;
else if (system_rev > BOARD_REV05 && system_rev < BOARD_REV10)
@@ -3397,14 +3393,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,
},
{
@@ -5185,6 +5181,7 @@ static void main_mic_bias_init(void)
static void __init gpio_rev_init(void)
{
+
#ifdef CONFIG_SEC_FPGA
if (system_rev < BOARD_REV06) {
barcode_i2c_gpio_data.sda_pin = gpio_rev(GPIO_BARCODE_SDA);
projects / ziggy471-sgs4-jb.git / blobdiff