Menu
▾
▴
[Hackndev-commit] SF.net SVN: hackndev: [998] linux4palm/linux/trunk
|
From: <mar...@us...> - 2007-05-27 17:42:06
|
Revision: 998
http://svn.sourceforge.net/hackndev/?rev=998&view=rev
Author: marex_z71
Date: 2007-05-27 10:42:01 -0700 (Sun, 27 May 2007)
Log Message:
-----------
PalmLD: PalmLD specific fixes, PalmLD battery, WM97xx fixes, new defconfig
Modified Paths:
--------------
linux4palm/linux/trunk/arch/arm/configs/palmld_defconfig
linux4palm/linux/trunk/arch/arm/mach-pxa/palmld/palmld_battery.c
linux4palm/linux/trunk/include/linux/wm97xx.h
Removed Paths:
-------------
linux4palm/linux/trunk/include/linux/wm9712_ts.h
Modified: linux4palm/linux/trunk/arch/arm/configs/palmld_defconfig
===================================================================
--- linux4palm/linux/trunk/arch/arm/configs/palmld_defconfig 2007-05-27 17:00:31 UTC (rev 997)
+++ linux4palm/linux/trunk/arch/arm/configs/palmld_defconfig 2007-05-27 17:42:01 UTC (rev 998)
@@ -1,11 +1,14 @@
#
# Automatically generated make config: don't edit
-# Linux kernel version: 2.6.20-hnd0
-# Tue Feb 27 17:46:56 2007
+# Linux kernel version: 2.6.21-hnd0
+# Sun May 27 14:49:20 2007
#
CONFIG_ARM=y
-# CONFIG_GENERIC_TIME is not set
+CONFIG_SYS_SUPPORTS_APM_EMULATION=y
+CONFIG_GENERIC_GPIO=y
+CONFIG_GENERIC_TIME=y
CONFIG_MMU=y
+# CONFIG_NO_IOPORT is not set
CONFIG_GENERIC_HARDIRQS=y
CONFIG_TRACE_IRQFLAGS_SUPPORT=y
CONFIG_HARDIRQS_SW_RESEND=y
@@ -15,6 +18,7 @@
# CONFIG_ARCH_HAS_ILOG2_U64 is not set
CONFIG_GENERIC_HWEIGHT=y
CONFIG_GENERIC_CALIBRATE_DELAY=y
+CONFIG_ZONE_DMA=y
CONFIG_ARCH_MTD_XIP=y
CONFIG_VECTORS_BASE=0xffff0000
CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
@@ -34,6 +38,7 @@
CONFIG_SWAP=y
CONFIG_SYSVIPC=y
# CONFIG_IPC_NS is not set
+CONFIG_SYSVIPC_SYSCTL=y
# CONFIG_POSIX_MQUEUE is not set
# CONFIG_BSD_PROCESS_ACCT is not set
# CONFIG_TASKSTATS is not set
@@ -42,6 +47,7 @@
# CONFIG_IKCONFIG is not set
CONFIG_SYSFS_DEPRECATED=y
# CONFIG_RELAY is not set
+CONFIG_BLK_DEV_INITRD=y
# CONFIG_INITRAMFS_SOURCE is not set
CONFIG_CC_OPTIMIZE_FOR_SIZE=y
CONFIG_SYSCTL=y
@@ -120,6 +126,7 @@
# CONFIG_ARCH_IXP2000 is not set
# CONFIG_ARCH_IXP23XX is not set
# CONFIG_ARCH_L7200 is not set
+# CONFIG_ARCH_NS9XXX is not set
# CONFIG_ARCH_PNX4008 is not set
CONFIG_ARCH_PXA=y
# CONFIG_ARCH_RPC is not set
@@ -128,6 +135,8 @@
# CONFIG_ARCH_SHARK is not set
# CONFIG_ARCH_LH7A40X is not set
# CONFIG_ARCH_OMAP is not set
+# CONFIG_BOARD_IRQ_MAP_SMALL is not set
+# CONFIG_BOARD_IRQ_MAP_BIG is not set
#
# Intel PXA2xx Implementations
@@ -156,6 +165,7 @@
# CONFIG_MACH_BLUEANGEL is not set
# CONFIG_MACH_HTCBEETLES is not set
# CONFIG_MACH_HW6900 is not set
+# CONFIG_MACH_HTCATHENA is not set
# CONFIG_ARCH_AXIMX3 is not set
# CONFIG_ARCH_AXIMX5 is not set
# CONFIG_MACH_X50 is not set
@@ -177,6 +187,8 @@
# CONFIG_MACH_PALMZ72 is not set
# CONFIG_MACH_OMAP_PALMTC is not set
# CONFIG_MACH_ZIRE31 is not set
+CONFIG_GPIOED=m
+CONFIG_GPIOEDNG=m
# CONFIG_PXA_SHARPSL is not set
# CONFIG_MACH_TRIZEPS4 is not set
CONFIG_PXA27x=y
@@ -203,20 +215,12 @@
#
CONFIG_ARM_THUMB=y
# CONFIG_CPU_DCACHE_DISABLE is not set
+# CONFIG_OUTER_CACHE is not set
CONFIG_IWMMXT=y
# CONFIG_ARMBOOT_PROC is not set
CONFIG_XSCALE_PMU=y
-# CONFIG_KEXEC is not set
#
-# Compaq/iPAQ Drivers
-#
-
-#
-# Compaq/HP iPAQ Drivers
-#
-
-#
# Bus support
#
@@ -252,6 +256,7 @@
# CONFIG_SPARSEMEM_STATIC is not set
CONFIG_SPLIT_PTLOCK_CPUS=4096
# CONFIG_RESOURCES_64BIT is not set
+CONFIG_ZONE_DMA_FLAG=1
CONFIG_ALIGNMENT_TRAP=y
#
@@ -261,6 +266,8 @@
CONFIG_ZBOOT_ROM_BSS=0x0
CONFIG_CMDLINE=""
# CONFIG_XIP_KERNEL is not set
+# CONFIG_KEXEC is not set
+# CONFIG_TXTOFFSET_DELTA is not set
#
# CPU Frequency scaling
@@ -293,7 +300,7 @@
# CONFIG_PM_DEBUG is not set
# CONFIG_DPM_DEBUG is not set
# CONFIG_PM_SYSFS_DEPRECATED is not set
-CONFIG_APM=y
+CONFIG_APM_EMULATION=y
#
# Networking
@@ -310,7 +317,9 @@
CONFIG_XFRM=y
# CONFIG_XFRM_USER is not set
# CONFIG_XFRM_SUB_POLICY is not set
+# CONFIG_XFRM_MIGRATE is not set
CONFIG_NET_KEY=y
+# CONFIG_NET_KEY_MIGRATE is not set
CONFIG_INET=y
# CONFIG_IP_MULTICAST is not set
# CONFIG_IP_ADVANCED_ROUTER is not set
@@ -437,6 +446,7 @@
# CONFIG_BT_HCIUART_BCSP is not set
# CONFIG_BT_HCIDTL1 is not set
# CONFIG_BT_HCIBT3C is not set
+CONFIG_BT_BCM2035UART=m
# CONFIG_BT_HCIBLUECARD is not set
# CONFIG_BT_HCIBTUART is not set
# CONFIG_BT_HCIVHCI is not set
@@ -520,6 +530,7 @@
# CONFIG_MTD_COMPLEX_MAPPINGS is not set
# CONFIG_MTD_PHYSMAP is not set
# CONFIG_MTD_ARM_INTEGRATOR is not set
+# CONFIG_MTD_IPAQ is not set
# CONFIG_MTD_IMPA7 is not set
# CONFIG_MTD_SHARP_SL is not set
# CONFIG_MTD_PLATRAM is not set
@@ -557,6 +568,7 @@
#
# Plug and Play support
#
+# CONFIG_PNPACPI is not set
#
# Block devices
@@ -569,7 +581,6 @@
CONFIG_BLK_DEV_RAM_COUNT=16
CONFIG_BLK_DEV_RAM_SIZE=4096
CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
-CONFIG_BLK_DEV_INITRD=y
# CONFIG_CDROM_PKTCDVD is not set
# CONFIG_ATA_OVER_ETH is not set
@@ -597,7 +608,6 @@
CONFIG_IDE_GENERIC=y
# CONFIG_IDE_ARM is not set
# CONFIG_BLK_DEV_IDEDMA is not set
-# CONFIG_IDEDMA_AUTO is not set
# CONFIG_BLK_DEV_HD is not set
#
@@ -753,8 +763,10 @@
# CONFIG_KEYBOARD_XTKBD is not set
# CONFIG_KEYBOARD_NEWTON is not set
# CONFIG_KEYBOARD_STOWAWAY is not set
-# CONFIG_KEYBOARD_GPIO is not set
+# CONFIG_GPIODEV_KEYS is not set
+# CONFIG_GPIODEV_DIAGONAL is not set
CONFIG_KEYBOARD_PXA27x=y
+CONFIG_KEYBOARD_GPIO=y
# CONFIG_INPUT_MOUSE is not set
# CONFIG_INPUT_JOYSTICK is not set
CONFIG_INPUT_TOUCHSCREEN=y
@@ -765,8 +777,6 @@
# CONFIG_TOUCHSCREEN_PENMOUNT is not set
# CONFIG_TOUCHSCREEN_TOUCHRIGHT is not set
# CONFIG_TOUCHSCREEN_TOUCHWIN is not set
-# CONFIG_TOUCHSCREEN_ADC is not set
-# CONFIG_TOUCHSCREEN_ADC_DEBOUNCE is not set
# CONFIG_TOUCHSCREEN_UCB1400 is not set
# CONFIG_TOUCHSCREEN_PALMTC is not set
CONFIG_TOUCHSCREEN_WM97XX=m
@@ -811,6 +821,7 @@
# CONFIG_SERIAL_PXA_IR is not set
CONFIG_SERIAL_CORE=y
CONFIG_SERIAL_CORE_CONSOLE=y
+# CONFIG_RS232_SERIAL is not set
CONFIG_UNIX98_PTYS=y
CONFIG_LEGACY_PTYS=y
CONFIG_LEGACY_PTY_COUNT=256
@@ -829,6 +840,7 @@
CONFIG_SA1100_RTC=y
# CONFIG_DTLK is not set
# CONFIG_R3964 is not set
+# CONFIG_TIHTC is not set
#
# PCMCIA character devices
@@ -866,10 +878,12 @@
# CONFIG_HWMON_VID is not set
#
-# Hardware Monitoring - Battery
+# Hardware Monitoring - external power and batteries
#
-# CONFIG_BATTERY is not set
-# CONFIG_ADC_BATTERY is not set
+CONFIG_EXTERNAL_POWER=m
+CONFIG_BATTERY=m
+CONFIG_PDA_POWER=m
+CONFIG_APM_POWER=m
#
# L3 serial bus support
@@ -877,20 +891,6 @@
# CONFIG_L3 is not set
#
-# SoC drivers
-#
-# CONFIG_SOC_MQ11XX is not set
-# CONFIG_SOC_T7L66XB is not set
-# CONFIG_SOC_TC6387XB is not set
-# CONFIG_SOC_TC6393XB is not set
-# CONFIG_SOC_SAMCOP is not set
-# CONFIG_SOC_HAMCOP is not set
-# CONFIG_HTC_ASIC2 is not set
-# CONFIG_HTC_ASIC3 is not set
-# CONFIG_HTC_ASIC3_DS1WM is not set
-# CONFIG_SOC_TSC2200 is not set
-
-#
# Misc devices
#
# CONFIG_BATTCHARGE_MONITOR is not set
@@ -898,12 +898,25 @@
#
# Multimedia Capabilities Port drivers
#
-# CONFIG_MCP is not set
-# CONFIG_ADC_ADS7846_SSP is not set
-# CONFIG_ADC_AD7877 is not set
-# CONFIG_TIFM_CORE is not set
+# CONFIG_ADC is not set
#
+# Multifunction device drivers
+#
+# CONFIG_MFD_SM501 is not set
+# CONFIG_HTC_ASIC2 is not set
+# CONFIG_HTC_ASIC3 is not set
+# CONFIG_HTC_ASIC3_DS1WM is not set
+# CONFIG_SOC_SAMCOP is not set
+# CONFIG_SOC_HAMCOP is not set
+# CONFIG_SOC_MQ11XX is not set
+# CONFIG_SOC_T7L66XB is not set
+# CONFIG_SOC_TC6387XB is not set
+# CONFIG_SOC_TC6393XB is not set
+# CONFIG_SOC_TSC2101 is not set
+# CONFIG_SOC_TSC2200 is not set
+
+#
# LED devices
#
CONFIG_NEW_LEDS=y
@@ -938,15 +951,26 @@
#
# Graphics support
#
+CONFIG_BACKLIGHT_LCD_SUPPORT=y
+CONFIG_BACKLIGHT_CLASS_DEVICE=m
+CONFIG_LCD_CLASS_DEVICE=m
+# CONFIG_BACKLIGHT_CORGI is not set
+CONFIG_BACKLIGHT_PXAPWM=m
+CONFIG_FB=y
CONFIG_FIRMWARE_EDID=y
-CONFIG_FB=y
+# CONFIG_FB_DDC is not set
CONFIG_FB_CFB_FILLRECT=y
CONFIG_FB_CFB_COPYAREA=y
CONFIG_FB_CFB_IMAGEBLIT=y
+# CONFIG_FB_SVGALIB is not set
# CONFIG_FB_MACMODES is not set
# CONFIG_FB_BACKLIGHT is not set
# CONFIG_FB_MODE_HELPERS is not set
CONFIG_FB_TILEBLITTING=y
+
+#
+# Frame buffer hardware drivers
+#
# CONFIG_FB_IMAGEON is not set
# CONFIG_FB_S1D13XXX is not set
CONFIG_FB_PXA=y
@@ -962,21 +986,22 @@
CONFIG_DUMMY_CONSOLE=y
CONFIG_FRAMEBUFFER_CONSOLE=y
CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
-# CONFIG_FONTS is not set
+CONFIG_FONTS=y
CONFIG_FONT_8x8=y
-CONFIG_FONT_8x16=y
+# CONFIG_FONT_8x16 is not set
+# CONFIG_FONT_6x11 is not set
+# CONFIG_FONT_7x14 is not set
+# CONFIG_FONT_PEARL_8x8 is not set
+# CONFIG_FONT_ACORN_8x8 is not set
+# CONFIG_FONT_MINI_4x6 is not set
+# CONFIG_FONT_SUN8x16 is not set
+# CONFIG_FONT_SUN12x22 is not set
+# CONFIG_FONT_10x18 is not set
#
# Logo configuration
#
# CONFIG_LOGO is not set
-CONFIG_BACKLIGHT_LCD_SUPPORT=y
-CONFIG_BACKLIGHT_CLASS_DEVICE=m
-CONFIG_BACKLIGHT_DEVICE=y
-CONFIG_LCD_CLASS_DEVICE=m
-CONFIG_LCD_DEVICE=y
-# CONFIG_BACKLIGHT_CORGI is not set
-CONFIG_BACKLIGHT_PXAPWM=m
#
# Sound
@@ -1040,6 +1065,7 @@
# HID Devices
#
CONFIG_HID=y
+# CONFIG_HID_DEBUG is not set
#
# USB support
@@ -1056,7 +1082,29 @@
#
# USB Gadget Support
#
-# CONFIG_USB_GADGET is not set
+CONFIG_USB_GADGET=m
+# CONFIG_USB_GADGET_DEBUG_FILES is not set
+CONFIG_USB_GADGET_SELECTED=y
+# CONFIG_USB_GADGET_NET2280 is not set
+# CONFIG_USB_GADGET_PXA2XX is not set
+# CONFIG_USB_GADGET_PXA27X is not set
+CONFIG_USB_GADGET_SX2=y
+CONFIG_USB_SX2=m
+# CONFIG_USB_GADGET_GOKU is not set
+# CONFIG_USB_GADGET_MQ11XX is not set
+# CONFIG_USB_GADGET_LH7A40X is not set
+# CONFIG_USB_GADGET_S3C2410 is not set
+# CONFIG_USB_GADGET_OMAP is not set
+# CONFIG_USB_GADGET_AT91 is not set
+# CONFIG_USB_GADGET_DUMMY_HCD is not set
+# CONFIG_USB_GADGET_DUALSPEED is not set
+CONFIG_USB_ZERO=m
+# CONFIG_USB_ETH is not set
+# CONFIG_USB_GADGETFS is not set
+# CONFIG_USB_FILE_STORAGE is not set
+# CONFIG_USB_G_SERIAL is not set
+# CONFIG_USB_MIDI_GADGET is not set
+# CONFIG_USB_G_CHAR is not set
#
# MMC/SD Card support
@@ -1065,7 +1113,6 @@
# CONFIG_MMC_DEBUG is not set
CONFIG_MMC_BLOCK=y
CONFIG_MMC_PXA=y
-# CONFIG_MMC_TIFM_SD is not set
# CONFIG_MMC_TMIO is not set
# CONFIG_MMC_SAMCOP is not set
@@ -1073,10 +1120,32 @@
# Real Time Clock
#
CONFIG_RTC_LIB=y
-# CONFIG_RTC_CLASS is not set
+CONFIG_RTC_CLASS=y
+CONFIG_RTC_HCTOSYS=y
+CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
CONFIG_RTC_EPOCH=1904
+# CONFIG_RTC_DEBUG is not set
#
+# RTC interfaces
+#
+CONFIG_RTC_INTF_SYSFS=y
+CONFIG_RTC_INTF_PROC=y
+CONFIG_RTC_INTF_DEV=y
+# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set
+
+#
+# RTC drivers
+#
+# CONFIG_RTC_DRV_CMOS is not set
+# CONFIG_RTC_DRV_DS1553 is not set
+# CONFIG_RTC_DRV_DS1742 is not set
+# CONFIG_RTC_DRV_M48T86 is not set
+CONFIG_RTC_DRV_SA1100=y
+# CONFIG_RTC_DRV_TEST is not set
+# CONFIG_RTC_DRV_V3020 is not set
+
+#
# File systems
#
CONFIG_EXT2_FS=y
@@ -1271,8 +1340,10 @@
# CONFIG_CRYPTO_GF128MUL is not set
CONFIG_CRYPTO_ECB=m
CONFIG_CRYPTO_CBC=m
+CONFIG_CRYPTO_PCBC=m
# CONFIG_CRYPTO_LRW is not set
# CONFIG_CRYPTO_DES is not set
+# CONFIG_CRYPTO_FCRYPT is not set
# CONFIG_CRYPTO_BLOWFISH is not set
# CONFIG_CRYPTO_TWOFISH is not set
# CONFIG_CRYPTO_SERPENT is not set
@@ -1286,6 +1357,7 @@
# CONFIG_CRYPTO_DEFLATE is not set
# CONFIG_CRYPTO_MICHAEL_MIC is not set
# CONFIG_CRYPTO_CRC32C is not set
+# CONFIG_CRYPTO_CAMELLIA is not set
# CONFIG_CRYPTO_TEST is not set
#
@@ -1303,4 +1375,5 @@
CONFIG_ZLIB_INFLATE=y
CONFIG_ZLIB_DEFLATE=y
CONFIG_PLIST=y
-CONFIG_IOMAP_COPY=y
+CONFIG_HAS_IOMEM=y
+CONFIG_HAS_IOPORT=y
Modified: linux4palm/linux/trunk/arch/arm/mach-pxa/palmld/palmld_battery.c
===================================================================
--- linux4palm/linux/trunk/arch/arm/mach-pxa/palmld/palmld_battery.c 2007-05-27 17:00:31 UTC (rev 997)
+++ linux4palm/linux/trunk/arch/arm/mach-pxa/palmld/palmld_battery.c 2007-05-27 17:42:01 UTC (rev 998)
@@ -8,7 +8,6 @@
* *
************************************************************************/
-
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/moduleparam.h>
@@ -18,8 +17,9 @@
#include <linux/device.h>
#include <linux/workqueue.h>
#include <linux/battery.h>
+#include <linux/apm-emulation.h>
+#include <linux/wm97xx.h>
-#include <asm/apm.h>
#include <asm/delay.h>
#include <asm/mach-types.h>
#include <asm/mach/arch.h>
@@ -27,19 +27,17 @@
#include <asm/arch/hardware.h>
#include <asm/arch/pxa-regs.h>
#include <asm/arch/irqs.h>
+#include <asm/arch/palmld-gpio.h>
+#include <asm/arch/palmld-init.h>
#include <sound/driver.h>
#include <sound/core.h>
#include <sound/pcm.h>
#include <sound/initval.h>
-#include <linux/wm97xx.h>
-#include <asm/arch/palmld-gpio.h>
-#include <asm/arch/palmld-init.h>
-
struct palmld_battery_dev
{
- struct wm97xx * wm;
+ struct wm97xx *wm;
int battery_registered;
int current_voltage;
int previous_voltage;
@@ -48,7 +46,7 @@
struct palmld_battery_dev bat;
-#if defined(CONFIG_APM) || defined(CONFIG_APM_MODULE)
+#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
@@ -83,6 +81,17 @@
}
}
+int palmld_battery_get_capacity(struct battery *b)
+{
+ if (bat.battery_registered){
+ return ((palmld_battery_get_voltage(b)-palmld_battery_min_voltage(b))
+ /(palmld_battery_max_voltage(b)-palmld_battery_min_voltage(b)));
+ }
+ else{
+ printk("palmld_battery: cannot get capacity -> battery driver unregistered\n");
+ return 0;
+ }
+}
int palmld_battery_get_status(struct battery *b)
{
@@ -101,13 +110,53 @@
return BATTERY_STATUS_DISCHARGING;
}
+int tmp;
+
+static void *palmld_battery_get_property(struct battery *b, enum battery_property bp)
+{
+ switch (bp) {
+ case BATTERY_PROP_VOLTAGE_MAX_DESIGN:
+ tmp = palmld_battery_max_voltage(b);
+ return &tmp;
+ case BATTERY_PROP_VOLTAGE_MIN_DESIGN:
+ tmp = palmld_battery_min_voltage(b);
+ return &tmp;
+ case BATTERY_PROP_CHARGE_FULL_DESIGN:
+ tmp = 100;
+ return &tmp;
+ case BATTERY_PROP_CHARGE_EMPTY_DESIGN:
+ tmp = 0;
+ return &tmp;
+ case BATTERY_PROP_CHARGE_NOW:
+ tmp = palmld_battery_get_capacity(b);
+ return &tmp;
+ case BATTERY_PROP_VOLTAGE_NOW:
+ tmp = palmld_battery_get_voltage(b);
+ return &tmp;
+ case BATTERY_PROP_STATUS:
+ tmp = palmld_battery_get_status(b);
+ return &tmp;
+ default: break;
+ };
+
+ return NULL;
+}
+
+static enum battery_property palmld_battery_props[] = {
+ BATTERY_PROP_VOLTAGE_MAX_DESIGN,
+ BATTERY_PROP_VOLTAGE_MIN_DESIGN,
+ BATTERY_PROP_CHARGE_FULL_DESIGN,
+ BATTERY_PROP_CHARGE_EMPTY_DESIGN,
+ BATTERY_PROP_CHARGE_NOW,
+ BATTERY_PROP_VOLTAGE_NOW,
+ BATTERY_PROP_STATUS,
+};
+
struct battery palmld_battery = {
- .name = "palmld_battery",
- .id = "battery0",
- .get_min_voltage = palmld_battery_min_voltage,
- .get_max_voltage = palmld_battery_max_voltage,
- .get_voltage = palmld_battery_get_voltage,
- .get_status = palmld_battery_get_status,
+ .name = "palmld_battery",
+ .get_property = palmld_battery_get_property,
+ .properties = palmld_battery_props,
+ .num_properties = ARRAY_SIZE(palmld_battery_props),
};
static int palmld_wm97xx_probe(struct device *dev)
@@ -125,7 +174,7 @@
static void
palmld_wm97xx_shutdown(struct device *dev)
{
-#if defined(CONFIG_APM) || defined(CONFIG_APM_MODULE)
+#if defined(CONFIG_APM_EMULATION) || defined(CONFIG_APM_MODULE)
apm_get_power_status = apm_get_power_status_orig;
#endif
}
@@ -154,7 +203,7 @@
.shutdown = palmld_wm97xx_shutdown
};
-#if defined(CONFIG_APM) || defined(CONFIG_APM_MODULE)
+#if defined(CONFIG_APM_EMULATION) || defined(CONFIG_APM_MODULE)
/* APM status query callback implementation */
static void palmld_apm_get_power_status(struct apm_power_info *info)
@@ -200,14 +249,14 @@
/* register battery to APM layer */
bat.battery_registered = 0;
- if(battery_class_register(&palmld_battery)) {
+ if(battery_register(NULL, &palmld_battery)) {
printk(KERN_ERR "palmld_ac97_probe: could not register battery class\n");
}
else {
bat.battery_registered = 1;
printk("Battery registered\n");
}
-#if defined(CONFIG_APM) || defined(CONFIG_APM_MODULE)
+#if defined(CONFIG_APM_EMULATION) || defined(CONFIG_APM_MODULE)
apm_get_power_status_orig = apm_get_power_status;
apm_get_power_status = palmld_apm_get_power_status;
#endif
@@ -223,7 +272,7 @@
static void __exit palmld_wm97xx_exit(void)
{
/* TODO - recover APM callback to original state */
- battery_class_unregister(&palmld_battery);
+ battery_unregister(&palmld_battery);
driver_unregister(&palmld_wm97xx_driver);
}
@@ -231,6 +280,7 @@
module_exit(palmld_wm97xx_exit);
/* Module information */
-MODULE_AUTHOR("Sergey Lapin <sl...@ha...> Jan Herman <2h...@se...>");
+MODULE_AUTHOR("Sergey Lapin <sl...@ha...> Jan Herman <2h...@se...>"
+ "Marek Vasut <mar...@gm...");
MODULE_DESCRIPTION("wm97xx battery driver");
MODULE_LICENSE("GPL");
Deleted: linux4palm/linux/trunk/include/linux/wm9712_ts.h
===================================================================
--- linux4palm/linux/trunk/include/linux/wm9712_ts.h 2007-05-27 17:00:31 UTC (rev 997)
+++ linux4palm/linux/trunk/include/linux/wm9712_ts.h 2007-05-27 17:42:01 UTC (rev 998)
@@ -1,29 +0,0 @@
-/*
- * Support for the WM9712 AC97 touchscreen codec.
- *
- * Author: Alex Osborne <bob...@gm...>
- * Created: 2006-06-10
- *
- */
-
-#ifndef __LINUX_WM9712_TS_H
-#define __LINUX_WM9712_TS_H
-
-#include <sound/ac97_codec.h>
-
-struct wm9712_platform_data {
- int pendown_irq;
- int interrupt_irq;
-
- int x_axis_max;
- int x_axis_min;
-
- int y_axis_max;
- int y_axis_min;
-
- int pressure_min;
- int pressure_max;
- int pressure_threshold;
-}
-
-#endif
Modified: linux4palm/linux/trunk/include/linux/wm97xx.h
===================================================================
--- linux4palm/linux/trunk/include/linux/wm97xx.h 2007-05-27 17:00:31 UTC (rev 997)
+++ linux4palm/linux/trunk/include/linux/wm97xx.h 2007-05-27 17:42:01 UTC (rev 998)
@@ -243,7 +243,7 @@
u16 dig_save[3]; /* saved during aux reading */
struct wm97xx_codec_drv *codec; /* attached codec driver*/
struct input_dev* input_dev; /* touchscreen input device */
- ac97_t *ac97; /* ALSA codec access */
+ struct snd_ac97 *ac97; /* ALSA codec access */
struct device *dev; /* ALSA device */
struct device *battery_dev;
struct device *touch_dev;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
