git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'linux-next' of git://git.infradead.org/~dedekind/ubi-2.6
[safe/jmp/linux-2.6]
/
arch
/
arm
/
mach-at91
/
board-cap9adk.c
diff --git
a/arch/arm/mach-at91/board-cap9adk.c
b/arch/arm/mach-at91/board-cap9adk.c
index
e5512d1
..
a1c41d7
100644
(file)
--- a/
arch/arm/mach-at91/board-cap9adk.c
+++ b/
arch/arm/mach-at91/board-cap9adk.c
@@
-78,6
+78,12
@@
static struct at91_usbh_data __initdata cap9adk_usbh_data = {
.ports = 2,
};
.ports = 2,
};
+/*
+ * USB HS Device port
+ */
+static struct usba_platform_data __initdata cap9adk_usba_udc_data = {
+ .vbus_pin = AT91_PIN_PB31,
+};
/*
* ADS7846 Touchscreen
/*
* ADS7846 Touchscreen
@@
-175,7
+181,7
@@
static struct mtd_partition * __init nand_partitions(int size, int *num_partitio
return cap9adk_nand_partitions;
}
return cap9adk_nand_partitions;
}
-static struct at
91
_nand_data __initdata cap9adk_nand_data = {
+static struct at
mel
_nand_data __initdata cap9adk_nand_data = {
.ale = 21,
.cle = 22,
// .det_pin = ... not connected
.ale = 21,
.cle = 22,
// .det_pin = ... not connected
@@
-326,6
+332,9
@@
static void __init cap9adk_board_init(void)
/* USB Host */
set_irq_type(AT91CAP9_ID_UHP, IRQT_HIGH);
at91_add_device_usbh(&cap9adk_usbh_data);
/* USB Host */
set_irq_type(AT91CAP9_ID_UHP, IRQT_HIGH);
at91_add_device_usbh(&cap9adk_usbh_data);
+ /* USB HS */
+ set_irq_type(AT91CAP9_ID_UDPHS, IRQT_HIGH);
+ at91_add_device_usba(&cap9adk_usba_udc_data);
/* SPI */
at91_add_device_spi(cap9adk_spi_devices, ARRAY_SIZE(cap9adk_spi_devices));
/* Touchscreen */
/* SPI */
at91_add_device_spi(cap9adk_spi_devices, ARRAY_SIZE(cap9adk_spi_devices));
/* Touchscreen */