Menu
▾
▴
[Hackndev-commit] SF.net SVN: hackndev: [1342] linux4palm/linux/trunk/arch/arm/mach-pxa/ palmtx
|
From: <mis...@us...> - 2007-09-26 14:45:09
|
Revision: 1342
http://hackndev.svn.sourceforge.net/hackndev/?rev=1342&view=rev
Author: miska_tx
Date: 2007-09-26 07:44:58 -0700 (Wed, 26 Sep 2007)
Log Message:
-----------
PalmTX: Migration to the universal batery driver
Signed-off-by: Michal Hrusecky <Mic...@se...>
Modified Paths:
--------------
linux4palm/linux/trunk/arch/arm/mach-pxa/palmtx/Kconfig
linux4palm/linux/trunk/arch/arm/mach-pxa/palmtx/Makefile
linux4palm/linux/trunk/arch/arm/mach-pxa/palmtx/palmtx.c
Removed Paths:
-------------
linux4palm/linux/trunk/arch/arm/mach-pxa/palmtx/palmtx_battery.c
Modified: linux4palm/linux/trunk/arch/arm/mach-pxa/palmtx/Kconfig
===================================================================
--- linux4palm/linux/trunk/arch/arm/mach-pxa/palmtx/Kconfig 2007-09-26 14:42:12 UTC (rev 1341)
+++ linux4palm/linux/trunk/arch/arm/mach-pxa/palmtx/Kconfig 2007-09-26 14:44:58 UTC (rev 1342)
@@ -11,16 +11,6 @@
help
Enable core debug output for Palm TX modules.
-config PALMTX_BATTERY
- tristate "Palm TX Battery support"
- select TOUCHSCREEN_WM97XX
- select POWER_SUPPLY
- depends on MACH_XSCALE_PALMTX
- default m
- help
- Enable support for Palm TX battery to APM.
- ATM use it only as module, otherwise it hangs.
-
config PALMTX_PM
tristate "Palm TX Power Management support"
depends on MACH_XSCALE_PALMTX
Modified: linux4palm/linux/trunk/arch/arm/mach-pxa/palmtx/Makefile
===================================================================
--- linux4palm/linux/trunk/arch/arm/mach-pxa/palmtx/Makefile 2007-09-26 14:42:12 UTC (rev 1341)
+++ linux4palm/linux/trunk/arch/arm/mach-pxa/palmtx/Makefile 2007-09-26 14:44:58 UTC (rev 1342)
@@ -3,6 +3,5 @@
#
#
obj-$(CONFIG_MACH_XSCALE_PALMTX) += palmtx.o
-obj-$(CONFIG_PALMTX_BATTERY) += palmtx_battery.o
obj-$(CONFIG_PALMTX_PM) += palmtx_pm.o
obj-$(CONFIG_PALMTX_PCMCIA) += palmtx_pcmcia.o
Modified: linux4palm/linux/trunk/arch/arm/mach-pxa/palmtx/palmtx.c
===================================================================
--- linux4palm/linux/trunk/arch/arm/mach-pxa/palmtx/palmtx.c 2007-09-26 14:42:12 UTC (rev 1341)
+++ linux4palm/linux/trunk/arch/arm/mach-pxa/palmtx/palmtx.c 2007-09-26 14:44:58 UTC (rev 1342)
@@ -169,6 +169,25 @@
};
/*************
+ * Batery *
+ *************/
+
+int palmtx_ac_is_connected (void){
+ /* when charger is plugged in, then status is ONLINE */
+ return GET_PALMTX_GPIO(POWER_DETECT)||(!GET_PALMTX_GPIO(USB_DETECT_N));
+}
+
+static struct palm_battery_data palm_battery_info = {
+ .bat_min_voltage = PALMTX_BAT_MIN_VOLTAGE,
+ .bat_max_voltage = PALMTX_BAT_MAX_VOLTAGE,
+ .bat_max_life_mins = PALMTX_MAX_LIFE_MINS,
+ .ac_connected = &palmtx_ac_is_connected,
+};
+
+EXPORT_SYMBOL_GPL(palm_battery_info);
+
+
+/*************
* Backlight *
*************/
Deleted: linux4palm/linux/trunk/arch/arm/mach-pxa/palmtx/palmtx_battery.c
===================================================================
--- linux4palm/linux/trunk/arch/arm/mach-pxa/palmtx/palmtx_battery.c 2007-09-26 14:42:12 UTC (rev 1341)
+++ linux4palm/linux/trunk/arch/arm/mach-pxa/palmtx/palmtx_battery.c 2007-09-26 14:44:58 UTC (rev 1342)
@@ -1,285 +0,0 @@
-/************************************************************************
- * linux/arch/arm/mach-pxa/palmztx/palmtx_battery.c *
- * Battery driver for Palm TX *
- * *
- * Author: Jan Herman <2h...@se...> *
- * *
- * Based on code for Palm Zire 72 by *
- * *
- * Authors: Jan Herman <2h...@se...> *
- * Sergey Lapin <sl...@ha...> *
- * *
- ************************************************************************/
-
-
-#include <linux/kernel.h>
-#include <linux/module.h>
-#include <linux/moduleparam.h>
-#include <linux/init.h>
-#include <linux/interrupt.h>
-#include <linux/input.h>
-#include <linux/device.h>
-#include <linux/workqueue.h>
-#include <linux/power_supply.h>
-#include <linux/apm-emulation.h>
-#include <linux/wm97xx.h>
-
-#include <asm/delay.h>
-#include <asm/mach-types.h>
-#include <asm/mach/arch.h>
-#include <asm/mach/map.h>
-#include <asm/arch/hardware.h>
-#include <asm/arch/pxa-regs.h>
-#include <asm/arch/irqs.h>
-#include <asm/arch/palmtx-gpio.h>
-#include <asm/arch/palmtx-init.h>
-
-#include <sound/driver.h>
-#include <sound/core.h>
-#include <sound/pcm.h>
-#include <sound/initval.h>
-
-struct palmtx_battery_dev
-{
- struct wm97xx * wm;
- int battery_registered;
- int current_voltage;
- int previous_voltage;
- u32 last_battery_update;
-};
-
-struct palmtx_battery_dev bat;
-
-#if defined(CONFIG_APM_EMULATION) || defined(CONFIG_APM_MODULE)
-/* original APM hook */
-static void (*apm_get_power_status_orig)(struct apm_power_info *info);
-#endif
-
-int palmtx_battery_min_voltage(struct power_supply *b)
-{
- return PALMTX_BAT_MIN_VOLTAGE;
-}
-
-
-int palmtx_battery_max_voltage(struct power_supply *b)
-{
- return PALMTX_BAT_MAX_VOLTAGE; /* mV */
-}
-
-static int palmtx_ac_is_connected (void){
- /* when charger is plugged in, then status is ONLINE */
- return GET_PALMTX_GPIO(POWER_DETECT)||(!GET_PALMTX_GPIO(USB_DETECT_N));
-}
-
-/*
- This formula is based on battery life of my battery 1100mAh. Original battery in Zire72 is Li-On 920mAh
- V_batt = ADCSEL_BMON * 1,889 + 767,8 [mV]
-*/
-
-int palmtx_battery_get_voltage(struct power_supply *b)
-{
- if (bat.battery_registered) {
- bat.previous_voltage = bat.current_voltage;
- bat.current_voltage = wm97xx_read_aux_adc(bat.wm, WM97XX_AUX_ID3);
- bat.last_battery_update = jiffies;
- return bat.current_voltage * 1889/1000 + 7678/10;
- } else {
- printk("palmtx_battery: cannot get voltage -> battery driver unregistered\n");
- return 0;
- }
-}
-
-int palmtx_battery_get_capacity(struct power_supply *b)
-{
- if (bat.battery_registered)
- return (((palmtx_battery_get_voltage(b)-palmtx_battery_min_voltage(b))
- /(palmtx_battery_max_voltage(b)-palmtx_battery_min_voltage(b)))*100);
- else{
- printk("palmtx_battery: cannot get capacity -> battery driver unregistered\n");
- return 0;
- }
-}
-
-int palmtx_battery_get_status(struct power_supply *b)
-{
- if ( palmtx_ac_is_connected() &&
- ( ( bat.current_voltage > bat.previous_voltage ) ||
- (bat.current_voltage <= palmtx_battery_max_voltage(b)) ) )
- return POWER_SUPPLY_STATUS_CHARGING;
- else
- return POWER_SUPPLY_STATUS_NOT_CHARGING;
-}
-
-static int palmtx_battery_get_property(struct power_supply *b,
- enum power_supply_property psp,
- union power_supply_propval *val)
-{
- switch (psp) {
- case POWER_SUPPLY_PROP_VOLTAGE_MAX_DESIGN:
- val->intval = palmtx_battery_max_voltage(b);
- break;
- case POWER_SUPPLY_PROP_VOLTAGE_MIN_DESIGN:
- val->intval = palmtx_battery_min_voltage(b);
- break;
- case POWER_SUPPLY_PROP_CHARGE_FULL_DESIGN:
- val->intval = 100;
- break;
- case POWER_SUPPLY_PROP_CHARGE_EMPTY_DESIGN:
- val->intval = 0;
- break;
- case POWER_SUPPLY_PROP_CHARGE_NOW:
- val->intval = palmtx_battery_get_capacity(b);
- break;
- case POWER_SUPPLY_PROP_VOLTAGE_NOW:
- val->intval = palmtx_battery_get_voltage(b);
- break;
- case POWER_SUPPLY_PROP_STATUS:
- val->intval = palmtx_battery_get_status(b);
- break;
- default:
- break;
- };
-
- return 0;
-}
-
-static enum power_supply_property palmtx_battery_props[] = {
- POWER_SUPPLY_PROP_VOLTAGE_MAX_DESIGN,
- POWER_SUPPLY_PROP_VOLTAGE_MIN_DESIGN,
- POWER_SUPPLY_PROP_CHARGE_FULL_DESIGN,
- POWER_SUPPLY_PROP_CHARGE_EMPTY_DESIGN,
- POWER_SUPPLY_PROP_CHARGE_NOW,
- POWER_SUPPLY_PROP_VOLTAGE_NOW,
- POWER_SUPPLY_PROP_STATUS,
-};
-
-struct power_supply palmtx_battery = {
- .name = "palmtx_battery",
- .get_property = palmtx_battery_get_property,
- .properties = palmtx_battery_props,
- .num_properties = ARRAY_SIZE(palmtx_battery_props),
-};
-
-static int palmtx_wm97xx_probe(struct device *dev)
-{
- struct wm97xx *wm = dev->driver_data;
- bat.wm = wm;
- return 0;
-}
-
-static int palmtx_wm97xx_remove(struct device *dev)
-{
- return 0;
-}
-
-static void
-palmtx_wm97xx_shutdown(struct device *dev)
-{
-#if defined(CONFIG_APM_EMULATION) || defined(CONFIG_APM_MODULE)
- apm_get_power_status = apm_get_power_status_orig;
-#endif
-}
-
-static int
-palmtx_wm97xx_suspend(struct device *dev, pm_message_t state)
-{
- return 0;
-}
-
-static int
-palmtx_wm97xx_resume(struct device *dev)
-{
- return 0;
-}
-
-
-static struct device_driver palmtx_wm97xx_driver = {
- .name = "wm97xx-touchscreen",
- .bus = &wm97xx_bus_type,
- .owner = THIS_MODULE,
- .probe = palmtx_wm97xx_probe,
- .remove = palmtx_wm97xx_remove,
- .suspend = palmtx_wm97xx_suspend,
- .resume = palmtx_wm97xx_resume,
- .shutdown = palmtx_wm97xx_shutdown
-};
-
-
-#if defined(CONFIG_APM_EMULATION) || defined(CONFIG_APM_MODULE)
-
-/* APM status query callback implementation */
-static void palmtx_apm_get_power_status(struct apm_power_info *info)
-{
- int min, max, curr, percent;
-
- curr = palmtx_battery_get_voltage(&palmtx_battery);
- min = palmtx_battery_min_voltage(&palmtx_battery);
- max = palmtx_battery_max_voltage(&palmtx_battery);
-
- curr = curr - min;
- if (curr < 0) curr = 0;
- max = max - min;
-
- percent = curr*100/max;
-
- info->battery_life = percent;
-
- info->ac_line_status = palmtx_ac_is_connected() ? APM_AC_ONLINE : APM_AC_OFFLINE;
-
- if (info->ac_line_status)
- info->battery_status = APM_BATTERY_STATUS_CHARGING;
- else {
- if (percent > 50)
- info->battery_status = APM_BATTERY_STATUS_HIGH;
- else if (percent < 5)
- info->battery_status = APM_BATTERY_STATUS_CRITICAL;
- else
- info->battery_status = APM_BATTERY_STATUS_LOW;
- }
-
- info->time = percent * PALMTX_MAX_LIFE_MINS/100;
- info->units = APM_UNITS_MINS;
-}
-#endif
-static int __init palmtx_wm97xx_init(void)
-{
-#ifndef MODULE
- int ret;
-#endif
-
- /* register battery to APM layer */
- bat.battery_registered = 0;
-
- if(power_supply_register(NULL, &palmtx_battery))
- printk(KERN_ERR "palmtx_ac97_probe: could not register battery class\n");
- else {
- bat.battery_registered = 1;
- printk("Battery registered\n");
- }
-#if defined(CONFIG_APM_EMULATION) || defined(CONFIG_APM_MODULE)
- apm_get_power_status_orig = apm_get_power_status;
- apm_get_power_status = palmtx_apm_get_power_status;
-#endif
-#ifndef MODULE
- /* If we're in kernel, we could accidentally be run before wm97xx
- and thus have panic */
- if((ret = bus_register(&wm97xx_bus_type)) < 0)
- return ret;
-#endif
- return driver_register(&palmtx_wm97xx_driver);
-}
-
-static void __exit palmtx_wm97xx_exit(void)
-{
-/* TODO - recover APM callback to original state */
- power_supply_unregister(&palmtx_battery);
- driver_unregister(&palmtx_wm97xx_driver);
-}
-
-module_init(palmtx_wm97xx_init);
-module_exit(palmtx_wm97xx_exit);
-
-/* Module information */
-MODULE_AUTHOR("Jan Herman <2h...@se...>");
-MODULE_DESCRIPTION("wm97xx battery driver for Palm TX");
-MODULE_LICENSE("GPL");
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
