aboutsummaryrefslogtreecommitdiff
path: root/include/linux
diff options
context:
space:
mode:
authorBalaji Rao <balajirrao@openmoko.org>2009-01-28 19:30:42 +0000
committerAndy Green <agreen@octopus.localdomain>2009-01-28 19:30:42 +0000
commit9d1fd9e7b19d66a35ee4e760b30a3b9a168c20a2 (patch)
tree48f4ebb86706de06434d8ba582f58b5a7c9ecb51 /include/linux
parent11afa2f75c68eb2c984ea43a92b8e453b8b70e49 (diff)
Subject: pcf50606_rebase_changes,patch
X-Git-Url: http://git.openmoko.org/?p=kernel.git;a=commitdiff_plain;h=938eddf17625cce0307f7612a3ea2560384e2384 pcf50606_rebase_changes,patch This patch brings into andy-tracking all changes related to pcf50606 from old balaji-tracking.
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/gta01_battery.h10
-rw-r--r--include/linux/mfd/pcf50606/input.h37
2 files changed, 10 insertions, 37 deletions
diff --git a/include/linux/gta01_battery.h b/include/linux/gta01_battery.h
new file mode 100644
index 00000000000..d670ad471ba
--- /dev/null
+++ b/include/linux/gta01_battery.h
@@ -0,0 +1,10 @@
+#ifndef __GTA01_BATTERY_H__
+#define __GTA01_BATTERY_H__
+
+struct gta01_bat_platform_data {
+ int (*get_charging_status)(void);
+ int (*get_voltage)(void);
+ int (*get_current)(void);
+};
+
+#endif
diff --git a/include/linux/mfd/pcf50606/input.h b/include/linux/mfd/pcf50606/input.h
deleted file mode 100644
index 3709fb9f2db..00000000000
--- a/include/linux/mfd/pcf50606/input.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * input.h -- Input driver for NXP PCF50606
- *
- * (C) 2006-2008 by Openmoko, Inc.
- * All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the
- * Free Software Foundation; either version 2 of the License, or (at your
- * option) any later version.
- */
-
-#ifndef __LINUX_MFD_PCF50606_INPUT_H
-#define __LINUX_MFD_PCF50606_INPUT_H
-
-#include <linux/platform_device.h>
-#include <linux/input.h>
-
-#define PCF50606_OOCS_ONKEY 0x01
-#define PCF50606_OOCS_EXTON 0x02
-
-#define PCF50606_OOCC2_ONKEYDB_NONE 0x00
-#define PCF50606_OOCC2_ONKEYDB_14ms 0x01
-#define PCF50606_OOCC2_ONKEYDB_62ms 0x02
-#define PCF50606_OOCC2_ONKEYDB_500ms 0x03
-#define PCF50606_OOCC2_EXTONDB_NONE 0x00
-#define PCF50606_OOCC2_EXTONDB_14ms 0x04
-#define PCF50606_OOCC2_EXTONDB_62ms 0x08
-#define PCF50606_OOCC2_EXTONDB_500ms 0x0c
-
-struct pcf50606_input {
- struct input_dev *input_dev;
- struct platform_device *pdev;
-};
-
-#endif
-