Messages in this thread | | | Subject | Re: [PATCH RESEND 3/3] extcon: max77693: Fix extcon UART on Trats2 board | From | Krzysztof Kozlowski <> | Date | Wed, 22 Oct 2014 11:13:20 +0200 |
| |
On śro, 2014-10-22 at 18:09 +0900, Chanwoo Choi wrote: > On 10/22/2014 05:45 PM, Krzysztof Kozlowski wrote: > > 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> > > I want to change the name of this patch because I don't prefer to use board name on extcon driver patch. > before - extcon: max77693: Fix extcon UART on Trats2 board > after - extcon: max77693: Fix cable name of JIG_UART_ON
No problem, thanks!
> > Applied it. > > Thanks, > Chanwoo Choi > > > --- > > drivers/extcon/extcon-max77693.c | 12 +++++++----- > > 1 file changed, 7 insertions(+), 5 deletions(-) > > > > diff --git a/drivers/extcon/extcon-max77693.c b/drivers/extcon/extcon-max77693.c > > index 9d21e75a7032..beaa8cd71c3b 100644 > > --- a/drivers/extcon/extcon-max77693.c > > +++ b/drivers/extcon/extcon-max77693.c > > @@ -206,7 +206,7 @@ static const char *max77693_extcon_cable[] = { > > [EXTCON_CABLE_JIG_USB_ON] = "JIG-USB-ON", > > [EXTCON_CABLE_JIG_USB_OFF] = "JIG-USB-OFF", > > [EXTCON_CABLE_JIG_UART_OFF] = "JIG-UART-OFF", > > - [EXTCON_CABLE_JIG_UART_ON] = "Dock-Car", > > + [EXTCON_CABLE_JIG_UART_ON] = "JIG-UART-ON", > > [EXTCON_CABLE_DOCK_SMART] = "Dock-Smart", > > [EXTCON_CABLE_DOCK_DESK] = "Dock-Desk", > > [EXTCON_CABLE_DOCK_AUDIO] = "Dock-Audio", > > @@ -506,9 +506,6 @@ static int max77693_muic_dock_handler(struct max77693_muic_info *info, > > extcon_set_cable_state(info->edev, "Dock-Smart", attached); > > extcon_set_cable_state(info->edev, "MHL", attached); > > goto out; > > - case MAX77693_MUIC_ADC_FACTORY_MODE_UART_ON: /* Dock-Car */ > > - strcpy(dock_name, "Dock-Car"); > > - break; > > case MAX77693_MUIC_ADC_AUDIO_MODE_REMOTE: /* Dock-Desk */ > > strcpy(dock_name, "Dock-Desk"); > > break; > > @@ -643,6 +640,11 @@ static int max77693_muic_jig_handler(struct max77693_muic_info *info, > > strcpy(cable_name, "JIG-UART-OFF"); > > path = CONTROL1_SW_UART; > > break; > > + case MAX77693_MUIC_ADC_FACTORY_MODE_UART_ON: /* ADC_JIG_UART_ON */ > > + /* PATH:AP_UART */ > > + strcpy(cable_name, "JIG-UART-ON"); > > + path = CONTROL1_SW_UART; > > + break; > > default: > > dev_err(info->dev, "failed to detect %s jig cable\n", > > attached ? "attached" : "detached"); > > @@ -682,13 +684,13 @@ static int max77693_muic_adc_handler(struct max77693_muic_info *info) > > case MAX77693_MUIC_ADC_FACTORY_MODE_USB_OFF: > > case MAX77693_MUIC_ADC_FACTORY_MODE_USB_ON: > > case MAX77693_MUIC_ADC_FACTORY_MODE_UART_OFF: > > + case MAX77693_MUIC_ADC_FACTORY_MODE_UART_ON: > > /* JIG */ > > ret = max77693_muic_jig_handler(info, cable_type, attached); > > if (ret < 0) > > return ret; > > break; > > case MAX77693_MUIC_ADC_RESERVED_ACC_3: /* Dock-Smart */ > > - case MAX77693_MUIC_ADC_FACTORY_MODE_UART_ON: /* Dock-Car */ > > case MAX77693_MUIC_ADC_AUDIO_MODE_REMOTE: /* Dock-Desk */ > > case MAX77693_MUIC_ADC_AV_CABLE_NOLOAD: /* Dock-Audio */ > > /* > >
-- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
| |