diff options
| author | Krishna Yarlagadda <kyarlagadda@nvidia.com> | 2011-09-06 14:33:26 +0530 |
|---|---|---|
| committer | Dan Willemsen <dwillemsen@nvidia.com> | 2011-11-30 21:50:00 -0800 |
| commit | 1e846bc4f1df4103b10cc915da89398b70c8caa6 (patch) | |
| tree | 1c21893525efb384de9607a2ad87defdf40c1403 | |
| parent | 822011d5c3d2cad33b3e650df82c38defa14d49c (diff) | |
ARM: Tegra: Avoid regulator info in pdata
USB charger regulator info is sent through platform data
Regulator power rails do not change and hence need to be
constant and should be defined in driver file directly.
Bug 869211
Change-Id: Icf5a10968ac4207a1f9b846b714b765f78d807ac
Reviewed-on: http://git-master/r/50805
Reviewed-on: http://git-master/r/62018
Reviewed-by: Krishna Yarlagadda <kyarlagadda@nvidia.com>
Tested-by: Krishna Yarlagadda <kyarlagadda@nvidia.com>
Reviewed-by: Venkat Moganty <vmoganty@nvidia.com>
Rebase-Id: R102ae1f4baab37e0fe3c648a2b1fde02f34d4e45
| -rw-r--r-- | arch/arm/mach-tegra/board-enterprise.c | 1 | ||||
| -rw-r--r-- | drivers/usb/gadget/fsl_udc_core.c | 15 | ||||
| -rw-r--r-- | include/linux/fsl_devices.h | 1 |
3 files changed, 6 insertions, 11 deletions
diff --git a/arch/arm/mach-tegra/board-enterprise.c b/arch/arm/mach-tegra/board-enterprise.c index b8cad28833bb..3d349620bd2b 100644 --- a/arch/arm/mach-tegra/board-enterprise.c +++ b/arch/arm/mach-tegra/board-enterprise.c @@ -665,7 +665,6 @@ static void enterprise_usb_init(void) platform_device_register(&tegra_otg_device); udc_pdata = tegra_udc_device.dev.platform_data; - udc_pdata->charge_regulator ="usb_bat_chg"; } static void enterprise_gps_init(void) diff --git a/drivers/usb/gadget/fsl_udc_core.c b/drivers/usb/gadget/fsl_udc_core.c index 59de4264c9a2..f7abe13d3e73 100644 --- a/drivers/usb/gadget/fsl_udc_core.c +++ b/drivers/usb/gadget/fsl_udc_core.c @@ -3034,15 +3034,12 @@ static int __init fsl_udc_probe(struct platform_device *pdev) INIT_WORK(&udc_controller->charger_work, fsl_udc_set_current_limit_work); /* Get the regulator for drawing the vbus current in udc driver */ - if (pdata->charge_regulator) { - udc_controller->vbus_regulator = regulator_get(NULL, - pdata->charge_regulator); - if (IS_ERR(udc_controller->vbus_regulator)) { - dev_err(&pdev->dev, - "can't get charge regulator,err:%ld\n", - PTR_ERR(udc_controller->vbus_regulator)); - udc_controller->vbus_regulator = NULL; - } + udc_controller->vbus_regulator = regulator_get(NULL, "usb_bat_chg"); + if (IS_ERR(udc_controller->vbus_regulator)) { + dev_err(&pdev->dev, + "can't get charge regulator,err:%ld\n", + PTR_ERR(udc_controller->vbus_regulator)); + udc_controller->vbus_regulator = NULL; } #ifdef CONFIG_USB_OTG_UTILS diff --git a/include/linux/fsl_devices.h b/include/linux/fsl_devices.h index b54bd37ec09b..1962102d132e 100644 --- a/include/linux/fsl_devices.h +++ b/include/linux/fsl_devices.h @@ -104,7 +104,6 @@ struct fsl_usb2_platform_data { void *phy_config; enum fsl_usb2_phy_types usb_phy_type; - const char *charge_regulator; }; /* Flags in fsl_usb2_mph_platform_data */ |