diff options
| -rw-r--r-- | drivers/extcon/extcon-max77843.c | 49 | ||||
| -rw-r--r-- | include/linux/mfd/max77843-private.h | 154 |
2 files changed, 109 insertions, 94 deletions
diff --git a/drivers/extcon/extcon-max77843.c b/drivers/extcon/extcon-max77843.c index 4dfe0a6337d8..f652c4199870 100644 --- a/drivers/extcon/extcon-max77843.c +++ b/drivers/extcon/extcon-max77843.c | |||
| @@ -206,11 +206,11 @@ static int max77843_muic_set_path(struct max77843_muic_info *info, | |||
| 206 | if (attached) | 206 | if (attached) |
| 207 | ctrl1 = val; | 207 | ctrl1 = val; |
| 208 | else | 208 | else |
| 209 | ctrl1 = CONTROL1_SW_OPEN; | 209 | ctrl1 = MAX77843_MUIC_CONTROL1_SW_OPEN; |
| 210 | 210 | ||
| 211 | ret = regmap_update_bits(max77843->regmap_muic, | 211 | ret = regmap_update_bits(max77843->regmap_muic, |
| 212 | MAX77843_MUIC_REG_CONTROL1, | 212 | MAX77843_MUIC_REG_CONTROL1, |
| 213 | CONTROL1_COM_SW, ctrl1); | 213 | MAX77843_MUIC_CONTROL1_COM_SW, ctrl1); |
| 214 | if (ret < 0) { | 214 | if (ret < 0) { |
| 215 | dev_err(info->dev, "Cannot switch MUIC port\n"); | 215 | dev_err(info->dev, "Cannot switch MUIC port\n"); |
| 216 | return ret; | 216 | return ret; |
| @@ -244,7 +244,7 @@ static int max77843_muic_get_cable_type(struct max77843_muic_info *info, | |||
| 244 | 244 | ||
| 245 | adc = info->status[MAX77843_MUIC_STATUS1] & | 245 | adc = info->status[MAX77843_MUIC_STATUS1] & |
| 246 | MAX77843_MUIC_STATUS1_ADC_MASK; | 246 | MAX77843_MUIC_STATUS1_ADC_MASK; |
| 247 | adc >>= STATUS1_ADC_SHIFT; | 247 | adc >>= MAX77843_MUIC_STATUS1_ADC_SHIFT; |
| 248 | 248 | ||
| 249 | switch (group) { | 249 | switch (group) { |
| 250 | case MAX77843_CABLE_GROUP_ADC: | 250 | case MAX77843_CABLE_GROUP_ADC: |
| @@ -310,7 +310,7 @@ static int max77843_muic_get_cable_type(struct max77843_muic_info *info, | |||
| 310 | /* Get VBVolt register bit */ | 310 | /* Get VBVolt register bit */ |
| 311 | gnd_type |= (info->status[MAX77843_MUIC_STATUS2] & | 311 | gnd_type |= (info->status[MAX77843_MUIC_STATUS2] & |
| 312 | MAX77843_MUIC_STATUS2_VBVOLT_MASK); | 312 | MAX77843_MUIC_STATUS2_VBVOLT_MASK); |
| 313 | gnd_type >>= STATUS2_VBVOLT_SHIFT; | 313 | gnd_type >>= MAX77843_MUIC_STATUS2_VBVOLT_SHIFT; |
| 314 | 314 | ||
| 315 | /* Offset of GND cable */ | 315 | /* Offset of GND cable */ |
| 316 | gnd_type |= MAX77843_MUIC_GND_USB_HOST; | 316 | gnd_type |= MAX77843_MUIC_GND_USB_HOST; |
| @@ -339,7 +339,9 @@ static int max77843_muic_adc_gnd_handler(struct max77843_muic_info *info) | |||
| 339 | switch (gnd_cable_type) { | 339 | switch (gnd_cable_type) { |
| 340 | case MAX77843_MUIC_GND_USB_HOST: | 340 | case MAX77843_MUIC_GND_USB_HOST: |
| 341 | case MAX77843_MUIC_GND_USB_HOST_VB: | 341 | case MAX77843_MUIC_GND_USB_HOST_VB: |
| 342 | ret = max77843_muic_set_path(info, CONTROL1_SW_USB, attached); | 342 | ret = max77843_muic_set_path(info, |
| 343 | MAX77843_MUIC_CONTROL1_SW_USB, | ||
| 344 | attached); | ||
| 343 | if (ret < 0) | 345 | if (ret < 0) |
| 344 | return ret; | 346 | return ret; |
| 345 | 347 | ||
| @@ -347,7 +349,9 @@ static int max77843_muic_adc_gnd_handler(struct max77843_muic_info *info) | |||
| 347 | break; | 349 | break; |
| 348 | case MAX77843_MUIC_GND_MHL_VB: | 350 | case MAX77843_MUIC_GND_MHL_VB: |
| 349 | case MAX77843_MUIC_GND_MHL: | 351 | case MAX77843_MUIC_GND_MHL: |
| 350 | ret = max77843_muic_set_path(info, CONTROL1_SW_OPEN, attached); | 352 | ret = max77843_muic_set_path(info, |
| 353 | MAX77843_MUIC_CONTROL1_SW_OPEN, | ||
| 354 | attached); | ||
| 351 | if (ret < 0) | 355 | if (ret < 0) |
| 352 | return ret; | 356 | return ret; |
| 353 | 357 | ||
| @@ -366,7 +370,7 @@ static int max77843_muic_jig_handler(struct max77843_muic_info *info, | |||
| 366 | int cable_type, bool attached) | 370 | int cable_type, bool attached) |
| 367 | { | 371 | { |
| 368 | int ret; | 372 | int ret; |
| 369 | u8 path = CONTROL1_SW_OPEN; | 373 | u8 path = MAX77843_MUIC_CONTROL1_SW_OPEN; |
| 370 | 374 | ||
| 371 | dev_dbg(info->dev, "external connector is %s (adc:0x%02x)\n", | 375 | dev_dbg(info->dev, "external connector is %s (adc:0x%02x)\n", |
| 372 | attached ? "attached" : "detached", cable_type); | 376 | attached ? "attached" : "detached", cable_type); |
| @@ -374,10 +378,10 @@ static int max77843_muic_jig_handler(struct max77843_muic_info *info, | |||
| 374 | switch (cable_type) { | 378 | switch (cable_type) { |
| 375 | case MAX77843_MUIC_ADC_FACTORY_MODE_USB_OFF: | 379 | case MAX77843_MUIC_ADC_FACTORY_MODE_USB_OFF: |
| 376 | case MAX77843_MUIC_ADC_FACTORY_MODE_USB_ON: | 380 | case MAX77843_MUIC_ADC_FACTORY_MODE_USB_ON: |
| 377 | path = CONTROL1_SW_USB; | 381 | path = MAX77843_MUIC_CONTROL1_SW_USB; |
| 378 | break; | 382 | break; |
| 379 | case MAX77843_MUIC_ADC_FACTORY_MODE_UART_OFF: | 383 | case MAX77843_MUIC_ADC_FACTORY_MODE_UART_OFF: |
| 380 | path = CONTROL1_SW_UART; | 384 | path = MAX77843_MUIC_CONTROL1_SW_UART; |
| 381 | break; | 385 | break; |
| 382 | default: | 386 | default: |
| 383 | return -EINVAL; | 387 | return -EINVAL; |
| @@ -475,14 +479,18 @@ static int max77843_muic_chg_handler(struct max77843_muic_info *info) | |||
| 475 | 479 | ||
| 476 | switch (chg_type) { | 480 | switch (chg_type) { |
| 477 | case MAX77843_MUIC_CHG_USB: | 481 | case MAX77843_MUIC_CHG_USB: |
| 478 | ret = max77843_muic_set_path(info, CONTROL1_SW_USB, attached); | 482 | ret = max77843_muic_set_path(info, |
| 483 | MAX77843_MUIC_CONTROL1_SW_USB, | ||
| 484 | attached); | ||
| 479 | if (ret < 0) | 485 | if (ret < 0) |
| 480 | return ret; | 486 | return ret; |
| 481 | 487 | ||
| 482 | extcon_set_cable_state_(info->edev, EXTCON_USB, attached); | 488 | extcon_set_cable_state_(info->edev, EXTCON_USB, attached); |
| 483 | break; | 489 | break; |
| 484 | case MAX77843_MUIC_CHG_DOWNSTREAM: | 490 | case MAX77843_MUIC_CHG_DOWNSTREAM: |
| 485 | ret = max77843_muic_set_path(info, CONTROL1_SW_OPEN, attached); | 491 | ret = max77843_muic_set_path(info, |
| 492 | MAX77843_MUIC_CONTROL1_SW_OPEN, | ||
| 493 | attached); | ||
| 486 | if (ret < 0) | 494 | if (ret < 0) |
| 487 | return ret; | 495 | return ret; |
| 488 | 496 | ||
| @@ -490,14 +498,18 @@ static int max77843_muic_chg_handler(struct max77843_muic_info *info) | |||
| 490 | attached); | 498 | attached); |
| 491 | break; | 499 | break; |
| 492 | case MAX77843_MUIC_CHG_DEDICATED: | 500 | case MAX77843_MUIC_CHG_DEDICATED: |
| 493 | ret = max77843_muic_set_path(info, CONTROL1_SW_OPEN, attached); | 501 | ret = max77843_muic_set_path(info, |
| 502 | MAX77843_MUIC_CONTROL1_SW_OPEN, | ||
| 503 | attached); | ||
| 494 | if (ret < 0) | 504 | if (ret < 0) |
| 495 | return ret; | 505 | return ret; |
| 496 | 506 | ||
| 497 | extcon_set_cable_state_(info->edev, EXTCON_TA, attached); | 507 | extcon_set_cable_state_(info->edev, EXTCON_TA, attached); |
| 498 | break; | 508 | break; |
| 499 | case MAX77843_MUIC_CHG_SPECIAL_500MA: | 509 | case MAX77843_MUIC_CHG_SPECIAL_500MA: |
| 500 | ret = max77843_muic_set_path(info, CONTROL1_SW_OPEN, attached); | 510 | ret = max77843_muic_set_path(info, |
| 511 | MAX77843_MUIC_CONTROL1_SW_OPEN, | ||
| 512 | attached); | ||
| 501 | if (ret < 0) | 513 | if (ret < 0) |
| 502 | return ret; | 514 | return ret; |
| 503 | 515 | ||
| @@ -505,7 +517,9 @@ static int max77843_muic_chg_handler(struct max77843_muic_info *info) | |||
| 505 | attached); | 517 | attached); |
| 506 | break; | 518 | break; |
| 507 | case MAX77843_MUIC_CHG_SPECIAL_1A: | 519 | case MAX77843_MUIC_CHG_SPECIAL_1A: |
| 508 | ret = max77843_muic_set_path(info, CONTROL1_SW_OPEN, attached); | 520 | ret = max77843_muic_set_path(info, |
| 521 | MAX77843_MUIC_CONTROL1_SW_OPEN, | ||
| 522 | attached); | ||
| 509 | if (ret < 0) | 523 | if (ret < 0) |
| 510 | return ret; | 524 | return ret; |
| 511 | 525 | ||
| @@ -529,7 +543,8 @@ static int max77843_muic_chg_handler(struct max77843_muic_info *info) | |||
| 529 | "failed to detect %s accessory (chg_type:0x%x)\n", | 543 | "failed to detect %s accessory (chg_type:0x%x)\n", |
| 530 | attached ? "attached" : "detached", chg_type); | 544 | attached ? "attached" : "detached", chg_type); |
| 531 | 545 | ||
| 532 | max77843_muic_set_path(info, CONTROL1_SW_OPEN, attached); | 546 | max77843_muic_set_path(info, MAX77843_MUIC_CONTROL1_SW_OPEN, |
| 547 | attached); | ||
| 533 | return -EINVAL; | 548 | return -EINVAL; |
| 534 | } | 549 | } |
| 535 | 550 | ||
| @@ -668,7 +683,7 @@ static int max77843_muic_set_debounce_time(struct max77843_muic_info *info, | |||
| 668 | ret = regmap_update_bits(max77843->regmap_muic, | 683 | ret = regmap_update_bits(max77843->regmap_muic, |
| 669 | MAX77843_MUIC_REG_CONTROL4, | 684 | MAX77843_MUIC_REG_CONTROL4, |
| 670 | MAX77843_MUIC_CONTROL4_ADCDBSET_MASK, | 685 | MAX77843_MUIC_CONTROL4_ADCDBSET_MASK, |
| 671 | time << CONTROL4_ADCDBSET_SHIFT); | 686 | time << MAX77843_MUIC_CONTROL4_ADCDBSET_SHIFT); |
| 672 | if (ret < 0) { | 687 | if (ret < 0) { |
| 673 | dev_err(info->dev, "Cannot write MUIC regmap\n"); | 688 | dev_err(info->dev, "Cannot write MUIC regmap\n"); |
| 674 | return ret; | 689 | return ret; |
| @@ -769,7 +784,7 @@ static int max77843_muic_probe(struct platform_device *pdev) | |||
| 769 | max77843_muic_set_debounce_time(info, MAX77843_DEBOUNCE_TIME_25MS); | 784 | max77843_muic_set_debounce_time(info, MAX77843_DEBOUNCE_TIME_25MS); |
| 770 | 785 | ||
| 771 | /* Set initial path for UART */ | 786 | /* Set initial path for UART */ |
| 772 | max77843_muic_set_path(info, CONTROL1_SW_UART, true); | 787 | max77843_muic_set_path(info, MAX77843_MUIC_CONTROL1_SW_UART, true); |
| 773 | 788 | ||
| 774 | /* Check revision number of MUIC device */ | 789 | /* Check revision number of MUIC device */ |
| 775 | ret = regmap_read(max77843->regmap_muic, MAX77843_MUIC_REG_ID, &id); | 790 | ret = regmap_read(max77843->regmap_muic, MAX77843_MUIC_REG_ID, &id); |
diff --git a/include/linux/mfd/max77843-private.h b/include/linux/mfd/max77843-private.h index 0121d9440340..c19303b0ccfd 100644 --- a/include/linux/mfd/max77843-private.h +++ b/include/linux/mfd/max77843-private.h | |||
| @@ -318,62 +318,62 @@ enum max77843_irq_muic { | |||
| 318 | MAX77843_INTSRCMASK_SYS_MASK | MAX77843_INTSRCMASK_CHGR_MASK) | 318 | MAX77843_INTSRCMASK_SYS_MASK | MAX77843_INTSRCMASK_CHGR_MASK) |
| 319 | 319 | ||
| 320 | /* MAX77843 STATUS register*/ | 320 | /* MAX77843 STATUS register*/ |
| 321 | #define STATUS1_ADC_SHIFT 0 | 321 | #define MAX77843_MUIC_STATUS1_ADC_SHIFT 0 |
| 322 | #define STATUS1_ADCERROR_SHIFT 6 | 322 | #define MAX77843_MUIC_STATUS1_ADCERROR_SHIFT 6 |
| 323 | #define STATUS1_ADC1K_SHIFT 7 | 323 | #define MAX77843_MUIC_STATUS1_ADC1K_SHIFT 7 |
| 324 | #define STATUS2_CHGTYP_SHIFT 0 | 324 | #define MAX77843_MUIC_STATUS2_CHGTYP_SHIFT 0 |
| 325 | #define STATUS2_CHGDETRUN_SHIFT 3 | 325 | #define MAX77843_MUIC_STATUS2_CHGDETRUN_SHIFT 3 |
| 326 | #define STATUS2_DCDTMR_SHIFT 4 | 326 | #define MAX77843_MUIC_STATUS2_DCDTMR_SHIFT 4 |
| 327 | #define STATUS2_DXOVP_SHIFT 5 | 327 | #define MAX77843_MUIC_STATUS2_DXOVP_SHIFT 5 |
| 328 | #define STATUS2_VBVOLT_SHIFT 6 | 328 | #define MAX77843_MUIC_STATUS2_VBVOLT_SHIFT 6 |
| 329 | #define STATUS3_VBADC_SHIFT 0 | 329 | #define MAX77843_MUIC_STATUS3_VBADC_SHIFT 0 |
| 330 | #define STATUS3_VDNMON_SHIFT 4 | 330 | #define MAX77843_MUIC_STATUS3_VDNMON_SHIFT 4 |
| 331 | #define STATUS3_DNRES_SHIFT 5 | 331 | #define MAX77843_MUIC_STATUS3_DNRES_SHIFT 5 |
| 332 | #define STATUS3_MPNACK_SHIFT 6 | 332 | #define MAX77843_MUIC_STATUS3_MPNACK_SHIFT 6 |
| 333 | 333 | ||
| 334 | #define MAX77843_MUIC_STATUS1_ADC_MASK (0x1f << STATUS1_ADC_SHIFT) | 334 | #define MAX77843_MUIC_STATUS1_ADC_MASK (0x1f << MAX77843_MUIC_STATUS1_ADC_SHIFT) |
| 335 | #define MAX77843_MUIC_STATUS1_ADCERROR_MASK BIT(STATUS1_ADCERROR_SHIFT) | 335 | #define MAX77843_MUIC_STATUS1_ADCERROR_MASK BIT(MAX77843_MUIC_STATUS1_ADCERROR_SHIFT) |
| 336 | #define MAX77843_MUIC_STATUS1_ADC1K_MASK BIT(STATUS1_ADC1K_SHIFT) | 336 | #define MAX77843_MUIC_STATUS1_ADC1K_MASK BIT(MAX77843_MUIC_STATUS1_ADC1K_SHIFT) |
| 337 | #define MAX77843_MUIC_STATUS2_CHGTYP_MASK (0x7 << STATUS2_CHGTYP_SHIFT) | 337 | #define MAX77843_MUIC_STATUS2_CHGTYP_MASK (0x7 << MAX77843_MUIC_STATUS2_CHGTYP_SHIFT) |
| 338 | #define MAX77843_MUIC_STATUS2_CHGDETRUN_MASK BIT(STATUS2_CHGDETRUN_SHIFT) | 338 | #define MAX77843_MUIC_STATUS2_CHGDETRUN_MASK BIT(MAX77843_MUIC_STATUS2_CHGDETRUN_SHIFT) |
| 339 | #define MAX77843_MUIC_STATUS2_DCDTMR_MASK BIT(STATUS2_DCDTMR_SHIFT) | 339 | #define MAX77843_MUIC_STATUS2_DCDTMR_MASK BIT(MAX77843_MUIC_STATUS2_DCDTMR_SHIFT) |
| 340 | #define MAX77843_MUIC_STATUS2_DXOVP_MASK BIT(STATUS2_DXOVP_SHIFT) | 340 | #define MAX77843_MUIC_STATUS2_DXOVP_MASK BIT(MAX77843_MUIC_STATUS2_DXOVP_SHIFT) |
| 341 | #define MAX77843_MUIC_STATUS2_VBVOLT_MASK BIT(STATUS2_VBVOLT_SHIFT) | 341 | #define MAX77843_MUIC_STATUS2_VBVOLT_MASK BIT(MAX77843_MUIC_STATUS2_VBVOLT_SHIFT) |
| 342 | #define MAX77843_MUIC_STATUS3_VBADC_MASK (0xf << STATUS3_VBADC_SHIFT) | 342 | #define MAX77843_MUIC_STATUS3_VBADC_MASK (0xf << MAX77843_MUIC_STATUS3_VBADC_SHIFT) |
| 343 | #define MAX77843_MUIC_STATUS3_VDNMON_MASK BIT(STATUS3_VDNMON_SHIFT) | 343 | #define MAX77843_MUIC_STATUS3_VDNMON_MASK BIT(MAX77843_MUIC_STATUS3_VDNMON_SHIFT) |
| 344 | #define MAX77843_MUIC_STATUS3_DNRES_MASK BIT(STATUS3_DNRES_SHIFT) | 344 | #define MAX77843_MUIC_STATUS3_DNRES_MASK BIT(MAX77843_MUIC_STATUS3_DNRES_SHIFT) |
| 345 | #define MAX77843_MUIC_STATUS3_MPNACK_MASK BIT(STATUS3_MPNACK_SHIFT) | 345 | #define MAX77843_MUIC_STATUS3_MPNACK_MASK BIT(MAX77843_MUIC_STATUS3_MPNACK_SHIFT) |
| 346 | 346 | ||
| 347 | /* MAX77843 CONTROL register */ | 347 | /* MAX77843 CONTROL register */ |
| 348 | #define CONTROL1_COMP1SW_SHIFT 0 | 348 | #define MAX77843_MUIC_CONTROL1_COMP1SW_SHIFT 0 |
| 349 | #define CONTROL1_COMP2SW_SHIFT 3 | 349 | #define MAX77843_MUIC_CONTROL1_COMP2SW_SHIFT 3 |
| 350 | #define CONTROL1_IDBEN_SHIFT 7 | 350 | #define MAX77843_MUIC_CONTROL1_IDBEN_SHIFT 7 |
| 351 | #define CONTROL2_LOWPWR_SHIFT 0 | 351 | #define MAX77843_MUIC_CONTROL2_LOWPWR_SHIFT 0 |
| 352 | #define CONTROL2_ADCEN_SHIFT 1 | 352 | #define MAX77843_MUIC_CONTROL2_ADCEN_SHIFT 1 |
| 353 | #define CONTROL2_CPEN_SHIFT 2 | 353 | #define MAX77843_MUIC_CONTROL2_CPEN_SHIFT 2 |
| 354 | #define CONTROL2_ACC_DET_SHIFT 5 | 354 | #define MAX77843_MUIC_CONTROL2_ACC_DET_SHIFT 5 |
| 355 | #define CONTROL2_USBCPINT_SHIFT 6 | 355 | #define MAX77843_MUIC_CONTROL2_USBCPINT_SHIFT 6 |
| 356 | #define CONTROL2_RCPS_SHIFT 7 | 356 | #define MAX77843_MUIC_CONTROL2_RCPS_SHIFT 7 |
| 357 | #define CONTROL3_JIGSET_SHIFT 0 | 357 | #define MAX77843_MUIC_CONTROL3_JIGSET_SHIFT 0 |
| 358 | #define CONTROL4_ADCDBSET_SHIFT 0 | 358 | #define MAX77843_MUIC_CONTROL4_ADCDBSET_SHIFT 0 |
| 359 | #define CONTROL4_USBAUTO_SHIFT 4 | 359 | #define MAX77843_MUIC_CONTROL4_USBAUTO_SHIFT 4 |
| 360 | #define CONTROL4_FCTAUTO_SHIFT 5 | 360 | #define MAX77843_MUIC_CONTROL4_FCTAUTO_SHIFT 5 |
| 361 | #define CONTROL4_ADCMODE_SHIFT 6 | 361 | #define MAX77843_MUIC_CONTROL4_ADCMODE_SHIFT 6 |
| 362 | 362 | ||
| 363 | #define MAX77843_MUIC_CONTROL1_COMP1SW_MASK (0x7 << CONTROL1_COMP1SW_SHIFT) | 363 | #define MAX77843_MUIC_CONTROL1_COMP1SW_MASK (0x7 << MAX77843_MUIC_CONTROL1_COMP1SW_SHIFT) |
| 364 | #define MAX77843_MUIC_CONTROL1_COMP2SW_MASK (0x7 << CONTROL1_COMP2SW_SHIFT) | 364 | #define MAX77843_MUIC_CONTROL1_COMP2SW_MASK (0x7 << MAX77843_MUIC_CONTROL1_COMP2SW_SHIFT) |
| 365 | #define MAX77843_MUIC_CONTROL1_IDBEN_MASK BIT(CONTROL1_IDBEN_SHIFT) | 365 | #define MAX77843_MUIC_CONTROL1_IDBEN_MASK BIT(MAX77843_MUIC_CONTROL1_IDBEN_SHIFT) |
| 366 | #define MAX77843_MUIC_CONTROL2_LOWPWR_MASK BIT(CONTROL2_LOWPWR_SHIFT) | 366 | #define MAX77843_MUIC_CONTROL2_LOWPWR_MASK BIT(MAX77843_MUIC_CONTROL2_LOWPWR_SHIFT) |
| 367 | #define MAX77843_MUIC_CONTROL2_ADCEN_MASK BIT(CONTROL2_ADCEN_SHIFT) | 367 | #define MAX77843_MUIC_CONTROL2_ADCEN_MASK BIT(MAX77843_MUIC_CONTROL2_ADCEN_SHIFT) |
| 368 | #define MAX77843_MUIC_CONTROL2_CPEN_MASK BIT(CONTROL2_CPEN_SHIFT) | 368 | #define MAX77843_MUIC_CONTROL2_CPEN_MASK BIT(MAX77843_MUIC_CONTROL2_CPEN_SHIFT) |
| 369 | #define MAX77843_MUIC_CONTROL2_ACC_DET_MASK BIT(CONTROL2_ACC_DET_SHIFT) | 369 | #define MAX77843_MUIC_CONTROL2_ACC_DET_MASK BIT(MAX77843_MUIC_CONTROL2_ACC_DET_SHIFT) |
| 370 | #define MAX77843_MUIC_CONTROL2_USBCPINT_MASK BIT(CONTROL2_USBCPINT_SHIFT) | 370 | #define MAX77843_MUIC_CONTROL2_USBCPINT_MASK BIT(MAX77843_MUIC_CONTROL2_USBCPINT_SHIFT) |
| 371 | #define MAX77843_MUIC_CONTROL2_RCPS_MASK BIT(CONTROL2_RCPS_SHIFT) | 371 | #define MAX77843_MUIC_CONTROL2_RCPS_MASK BIT(MAX77843_MUIC_CONTROL2_RCPS_SHIFT) |
| 372 | #define MAX77843_MUIC_CONTROL3_JIGSET_MASK (0x3 << CONTROL3_JIGSET_SHIFT) | 372 | #define MAX77843_MUIC_CONTROL3_JIGSET_MASK (0x3 << MAX77843_MUIC_CONTROL3_JIGSET_SHIFT) |
| 373 | #define MAX77843_MUIC_CONTROL4_ADCDBSET_MASK (0x3 << CONTROL4_ADCDBSET_SHIFT) | 373 | #define MAX77843_MUIC_CONTROL4_ADCDBSET_MASK (0x3 << MAX77843_MUIC_CONTROL4_ADCDBSET_SHIFT) |
| 374 | #define MAX77843_MUIC_CONTROL4_USBAUTO_MASK BIT(CONTROL4_USBAUTO_SHIFT) | 374 | #define MAX77843_MUIC_CONTROL4_USBAUTO_MASK BIT(MAX77843_MUIC_CONTROL4_USBAUTO_SHIFT) |
| 375 | #define MAX77843_MUIC_CONTROL4_FCTAUTO_MASK BIT(CONTROL4_FCTAUTO_SHIFT) | 375 | #define MAX77843_MUIC_CONTROL4_FCTAUTO_MASK BIT(MAX77843_MUIC_CONTROL4_FCTAUTO_SHIFT) |
| 376 | #define MAX77843_MUIC_CONTROL4_ADCMODE_MASK (0x3 << CONTROL4_ADCMODE_SHIFT) | 376 | #define MAX77843_MUIC_CONTROL4_ADCMODE_MASK (0x3 << MAX77843_MUIC_CONTROL4_ADCMODE_SHIFT) |
| 377 | 377 | ||
| 378 | /* MAX77843 switch port */ | 378 | /* MAX77843 switch port */ |
| 379 | #define COM_OPEN 0 | 379 | #define COM_OPEN 0 |
| @@ -383,38 +383,38 @@ enum max77843_irq_muic { | |||
| 383 | #define COM_AUX_USB 4 | 383 | #define COM_AUX_USB 4 |
| 384 | #define COM_AUX_UART 5 | 384 | #define COM_AUX_UART 5 |
| 385 | 385 | ||
| 386 | #define CONTROL1_COM_SW \ | 386 | #define MAX77843_MUIC_CONTROL1_COM_SW \ |
| 387 | ((MAX77843_MUIC_CONTROL1_COMP1SW_MASK | \ | 387 | ((MAX77843_MUIC_CONTROL1_COMP1SW_MASK | \ |
| 388 | MAX77843_MUIC_CONTROL1_COMP2SW_MASK)) | 388 | MAX77843_MUIC_CONTROL1_COMP2SW_MASK)) |
| 389 | 389 | ||
| 390 | #define CONTROL1_SW_OPEN \ | 390 | #define MAX77843_MUIC_CONTROL1_SW_OPEN \ |
| 391 | ((COM_OPEN << CONTROL1_COMP1SW_SHIFT | \ | 391 | ((COM_OPEN << MAX77843_MUIC_CONTROL1_COMP1SW_SHIFT | \ |
| 392 | COM_OPEN << CONTROL1_COMP2SW_SHIFT)) | 392 | COM_OPEN << MAX77843_MUIC_CONTROL1_COMP2SW_SHIFT)) |
| 393 | #define CONTROL1_SW_USB \ | 393 | #define MAX77843_MUIC_CONTROL1_SW_USB \ |
| 394 | ((COM_USB << CONTROL1_COMP1SW_SHIFT | \ | 394 | ((COM_USB << MAX77843_MUIC_CONTROL1_COMP1SW_SHIFT | \ |
| 395 | COM_USB << CONTROL1_COMP2SW_SHIFT)) | 395 | COM_USB << MAX77843_MUIC_CONTROL1_COMP2SW_SHIFT)) |
| 396 | #define CONTROL1_SW_AUDIO \ | 396 | #define MAX77843_MUIC_CONTROL1_SW_AUDIO \ |
| 397 | ((COM_AUDIO << CONTROL1_COMP1SW_SHIFT | \ | 397 | ((COM_AUDIO << MAX77843_MUIC_CONTROL1_COMP1SW_SHIFT | \ |
| 398 | COM_AUDIO << CONTROL1_COMP2SW_SHIFT)) | 398 | COM_AUDIO << MAX77843_MUIC_CONTROL1_COMP2SW_SHIFT)) |
| 399 | #define CONTROL1_SW_UART \ | 399 | #define MAX77843_MUIC_CONTROL1_SW_UART \ |
| 400 | ((COM_UART << CONTROL1_COMP1SW_SHIFT | \ | 400 | ((COM_UART << MAX77843_MUIC_CONTROL1_COMP1SW_SHIFT | \ |
| 401 | COM_UART << CONTROL1_COMP2SW_SHIFT)) | 401 | COM_UART << MAX77843_MUIC_CONTROL1_COMP2SW_SHIFT)) |
| 402 | #define CONTROL1_SW_AUX_USB \ | 402 | #define MAX77843_MUIC_CONTROL1_SW_AUX_USB \ |
| 403 | ((COM_AUX_USB << CONTROL1_COMP1SW_SHIFT | \ | 403 | ((COM_AUX_USB << MAX77843_MUIC_CONTROL1_COMP1SW_SHIFT | \ |
| 404 | COM_AUX_USB << CONTROL1_COMP2SW_SHIFT)) | 404 | COM_AUX_USB << MAX77843_MUIC_CONTROL1_COMP2SW_SHIFT)) |
| 405 | #define CONTROL1_SW_AUX_UART \ | 405 | #define MAX77843_MUIC_CONTROL1_SW_AUX_UART \ |
| 406 | ((COM_AUX_UART << CONTROL1_COMP1SW_SHIFT | \ | 406 | ((COM_AUX_UART << MAX77843_MUIC_CONTROL1_COMP1SW_SHIFT | \ |
| 407 | COM_AUX_UART << CONTROL1_COMP2SW_SHIFT)) | 407 | COM_AUX_UART << MAX77843_MUIC_CONTROL1_COMP2SW_SHIFT)) |
| 408 | 408 | ||
| 409 | #define MAX77843_DISABLE 0 | 409 | #define MAX77843_DISABLE 0 |
| 410 | #define MAX77843_ENABLE 1 | 410 | #define MAX77843_ENABLE 1 |
| 411 | 411 | ||
| 412 | #define CONTROL4_AUTO_DISABLE \ | 412 | #define CONTROL4_AUTO_DISABLE \ |
| 413 | ((MAX77843_DISABLE << CONTROL4_USBAUTO_SHIFT) | \ | 413 | ((MAX77843_DISABLE << MAX77843_MUIC_CONTROL4_USBAUTO_SHIFT) | \ |
| 414 | (MAX77843_DISABLE << CONTROL4_FCTAUTO_SHIFT)) | 414 | (MAX77843_DISABLE << MAX77843_MUIC_CONTROL4_FCTAUTO_SHIFT)) |
| 415 | #define CONTROL4_AUTO_ENABLE \ | 415 | #define CONTROL4_AUTO_ENABLE \ |
| 416 | ((MAX77843_ENABLE << CONTROL4_USBAUTO_SHIFT) | \ | 416 | ((MAX77843_ENABLE << MAX77843_MUIC_CONTROL4_USBAUTO_SHIFT) | \ |
| 417 | (MAX77843_ENABLE << CONTROL4_FCTAUTO_SHIFT)) | 417 | (MAX77843_ENABLE << MAX77843_MUIC_CONTROL4_FCTAUTO_SHIFT)) |
| 418 | 418 | ||
| 419 | /* MAX77843 SAFEOUT LDO Control register */ | 419 | /* MAX77843 SAFEOUT LDO Control register */ |
| 420 | #define SAFEOUTCTRL_SAFEOUT1_SHIFT 0 | 420 | #define SAFEOUTCTRL_SAFEOUT1_SHIFT 0 |
