diff options
| author | Dan Willemsen <dwillemsen@nvidia.com> | 2011-11-14 20:19:42 -0800 |
|---|---|---|
| committer | Dan Willemsen <dwillemsen@nvidia.com> | 2012-03-24 01:53:31 -0700 |
| commit | fa45c17c64563ff06acbf5cc3a8cfd26c0bf8d97 (patch) | |
| tree | 7bc46b34d53649845c916316b263ae242940b1e3 /arch/arm/mach-tegra/board-ventana.c | |
| parent | 74704be9bf1d7a22e6b024d39ed3a19c5f17b152 (diff) | |
ARM: tegra: ventana: Remove old android usb composite config
Change-Id: I9d08c86aa406fd8b5c41f374ad4168f3685409f4
Signed-off-by: Dan Willemsen <dwillemsen@nvidia.com>
Reviewed-on: http://git-master/r/66280
Rebase-Id: Rceacdad26018405ebf53cf3b48dcd7b52f319d5b
Diffstat (limited to 'arch/arm/mach-tegra/board-ventana.c')
| -rw-r--r-- | arch/arm/mach-tegra/board-ventana.c | 40 |
1 files changed, 0 insertions, 40 deletions
diff --git a/arch/arm/mach-tegra/board-ventana.c b/arch/arm/mach-tegra/board-ventana.c index 69dd11a9df36..53fe7c1a3a49 100644 --- a/arch/arm/mach-tegra/board-ventana.c +++ b/arch/arm/mach-tegra/board-ventana.c @@ -34,7 +34,6 @@ #include <linux/gpio_keys.h> #include <linux/input.h> #include <linux/platform_data/tegra_usb.h> -#include <linux/usb/android_composite.h> #include <linux/mfd/tps6586x.h> #include <linux/memblock.h> #include <linux/i2c/atmel_mxt_ts.h> @@ -198,43 +197,6 @@ static __initdata struct tegra_clk_init_table ventana_clk_init_table[] = { { NULL, NULL, 0, 0}, }; -static char *usb_functions[] = { "mtp" }; -static char *usb_functions_adb[] = { "mtp", "adb" }; - -static struct android_usb_product usb_products[] = { - { - .product_id = 0x7102, - .num_functions = ARRAY_SIZE(usb_functions), - .functions = usb_functions, - }, - { - .product_id = 0x7100, - .num_functions = ARRAY_SIZE(usb_functions_adb), - .functions = usb_functions_adb, - }, -}; - -/* standard android USB platform data */ -static struct android_usb_platform_data andusb_plat = { - .vendor_id = 0x0955, - .product_id = 0x7100, - .manufacturer_name = "NVIDIA", - .product_name = "Ventana", - .serial_number = NULL, - .num_products = ARRAY_SIZE(usb_products), - .products = usb_products, - .num_functions = ARRAY_SIZE(usb_functions_adb), - .functions = usb_functions_adb, -}; - -static struct platform_device androidusb_device = { - .name = "android_usb", - .id = -1, - .dev = { - .platform_data = &andusb_plat, - }, -}; - static struct tegra_ulpi_config ventana_ehci2_ulpi_phy_config = { .reset_gpio = TEGRA_GPIO_PV1, .clk = "cdev2", @@ -646,8 +608,6 @@ static void __init tegra_ventana_init(void) ventana_pinmux_init(); ventana_i2c_init(); ventana_uart_init(); - snprintf(serial, sizeof(serial), "%llx", tegra_chip_uid()); - andusb_plat.serial_number = kstrdup(serial, GFP_KERNEL); tegra_ehci2_device.dev.platform_data = &ventana_ehci2_ulpi_platform_data; platform_add_devices(ventana_devices, ARRAY_SIZE(ventana_devices)); |