summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorRakesh Bodla <rbodla@nvidia.com>2011-08-17 17:27:14 +0530
committerVarun Colbert <vcolbert@nvidia.com>2011-08-19 15:41:15 -0700
commitd3ab63bfa450bdd459936eee3fc47c46621bea1c (patch)
treef6e29fd96b74277b86461970d4e64fc0fff6d374 /arch
parentb911a6a6e796318775dbc50a70d8fb5b87a36210 (diff)
arm: tegra: enterprise: add usb charge regulator
Adding the regulator information needed for usb charging. Bug 854993 Change-Id: Ie2a1d1b91e19a37d6fc437fa9ec933172f682259 Reviewed-on: http://git-master/r/47530 Reviewed-by: Varun Colbert <vcolbert@nvidia.com> Tested-by: Varun Colbert <vcolbert@nvidia.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/mach-tegra/board-enterprise.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/arch/arm/mach-tegra/board-enterprise.c b/arch/arm/mach-tegra/board-enterprise.c
index 664c39e746cc..32b20c02c14c 100644
--- a/arch/arm/mach-tegra/board-enterprise.c
+++ b/arch/arm/mach-tegra/board-enterprise.c
@@ -36,6 +36,7 @@
#include <linux/usb/f_accessory.h>
#include <linux/spi/spi.h>
#include <linux/tegra_uart.h>
+#include <linux/fsl_devices.h>
#include <mach/clk.h>
#include <mach/iomap.h>
@@ -830,6 +831,7 @@ static void enterprise_usb_init(void)
char *src = usb_serial_num;
int i;
#endif
+ struct fsl_usb2_platform_data *udc_pdata;
tegra_usb_phy_init(tegra_usb_phy_pdata, ARRAY_SIZE(tegra_usb_phy_pdata));
@@ -839,6 +841,9 @@ static void enterprise_usb_init(void)
tegra_ehci3_device.dev.platform_data = &tegra_ehci_pdata[2];
platform_device_register(&tegra_ehci3_device);
+ udc_pdata = tegra_udc_device.dev.platform_data;
+ udc_pdata->charge_regulator ="usb_bat_chg";
+
#ifdef CONFIG_USB_ANDROID_RNDIS
/* create a fake MAC address from our serial number.
* first byte is 0x02 to signify locally administered.
@@ -881,6 +886,7 @@ static void __init tegra_enterprise_init(void)
enterprise_pinmux_init();
enterprise_i2c_init();
enterprise_uart_init();
+ enterprise_usb_init();
snprintf(serial, sizeof(serial), "%llx", tegra_chip_uid());
andusb_plat.serial_number = kstrdup(serial, GFP_KERNEL);
platform_add_devices(enterprise_devices, ARRAY_SIZE(enterprise_devices));
@@ -888,7 +894,6 @@ static void __init tegra_enterprise_init(void)
enterprise_audio_init();
enterprise_sdhci_init();
touch_init();
- enterprise_usb_init();
#ifdef CONFIG_TEGRA_EDP_LIMITS
enterprise_edp_init();
#endif