diff options
author | Chanwoo Choi <cw00.choi@samsung.com> | 2013-02-12 18:42:37 -0500 |
---|---|---|
committer | Chanwoo Choi <cw00.choi@samsung.com> | 2013-02-13 17:53:55 -0500 |
commit | 07c70503a420d48402b3859e2c1c4c847a130a8b (patch) | |
tree | 569039c19135e3740fed38ead53fa30d9f9fe655 /include/linux/mfd | |
parent | e3e5bc02d2365d3e09164fd9a559011399ca2a4f (diff) |
extcon: max8997: Remove duplicate code related to set H/W line path
Signed-off-by: Chanwoo Choi <cw00.choi@samsung.com>
Signed-off-by: Myungjoo Ham <myungjoo.ham@samsung.com>
Diffstat (limited to 'include/linux/mfd')
-rw-r--r-- | include/linux/mfd/max8997-private.h | 19 |
1 files changed, 18 insertions, 1 deletions
diff --git a/include/linux/mfd/max8997-private.h b/include/linux/mfd/max8997-private.h index acf42e960320..010173a92274 100644 --- a/include/linux/mfd/max8997-private.h +++ b/include/linux/mfd/max8997-private.h | |||
@@ -223,7 +223,7 @@ enum max8997_muic_reg { | |||
223 | #define COMP2SW_SHIFT 3 | 223 | #define COMP2SW_SHIFT 3 |
224 | #define COMN1SW_MASK (0x7 << COMN1SW_SHIFT) | 224 | #define COMN1SW_MASK (0x7 << COMN1SW_SHIFT) |
225 | #define COMP2SW_MASK (0x7 << COMP2SW_SHIFT) | 225 | #define COMP2SW_MASK (0x7 << COMP2SW_SHIFT) |
226 | #define CONTROL1_SW_MASK (COMP2SW_MASK | COMN1SW_MASK) | 226 | #define COMP_SW_MASK (COMP2SW_MASK | COMN1SW_MASK) |
227 | 227 | ||
228 | #define CONTROL1_SW_USB ((1 << COMP2SW_SHIFT) \ | 228 | #define CONTROL1_SW_USB ((1 << COMP2SW_SHIFT) \ |
229 | | (1 << COMN1SW_SHIFT)) | 229 | | (1 << COMN1SW_SHIFT)) |
@@ -234,6 +234,23 @@ enum max8997_muic_reg { | |||
234 | #define CONTROL1_SW_OPEN ((0 << COMP2SW_SHIFT) \ | 234 | #define CONTROL1_SW_OPEN ((0 << COMP2SW_SHIFT) \ |
235 | | (0 << COMN1SW_SHIFT)) | 235 | | (0 << COMN1SW_SHIFT)) |
236 | 236 | ||
237 | #define CONTROL2_LOWPWR_SHIFT (0) | ||
238 | #define CONTROL2_ADCEN_SHIFT (1) | ||
239 | #define CONTROL2_CPEN_SHIFT (2) | ||
240 | #define CONTROL2_SFOUTASRT_SHIFT (3) | ||
241 | #define CONTROL2_SFOUTORD_SHIFT (4) | ||
242 | #define CONTROL2_ACCDET_SHIFT (5) | ||
243 | #define CONTROL2_USBCPINT_SHIFT (6) | ||
244 | #define CONTROL2_RCPS_SHIFT (7) | ||
245 | #define CONTROL2_LOWPWR_MASK (0x1 << CONTROL2_LOWPWR_SHIFT) | ||
246 | #define CONTROL2_ADCEN_MASK (0x1 << CONTROL2_ADCEN_SHIFT) | ||
247 | #define CONTROL2_CPEN_MASK (0x1 << CONTROL2_CPEN_SHIFT) | ||
248 | #define CONTROL2_SFOUTASRT_MASK (0x1 << CONTROL2_SFOUTASRT_SHIFT) | ||
249 | #define CONTROL2_SFOUTORD_MASK (0x1 << CONTROL2_SFOUTORD_SHIFT) | ||
250 | #define CONTROL2_ACCDET_MASK (0x1 << CONTROL2_ACCDET_SHIFT) | ||
251 | #define CONTROL2_USBCPINT_MASK (0x1 << CONTROL2_USBCPINT_SHIFT) | ||
252 | #define CONTROL2_RCPS_MASK (0x1 << CONTROL2_RCPS_SHIFT) | ||
253 | |||
237 | #define MAX8997_ADC_GROUND 0x00 | 254 | #define MAX8997_ADC_GROUND 0x00 |
238 | #define MAX8997_ADC_MHL 0x01 | 255 | #define MAX8997_ADC_MHL 0x01 |
239 | #define MAX8997_ADC_JIG_USB_1 0x18 | 256 | #define MAX8997_ADC_JIG_USB_1 0x18 |