Skip to content

Commit

Permalink
Revert "mfd: Add platform data for MAX8997 haptic driver"
Browse files Browse the repository at this point in the history
This reverts commit 02b0970.

Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
  • Loading branch information
Samuel Ortiz committed Mar 21, 2012
1 parent 3c33be0 commit fd7cddd
Showing 1 changed file with 1 addition and 52 deletions.
53 changes: 1 addition & 52 deletions include/linux/mfd/max8997.h
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down

0 comments on commit fd7cddd

Please sign in to comment.