Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 55b3fd41 authored by Haavard Skinnemoen's avatar Haavard Skinnemoen Committed by Greg Kroah-Hartman
Browse files

usb gadget: Rename husb2dev -> usba 



husb2dev was the internal name of the USB Device Controller on
AT32AP7000. Rename it to "atmel_usba", which is closer to the official
name used in documentation and marketing material.

Signed-off-by: default avatarHaavard Skinnemoen <hskinnemoen@atmel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 8b3b01c8

drivers/usb/gadget/ether.c

+1 −1
Original line number Diff line number Diff line
@@ -277,7 +277,7 @@ MODULE_PARM_DESC(host_addr, "Host Ethernet Address"); 
#define DEV_CONFIG_CDC

#endif



#ifdef CONFIG_USB_GADGET_HUSB2DEV

#ifdef CONFIG_USB_GADGET_ATMEL_USBA

#define DEV_CONFIG_CDC

#endif

drivers/usb/gadget/gadget_chips.h

+4 −4
Original line number Diff line number Diff line
@@ -82,10 +82,10 @@ 
#define	gadget_is_pxa27x(g)	0

#endif



#ifdef CONFIG_USB_GADGET_HUSB2DEV

#define gadget_is_husb2dev(g)	!strcmp("husb2_udc", (g)->name)

#ifdef CONFIG_USB_GADGET_ATMEL_USBA

#define gadget_is_atmel_usba(g)	!strcmp("atmel_usba_udc", (g)->name)

#else

#define gadget_is_husb2dev(g)	0

#define gadget_is_atmel_usba(g)	0

#endif



#ifdef CONFIG_USB_GADGET_S3C2410
@@ -198,7 +198,7 @@ static inline int usb_gadget_controller_number(struct usb_gadget *gadget) 
		return 0x16;

	else if (gadget_is_mpc8272(gadget))

		return 0x17;

	else if (gadget_is_husb2dev(gadget))

	else if (gadget_is_atmel_usba(gadget))

		return 0x18;

	else if (gadget_is_fsl_usb2(gadget))

		return 0x19;