diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/mfd/arizona/core.h | 4 | ||||
| -rw-r--r-- | include/linux/mfd/arizona/pdata.h | 6 |
2 files changed, 10 insertions, 0 deletions
diff --git a/include/linux/mfd/arizona/core.h b/include/linux/mfd/arizona/core.h index dd231ac0bb1f..a580363a7d29 100644 --- a/include/linux/mfd/arizona/core.h +++ b/include/linux/mfd/arizona/core.h | |||
| @@ -78,6 +78,8 @@ enum arizona_type { | |||
| 78 | 78 | ||
| 79 | #define ARIZONA_NUM_IRQ 50 | 79 | #define ARIZONA_NUM_IRQ 50 |
| 80 | 80 | ||
| 81 | struct snd_soc_dapm_context; | ||
| 82 | |||
| 81 | struct arizona { | 83 | struct arizona { |
| 82 | struct regmap *regmap; | 84 | struct regmap *regmap; |
| 83 | struct device *dev; | 85 | struct device *dev; |
| @@ -98,6 +100,8 @@ struct arizona { | |||
| 98 | 100 | ||
| 99 | struct mutex clk_lock; | 101 | struct mutex clk_lock; |
| 100 | int clk32k_ref; | 102 | int clk32k_ref; |
| 103 | |||
| 104 | struct snd_soc_dapm_context *dapm; | ||
| 101 | }; | 105 | }; |
| 102 | 106 | ||
| 103 | int arizona_clk32k_enable(struct arizona *arizona); | 107 | int arizona_clk32k_enable(struct arizona *arizona); |
diff --git a/include/linux/mfd/arizona/pdata.h b/include/linux/mfd/arizona/pdata.h index 7ab442905a57..8b1d1daaae16 100644 --- a/include/linux/mfd/arizona/pdata.h +++ b/include/linux/mfd/arizona/pdata.h | |||
| @@ -62,6 +62,9 @@ | |||
| 62 | 62 | ||
| 63 | #define ARIZONA_MAX_OUTPUT 6 | 63 | #define ARIZONA_MAX_OUTPUT 6 |
| 64 | 64 | ||
| 65 | #define ARIZONA_HAP_ACT_ERM 0 | ||
| 66 | #define ARIZONA_HAP_ACT_LRA 2 | ||
| 67 | |||
| 65 | #define ARIZONA_MAX_PDM_SPK 2 | 68 | #define ARIZONA_MAX_PDM_SPK 2 |
| 66 | 69 | ||
| 67 | struct regulator_init_data; | 70 | struct regulator_init_data; |
| @@ -114,6 +117,9 @@ struct arizona_pdata { | |||
| 114 | 117 | ||
| 115 | /** PDM speaker format */ | 118 | /** PDM speaker format */ |
| 116 | unsigned int spk_fmt[ARIZONA_MAX_PDM_SPK]; | 119 | unsigned int spk_fmt[ARIZONA_MAX_PDM_SPK]; |
| 120 | |||
| 121 | /** Haptic actuator type */ | ||
| 122 | unsigned int hap_act; | ||
| 117 | }; | 123 | }; |
| 118 | 124 | ||
| 119 | #endif | 125 | #endif |
