summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSamuel Ortiz <sameo@linux.intel.com>2012-03-21 21:38:59 +0100
committerSamuel Ortiz <sameo@linux.intel.com>2012-03-21 21:39:18 +0100
commitfd7cdddf9fe0fc63a10233223cf9fd774b33612c (patch)
tree6041eeff9030bad6f603a344d60767c59f29bdf1
parentmfd: Add support for TPS65090 (diff)
downloadlinux-fd7cdddf9fe0fc63a10233223cf9fd774b33612c.tar.xz
linux-fd7cdddf9fe0fc63a10233223cf9fd774b33612c.zip
Revert "mfd: Add platform data for MAX8997 haptic driver"
This reverts commit 02b09703e7a411f80e5ec037b3abf14061a61933. Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
-rw-r--r--include/linux/mfd/max8997.h53
1 files changed, 1 insertions, 52 deletions
diff --git a/include/linux/mfd/max8997.h b/include/linux/mfd/max8997.h
index 9d8006b4a13a..fff590521e50 100644
--- a/include/linux/mfd/max8997.h
+++ b/include/linux/mfd/max8997.h
@@ -153,55 +153,6 @@ struct max8997_led_platform_data {
u8 brightness[2];
};
-enum max8997_haptic_motor_type {
- MAX8997_HAPTIC_ERM,
- MAX8997_HAPTIC_LRA,
-};
-
-enum max8997_haptic_pulse_mode {
- MAX8997_EXTERNAL_MODE,
- MAX8997_INTERNAL_MODE,
-};
-
-enum max8997_haptic_pwm_divisor {
- MAX8997_PWM_DIVISOR_32,
- MAX8997_PWM_DIVISOR_64,
- MAX8997_PWM_DIVISOR_128,
- MAX8997_PWM_DIVISOR_256,
-};
-
-/*
- * max8997_haptic_platform_data
- * @pwm_channel_id: channel number of PWM device
- * valid for MAX8997_EXTERNAL_MODE
- * @pwm_period: period in nano second for PWM device
- * valid for MAX8997_EXTERNAL_MODE
- * @type: motor type
- * @mode: pulse mode
- * MAX8997_EXTERNAL_MODE: external PWM device is used to control motor
- * MAX8997_INTERNAL_MODE: internal pulse generator is used to control motor
- * @pwm_divisor: divisor for external PWM device
- * @internal_mode_pattern: internal mode pattern for internal mode
- * [0 - 3]: valid pattern number
- * @pattern_cycle: the number of cycles of the waveform
- * for the internal mode pattern
- * [0 - 15]: available cycles
- * @pattern_signal_period: period of the waveform for the internal mode pattern
- * [0 - 255]: available period
- */
-struct max8997_haptic_platform_data {
- int pwm_channel_id;
- int pwm_period;
-
- enum max8997_haptic_motor_type type;
- enum max8997_haptic_pulse_mode mode;
- enum max8997_haptic_pwm_divisor pwm_divisor;
-
- int internal_mode_pattern;
- int pattern_cycle;
- int pattern_signal_period;
-};
-
struct max8997_platform_data {
/* IRQ */
int irq_base;
@@ -241,9 +192,7 @@ struct max8997_platform_data {
/* ---- MUIC ---- */
struct max8997_muic_platform_data *muic_pdata;
- /* ---- HAPTIC ---- */
- struct max8997_haptic_platform_data *haptic_pdata;
-
+ /* HAPTIC: Not implemented */
/* RTC: Not implemented */
/* ---- LED ---- */
struct max8997_led_platform_data *led_pdata;