View | Details | Raw Unified | Return to bug 194811 | Differences between
and this patch

Collapse All | Expand All

(-)a/drivers/power/supply/Kconfig (+2 lines)
Lines 242-247 config AXP288_CHARGER Link Here
242 
config AXP288_FUEL_GAUGE
 242 
config AXP288_FUEL_GAUGE
243 
	tristate "X-Powers AXP288 Fuel Gauge"
 243 
	tristate "X-Powers AXP288 Fuel Gauge"
244 
	depends on MFD_AXP20X && IIO
 244 
	depends on MFD_AXP20X && IIO
245 
	# if ACPI_BATTERY=m, this can't be 'y'
246 
	depends on ACPI_BATTERY || !ACPI_BATTERY
245 
	help
 247 
	help
246 
	  Say yes here to have support for X-Power power management IC (PMIC)
 248 
	  Say yes here to have support for X-Power power management IC (PMIC)
247 
	  Fuel Gauge. The device provides battery statistics and status
 249 
	  Fuel Gauge. The device provides battery statistics and status
(-)a/drivers/power/supply/axp288_fuel_gauge.c (-1 / +3 lines)
Lines 26-31 Link Here
26 
#include <linux/mfd/axp20x.h>
 26 
#include <linux/mfd/axp20x.h>
27 
#include <linux/platform_device.h>
 27 
#include <linux/platform_device.h>
28 
#include <linux/power_supply.h>
 28 
#include <linux/power_supply.h>
29 
#include <linux/power/acpi.h>
29 
#include <linux/iio/consumer.h>
 30 
#include <linux/iio/consumer.h>
30 
#include <linux/debugfs.h>
 31 
#include <linux/debugfs.h>
31 
#include <linux/seq_file.h>
 32 
#include <linux/seq_file.h>
Lines 754-759 static int axp288_fuel_gauge_probe(struct platform_device *pdev) Link Here
754 
		return ret;
 755 
		return ret;
755 
	}
 756 
	}
756 

          757
          

        

            

              
              
              758
              
	acpi_battery_unregister();

            

            

              759
              

            

        

          757
          
	fuel_gauge_create_debugfs(info);

          760
          
	fuel_gauge_create_debugfs(info);

        

        

          758
          
	fuel_gauge_init_irq(info);

          761
          
	fuel_gauge_init_irq(info);

        

        

          759
          
	schedule_delayed_work(&info->status_monitor, STATUS_MON_DELAY_JIFFIES);

          762
          
	schedule_delayed_work(&info->status_monitor, STATUS_MON_DELAY_JIFFIES);

        

            

              760
              
- 

              
              
            






  

  Return to bug 194811