修改充电满的电平也由board进行传入

diff --git a/arch/arm/mach-rk2818/board-raho.c b/arch/arm/mach-rk2818/board-raho.c
index bfda466f196b51ac52afd7a75cc099afc300dace..b302c9ecce80bfd71b325e386ecbd60124cf3730 100755 (executable)
--- a/arch/arm/mach-rk2818/board-raho.c
+++ b/arch/arm/mach-rk2818/board-raho.c
@@ -863,6 +863,7 @@ struct soc_camera_link rk2818_iclink = {
 #define CHARGEOK_PIN   SPI_GPIO_P6_06//RK2818_PIN_PB1
 struct rk2818_battery_platform_data rk2818_battery_platdata = {
        .charge_ok_pin = CHARGEOK_PIN,
+       .charge_ok_level = 0,
 };
 
 

diff --git a/arch/arm/mach-rk2818/include/mach/board.h b/arch/arm/mach-rk2818/include/mach/board.h
index e191c3a4d710b187fe7932e2f10d701faa4bd2d6..01562fac964dfaf6572295f38c051e2a295a5c0e 100755 (executable)
--- a/arch/arm/mach-rk2818/include/mach/board.h
+++ b/arch/arm/mach-rk2818/include/mach/board.h
@@ -152,6 +152,7 @@ struct rk2818_battery_platform_data {
        int (*io_init)(void);
        int (*io_deinit)(void);
        int charge_ok_pin;
+       int charge_ok_level;
 };
 
 /*g_sensor*/

diff --git a/drivers/power/rk2818_battery.c b/drivers/power/rk2818_battery.c
index 2c19ac375050e195414f3598707be3f3bca847b1..84191d6a6d4cfcd786b40084c086eff35e13ee4f 100755 (executable)
--- a/drivers/power/rk2818_battery.c
+++ b/drivers/power/rk2818_battery.c
@@ -113,6 +113,7 @@ struct rk2818_battery_data {
        struct power_supply ac;
 
        int charge_ok_pin;
+       int charge_ok_level;
        
        int adc_bat_divider;
        int bat_max;
@@ -156,7 +157,7 @@ static void rk2818_get_bat_status(struct rk2818_battery_data *bat)
 {
        if(rk2818_get_charge_status() == 1)
        {
-               if(gpio_get_value (bat->charge_ok_pin) == 1) //CHG_OK ==0 
+               if(gpio_get_value (bat->charge_ok_pin) == bat->charge_ok_level)
                {
                        gBatStatus = POWER_SUPPLY_STATUS_FULL;
                        DBG("Battery is Full!\n");
@@ -602,6 +603,7 @@ static int rk2818_battery_probe(struct platform_device *pdev)
        data->ac.type = POWER_SUPPLY_TYPE_MAINS;
 
        data->charge_ok_pin = pdata->charge_ok_pin;
+       data->charge_ok_level = pdata->charge_ok_level;
        
        ret = power_supply_register(&pdev->dev, &data->ac);
        if (ret)