Re: [PATCH 1/3] USB: gadget: at91_udc: add at91sam9n12 support

[Alexandre Belloni]

Hi Bo,

On 09/02/2015 at 17:02:50 +0800, Bo Shen wrote :
> Add at91sam9n12 SoC support.
> 
> Signed-off-by: Bo Shen <voice.shen@xxxxxxxxx>
> ---
> 
>  drivers/usb/gadget/udc/at91_udc.c | 9 ++++++---
>  1 file changed, 6 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/usb/gadget/udc/at91_udc.c b/drivers/usb/gadget/udc/at91_udc.c
> index c862656..f4c785f 100644
> --- a/drivers/usb/gadget/udc/at91_udc.c
> +++ b/drivers/usb/gadget/udc/at91_udc.c
> @@ -931,7 +931,8 @@ static void pullup(struct at91_udc *udc, int is_on)
>  		at91_udp_write(udc, AT91_UDP_TXVC, 0);
>  		if (cpu_is_at91rm9200())
>  			gpio_set_value(udc->board.pullup_pin, active);
> -		else if (cpu_is_at91sam9260() || cpu_is_at91sam9263() || cpu_is_at91sam9g20()) {
> +		else if (cpu_is_at91sam9260() || cpu_is_at91sam9263() ||
> +			 cpu_is_at91sam9g20() || cpu_is_at91sam9n12()) {

cpu_is_at91xx have been removed from the kernel, using the correct
compatible should be enough, see
http://git.kernel.org/cgit/linux/kernel/git/next/linux-next.git/commit/drivers/usb/gadget/udc/at91_udc.c?id=f0bceab4e3b528e799aba8fda8d2936fcfd41f1f


>  			u32	txvc = at91_udp_read(udc, AT91_UDP_TXVC);
>  
>  			txvc |= AT91_UDP_TXVC_PUON;
> @@ -949,7 +950,8 @@ static void pullup(struct at91_udc *udc, int is_on)
>  		at91_udp_write(udc, AT91_UDP_TXVC, AT91_UDP_TXVC_TXVDIS);
>  		if (cpu_is_at91rm9200())
>  			gpio_set_value(udc->board.pullup_pin, !active);
> -		else if (cpu_is_at91sam9260() || cpu_is_at91sam9263() || cpu_is_at91sam9g20()) {
> +		else if (cpu_is_at91sam9260() || cpu_is_at91sam9263() ||
> +			 cpu_is_at91sam9g20() || cpu_is_at91sam9n12()) {
>  			u32	txvc = at91_udp_read(udc, AT91_UDP_TXVC);
>  
>  			txvc &= ~AT91_UDP_TXVC_PUON;
> @@ -1758,7 +1760,8 @@ static int at91udc_probe(struct platform_device *pdev)
>  	}
>  
>  	/* newer chips have more FIFO memory than rm9200 */
> -	if (cpu_is_at91sam9260() || cpu_is_at91sam9g20()) {
> +	if (cpu_is_at91sam9260() || cpu_is_at91sam9g20() ||
> +	    cpu_is_at91sam9n12()) {
>  		udc->ep[0].maxpacket = 64;
>  		udc->ep[3].maxpacket = 64;
>  		udc->ep[4].maxpacket = 512;
> -- 
> 2.3.0.rc0
> 
> 
> _______________________________________________
> linux-arm-kernel mailing list
> linux-arm-kernel@xxxxxxxxxxxxxxxxxxx
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

-- 
Alexandre Belloni, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/