Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 364751
b: refs/heads/master
c: 73f226c
h: refs/heads/master
i:
  364749: 9c0f770
  364747: a268dab
  364743: c74381d
  364735: 8697e02
v: v3
  • Loading branch information
Fabio Baltieri authored and Felipe Balbi committed Mar 18, 2013
1 parent fe72770 commit 82f39a1
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 129 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 0135522c48982cf1d456d863272e911fdf8a17da
refs/heads/master: 73f226cbd79adb5f3f25ee14c18900bb4a9acd15
139 changes: 11 additions & 128 deletions trunk/drivers/usb/phy/phy-ab8500-usb.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,10 +42,8 @@
#define AB8500_BIT_WD_CTRL_ENABLE (1 << 0)
#define AB8500_BIT_WD_CTRL_KICK (1 << 1)

#define AB8500_V1x_LINK_STAT_WAIT (HZ/10)
#define AB8500_WD_KICK_DELAY_US 100 /* usec */
#define AB8500_WD_V11_DISABLE_DELAY_US 100 /* usec */
#define AB8500_WD_V10_DISABLE_DELAY_MS 100 /* ms */

/* Usb line status register */
enum ab8500_usb_link_status {
Expand All @@ -70,16 +68,12 @@ enum ab8500_usb_link_status {
struct ab8500_usb {
struct usb_phy phy;
struct device *dev;
int irq_num_id_rise;
int irq_num_id_fall;
int irq_num_vbus_rise;
int irq_num_vbus_fall;
struct ab8500 *ab8500;
int irq_num_link_status;
unsigned vbus_draw;
struct delayed_work dwork;
struct work_struct phy_dis_work;
unsigned long link_status_wait;
int rev;
};

static inline struct ab8500_usb *phy_to_ab(struct usb_phy *x)
Expand All @@ -102,10 +96,7 @@ static void ab8500_usb_wd_workaround(struct ab8500_usb *ab)
(AB8500_BIT_WD_CTRL_ENABLE
| AB8500_BIT_WD_CTRL_KICK));

if (ab->rev > 0x10) /* v1.1 v2.0 */
udelay(AB8500_WD_V11_DISABLE_DELAY_US);
else /* v1.0 */
msleep(AB8500_WD_V10_DISABLE_DELAY_MS);
udelay(AB8500_WD_V11_DISABLE_DELAY_US);

abx500_set_register_interruptible(ab->dev,
AB8500_SYS_CTRL2_BLOCK,
Expand Down Expand Up @@ -225,29 +216,6 @@ static void ab8500_usb_delayed_work(struct work_struct *work)
ab8500_usb_link_status_update(ab);
}

static irqreturn_t ab8500_usb_v1x_common_irq(int irq, void *data)
{
struct ab8500_usb *ab = (struct ab8500_usb *) data;

/* Wait for link status to become stable. */
schedule_delayed_work(&ab->dwork, ab->link_status_wait);

return IRQ_HANDLED;
}

static irqreturn_t ab8500_usb_v1x_vbus_fall_irq(int irq, void *data)
{
struct ab8500_usb *ab = (struct ab8500_usb *) data;

/* Link status will not be updated till phy is disabled. */
ab8500_usb_peri_phy_dis(ab);

/* Wait for link status to become stable. */
schedule_delayed_work(&ab->dwork, ab->link_status_wait);

return IRQ_HANDLED;
}

static irqreturn_t ab8500_usb_v20_irq(int irq, void *data)
{
struct ab8500_usb *ab = (struct ab8500_usb *) data;
Expand Down Expand Up @@ -361,86 +329,7 @@ static int ab8500_usb_set_host(struct usb_otg *otg, struct usb_bus *host)

static void ab8500_usb_irq_free(struct ab8500_usb *ab)
{
if (ab->rev < 0x20) {
free_irq(ab->irq_num_id_rise, ab);
free_irq(ab->irq_num_id_fall, ab);
free_irq(ab->irq_num_vbus_rise, ab);
free_irq(ab->irq_num_vbus_fall, ab);
} else {
free_irq(ab->irq_num_link_status, ab);
}
}

static int ab8500_usb_v1x_res_setup(struct platform_device *pdev,
struct ab8500_usb *ab)
{
int err;

ab->irq_num_id_rise = platform_get_irq_byname(pdev, "ID_WAKEUP_R");
if (ab->irq_num_id_rise < 0) {
dev_err(&pdev->dev, "ID rise irq not found\n");
return ab->irq_num_id_rise;
}
err = request_threaded_irq(ab->irq_num_id_rise, NULL,
ab8500_usb_v1x_common_irq,
IRQF_NO_SUSPEND | IRQF_SHARED,
"usb-id-rise", ab);
if (err < 0) {
dev_err(ab->dev, "request_irq failed for ID rise irq\n");
goto fail0;
}

ab->irq_num_id_fall = platform_get_irq_byname(pdev, "ID_WAKEUP_F");
if (ab->irq_num_id_fall < 0) {
dev_err(&pdev->dev, "ID fall irq not found\n");
return ab->irq_num_id_fall;
}
err = request_threaded_irq(ab->irq_num_id_fall, NULL,
ab8500_usb_v1x_common_irq,
IRQF_NO_SUSPEND | IRQF_SHARED,
"usb-id-fall", ab);
if (err < 0) {
dev_err(ab->dev, "request_irq failed for ID fall irq\n");
goto fail1;
}

ab->irq_num_vbus_rise = platform_get_irq_byname(pdev, "VBUS_DET_R");
if (ab->irq_num_vbus_rise < 0) {
dev_err(&pdev->dev, "VBUS rise irq not found\n");
return ab->irq_num_vbus_rise;
}
err = request_threaded_irq(ab->irq_num_vbus_rise, NULL,
ab8500_usb_v1x_common_irq,
IRQF_NO_SUSPEND | IRQF_SHARED,
"usb-vbus-rise", ab);
if (err < 0) {
dev_err(ab->dev, "request_irq failed for Vbus rise irq\n");
goto fail2;
}

ab->irq_num_vbus_fall = platform_get_irq_byname(pdev, "VBUS_DET_F");
if (ab->irq_num_vbus_fall < 0) {
dev_err(&pdev->dev, "VBUS fall irq not found\n");
return ab->irq_num_vbus_fall;
}
err = request_threaded_irq(ab->irq_num_vbus_fall, NULL,
ab8500_usb_v1x_vbus_fall_irq,
IRQF_NO_SUSPEND | IRQF_SHARED,
"usb-vbus-fall", ab);
if (err < 0) {
dev_err(ab->dev, "request_irq failed for Vbus fall irq\n");
goto fail3;
}

return 0;
fail3:
free_irq(ab->irq_num_vbus_rise, ab);
fail2:
free_irq(ab->irq_num_id_fall, ab);
fail1:
free_irq(ab->irq_num_id_rise, ab);
fail0:
return err;
free_irq(ab->irq_num_link_status, ab);
}

static int ab8500_usb_v2_res_setup(struct platform_device *pdev,
Expand Down Expand Up @@ -471,16 +360,16 @@ static int ab8500_usb_v2_res_setup(struct platform_device *pdev,
static int ab8500_usb_probe(struct platform_device *pdev)
{
struct ab8500_usb *ab;
struct ab8500 *ab8500;
struct usb_otg *otg;
int err;
int rev;

ab8500 = dev_get_drvdata(pdev->dev.parent);
rev = abx500_get_chip_id(&pdev->dev);
if (rev < 0) {
dev_err(&pdev->dev, "Chip id read failed\n");
return rev;
} else if (rev < 0x10) {
dev_err(&pdev->dev, "Unsupported AB8500 chip\n");

if (is_ab8500_1p1_or_earlier(ab8500)) {
dev_err(&pdev->dev, "Unsupported AB8500 chip rev=%d\n", rev);
return -ENODEV;
}

Expand All @@ -495,7 +384,7 @@ static int ab8500_usb_probe(struct platform_device *pdev)
}

ab->dev = &pdev->dev;
ab->rev = rev;
ab->ab8500 = ab8500;
ab->phy.dev = ab->dev;
ab->phy.otg = otg;
ab->phy.label = "ab8500";
Expand All @@ -519,13 +408,7 @@ static int ab8500_usb_probe(struct platform_device *pdev)
/* all: Disable phy when called from set_host and set_peripheral */
INIT_WORK(&ab->phy_dis_work, ab8500_usb_phy_disable_work);

if (ab->rev < 0x20) {
err = ab8500_usb_v1x_res_setup(pdev, ab);
ab->link_status_wait = AB8500_V1x_LINK_STAT_WAIT;
} else {
err = ab8500_usb_v2_res_setup(pdev, ab);
}

err = ab8500_usb_v2_res_setup(pdev, ab);
if (err < 0)
goto fail0;

Expand All @@ -535,7 +418,7 @@ static int ab8500_usb_probe(struct platform_device *pdev)
goto fail1;
}

dev_info(&pdev->dev, "AB8500 usb driver initialized\n");
dev_info(&pdev->dev, "revision 0x%2x driver initialized\n", rev);

return 0;
fail1:
Expand Down

0 comments on commit 82f39a1

Please sign in to comment.