diff options
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/mfd/arizona/core.h | 2 | ||||
| -rw-r--r-- | include/linux/mfd/arizona/pdata.h | 2 | ||||
| -rw-r--r-- | include/linux/mfd/arizona/registers.h | 3 |
3 files changed, 6 insertions, 1 deletions
diff --git a/include/linux/mfd/arizona/core.h b/include/linux/mfd/arizona/core.h index cc281368dc55..f797bb9b8b56 100644 --- a/include/linux/mfd/arizona/core.h +++ b/include/linux/mfd/arizona/core.h | |||
| @@ -95,6 +95,8 @@ struct arizona { | |||
| 95 | 95 | ||
| 96 | struct arizona_pdata pdata; | 96 | struct arizona_pdata pdata; |
| 97 | 97 | ||
| 98 | unsigned int external_dcvdd:1; | ||
| 99 | |||
| 98 | int irq; | 100 | int irq; |
| 99 | struct irq_domain *virq; | 101 | struct irq_domain *virq; |
| 100 | struct regmap_irq_chip_data *aod_irq_chip; | 102 | struct regmap_irq_chip_data *aod_irq_chip; |
diff --git a/include/linux/mfd/arizona/pdata.h b/include/linux/mfd/arizona/pdata.h index 80dead1f7100..12a5c135c746 100644 --- a/include/linux/mfd/arizona/pdata.h +++ b/include/linux/mfd/arizona/pdata.h | |||
| @@ -77,7 +77,7 @@ struct arizona_micbias { | |||
| 77 | int mV; /** Regulated voltage */ | 77 | int mV; /** Regulated voltage */ |
| 78 | unsigned int ext_cap:1; /** External capacitor fitted */ | 78 | unsigned int ext_cap:1; /** External capacitor fitted */ |
| 79 | unsigned int discharge:1; /** Actively discharge */ | 79 | unsigned int discharge:1; /** Actively discharge */ |
| 80 | unsigned int fast_start:1; /** Enable aggressive startup ramp rate */ | 80 | unsigned int soft_start:1; /** Disable aggressive startup ramp rate */ |
| 81 | unsigned int bypass:1; /** Use bypass mode */ | 81 | unsigned int bypass:1; /** Use bypass mode */ |
| 82 | }; | 82 | }; |
| 83 | 83 | ||
diff --git a/include/linux/mfd/arizona/registers.h b/include/linux/mfd/arizona/registers.h index 715b6ba3d52a..4730b5c576e2 100644 --- a/include/linux/mfd/arizona/registers.h +++ b/include/linux/mfd/arizona/registers.h | |||
| @@ -1002,6 +1002,7 @@ | |||
| 1002 | #define ARIZONA_DSP2_CLOCKING_1 0x1201 | 1002 | #define ARIZONA_DSP2_CLOCKING_1 0x1201 |
| 1003 | #define ARIZONA_DSP2_STATUS_1 0x1204 | 1003 | #define ARIZONA_DSP2_STATUS_1 0x1204 |
| 1004 | #define ARIZONA_DSP2_STATUS_2 0x1205 | 1004 | #define ARIZONA_DSP2_STATUS_2 0x1205 |
| 1005 | #define ARIZONA_DSP2_STATUS_3 0x1206 | ||
| 1005 | #define ARIZONA_DSP2_SCRATCH_0 0x1240 | 1006 | #define ARIZONA_DSP2_SCRATCH_0 0x1240 |
| 1006 | #define ARIZONA_DSP2_SCRATCH_1 0x1241 | 1007 | #define ARIZONA_DSP2_SCRATCH_1 0x1241 |
| 1007 | #define ARIZONA_DSP2_SCRATCH_2 0x1242 | 1008 | #define ARIZONA_DSP2_SCRATCH_2 0x1242 |
| @@ -1010,6 +1011,7 @@ | |||
| 1010 | #define ARIZONA_DSP3_CLOCKING_1 0x1301 | 1011 | #define ARIZONA_DSP3_CLOCKING_1 0x1301 |
| 1011 | #define ARIZONA_DSP3_STATUS_1 0x1304 | 1012 | #define ARIZONA_DSP3_STATUS_1 0x1304 |
| 1012 | #define ARIZONA_DSP3_STATUS_2 0x1305 | 1013 | #define ARIZONA_DSP3_STATUS_2 0x1305 |
| 1014 | #define ARIZONA_DSP3_STATUS_3 0x1306 | ||
| 1013 | #define ARIZONA_DSP3_SCRATCH_0 0x1340 | 1015 | #define ARIZONA_DSP3_SCRATCH_0 0x1340 |
| 1014 | #define ARIZONA_DSP3_SCRATCH_1 0x1341 | 1016 | #define ARIZONA_DSP3_SCRATCH_1 0x1341 |
| 1015 | #define ARIZONA_DSP3_SCRATCH_2 0x1342 | 1017 | #define ARIZONA_DSP3_SCRATCH_2 0x1342 |
| @@ -1018,6 +1020,7 @@ | |||
| 1018 | #define ARIZONA_DSP4_CLOCKING_1 0x1401 | 1020 | #define ARIZONA_DSP4_CLOCKING_1 0x1401 |
| 1019 | #define ARIZONA_DSP4_STATUS_1 0x1404 | 1021 | #define ARIZONA_DSP4_STATUS_1 0x1404 |
| 1020 | #define ARIZONA_DSP4_STATUS_2 0x1405 | 1022 | #define ARIZONA_DSP4_STATUS_2 0x1405 |
| 1023 | #define ARIZONA_DSP4_STATUS_3 0x1406 | ||
| 1021 | #define ARIZONA_DSP4_SCRATCH_0 0x1440 | 1024 | #define ARIZONA_DSP4_SCRATCH_0 0x1440 |
| 1022 | #define ARIZONA_DSP4_SCRATCH_1 0x1441 | 1025 | #define ARIZONA_DSP4_SCRATCH_1 0x1441 |
| 1023 | #define ARIZONA_DSP4_SCRATCH_2 0x1442 | 1026 | #define ARIZONA_DSP4_SCRATCH_2 0x1442 |
