From 6458bd21e2c8cc3f5be98d8ea33854eb53fb138f Mon Sep 17 00:00:00 2001 From: Thomas Kunze Date: Thu, 8 Oct 2009 00:12:48 +0200 Subject: [PATCH 13/15] add sa1100-udc hack (extra hacked for collie) --- arch/arm/mach-sa1100/include/mach/collie.h | 5 ++--- drivers/usb/gadget/Kconfig | 15 +++++++++++++++ drivers/usb/gadget/Makefile | 1 + 3 files changed, 18 insertions(+), 3 deletions(-) diff --git a/arch/arm/mach-sa1100/include/mach/collie.h b/arch/arm/mach-sa1100/include/mach/collie.h index 71a0b3f..1e5f492 100644 --- a/arch/arm/mach-sa1100/include/mach/collie.h +++ b/arch/arm/mach-sa1100/include/mach/collie.h @@ -23,11 +23,10 @@ #define COLLIE_SCP_5VON SCOOP_GPCR_PA16 #define COLLIE_SCP_AMP_ON SCOOP_GPCR_PA17 #define COLLIE_GPIO_VPEN (COLLIE_SCOOP_GPIO_BASE + 7) -#define COLLIE_SCP_LB_VOL_CHG SCOOP_GPCR_PA19 +#define COLLIE_GPIO_LB_VOL_CHG (COLLIE_SCOOP_GPIO_BASE + 8) #define COLLIE_SCOOP_IO_DIR (COLLIE_SCP_MUTE_L | COLLIE_SCP_MUTE_R | \ - COLLIE_SCP_5VON | COLLIE_SCP_AMP_ON | \ - COLLIE_SCP_LB_VOL_CHG) + COLLIE_SCP_5VON | COLLIE_SCP_AMP_ON) #define COLLIE_SCOOP_IO_OUT (COLLIE_SCP_MUTE_L | COLLIE_SCP_MUTE_R) /* GPIOs for gpiolib */ diff --git a/drivers/usb/gadget/Kconfig b/drivers/usb/gadget/Kconfig index 7f8e83a..d7da5c9 100644 --- a/drivers/usb/gadget/Kconfig +++ b/drivers/usb/gadget/Kconfig @@ -500,6 +500,21 @@ config USB_LANGWELL # LAST -- dummy/emulated controller # +config USB_GADGET_SA1100 + boolean "SA1100 USB Device Port" + depends on ARCH_SA1100 + select USB_GADGET_SELECTED + help + + Say "y" to link the driver statically, or "m" to build a + dynamically linked module called "sa1100_udc" and force all + gadget drivers to also be dynamically linked. + +config USB_SA1100 + tristate + depends on USB_GADGET_SA1100 + default USB_GADGET + config USB_GADGET_DUMMY_HCD boolean "Dummy HCD (DEVELOPMENT)" depends on USB=y || (USB=m && USB_GADGET=m) diff --git a/drivers/usb/gadget/Makefile b/drivers/usb/gadget/Makefile index e6017e6..1984d4a 100644 --- a/drivers/usb/gadget/Makefile +++ b/drivers/usb/gadget/Makefile @@ -15,6 +15,7 @@ obj-$(CONFIG_USB_GOKU) += goku_udc.o obj-$(CONFIG_USB_OMAP) += omap_udc.o obj-$(CONFIG_USB_LH7A40X) += lh7a40x_udc.o obj-$(CONFIG_USB_S3C2410) += s3c2410_udc.o +obj-$(CONFIG_USB_SA1100) += sa1100_udc.o obj-$(CONFIG_USB_AT91) += at91_udc.o obj-$(CONFIG_USB_ATMEL_USBA) += atmel_usba_udc.o obj-$(CONFIG_USB_FSL_USB2) += fsl_usb2_udc.o -- 1.6.0.4