summaryrefslogtreecommitdiff
path: root/arch/arm/mach-tegra/board-harmony.c
diff options
context:
space:
mode:
authorColin Cross <ccross@android.com>2010-06-26 22:36:41 -0700
committerDan Willemsen <dwillemsen@nvidia.com>2012-03-21 22:10:43 -0700
commit964a898fc3fefe9804407cd81ce4dd5e38b87a26 (patch)
tree4b6a9ab05b3fa37b328b45420902e25caa8ca219 /arch/arm/mach-tegra/board-harmony.c
parente953e1214ecc4653e15b4dc90843db3fd6b7e1f0 (diff)
[ARM] tegra: harmony: Remove android platform devices
Signed-off-by: Colin Cross <ccross@android.com> Rebase-Id: R5f6dc634a1970b021d0371354b930f47e6c682ec
Diffstat (limited to 'arch/arm/mach-tegra/board-harmony.c')
-rw-r--r--arch/arm/mach-tegra/board-harmony.c41
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 87a64c82f372..b8d45f0e6a8b 100644
--- a/arch/arm/mach-tegra/board-harmony.c
+++ b/arch/arm/mach-tegra/board-harmony.c
@@ -43,8 +43,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"
@@ -268,44 +266,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 = {
};
@@ -330,7 +290,6 @@ static struct platform_device *harmony_devices[] __initdata = {
&harmony_audio_device,
&tegra_nand_device,
&tegra_otg,
- &androidusb_device,
&pda_power_device,
};