adc-battery: add battery-power decision method when reboot the system

diff --git a/arch/arm/mach-rk2928/include/mach/board.h b/arch/arm/mach-rk2928/include/mach/board.h
index 34a8035f78ba0f40878b0ff67d4fde4d4bc37a53..6ab45c5ddb0e90862a87dc2c9139dca4f3b59b39 100755 (executable)
--- a/arch/arm/mach-rk2928/include/mach/board.h
+++ b/arch/arm/mach-rk2928/include/mach/board.h
@@ -40,60 +40,6 @@ struct ts_hw_data {
        int touch_en_gpio;
 };
 
-
-//#if defined  CONFIG_BATTERY_RK30_ADC_FAC 
-/* adc battery */
-struct rk30_adc_battery_platform_data {
-       int (*io_init)(void);
-       int (*io_deinit)(void);
-       int (*is_dc_charging)(void);
-       int (*charging_ok)(void);
-
-       int (*is_usb_charging)(void);
-       int spport_usb_charging ;
-       int (*control_usb_charging)(int);
-
-       int dc_det_pin;
-       int batt_low_pin;
-       int charge_ok_pin;
-       int charge_set_pin;
-
-       int dc_det_level;
-       int batt_low_level;
-       int charge_ok_level;
-       int charge_set_level;
-       
-       int adc_channel;
-
-       int dc_det_pin_pull;    //pull up/down enable/disbale
-       int batt_low_pin_pull;
-       int charge_ok_pin_pull;
-       int charge_set_pin_pull;
-
-       int low_voltage_protection; // low voltage protection
-
-       int charging_sleep; // don't have lock,if chargeing_sleep = 0;else have lock
-       
-
-       int save_capacity;  //save capacity to /data/bat_last_capacity.dat,  suggested use
-
-       int reference_voltage; // the rK2928 is 3300;RK3066 and rk29 are 2500;rk3066B is 1800;
-       int pull_up_res;      //divider resistance ,  pull-up resistor
-       int pull_down_res; //divider resistance , pull-down resistor
-
-       int time_down_discharge; //the time of capactiy drop 1% --discharge
-       int time_up_charge; //the time of capacity up 1% ---charging 
-
-       int  use_board_table;
-       int  table_size;
-       int  *discharge_table;
-       int  *charge_table;
-       int  *property_tabel;
-       int *board_batt_table;
-
-};
-//#endif
-
 #ifndef _LINUX_WLAN_PLAT_H_
 struct wifi_platform_data {
         int (*set_power)(int val);

diff --git a/arch/arm/mach-rk30/include/mach/board.h b/arch/arm/mach-rk30/include/mach/board.h
index 9b070b853f6aa389d58e1f61befae668e195c529..4e96f5ed77c5f46606f2f3591a458a7534cc41e2 100644 (file)
--- a/arch/arm/mach-rk30/include/mach/board.h
+++ b/arch/arm/mach-rk30/include/mach/board.h
@@ -11,56 +11,6 @@
 #include <plat/board.h>
 #include <mach/sram.h>
 #include <linux/i2c-gpio.h>
-/* adc battery */
-struct rk30_adc_battery_platform_data {
-       int (*io_init)(void);
-       int (*io_deinit)(void);
-       int (*is_dc_charging)(void);
-       int (*charging_ok)(void);
-
-       int (*is_usb_charging)(void);
-       int spport_usb_charging ;
-       int (*control_usb_charging)(int);
-
-       int dc_det_pin;
-       int batt_low_pin;
-       int charge_ok_pin;
-       int charge_set_pin;
-
-       int dc_det_level;
-       int batt_low_level;
-       int charge_ok_level;
-       int charge_set_level;
-       
-       int adc_channel;
-
-       int dc_det_pin_pull;    //pull up/down enable/disbale
-       int batt_low_pin_pull;
-       int charge_ok_pin_pull;
-       int charge_set_pin_pull;
-
-       int low_voltage_protection; // low voltage protection
-
-       int charging_sleep; // don't have lock,if chargeing_sleep = 0;else have lock
-       
-
-       int save_capacity;  //save capacity to /data/bat_last_capacity.dat,  suggested use
-
-       int reference_voltage; // the rK2928 is 3300;RK3066 and rk29 are 2500;rk3066B is 1800;
-       int pull_up_res;      //divider resistance ,  pull-up resistor
-       int pull_down_res; //divider resistance , pull-down resistor
-
-       int time_down_discharge; //the time of capactiy drop 1% --discharge
-       int time_up_charge; //the time of capacity up 1% ---charging 
-
-       int  use_board_table;
-       int  table_size;
-       int  *discharge_table;
-       int  *charge_table;
-       int  *property_tabel;
-       int *board_batt_table;
-
-};
 
 #ifndef _LINUX_WLAN_PLAT_H_
 struct wifi_platform_data {

diff --git a/arch/arm/plat-rk/include/plat/board.h b/arch/arm/plat-rk/include/plat/board.h
index 63053b939655aa5c25ac69ac8344246772ea0a98..d687ad00809aa90f03c070b4d8d3efe6919acc63 100755 (executable)
--- a/arch/arm/plat-rk/include/plat/board.h
+++ b/arch/arm/plat-rk/include/plat/board.h
@@ -264,6 +264,61 @@ struct rk29_vmac_platform_data {
        int (*rmii_power_control)(int enable);
         int(*rmii_speed_switch)(int speed);
 };
+//#if defined  CONFIG_BATTERY_RK30_ADC_FAC 
+/* adc battery */
+struct rk30_adc_battery_platform_data {
+       int (*io_init)(void);
+       int (*io_deinit)(void);
+       int (*is_dc_charging)(void);
+       int (*charging_ok)(void);
+
+       int (*is_usb_charging)(void);
+       int spport_usb_charging ;
+       int (*control_usb_charging)(int);
+
+       int is_reboot_charging;
+
+       int dc_det_pin;
+       int batt_low_pin;
+       int charge_ok_pin;
+       int charge_set_pin;
+
+       int dc_det_level;
+       int batt_low_level;
+       int charge_ok_level;
+       int charge_set_level;
+       
+       int adc_channel;
+
+       int dc_det_pin_pull;    //pull up/down enable/disbale
+       int batt_low_pin_pull;
+       int charge_ok_pin_pull;
+       int charge_set_pin_pull;
+
+       int low_voltage_protection; // low voltage protection
+
+       int charging_sleep; // don't have lock,if chargeing_sleep = 0;else have lock
+       
+
+       int save_capacity;  //save capacity to /data/bat_last_capacity.dat,  suggested use
+
+       int reference_voltage; // the rK2928 is 3300;RK3066 and rk29 are 2500;rk3066B is 1800;
+       int pull_up_res;      //divider resistance ,  pull-up resistor
+       int pull_down_res; //divider resistance , pull-down resistor
+
+       int time_down_discharge; //the time of capactiy drop 1% --discharge
+       int time_up_charge; //the time of capacity up 1% ---charging 
+
+       int  use_board_table;
+       int  table_size;
+       int  *discharge_table;
+       int  *charge_table;
+       int  *property_tabel;
+       int *board_batt_table;
+
+};
+//#endif
+
 
 #define BOOT_MODE_NORMAL               0
 #define BOOT_MODE_FACTORY2             1

diff --git a/drivers/power/rk30_factory_adc_battery.c b/drivers/power/rk30_factory_adc_battery.c
index 6b02d55392bada1d2b2c9b6107d286654f64f166..840e5acd0561b236ebc72ae088e737ab0c4f89ec 100644 (file)
--- a/drivers/power/rk30_factory_adc_battery.c
+++ b/drivers/power/rk30_factory_adc_battery.c
@@ -1070,7 +1070,12 @@ static void rk30_adc_battery_poweron_capacity_check(void)
 //     //2£©Èç¹û²»ÕâÑù×ö£¬¶Ìʱ¼ä¹Ø»úÔÙ¿ª»ú£¬Ç°ºóÈÝÁ¿²»Ò»ÖÂÓÖ¸ÃÔõô°ì£¿
 //     //3£©Ò»ÏÂÄÇÖÖ·½Ê½ºÏÊÊ£¿
        //gBatteryData->bat_capacity = new_capacity;
-               gBatteryData->bat_capacity = (new_capacity > old_capacity) ? new_capacity : old_capacity;
+       //      gBatteryData->bat_capacity = (new_capacity > old_capacity) ? new_capacity : old_capacity;
+               if( gBatteryData ->pdata->is_reboot_charging == 1)
+                       gBatteryData->bat_capacity = old_capacity;
+               else
+                       gBatteryData->bat_capacity = (new_capacity > old_capacity) ? new_capacity : old_capacity;
+       
        }else{
 
                if(new_capacity > old_capacity + 50 )