Skip to content

Commit

Permalink
usb:hsotg:samsung: Use of regulator_bulk_* functions for USB regulators
Browse files Browse the repository at this point in the history
This commit adds support for supply voltage management for s3c-hsotg IP
block. For that purpose a convenient regulator_bulk_* functions have been
used.

Signed-off-by: Lukasz Majewski <l.majewski@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Cc: Mark Brown <broonie@opensource.wolfsonmicro.com>
Cc: Liam Girdwood <lrg@ti.com>
Signed-off-by: Felipe Balbi <balbi@ti.com>
  • Loading branch information
Lukasz Majewski authored and Felipe Balbi committed May 4, 2012
1 parent 4118878 commit fc9a731
Showing 1 changed file with 39 additions and 2 deletions.
41 changes: 39 additions & 2 deletions drivers/usb/gadget/s3c-hsotg.c
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
#include <linux/io.h>
#include <linux/slab.h>
#include <linux/clk.h>
#include <linux/regulator/consumer.h>

#include <linux/usb/ch9.h>
#include <linux/usb/gadget.h>
Expand All @@ -38,6 +39,11 @@

#define DMA_ADDR_INVALID (~((dma_addr_t)0))

static const char * const s3c_hsotg_supply_names[] = {
"vusb_d", /* digital USB supply, 1.2V */
"vusb_a", /* analog USB supply, 1.1V */
};

/* EP0_MPS_LIMIT
*
* Unfortunately there seems to be a limit of the amount of data that can
Expand Down Expand Up @@ -132,6 +138,7 @@ struct s3c_hsotg_ep {
* @regs: The memory area mapped for accessing registers.
* @regs_res: The resource that was allocated when claiming register space.
* @irq: The IRQ number we are using
* @supplies: Definition of USB power supplies
* @dedicated_fifos: Set if the hardware has dedicated IN-EP fifos.
* @debug_root: root directrory for debugfs.
* @debug_file: main status file for debugfs.
Expand All @@ -152,6 +159,8 @@ struct s3c_hsotg {
int irq;
struct clk *clk;

struct regulator_bulk_data supplies[ARRAY_SIZE(s3c_hsotg_supply_names)];

unsigned int dedicated_fifos:1;

struct dentry *debug_root;
Expand Down Expand Up @@ -3256,6 +3265,7 @@ static int __devinit s3c_hsotg_probe(struct platform_device *pdev)
struct resource *res;
int epnum;
int ret;
int i;

plat = pdev->dev.platform_data;
if (!plat) {
Expand Down Expand Up @@ -3350,6 +3360,26 @@ static int __devinit s3c_hsotg_probe(struct platform_device *pdev)

clk_enable(hsotg->clk);

/* regulators */

for (i = 0; i < ARRAY_SIZE(hsotg->supplies); i++)
hsotg->supplies[i].supply = s3c_hsotg_supply_names[i];

ret = regulator_bulk_get(dev, ARRAY_SIZE(hsotg->supplies),
hsotg->supplies);
if (ret) {
dev_err(dev, "failed to request supplies: %d\n", ret);
goto err_supplies;
}

ret = regulator_bulk_enable(ARRAY_SIZE(hsotg->supplies),
hsotg->supplies);

if (ret) {
dev_err(hsotg->dev, "failed to enable supplies: %d\n", ret);
goto err_supplies;
}

/* usb phy enable */
s3c_hsotg_phy_enable(hsotg);

Expand All @@ -3362,7 +3392,7 @@ static int __devinit s3c_hsotg_probe(struct platform_device *pdev)

ret = usb_add_gadget_udc(&pdev->dev, &hsotg->gadget);
if (ret)
goto err_add_udc;
goto err_supplies;

s3c_hsotg_create_debug(hsotg);

Expand All @@ -3371,9 +3401,12 @@ static int __devinit s3c_hsotg_probe(struct platform_device *pdev)
our_hsotg = hsotg;
return 0;

err_add_udc:
err_supplies:
s3c_hsotg_phy_disable(hsotg);

regulator_bulk_disable(ARRAY_SIZE(hsotg->supplies), hsotg->supplies);
regulator_bulk_free(ARRAY_SIZE(hsotg->supplies), hsotg->supplies);

clk_disable(hsotg->clk);
clk_put(hsotg->clk);

Expand Down Expand Up @@ -3408,6 +3441,10 @@ static int __devexit s3c_hsotg_remove(struct platform_device *pdev)

s3c_hsotg_phy_disable(hsotg);


regulator_bulk_disable(ARRAY_SIZE(hsotg->supplies), hsotg->supplies);
regulator_bulk_free(ARRAY_SIZE(hsotg->supplies), hsotg->supplies);

clk_disable(hsotg->clk);
clk_put(hsotg->clk);

Expand Down

0 comments on commit fc9a731

Please sign in to comment.