---

yaml
---
r: 296887
b: refs/heads/master
c: fd7cddd
h: refs/heads/master
i:
  296885: 3bb2bf1
  296883: aa41f01
  296879: 7a46cdf
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3c33be06f9aa0949ad24e67dfcae1f2a3006f4e1
+refs/heads/master: fd7cdddf9fe0fc63a10233223cf9fd774b33612c

trunk/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;