phone-pad:modify some device configs.

This commit is contained in:
zwp
2011-08-11 03:01:10 -07:00
parent c802572c52
commit e6fc7055d7
2 changed files with 50 additions and 21 deletions

View File

@@ -831,8 +831,10 @@ CONFIG_MU509=y
# CONFIG_EEPROM_LEGACY is not set
# CONFIG_EEPROM_MAX6875 is not set
# CONFIG_EEPROM_93CX6 is not set
CONFIG_RK29_SUPPORT_MODEM=y
CONFIG_MODEM_ROCKCHIP_DEMO=y
# CONFIG_RK29_SUPPORT_MODEM is not set
# CONFIG_MODEM_ROCKCHIP_DEMO is not set
# CONFIG_MODEM_LONGCHEER_U6300V is not set
# CONFIG_MODEM_THINKWILL_MW100G is not set
# CONFIG_RK29_GPS is not set
#
@@ -1083,16 +1085,9 @@ CONFIG_TOUCHSCREEN_NAS=y
CONFIG_INPUT_MISC=y
CONFIG_INPUT_UINPUT=y
# CONFIG_INPUT_GPIO is not set
#
# Magnetometer sensors
#
# CONFIG_COMPASS_AK8975 is not set
# CONFIG_COMPASS_AK8973 is not set
CONFIG_G_SENSOR_DEVICE=y
# CONFIG_GS_MMA7660 is not set
CONFIG_GS_MMA8452=y
CONFIG_GS_L3G4200D=y
# CONFIG_INPUT_GPIO_ROTARY_ENCODER is not set
# CONFIG_MAG_SENSORS is not set
# CONFIG_G_SENSOR_DEVICE is not set
# CONFIG_INPUT_JOGBALL is not set
# CONFIG_LIGHT_SENSOR_DEVICE is not set
@@ -1229,10 +1224,9 @@ CONFIG_POWER_SUPPLY=y
# CONFIG_BATTERY_BQ27x00 is not set
# CONFIG_BATTERY_MAX17040 is not set
# CONFIG_BATTERY_STC3100 is not set
CONFIG_BATTERY_BQ27510=y
# CONFIG_BATTERY_BQ27510 is not set
CONFIG_BATTERY_BQ27541=y
# CONFIG_BATTERY_BQ3060 is not set
# CONFIG_CHECK_BATT_CAPACITY is not set
CONFIG_NO_BATTERY_IC=y
# CONFIG_HWMON is not set
# CONFIG_THERMAL is not set
# CONFIG_WATCHDOG is not set
@@ -1776,7 +1770,8 @@ CONFIG_USB_ANDROID_MASS_STORAGE=y
#
# CONFIG_USB_GPIO_VBUS is not set
# CONFIG_NOP_USB_XCEIV is not set
# CONFIG_USB11_HOST is not set
CONFIG_USB11_HOST=y
CONFIG_USB11_HOST_EN=y
CONFIG_USB20_HOST=y
CONFIG_USB20_HOST_EN=y
CONFIG_USB20_OTG=y

View File

@@ -428,6 +428,7 @@ int p1003_init_platform_hw(void)
if(gpio_request(TOUCH_INT_PIN,NULL) != 0){
gpio_free(TOUCH_INT_PIN);
gpio_free(TOUCH_RESET_PIN);
printk("p1003_init_platform_hw gpio_request error\n");
return -EIO;
}
@@ -463,6 +464,7 @@ static int EETI_EGALAX_init_platform_hw(void)
if(gpio_request(TOUCH_INT_PIN,NULL) != 0){
gpio_free(TOUCH_INT_PIN);
gpio_free(TOUCH_RESET_PIN);
printk("p1003_init_platform_hw gpio_request error\n");
return -EIO;
}
@@ -515,13 +517,14 @@ void nas_request_io(void)
if(gpio_request(TOUCH_RESET_PIN,NULL) != 0){
gpio_free(TOUCH_RESET_PIN);
printk("nas_init_platform_hw gpio_request error\n");
return -EIO;
return ;
}
if(gpio_request(TOUCH_INT_PIN,NULL) != 0){
gpio_free(TOUCH_INT_PIN);
gpio_free(TOUCH_RESET_PIN);
printk("nas_init_platform_hw gpio_request error\n");
return -EIO;
return;
}
}
@@ -567,13 +570,14 @@ void laibao_request_io(void)
if(gpio_request(TOUCH_RESET_PIN,NULL) != 0){
gpio_free(TOUCH_RESET_PIN);
printk("nas_init_platform_hw gpio_request error\n");
return -EIO;
return ;
}
if(gpio_request(TOUCH_INT_PIN,NULL) != 0){
gpio_free(TOUCH_INT_PIN);
gpio_free(TOUCH_RESET_PIN);
printk("nas_init_platform_hw gpio_request error\n");
return -EIO;
return ;
}
}
@@ -662,7 +666,7 @@ static struct mpu3050_platform_data mpu3050_data = {
//.orientation = { 0, -1, 0,-1, 0, 0,0, 0, -1 },
//.orientation = { 0, 1, 0,1, 0, 0,0, 0, -1 },
.orientation = { 1, 0, 0, 0, -1, 0, 0, 0, -1 },
.orientation = { -1, 0, 0, 0, -1, 0, 0, 0, 1 },
//.orientation = { 0, 1, 0, -1, 0, 0, 0, 0, -1 },
},
#endif
@@ -830,6 +834,26 @@ struct wm8994_pdata wm8994_platdata = {
.recorder_vol = 50,
};
#if defined (CONFIG_BATTERY_BQ27541)
#define DC_CHECK_PIN RK29_PIN4_PA1
#define LI_LION_BAT_NUM 2
static int bq27541_init_dc_check_pin(void){
if(gpio_request(DC_CHECK_PIN,"dc_check") != 0){
gpio_free(DC_CHECK_PIN);
printk("bq27541 init dc check pin request error\n");
return -EIO;
}
gpio_direction_input(DC_CHECK_PIN);
return 0;
}
struct bq27541_platform_data bq27541_info = {
.init_dc_check_pin = bq27541_init_dc_check_pin,
.dc_check_pin = DC_CHECK_PIN,
.bat_num = LI_LION_BAT_NUM,
};
#endif
/*****************************************************************************************
* i2c devices
@@ -1069,6 +1093,16 @@ static struct i2c_board_info __initdata board_i2c0_devices[] = {
.platform_data = &mpu3050_data,
},
#endif
#if defined (CONFIG_BATTERY_BQ27541)
{
.type = "bq27541",
.addr = 0x55,
.flags = 0,
.platform_data = &bq27541_info,
},
#endif
};
#endif