From ee90a398c37b30ebf39c7e0bbecfb681dc34d943 Mon Sep 17 00:00:00 2001 From: wuhao Date: Thu, 28 Mar 2013 16:40:11 +0800 Subject: [PATCH] rk3188 sdk: config cw2015 --- arch/arm/configs/rk3188_sdk_defconfig | 2 +- arch/arm/mach-rk3188/board-rk3188-sdk.c | 19 ++++++++++--------- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/arch/arm/configs/rk3188_sdk_defconfig b/arch/arm/configs/rk3188_sdk_defconfig index 68692f9af9a4..294750191208 100644 --- a/arch/arm/configs/rk3188_sdk_defconfig +++ b/arch/arm/configs/rk3188_sdk_defconfig @@ -278,7 +278,7 @@ CONFIG_EXPANDED_GPIO_IRQ_NUM=0 CONFIG_SPI_FPGA_GPIO_NUM=0 CONFIG_SPI_FPGA_GPIO_IRQ_NUM=0 CONFIG_POWER_SUPPLY=y -CONFIG_TEST_POWER=y +CONFIG_CW2015_BATTERY=y # CONFIG_HWMON is not set CONFIG_MFD_TPS65910=y CONFIG_MFD_WM831X_I2C=y diff --git a/arch/arm/mach-rk3188/board-rk3188-sdk.c b/arch/arm/mach-rk3188/board-rk3188-sdk.c index f9b5da6b8128..d5ee0e0c7427 100644 --- a/arch/arm/mach-rk3188/board-rk3188-sdk.c +++ b/arch/arm/mach-rk3188/board-rk3188-sdk.c @@ -1109,7 +1109,7 @@ static u8 config_info[SIZE_BATINFO] = { static struct cw_bat_platform_data cw_bat_platdata = { .dc_det_pin = RK30_PIN0_PB2, - .bat_low_pin = RK30_PIN0_PB1, + .bat_low_pin = INVALID_GPIO,//RK30_PIN0_PB1, .chg_ok_pin = RK30_PIN0_PA6, .dc_det_level = GPIO_LOW, .bat_low_level = GPIO_LOW, @@ -1541,6 +1541,15 @@ static struct i2c_board_info __initdata i2c0_info[] = { #endif #endif +#if defined (CONFIG_CW2015_BATTERY) + { + .type = "cw201x", + .addr = 0x62, + .flags = 0, + .platform_data = &cw_bat_platdata, + }, +#endif + }; #endif @@ -1944,14 +1953,6 @@ static struct i2c_board_info __initdata i2c1_info[] = { .flags = 0, .irq = RK30_PIN1_PA4, }, -#if defined (CONFIG_CW2015_BATTERY) - { - .type = "cw201x", - .addr = 0x62, - .flags = 0, - .platform_data = &cw_bat_platdata, - }, -#endif #endif }; -- 2.34.1