mfd/power: ab8500: Push algorithm to power supply code

The charging algorithm header is only used locally in the
power supply subsystem so push this down into
drivers/power/supply and rename from the confusing
"ux500_chargalg.h" to "ab8500-chargalg.h" for clarity:
it is only used with the AB8500.

This is another remnant of non-DT code needing to pass
data from boardfiles, which we don't do anymore.

Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Acked-by: Sebastian Reichel <sebastian.reichel@collabora.com>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
This commit is contained in:
Linus Walleij 2021-03-12 09:36:03 +01:00 committed by Lee Jones
parent 417c0fc24d
commit a65aa0ce23
4 changed files with 6 additions and 6 deletions

View File

@ -4,8 +4,8 @@
* Author: Johan Gardsmark <johan.gardsmark@stericsson.com> for ST-Ericsson.
*/
#ifndef _UX500_CHARGALG_H
#define _UX500_CHARGALG_H
#ifndef _AB8500_CHARGALG_H_
#define _AB8500_CHARGALG_H_
#include <linux/power_supply.h>
@ -48,4 +48,4 @@ struct ux500_charger {
extern struct blocking_notifier_head charger_notifier_list;
#endif
#endif /* _AB8500_CHARGALG_H_ */

View File

@ -28,12 +28,12 @@
#include <linux/mfd/core.h>
#include <linux/mfd/abx500/ab8500.h>
#include <linux/mfd/abx500.h>
#include <linux/mfd/abx500/ux500_chargalg.h>
#include <linux/usb/otg.h>
#include <linux/mutex.h>
#include <linux/iio/consumer.h>
#include "ab8500-bm.h"
#include "ab8500-chargalg.h"
/* Charger constants */
#define NO_PW_CONN 0

View File

@ -28,10 +28,10 @@
#include <linux/mfd/core.h>
#include <linux/mfd/abx500.h>
#include <linux/mfd/abx500/ab8500.h>
#include <linux/mfd/abx500/ux500_chargalg.h>
#include <linux/notifier.h>
#include "ab8500-bm.h"
#include "ab8500-chargalg.h"
/* Watchdog kick interval */
#define CHG_WD_INTERVAL (6 * HZ)

View File

@ -18,13 +18,13 @@
#include <linux/i2c.h>
#include <linux/workqueue.h>
#include <linux/mfd/abx500/ab8500.h>
#include <linux/mfd/abx500/ux500_chargalg.h>
#include <linux/pm2301_charger.h>
#include <linux/gpio.h>
#include <linux/pm_runtime.h>
#include <linux/pm.h>
#include "ab8500-bm.h"
#include "ab8500-chargalg.h"
#include "pm2301_charger.h"
#define to_pm2xxx_charger_ac_device_info(x) container_of((x), \