diff options
author | Krzysztof Kozlowski <k.kozlowski@samsung.com> | 2014-10-22 04:45:40 -0400 |
---|---|---|
committer | Chanwoo Choi <cw00.choi@samsung.com> | 2014-11-24 06:51:15 -0500 |
commit | c22159a2d50e677ada77fff164d7682adb3be40f (patch) | |
tree | a72574570d46b80c350510aded7d332d93ff9bd0 | |
parent | f841afb17476f485900bb6213cf93a64a7dc303f (diff) |
extcon: max77693: Fix cable name of JIG_UART_ON
When JIG was set to "boot on" mode, the UART connection did not work
because it was assigned to Dock-Car cable (path: audio), not JIG-UART-ON
cable.
This was introduced in 39bf369e4ed3 ("extcon: max77693: Add support dock
device and buttons") while adding dock features.
Assign the JIG-UART-ON back to UART path.
Signed-off-by: Krzysztof Kozlowski <k.kozlowski@samsung.com>
[cw00.choi: Modify the patch name to remove specific board name]
Signed-off-by: Chanwoo Choi <cw00.choi@samsung.com>
-rw-r--r-- | drivers/extcon/extcon-max77693.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/drivers/extcon/extcon-max77693.c b/drivers/extcon/extcon-max77693.c index 490e27475bac..89ef36f71f60 100644 --- a/drivers/extcon/extcon-max77693.c +++ b/drivers/extcon/extcon-max77693.c | |||
@@ -232,7 +232,7 @@ static const char *max77693_extcon_cable[] = { | |||
232 | [EXTCON_CABLE_JIG_USB_ON] = "JIG-USB-ON", | 232 | [EXTCON_CABLE_JIG_USB_ON] = "JIG-USB-ON", |
233 | [EXTCON_CABLE_JIG_USB_OFF] = "JIG-USB-OFF", | 233 | [EXTCON_CABLE_JIG_USB_OFF] = "JIG-USB-OFF", |
234 | [EXTCON_CABLE_JIG_UART_OFF] = "JIG-UART-OFF", | 234 | [EXTCON_CABLE_JIG_UART_OFF] = "JIG-UART-OFF", |
235 | [EXTCON_CABLE_JIG_UART_ON] = "Dock-Car", | 235 | [EXTCON_CABLE_JIG_UART_ON] = "JIG-UART-ON", |
236 | [EXTCON_CABLE_DOCK_SMART] = "Dock-Smart", | 236 | [EXTCON_CABLE_DOCK_SMART] = "Dock-Smart", |
237 | [EXTCON_CABLE_DOCK_DESK] = "Dock-Desk", | 237 | [EXTCON_CABLE_DOCK_DESK] = "Dock-Desk", |
238 | [EXTCON_CABLE_DOCK_AUDIO] = "Dock-Audio", | 238 | [EXTCON_CABLE_DOCK_AUDIO] = "Dock-Audio", |
@@ -532,9 +532,6 @@ static int max77693_muic_dock_handler(struct max77693_muic_info *info, | |||
532 | extcon_set_cable_state(info->edev, "Dock-Smart", attached); | 532 | extcon_set_cable_state(info->edev, "Dock-Smart", attached); |
533 | extcon_set_cable_state(info->edev, "MHL", attached); | 533 | extcon_set_cable_state(info->edev, "MHL", attached); |
534 | goto out; | 534 | goto out; |
535 | case MAX77693_MUIC_ADC_FACTORY_MODE_UART_ON: /* Dock-Car */ | ||
536 | strcpy(dock_name, "Dock-Car"); | ||
537 | break; | ||
538 | case MAX77693_MUIC_ADC_AUDIO_MODE_REMOTE: /* Dock-Desk */ | 535 | case MAX77693_MUIC_ADC_AUDIO_MODE_REMOTE: /* Dock-Desk */ |
539 | strcpy(dock_name, "Dock-Desk"); | 536 | strcpy(dock_name, "Dock-Desk"); |
540 | break; | 537 | break; |
@@ -669,6 +666,11 @@ static int max77693_muic_jig_handler(struct max77693_muic_info *info, | |||
669 | strcpy(cable_name, "JIG-UART-OFF"); | 666 | strcpy(cable_name, "JIG-UART-OFF"); |
670 | path = CONTROL1_SW_UART; | 667 | path = CONTROL1_SW_UART; |
671 | break; | 668 | break; |
669 | case MAX77693_MUIC_ADC_FACTORY_MODE_UART_ON: /* ADC_JIG_UART_ON */ | ||
670 | /* PATH:AP_UART */ | ||
671 | strcpy(cable_name, "JIG-UART-ON"); | ||
672 | path = CONTROL1_SW_UART; | ||
673 | break; | ||
672 | default: | 674 | default: |
673 | dev_err(info->dev, "failed to detect %s jig cable\n", | 675 | dev_err(info->dev, "failed to detect %s jig cable\n", |
674 | attached ? "attached" : "detached"); | 676 | attached ? "attached" : "detached"); |
@@ -708,13 +710,13 @@ static int max77693_muic_adc_handler(struct max77693_muic_info *info) | |||
708 | case MAX77693_MUIC_ADC_FACTORY_MODE_USB_OFF: | 710 | case MAX77693_MUIC_ADC_FACTORY_MODE_USB_OFF: |
709 | case MAX77693_MUIC_ADC_FACTORY_MODE_USB_ON: | 711 | case MAX77693_MUIC_ADC_FACTORY_MODE_USB_ON: |
710 | case MAX77693_MUIC_ADC_FACTORY_MODE_UART_OFF: | 712 | case MAX77693_MUIC_ADC_FACTORY_MODE_UART_OFF: |
713 | case MAX77693_MUIC_ADC_FACTORY_MODE_UART_ON: | ||
711 | /* JIG */ | 714 | /* JIG */ |
712 | ret = max77693_muic_jig_handler(info, cable_type, attached); | 715 | ret = max77693_muic_jig_handler(info, cable_type, attached); |
713 | if (ret < 0) | 716 | if (ret < 0) |
714 | return ret; | 717 | return ret; |
715 | break; | 718 | break; |
716 | case MAX77693_MUIC_ADC_RESERVED_ACC_3: /* Dock-Smart */ | 719 | case MAX77693_MUIC_ADC_RESERVED_ACC_3: /* Dock-Smart */ |
717 | case MAX77693_MUIC_ADC_FACTORY_MODE_UART_ON: /* Dock-Car */ | ||
718 | case MAX77693_MUIC_ADC_AUDIO_MODE_REMOTE: /* Dock-Desk */ | 720 | case MAX77693_MUIC_ADC_AUDIO_MODE_REMOTE: /* Dock-Desk */ |
719 | case MAX77693_MUIC_ADC_AV_CABLE_NOLOAD: /* Dock-Audio */ | 721 | case MAX77693_MUIC_ADC_AV_CABLE_NOLOAD: /* Dock-Audio */ |
720 | /* | 722 | /* |