From b714612f0d7cd3f734b1b96482e850c1d6758396 Mon Sep 17 00:00:00 2001 From: Deepesh Gujarathi Date: Wed, 1 Jun 2011 19:49:23 +0530 Subject: tegra: cardhu: add support for usb tethering -add rndis functionality needed for usb tethering fix for bug 829597 original work http://git-master/r/#change,16376 Change-Id: I98ce669f4bd2666ac4f6042cd1c6d11fb1a2cf41 Reviewed-on: http://git-master/r/34715 Reviewed-by: Niket Sirsi Tested-by: Niket Sirsi --- arch/arm/mach-tegra/board-cardhu.c | 100 ++++++++++++++++++++++++++++++------- 1 file changed, 82 insertions(+), 18 deletions(-) (limited to 'arch/arm/mach-tegra/board-cardhu.c') diff --git a/arch/arm/mach-tegra/board-cardhu.c b/arch/arm/mach-tegra/board-cardhu.c index 1f12914a75b2..53fac2a7b89d 100644 --- a/arch/arm/mach-tegra/board-cardhu.c +++ b/arch/arm/mach-tegra/board-cardhu.c @@ -228,33 +228,64 @@ static __initdata struct tegra_clk_init_table cardhu_clk_init_table[] = { { NULL, NULL, 0, 0}, }; -static char *usb_functions[] = { "mtp", "usb_mass_storage" }; -static char *usb_functions_adb[] = { "mtp", "adb", "usb_mass_storage" }; +#define USB_MANUFACTURER_NAME "NVIDIA" +#define USB_PRODUCT_NAME "Cardhu" +#define USB_PRODUCT_ID_MTP_ADB 0x7100 +#define USB_PRODUCT_ID_MTP 0x7102 +#define USB_PRODUCT_ID_RNDIS 0x7103 +#define USB_VENDOR_ID 0x0955 + +static char *usb_functions_mtp_ums[] = { "mtp", "usb_mass_storage" }; +static char *usb_functions_mtp_adb_ums[] = { "mtp", "adb", "usb_mass_storage" }; +#ifdef CONFIG_USB_ANDROID_RNDIS +static char *usb_functions_rndis[] = { "rndis" }; +static char *usb_functions_rndis_adb[] = { "rndis", "adb" }; +#endif +static char *usb_functions_all[] = { +#ifdef CONFIG_USB_ANDROID_RNDIS + "rndis", +#endif + "mtp", + "adb", + "usb_mass_storage" +}; static struct android_usb_product usb_products[] = { { - .product_id = 0x7102, - .num_functions = ARRAY_SIZE(usb_functions), - .functions = usb_functions, + .product_id = USB_PRODUCT_ID_MTP, + .num_functions = ARRAY_SIZE(usb_functions_mtp_ums), + .functions = usb_functions_mtp_ums, }, { - .product_id = 0x7100, - .num_functions = ARRAY_SIZE(usb_functions_adb), - .functions = usb_functions_adb, + .product_id = USB_PRODUCT_ID_MTP_ADB, + .num_functions = ARRAY_SIZE(usb_functions_mtp_adb_ums), + .functions = usb_functions_mtp_adb_ums, }, +#ifdef CONFIG_USB_ANDROID_RNDIS + { + .product_id = USB_PRODUCT_ID_RNDIS, + .num_functions = ARRAY_SIZE(usb_functions_rndis), + .functions = usb_functions_rndis, + }, + { + .product_id = USB_PRODUCT_ID_RNDIS, + .num_functions = ARRAY_SIZE(usb_functions_rndis_adb), + .functions = usb_functions_rndis_adb, + }, +#endif }; /* standard android USB platform data */ static struct android_usb_platform_data andusb_plat = { - .vendor_id = 0x0955, - .product_id = 0x7100, - .manufacturer_name = "NVIDIA", - .product_name = "Cardhu", + .vendor_id = USB_VENDOR_ID, + .product_id = USB_PRODUCT_ID_MTP_ADB, + .manufacturer_name = USB_MANUFACTURER_NAME, + .product_name = USB_PRODUCT_NAME, .serial_number = NULL, .num_products = ARRAY_SIZE(usb_products), .products = usb_products, - .num_functions = ARRAY_SIZE(usb_functions_adb), - .functions = usb_functions_adb, + .num_functions = ARRAY_SIZE(usb_functions_all), + .functions = usb_functions_all, }; static struct platform_device androidusb_device = { @@ -265,6 +296,22 @@ static struct platform_device androidusb_device = { }, }; +#ifdef CONFIG_USB_ANDROID_RNDIS +static struct usb_ether_platform_data rndis_pdata = { + .ethaddr = {0, 0, 0, 0, 0, 0}, + .vendorID = USB_VENDOR_ID, + .vendorDescr = USB_MANUFACTURER_NAME, +}; + +static struct platform_device rndis_device = { + .name = "rndis", + .id = -1, + .dev = { + .platform_data = &rndis_pdata, + }, +}; +#endif + static struct wm8903_platform_data wm8903_pdata = { .irq_active_low = 0, .micdet_cfg = 0x83, /* enable mic bias current */ @@ -587,9 +634,14 @@ static struct tegra_otg_platform_data tegra_otg_pdata = { .host_unregister = &tegra_usb_otg_host_unregister, }; +#define SERIAL_NUMBER_LENGTH 20 +static char usb_serial_num[SERIAL_NUMBER_LENGTH]; + static void cardhu_usb_init(void) { struct board_info bi; + char *src = NULL; + int i; tegra_get_board_info(&bi); @@ -608,6 +660,20 @@ static void cardhu_usb_init(void) tegra_ehci3_device.dev.platform_data = &tegra_ehci_pdata[2]; platform_device_register(&tegra_ehci3_device); +#ifdef CONFIG_USB_ANDROID_RNDIS + src = usb_serial_num; + + /* create a fake MAC address from our serial number. + * first byte is 0x02 to signify locally administered. + */ + rndis_pdata.ethaddr[0] = 0x02; + for (i = 0; *src; i++) { + /* XOR the USB serial across the remaining bytes */ + rndis_pdata.ethaddr[i % (ETH_ALEN - 1) + 1] ^= *src++; + } + platform_device_register(&rndis_device); +#endif + } static void cardhu_gps_init(void) @@ -632,8 +698,6 @@ static void cardhu_sata_init(void) { } static void __init tegra_cardhu_init(void) { - char serial[20]; - tegra_common_init(); tegra_clk_init_from_table(cardhu_clk_init_table); cardhu_pinmux_init(); @@ -642,8 +706,8 @@ static void __init tegra_cardhu_init(void) #ifdef CONFIG_TEGRA_EDP_LIMITS cardhu_edp_init(); #endif - snprintf(serial, sizeof(serial), "%llx", tegra_chip_uid()); - andusb_plat.serial_number = kstrdup(serial, GFP_KERNEL); + snprintf(usb_serial_num, sizeof(usb_serial_num), "%llx", tegra_chip_uid()); + andusb_plat.serial_number = kstrdup(usb_serial_num, GFP_KERNEL); platform_add_devices(cardhu_devices, ARRAY_SIZE(cardhu_devices)); cardhu_audio_init(); cardhu_sdhci_init(); -- cgit v1.2.3