From: lyx Date: Wed, 18 Aug 2010 05:35:49 +0000 (-0700) Subject: checkout infosdk board X-Git-Tag: firefly_0821_release~11254 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=5b6f84f8102930caf64fe4e650c9e20e5dd5cf68;p=firefly-linux-kernel-4.4.55.git checkout infosdk board --- diff --git a/arch/arm/mach-rk2818/board-infosdk.c b/arch/arm/mach-rk2818/board-infosdk.c index 6bf42042fb16..f15807a4dfd1 100755 --- a/arch/arm/mach-rk2818/board-infosdk.c +++ b/arch/arm/mach-rk2818/board-infosdk.c @@ -309,7 +309,11 @@ struct rk2818_gpio_expander_info extgpio_tca6424_settinginfo[] = { .pin_type = GPIO_IN, //.pin_value =GPIO_HIGH, }, - + { + .gpio_num = TCA6424_P17,// 3G PowerOn + .pin_type = GPIO_OUT, + .pin_value =GPIO_HIGH, + }, }; struct tca6424_platform_data rk2818_tca6424_data={ @@ -471,11 +475,12 @@ static struct i2c_board_info __initdata board_i2c1_devices[] = { }, #endif -#if defined (CONFIG_PMIC_LP8725) +#if defined (CONFIG_RK2818_REGULATOR_LP8725) { .type = "lp8725", .addr = 0x79, .flags = 0, + .platform_data=&rk2818_lp8725_data, }, #endif #if defined (CONFIG_GS_MMA7660) @@ -641,7 +646,7 @@ struct soc_camera_link rk2818_iclink = { * battery devices * author: lw@rock-chips.com *****************************************************************************************/ -#define CHARGEOK_PIN RK2818_PIN_PB1 +#define CHARGEOK_PIN RK2818_PIN_PA4 struct rk2818_battery_platform_data rk2818_battery_platdata = { .charge_ok_pin = CHARGEOK_PIN, };