diff options
author | Colin Cross <ccross@android.com> | 2010-06-26 22:36:41 -0700 |
---|---|---|
committer | Dan Willemsen <dwillemsen@nvidia.com> | 2011-11-30 21:34:41 -0800 |
commit | ebced7a4a2ac474e5d7613993e96275512ca4c7c (patch) | |
tree | 5c1b5f6b9074e39fa2c6c22fdc9dfda7252a1e97 /arch/arm/mach-tegra/board-harmony.c | |
parent | c9bfb3ba3978b5cd779c920bf83674130d6b97c2 (diff) |
[ARM] tegra: harmony: Remove android platform devices
Signed-off-by: Colin Cross <ccross@android.com>
Diffstat (limited to 'arch/arm/mach-tegra/board-harmony.c')
-rw-r--r-- | arch/arm/mach-tegra/board-harmony.c | 41 |
1 files changed, 0 insertions, 41 deletions
diff --git a/arch/arm/mach-tegra/board-harmony.c b/arch/arm/mach-tegra/board-harmony.c index 47878bbd499f..a3ca0994b2ab 100644 --- a/arch/arm/mach-tegra/board-harmony.c +++ b/arch/arm/mach-tegra/board-harmony.c @@ -42,8 +42,6 @@ #include <mach/sdhci.h> #include <mach/nand.h> -#include <linux/usb/android_composite.h> - #include "board.h" #include "board-harmony.h" #include "clock.h" @@ -266,44 +264,6 @@ struct platform_device tegra_otg = { .num_resources = ARRAY_SIZE(tegra_otg_resources), }; -static char *usb_functions[] = { "usb_mass_storage" }; -static char *usb_functions_adb[] = { "usb_mass_storage", "adb" }; - -static struct android_usb_product usb_products[] = { - { - .product_id = 0xDEAD, - .num_functions = ARRAY_SIZE(usb_functions), - .functions = usb_functions, - }, - { - .product_id = 0xBEEF, - .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 = 0x18d1, - .product_id = 0x0002, - .manufacturer_name = "Google", - .product_name = "Harmony!", - .serial_number = "0000", - .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, - }, -}; - /* PDA power */ static struct pda_power_pdata pda_power_pdata = { }; @@ -327,7 +287,6 @@ static struct platform_device *harmony_devices[] __initdata = { &harmony_audio_device, &tegra_nand_device, &tegra_otg, - &androidusb_device, &pda_power_device, }; |