From a34a13c09caf22ccb338791d91a7ed83f5977664 Mon Sep 17 00:00:00 2001 From: Gabor Juhos Date: Fri, 21 Sep 2007 07:32:19 +0000 Subject: checkin a new, experimental USB driver SVN-Revision: 8905 --- target/linux/adm5120/files/arch/mips/adm5120/board.c | 11 +++++------ .../adm5120/files/arch/mips/adm5120/boards/compex.c | 2 +- .../adm5120/files/arch/mips/adm5120/boards/edimax.c | 1 + .../adm5120/files/arch/mips/adm5120/boards/generic.c | 1 + .../adm5120/files/arch/mips/adm5120/boards/infineon.c | 1 - .../linux/adm5120/files/arch/mips/adm5120/boards/zyxel.c | 2 +- target/linux/adm5120/files/arch/mips/adm5120/platform.c | 16 +++++++++++----- 7 files changed, 20 insertions(+), 14 deletions(-) (limited to 'target/linux/adm5120/files/arch/mips') diff --git a/target/linux/adm5120/files/arch/mips/adm5120/board.c b/target/linux/adm5120/files/arch/mips/adm5120/board.c index 74bacaa2e8..376a11966c 100644 --- a/target/linux/adm5120/files/arch/mips/adm5120/board.c +++ b/target/linux/adm5120/files/arch/mips/adm5120/board.c @@ -31,11 +31,11 @@ #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include static LIST_HEAD(adm5120_boards); static char adm5120_board_name[ADM5120_BOARD_NAMELEN]; @@ -89,7 +89,6 @@ static int __init adm5120_board_setup(void) memcpy(adm5120_eth_vlans, board->eth_vlans, sizeof(adm5120_eth_vlans)); - if (board->board_setup) board->board_setup(); diff --git a/target/linux/adm5120/files/arch/mips/adm5120/boards/compex.c b/target/linux/adm5120/files/arch/mips/adm5120/boards/compex.c index 620179744e..37950932bd 100644 --- a/target/linux/adm5120/files/arch/mips/adm5120/boards/compex.c +++ b/target/linux/adm5120/files/arch/mips/adm5120/boards/compex.c @@ -68,7 +68,7 @@ static struct mtd_partition wp54g_wrt_partitions[] = { static struct platform_device *np2xg_devices[] __initdata = { &adm5120_flash0_device, - &adm5120_usbc_device, + &adm5120_hcd_device, }; static struct platform_device *wp54_devices[] __initdata = { diff --git a/target/linux/adm5120/files/arch/mips/adm5120/boards/edimax.c b/target/linux/adm5120/files/arch/mips/adm5120/boards/edimax.c index a184cbce44..d4b1b7442e 100644 --- a/target/linux/adm5120/files/arch/mips/adm5120/boards/edimax.c +++ b/target/linux/adm5120/files/arch/mips/adm5120/boards/edimax.c @@ -51,6 +51,7 @@ static struct mtd_partition br6104k_partitions[] = { static struct platform_device *br6104k_devices[] __initdata = { &adm5120_flash0_device, + &adm5120_hcd_device, }; static void __init br6104k_setup(void) { diff --git a/target/linux/adm5120/files/arch/mips/adm5120/boards/generic.c b/target/linux/adm5120/files/arch/mips/adm5120/boards/generic.c index de78ca40ea..044490e502 100644 --- a/target/linux/adm5120/files/arch/mips/adm5120/boards/generic.c +++ b/target/linux/adm5120/files/arch/mips/adm5120/boards/generic.c @@ -34,6 +34,7 @@ static struct platform_device *generic_devices[] __initdata = { &adm5120_flash0_device, + &adm5120_hcd_device, }; static struct adm5120_board generic_board __initdata = { diff --git a/target/linux/adm5120/files/arch/mips/adm5120/boards/infineon.c b/target/linux/adm5120/files/arch/mips/adm5120/boards/infineon.c index ebeb5aa87b..f0c682bcbc 100644 --- a/target/linux/adm5120/files/arch/mips/adm5120/boards/infineon.c +++ b/target/linux/adm5120/files/arch/mips/adm5120/boards/infineon.c @@ -80,7 +80,6 @@ static struct platform_device *easy5120pata_devices[] __initdata = { static struct platform_device *easy5120rt_devices[] __initdata = { &adm5120_flash0_device, - &adm5120_usbc_device }; static struct platform_device *easy5120wvoip_devices[] __initdata = { diff --git a/target/linux/adm5120/files/arch/mips/adm5120/boards/zyxel.c b/target/linux/adm5120/files/arch/mips/adm5120/boards/zyxel.c index 0a60205ebf..f6c3183dfa 100644 --- a/target/linux/adm5120/files/arch/mips/adm5120/boards/zyxel.c +++ b/target/linux/adm5120/files/arch/mips/adm5120/boards/zyxel.c @@ -76,7 +76,7 @@ static struct platform_device *p334_devices[] __initdata = { static struct platform_device *p335_devices[] __initdata = { &adm5120_flash0_device, - &adm5120_usbc_device, + &adm5120_hcd_device, }; static void __init p33x_setup(void) diff --git a/target/linux/adm5120/files/arch/mips/adm5120/platform.c b/target/linux/adm5120/files/arch/mips/adm5120/platform.c index a79893d540..e4353a00a7 100644 --- a/target/linux/adm5120/files/arch/mips/adm5120/platform.c +++ b/target/linux/adm5120/files/arch/mips/adm5120/platform.c @@ -83,7 +83,7 @@ struct platform_device adm5120_pci_device = { }; /* USB Host Controller */ -struct resource adm5120_usbc_resources[] = { +struct resource adm5120_hcd_resources[] = { [0] = { .start = ADM5120_USBC_BASE, .end = ADM5120_USBC_BASE+ADM5120_USBC_SIZE-1, @@ -96,11 +96,17 @@ struct resource adm5120_usbc_resources[] = { }, }; -struct platform_device adm5120_usbc_device = { +static u64 adm5120_hcd_dma_mask = ~(u32)0; + +struct platform_device adm5120_hcd_device = { .name = "adm5120-hcd", - .id = -1, - .num_resources = ARRAY_SIZE(adm5120_usbc_resources), - .resource = adm5120_usbc_resources, + .id = 0, + .num_resources = ARRAY_SIZE(adm5120_hcd_resources), + .resource = adm5120_hcd_resources, + .dev = { + .dma_mask = &adm5120_hcd_dma_mask, + .coherent_dma_mask = 0xFFFFFFFF, + } }; /* NOR flash 0 */ -- cgit v1.2.3