diff options
| author | Tomasz Figa <t.figa@samsung.com> | 2013-06-24 08:39:52 -0400 |
|---|---|---|
| committer | Samuel Ortiz <sameo@linux.intel.com> | 2013-06-30 17:29:44 -0400 |
| commit | 443c6ae253e96db9a5800a28d7c61131e81c2dee (patch) | |
| tree | c9df532a7f81a8799fe52f6845504b275803e58e /include/linux/mfd | |
| parent | b5c46787df1f28b0a24499e275491ba9a505c8ec (diff) | |
mfd: max8998: Add irq domain support
This patch adds irq domain support for max8998 interrupts.
To keep both non-DT and DT worlds happy, simple domain is used, which is
linear when no explicit IRQ base is specified and legacy, with static
mapping, otherwise.
Signed-off-by: Tomasz Figa <t.figa@samsung.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Diffstat (limited to 'include/linux/mfd')
| -rw-r--r-- | include/linux/mfd/max8998-private.h | 5 | ||||
| -rw-r--r-- | include/linux/mfd/max8998.h | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/include/linux/mfd/max8998-private.h b/include/linux/mfd/max8998-private.h index effa5d3b96ae..bfb48b6fcc74 100644 --- a/include/linux/mfd/max8998-private.h +++ b/include/linux/mfd/max8998-private.h | |||
| @@ -132,6 +132,8 @@ enum { | |||
| 132 | 132 | ||
| 133 | #define MAX8998_ENRAMP (1 << 4) | 133 | #define MAX8998_ENRAMP (1 << 4) |
| 134 | 134 | ||
| 135 | struct irq_domain; | ||
| 136 | |||
| 135 | /** | 137 | /** |
| 136 | * struct max8998_dev - max8998 master device for sub-drivers | 138 | * struct max8998_dev - max8998 master device for sub-drivers |
| 137 | * @dev: master device of the chip (can be used to access platform data) | 139 | * @dev: master device of the chip (can be used to access platform data) |
| @@ -153,7 +155,8 @@ struct max8998_dev { | |||
| 153 | struct mutex iolock; | 155 | struct mutex iolock; |
| 154 | struct mutex irqlock; | 156 | struct mutex irqlock; |
| 155 | 157 | ||
| 156 | int irq_base; | 158 | unsigned int irq_base; |
| 159 | struct irq_domain *irq_domain; | ||
| 157 | int irq; | 160 | int irq; |
| 158 | int ono; | 161 | int ono; |
| 159 | u8 irq_masks_cur[MAX8998_NUM_IRQ_REGS]; | 162 | u8 irq_masks_cur[MAX8998_NUM_IRQ_REGS]; |
diff --git a/include/linux/mfd/max8998.h b/include/linux/mfd/max8998.h index 6823548d0c0a..75471183b87a 100644 --- a/include/linux/mfd/max8998.h +++ b/include/linux/mfd/max8998.h | |||
| @@ -100,7 +100,7 @@ struct max8998_regulator_data { | |||
| 100 | struct max8998_platform_data { | 100 | struct max8998_platform_data { |
| 101 | struct max8998_regulator_data *regulators; | 101 | struct max8998_regulator_data *regulators; |
| 102 | int num_regulators; | 102 | int num_regulators; |
| 103 | int irq_base; | 103 | unsigned int irq_base; |
| 104 | int ono; | 104 | int ono; |
| 105 | bool buck_voltage_lock; | 105 | bool buck_voltage_lock; |
| 106 | int buck1_voltage1; | 106 | int buck1_voltage1; |
