diff options
| author | Philippe Langlais <philippe.langlais@stericsson.com> | 2011-10-17 13:02:11 +0200 |
|---|---|---|
| committer | Philippe Langlais <philippe.langlais@stericsson.com> | 2012-05-22 11:03:11 +0200 |
| commit | 6d690675734606ee4d59043c03d438eabc483645 (patch) | |
| tree | 403f5f9a31324c6503eaad3cec7f01575651a4d0 | |
| parent | 7ec1b9fb235618c189fd917a36ba2ceba8091aeb (diff) | |
ARM: ux500: usb: Replace mach prcmu driver with mainlined version
The prcmu driver now exists in drivers/mfd
Signed-off-by: Jonas Aaberg <jonas.aberg@stericsson.com>
Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/32057
| -rw-r--r-- | drivers/usb/otg/ab8500-usb.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/usb/otg/ab8500-usb.c b/drivers/usb/otg/ab8500-usb.c index 9bce140eb8f..14557117580 100644 --- a/drivers/usb/otg/ab8500-usb.c +++ b/drivers/usb/otg/ab8500-usb.c @@ -34,7 +34,7 @@ #include <linux/mfd/abx500.h> #include <linux/mfd/abx500/ab8500.h> #include <linux/regulator/consumer.h> -#include <mach/prcmu.h> +#include <linux/mfd/dbx500-prcmu.h> #include <mach/usb.h> #include <linux/kernel_stat.h> @@ -225,14 +225,12 @@ static void ab8500_usb_phy_enable(struct ab8500_usb *ab, bool sel_host) AB8500_BIT_PHY_CTRL_DEVICE_EN; ab->usb_gpio->enable(); - clk_enable(ab->sysclk); ab8500_usb_regulator_ctrl(ab, sel_host, true); prcmu_qos_update_requirement(PRCMU_QOS_APE_OPP, (char *)dev_name(ab->dev), 100); - if (!sel_host) { schedule_delayed_work_on(0, &ab->work_usb_workaround, @@ -925,7 +923,6 @@ static int __devinit ab8500_usb_probe(struct platform_device *pdev) prcmu_qos_add_requirement(PRCMU_QOS_APE_OPP, (char *)dev_name(ab->dev), 50); - dev_info(&pdev->dev, "revision 0x%2x driver initialized\n", ab->rev); prcmu_qos_add_requirement(PRCMU_QOS_ARM_OPP, "usb", 25); |