Convert WM97xx battery to use platform_data
PATCH 3/4 Convert WM97xx battery to use platform_data
Hi,
I split the "[PATCH 3/4] Convert WM97xx driver to use platform_data" patch into three smaller as Mark requested. These three will be:
[PATCH 2/4] Make wm97xx-core pass platform_data to battery, ts [PATCH 3/4] Convert WM97xx battery to use platform_data [PATCH 4/4] Let wm97xx-battery use irq to detect charger state
From 2c67cab373142cb442f31b8943c29b392123af77 Mon Sep 17 00:00:00 2001
From: Marek Vasut <[email protected]>
Date: Thu, 23 Jul 2009 15:52:08 +0200
Subject: [PATCH 3/4] Convert WM97xx battery to use platform_data
This patch converts the wm97xx-battery driver to use platform_data supplied by ac97 bus.
--- drivers/power/wm97xx_battery.c | 25 ++++++++++++++++--------- include/linux/wm97xx.h | 18 ++++++++++++++++++ include/linux/wm97xx_batt.h | 26 -------------------------- 3 files changed, 34 insertions(+), 35 deletions(-) delete mode 100644 include/linux/wm97xx_batt.h
drivers/power/wm97xx_battery.c +16 -9
@@ -22,17 +22,18 @@#include <linux/spinlock.h> #include <linux/interrupt.h> #include <linux/gpio.h> -#include <linux/wm97xx_batt.h> static DEFINE_MUTEX (bat_lock);static struct work_struct bat_work;struct mutex work_lock;static int bat_status =POWER_SUPPLY_STATUS_UNKNOWN ; -static struct wm97xx_batt_info *pdata;static enum power_supply_property *prop;static unsigned long wm97xx_read_bat (struct power_supply *bat_ps) { +struct wm97xx_pdata *wmdata = bat_ps->dev->parent->platform_data; +struct wm97xx_batt_pdata *pdata = wmdata->batt_pdata; +return wm97xx_read_aux_adc (bat_ps->dev->parent->driver_data, pdata->batt_aux) * pdata->batt_mult / pdata->batt_div;
@@ -40,6 +41,9 @@ static unsigned long wm97xx_read_bat(struct power_supply *bat_ps)static unsigned long wm97xx_read_temp (struct power_supply *bat_ps) { +struct wm97xx_pdata *wmdata = bat_ps->dev->parent->platform_data; +struct wm97xx_batt_pdata *pdata = wmdata->batt_pdata; +return wm97xx_read_aux_adc (bat_ps->dev->parent->driver_data, pdata->temp_aux) * pdata->temp_mult / pdata->temp_div;
@@ -49,6 +53,9 @@ static int wm97xx_bat_get_property(struct power_supply *bat_ps,enum power_supply_property psp, union power_supply_propval *val) { + struct wm97xx_pdata *wmdata = bat_ps->dev->parent->platform_data; +struct wm97xx_batt_pdata *pdata = wmdata->batt_pdata; +switch (psp) {case POWER_SUPPLY_PROP_STATUS : val->intval = bat_status;
@@ -97,6 +104,7 @@ static void wm97xx_bat_external_power_changed(struct power_supply *bat_ps)static void wm97xx_bat_update (struct power_supply *bat_ps) {int old_status = bat_status; +struct wm97xx_batt_pdata *pdata =dev_get_drvdata (bat_ps->dev->parent);mutex_lock (&work_lock);
@@ -149,6 +157,8 @@ static int __devinit wm97xx_bat_probe(struct platform_device *dev)int ret =0 ;int props =1 ;/* POWER_SUPPLY_PROP_PRESENT */ int i =0 ; +struct wm97xx_pdata *wmdata = dev->dev.platform_data; +struct wm97xx_batt_pdata *pdata = wmdata->batt_pdata;if (dev->id !=-1 )return -EINVAL ;
@@ -156,7 +166,7 @@ static int __devinit wm97xx_bat_probe(struct platform_device *dev)mutex_init (&work_lock);if (!pdata) { -dev_err (&dev->dev,"Please use wm97xx_bat_set_pdata\n" ); +dev_err (&dev->dev,"No platform_data supplied\n" );return -EINVAL ; }
@@ -229,6 +239,9 @@ err: static int __devexit wm97xx_bat_remove(struct platform_device *dev) { +struct wm97xx_pdata *wmdata = dev->dev.platform_data; +struct wm97xx_batt_pdata *pdata = wmdata->batt_pdata; +if (pdata && pdata->charge_gpio && pdata->charge_gpio >=0 )gpio_free (pdata->charge_gpio);flush_scheduled_work ();
@@ -258,12 +271,6 @@ static void __exit wm97xx_bat_exit(void)platform_driver_unregister (&wm97xx_bat_driver); } -void __init wm97xx_bat_set_pdata (struct wm97xx_batt_info *data) -{ - pdata = data; -} -EXPORT_SYMBOL_GPL (wm97xx_bat_set_pdata); -module_init (wm97xx_bat_init);module_exit (wm97xx_bat_exit);
include/linux/wm97xx.h +18 -0
@@ -293,6 +293,24 @@ struct wm97xx {u16 suspend_mode;/* PRP in suspend mode */ }; +struct wm97xx_batt_pdata { +int batt_aux; +int temp_aux; +int charge_gpio; +int min_voltage; +int max_voltage; +int batt_div; +int batt_mult; +int temp_div; +int temp_mult; +int batt_tech; +char *batt_name; +}; + +struct wm97xx_pdata { +struct wm97xx_batt_pdata *batt_pdata;/* battery data */ +}; +/* * Codec GPIO access (not supported on WM9705) * This can be used to set/get codec GPIO and Virtual GPIO status.
include/linux/wm97xx_batt.h deleted +0 -26
@@ -1,26 +0,0 @@ -#ifndef _LINUX_WM97XX_BAT_H -#define _LINUX_WM97XX_BAT_H - -#include <linux/wm97xx.h> - -struct wm97xx_batt_info { -int batt_aux; -int temp_aux; -int charge_gpio; -int min_voltage; -int max_voltage; -int batt_div; -int batt_mult; -int temp_div; -int temp_mult; -int batt_tech; -char *batt_name; -}; - -#ifdef CONFIG_BATTERY_WM97XX -void __init wm97xx_bat_set_pdata (struct wm97xx_batt_info *data); -#else -static inline void wm97xx_bat_set_pdata (struct wm97xx_batt_info *data) {} -#endif - -#endif
Signature · 1 line
1.6.3.3
_______________________________________________
Alsa-devel mailing list
[email protected]
http://mailman.alsa-project.org/mailman/listinfo/alsa-devel