diff options
Diffstat (limited to 'drivers/mfd/tps65090.c')
-rw-r--r-- | drivers/mfd/tps65090.c | 62 |
1 files changed, 31 insertions, 31 deletions
diff --git a/drivers/mfd/tps65090.c b/drivers/mfd/tps65090.c index 1c3e6e2efe41..14b62e11aff4 100644 --- a/drivers/mfd/tps65090.c +++ b/drivers/mfd/tps65090.c | |||
@@ -76,58 +76,58 @@ static struct mfd_cell tps65090s[] = { | |||
76 | static const struct regmap_irq tps65090_irqs[] = { | 76 | static const struct regmap_irq tps65090_irqs[] = { |
77 | /* INT1 IRQs*/ | 77 | /* INT1 IRQs*/ |
78 | [TPS65090_IRQ_VAC_STATUS_CHANGE] = { | 78 | [TPS65090_IRQ_VAC_STATUS_CHANGE] = { |
79 | .mask = TPS65090_INT1_MASK_VAC_STATUS_CHANGE, | 79 | .mask = TPS65090_INT1_MASK_VAC_STATUS_CHANGE, |
80 | }, | 80 | }, |
81 | [TPS65090_IRQ_VSYS_STATUS_CHANGE] = { | 81 | [TPS65090_IRQ_VSYS_STATUS_CHANGE] = { |
82 | .mask = TPS65090_INT1_MASK_VSYS_STATUS_CHANGE, | 82 | .mask = TPS65090_INT1_MASK_VSYS_STATUS_CHANGE, |
83 | }, | 83 | }, |
84 | [TPS65090_IRQ_BAT_STATUS_CHANGE] = { | 84 | [TPS65090_IRQ_BAT_STATUS_CHANGE] = { |
85 | .mask = TPS65090_INT1_MASK_BAT_STATUS_CHANGE, | 85 | .mask = TPS65090_INT1_MASK_BAT_STATUS_CHANGE, |
86 | }, | 86 | }, |
87 | [TPS65090_IRQ_CHARGING_STATUS_CHANGE] = { | 87 | [TPS65090_IRQ_CHARGING_STATUS_CHANGE] = { |
88 | .mask = TPS65090_INT1_MASK_CHARGING_STATUS_CHANGE, | 88 | .mask = TPS65090_INT1_MASK_CHARGING_STATUS_CHANGE, |
89 | }, | 89 | }, |
90 | [TPS65090_IRQ_CHARGING_COMPLETE] = { | 90 | [TPS65090_IRQ_CHARGING_COMPLETE] = { |
91 | .mask = TPS65090_INT1_MASK_CHARGING_COMPLETE, | 91 | .mask = TPS65090_INT1_MASK_CHARGING_COMPLETE, |
92 | }, | 92 | }, |
93 | [TPS65090_IRQ_OVERLOAD_DCDC1] = { | 93 | [TPS65090_IRQ_OVERLOAD_DCDC1] = { |
94 | .mask = TPS65090_INT1_MASK_OVERLOAD_DCDC1, | 94 | .mask = TPS65090_INT1_MASK_OVERLOAD_DCDC1, |
95 | }, | 95 | }, |
96 | [TPS65090_IRQ_OVERLOAD_DCDC2] = { | 96 | [TPS65090_IRQ_OVERLOAD_DCDC2] = { |
97 | .mask = TPS65090_INT1_MASK_OVERLOAD_DCDC2, | 97 | .mask = TPS65090_INT1_MASK_OVERLOAD_DCDC2, |
98 | }, | 98 | }, |
99 | /* INT2 IRQs*/ | 99 | /* INT2 IRQs*/ |
100 | [TPS65090_IRQ_OVERLOAD_DCDC3] = { | 100 | [TPS65090_IRQ_OVERLOAD_DCDC3] = { |
101 | .reg_offset = 1, | 101 | .reg_offset = 1, |
102 | .mask = TPS65090_INT2_MASK_OVERLOAD_DCDC3, | 102 | .mask = TPS65090_INT2_MASK_OVERLOAD_DCDC3, |
103 | }, | 103 | }, |
104 | [TPS65090_IRQ_OVERLOAD_FET1] = { | 104 | [TPS65090_IRQ_OVERLOAD_FET1] = { |
105 | .reg_offset = 1, | 105 | .reg_offset = 1, |
106 | .mask = TPS65090_INT2_MASK_OVERLOAD_FET1, | 106 | .mask = TPS65090_INT2_MASK_OVERLOAD_FET1, |
107 | }, | 107 | }, |
108 | [TPS65090_IRQ_OVERLOAD_FET2] = { | 108 | [TPS65090_IRQ_OVERLOAD_FET2] = { |
109 | .reg_offset = 1, | 109 | .reg_offset = 1, |
110 | .mask = TPS65090_INT2_MASK_OVERLOAD_FET2, | 110 | .mask = TPS65090_INT2_MASK_OVERLOAD_FET2, |
111 | }, | 111 | }, |
112 | [TPS65090_IRQ_OVERLOAD_FET3] = { | 112 | [TPS65090_IRQ_OVERLOAD_FET3] = { |
113 | .reg_offset = 1, | 113 | .reg_offset = 1, |
114 | .mask = TPS65090_INT2_MASK_OVERLOAD_FET3, | 114 | .mask = TPS65090_INT2_MASK_OVERLOAD_FET3, |
115 | }, | 115 | }, |
116 | [TPS65090_IRQ_OVERLOAD_FET4] = { | 116 | [TPS65090_IRQ_OVERLOAD_FET4] = { |
117 | .reg_offset = 1, | 117 | .reg_offset = 1, |
118 | .mask = TPS65090_INT2_MASK_OVERLOAD_FET4, | 118 | .mask = TPS65090_INT2_MASK_OVERLOAD_FET4, |
119 | }, | 119 | }, |
120 | [TPS65090_IRQ_OVERLOAD_FET5] = { | 120 | [TPS65090_IRQ_OVERLOAD_FET5] = { |
121 | .reg_offset = 1, | 121 | .reg_offset = 1, |
122 | .mask = TPS65090_INT2_MASK_OVERLOAD_FET5, | 122 | .mask = TPS65090_INT2_MASK_OVERLOAD_FET5, |
123 | }, | 123 | }, |
124 | [TPS65090_IRQ_OVERLOAD_FET6] = { | 124 | [TPS65090_IRQ_OVERLOAD_FET6] = { |
125 | .reg_offset = 1, | 125 | .reg_offset = 1, |
126 | .mask = TPS65090_INT2_MASK_OVERLOAD_FET6, | 126 | .mask = TPS65090_INT2_MASK_OVERLOAD_FET6, |
127 | }, | 127 | }, |
128 | [TPS65090_IRQ_OVERLOAD_FET7] = { | 128 | [TPS65090_IRQ_OVERLOAD_FET7] = { |
129 | .reg_offset = 1, | 129 | .reg_offset = 1, |
130 | .mask = TPS65090_INT2_MASK_OVERLOAD_FET7, | 130 | .mask = TPS65090_INT2_MASK_OVERLOAD_FET7, |
131 | }, | 131 | }, |
132 | }; | 132 | }; |
133 | 133 | ||
@@ -176,7 +176,7 @@ MODULE_DEVICE_TABLE(of, tps65090_of_match); | |||
176 | #endif | 176 | #endif |
177 | 177 | ||
178 | static int tps65090_i2c_probe(struct i2c_client *client, | 178 | static int tps65090_i2c_probe(struct i2c_client *client, |
179 | const struct i2c_device_id *id) | 179 | const struct i2c_device_id *id) |
180 | { | 180 | { |
181 | struct tps65090_platform_data *pdata = dev_get_platdata(&client->dev); | 181 | struct tps65090_platform_data *pdata = dev_get_platdata(&client->dev); |
182 | int irq_base = 0; | 182 | int irq_base = 0; |
@@ -210,11 +210,11 @@ static int tps65090_i2c_probe(struct i2c_client *client, | |||
210 | 210 | ||
211 | if (client->irq) { | 211 | if (client->irq) { |
212 | ret = regmap_add_irq_chip(tps65090->rmap, client->irq, | 212 | ret = regmap_add_irq_chip(tps65090->rmap, client->irq, |
213 | IRQF_ONESHOT | IRQF_TRIGGER_LOW, irq_base, | 213 | IRQF_ONESHOT | IRQF_TRIGGER_LOW, irq_base, |
214 | &tps65090_irq_chip, &tps65090->irq_data); | 214 | &tps65090_irq_chip, &tps65090->irq_data); |
215 | if (ret) { | 215 | if (ret) { |
216 | dev_err(&client->dev, | 216 | dev_err(&client->dev, |
217 | "IRQ init failed with err: %d\n", ret); | 217 | "IRQ init failed with err: %d\n", ret); |
218 | return ret; | 218 | return ret; |
219 | } | 219 | } |
220 | } else { | 220 | } else { |
@@ -223,8 +223,8 @@ static int tps65090_i2c_probe(struct i2c_client *client, | |||
223 | } | 223 | } |
224 | 224 | ||
225 | ret = mfd_add_devices(tps65090->dev, -1, tps65090s, | 225 | ret = mfd_add_devices(tps65090->dev, -1, tps65090s, |
226 | ARRAY_SIZE(tps65090s), NULL, | 226 | ARRAY_SIZE(tps65090s), NULL, |
227 | 0, regmap_irq_get_domain(tps65090->irq_data)); | 227 | 0, regmap_irq_get_domain(tps65090->irq_data)); |
228 | if (ret) { | 228 | if (ret) { |
229 | dev_err(&client->dev, "add mfd devices failed with err: %d\n", | 229 | dev_err(&client->dev, "add mfd devices failed with err: %d\n", |
230 | ret); | 230 | ret); |