LIV2/LIV2-Xoom-GNU
1
0
Fork 0
mirror of https://github.com/LIV2/LIV2-Xoom-GNU.git synced 2025-12-06 00:12:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "ARM: tegra: stingray: Preliminary USB Mass Storage support"

Browse Source 
This reverts commit 42a59043926da7f73b3718ba3176f2476ccd95b7.

Conflicts:

	arch/arm/mach-tegra/board-stingray.c
This commit is contained in:
Chris Trotman 2011-07-24 16:04:04 +12:00
parent e3d55fcaeb
commit 346cda5914
1 changed files with 1 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
arch/arm/mach-tegra/board-stingray.c
View File

@ -84,8 +84,6 @@
#define USB_PRODUCT_NAME_LTE "MZ602"
#define USB_PRODUCT_NAME_WIFI_ONLY "MZ604"
#define USB_PRODUCT_ID_BLAN 0x70A3
#define USB_PRODUCT_ID_MS 0x70A6 // FIXME need Moto's real PID here
#define USB_PRODUCT_ID_MS_ADB 0x70A7 // FIXME need Moto's real PID here
#define USB_PRODUCT_ID_MTP 0x70A8
#define USB_PRODUCT_ID_MTP_ADB 0x70A9
#define USB_PRODUCT_ID_RNDIS 0x70AE
@ -251,10 +249,6 @@ static struct tegra_audio_platform_data tegra_spdif_pdata = {
static char *usb_functions_mtp[] = { "mtp" };
static char *usb_functions_mtp_adb[] = { "mtp", "adb" };
#ifdef CONFIG_USB_ANDROID_MASS_STORAGE
static char *usb_functions_ms[] = { "usb_mass_storage" };
static char *usb_functions_ms_adb[] = { "usb_mass_storage", "adb" };
#endif
#ifdef CONFIG_USB_ANDROID_ACCESSORY
static char *usb_functions_accessory[] = { "accessory" };
static char *usb_functions_accessory_adb[] = { "accessory", "adb" };
@ -271,10 +265,7 @@ static char *usb_functions_all[] = {
"accessory",
#endif
"mtp",
"adb",
#ifdef CONFIG_USB_ANDROID_MASS_STORAGE
"usb_mass_storage",
#endif
"adb"
};
static struct android_usb_product usb_products[] = {
@ -288,18 +279,6 @@ static struct android_usb_product usb_products[] = {
.num_functions = ARRAY_SIZE(usb_functions_mtp_adb),
.functions = usb_functions_mtp_adb,
},
#ifdef CONFIG_USB_ANDROID_MASS_STORAGE
{
.product_id = USB_PRODUCT_ID_MS,
.num_functions = ARRAY_SIZE(usb_functions_ms),
.functions = usb_functions_ms,
},
{
.product_id = USB_PRODUCT_ID_MS_ADB,
.num_functions = ARRAY_SIZE(usb_functions_ms_adb),
.functions = usb_functions_ms_adb,
},
#endif
#ifdef CONFIG_USB_ANDROID_ACCESSORY
{
.vendor_id = USB_ACCESSORY_VENDOR_ID,
@ -422,23 +401,6 @@ static struct platform_device usbnet_device = {
.name = "usbnet",
};
#ifdef CONFIG_USB_ANDROID_MASS_STORAGE
static struct usb_mass_storage_platform_data mass_storage_pdata = {
.nluns = 1,
.vendor = USB_MANUFACTURER_NAME,
.product = USB_PRODUCT_NAME "-MS",
.release = 0x0100,
};
static struct platform_device mass_storage_device = {
.name = "usb_mass_storage",
.id = -1,
.dev = {
.platform_data = &mass_storage_pdata,
},
};
#endif
#ifdef CONFIG_USB_ANDROID_RNDIS
static struct usb_ether_platform_data rndis_pdata = {
/* ethaddr is filled by board_serialno_setup */
@ -906,10 +868,6 @@ static void stingray_usb_init(void)
platform_device_register(&tegra_ehci3_device);
#ifdef CONFIG_USB_ANDROID_MASS_STORAGE
platform_device_register(&mass_storage_device);
#endif
#ifdef CONFIG_USB_ANDROID_RNDIS
src = usb_serial_num;