Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1244728

Re: [PATCH] usb: musb: core: add common method of getting vbus status

Show all headers | View raw

On 12/10/15 16:59, Roman Alyautdin wrote:
> Fix musb_platform_get_vbus_status return value in case of platform
> implementation is not defined, bringing expected behaviour of
> musb_platform_get wrapper. Add musb_vbus_show default method to determine
> VBUS status in case platform method is not defined.
>
> Signed-off-by: Roman Alyautdin <ralyautdin@dev.rtsoft.ru>
> ---
>   drivers/usb/musb/musb_core.c |   13 ++++++++++---
>   drivers/usb/musb/musb_core.h |    2 +-
>   2 files changed, 11 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/usb/musb/musb_core.c b/drivers/usb/musb/musb_core.c
> index 4a518ff..3551540 100644
> --- a/drivers/usb/musb/musb_core.c
> +++ b/drivers/usb/musb/musb_core.c
> @@ -1771,13 +1771,20 @@ musb_vbus_show(struct device *dev, struct device_attribute *attr, char *buf)
>   	unsigned long	flags;
>   	unsigned long	val;
>   	int		vbus;
> +	u8		devctl;
>   
>   	spin_lock_irqsave(&musb->lock, flags);
>   	val = musb->a_wait_bcon;
> -	/* FIXME get_vbus_status() is normally #defined as false...
> -	 * and is effectively TUSB-specific.
> -	 */
>   	vbus = musb_platform_get_vbus_status(musb);
> +	if (vbus < 0) {
> +		/* Use default MUSB method by means of DEVCTL register */
> +		devctl = musb_readb(musb->mregs, MUSB_DEVCTL);
> +		if ((devctl & MUSB_DEVCTL_VBUS)
> +				!= (3 << MUSB_DEVCTL_VBUS_SHIFT))
> +			vbus = 1;
> +		else
> +			vbus = 0;
> +	}
>   	spin_unlock_irqrestore(&musb->lock, flags);
>   
>   	return sprintf(buf, "Vbus %s, timeout %lu msec\n",
> diff --git a/drivers/usb/musb/musb_core.h b/drivers/usb/musb/musb_core.h
> index 4b886d0..2337d7a 100644
> --- a/drivers/usb/musb/musb_core.h
> +++ b/drivers/usb/musb/musb_core.h
> @@ -579,7 +579,7 @@ static inline int  musb_platform_recover(struct musb *musb)
>   static inline int musb_platform_get_vbus_status(struct musb *musb)
>   {
>   	if (!musb->ops->vbus_status)
> -		return 0;
> +		return -EINVAL;
>   
>   	return musb->ops->vbus_status(musb);
>   }
Sorry, looks like logic inversion, will update soon

Regards,
Roman
--
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/

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH] usb: musb: core: add common method of getting vbus status Roman Alyautdin <ralyautdin@dev.rtsoft.ru> - 2015-10-12 16:10 +0200
  Re: [PATCH] usb: musb: core: add common method of getting vbus status Roman Alyautdin <ralyautdin@dev.rtsoft.ru> - 2015-10-12 16:20 +0200
  [PATCH] usb: musb: core: add common method of getting vbus status Roman Alyautdin <ralyautdin@dev.rtsoft.ru> - 2015-10-12 16:30 +0200
    Re: [PATCH] usb: musb: core: add common method of getting vbus status Sergei Shtylyov <sergei.shtylyov@cogentembedded.com> - 2015-10-12 18:50 +0200

csiph-web