* twl4030_usb - TWL4030 USB transceiver, talking to OMAP OTG controller
*
* Copyright (C) 2004-2007 Texas Instruments
+ * Copyright (C) 2008 Nokia Corporation
+ * Contact: Felipe Balbi <felipe.balbi@nokia.com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* - 3-pin mode support may be added in future.
*/
-
#include <linux/module.h>
#include <linux/init.h>
#include <linux/time.h>
#include <linux/interrupt.h>
+#include <linux/platform_device.h>
+#include <linux/spinlock.h>
+#include <linux/workqueue.h>
+#include <linux/io.h>
#include <linux/usb.h>
#include <linux/usb/ch9.h>
#include <linux/usb/gadget.h>
#include <linux/usb/otg.h>
#include <linux/i2c/twl4030.h>
-#include <asm/arch/usb.h>
+#include <mach/usb.h>
/* Register defines */
#define IFC_CTRL_CARKITMODE (1 << 2)
#define IFC_CTRL_FSLSSERIALMODE_3PIN (1 << 1)
-#define OTG_CTRL 0x0A
-#define OTG_CTRL_SET 0x0B
-#define OTG_CTRL_CLR 0x0C
-#define OTG_CTRL_DRVVBUS (1 << 5)
-#define OTG_CTRL_CHRGVBUS (1 << 4)
-#define OTG_CTRL_DISCHRGVBUS (1 << 3)
-#define OTG_CTRL_DMPULLDOWN (1 << 2)
-#define OTG_CTRL_DPPULLDOWN (1 << 1)
-#define OTG_CTRL_IDPULLUP (1 << 0)
+#define TWL4030_OTG_CTRL 0x0A
+#define TWL4030_OTG_CTRL_SET 0x0B
+#define TWL4030_OTG_CTRL_CLR 0x0C
+#define TWL4030_OTG_CTRL_DRVVBUS (1 << 5)
+#define TWL4030_OTG_CTRL_CHRGVBUS (1 << 4)
+#define TWL4030_OTG_CTRL_DISCHRGVBUS (1 << 3)
+#define TWL4030_OTG_CTRL_DMPULLDOWN (1 << 2)
+#define TWL4030_OTG_CTRL_DPPULLDOWN (1 << 1)
+#define TWL4030_OTG_CTRL_IDPULLUP (1 << 0)
#define USB_INT_EN_RISE 0x0D
#define USB_INT_EN_RISE_SET 0x0E
#define VUSB3V1_TYPE 0x78
#define VUSB3V1_REMAP 0x79
-#define ID_STATUS 0x96
-#define ID_RES_FLOAT (1 << 4) /* mini-B */
-#define ID_RES_440K (1 << 3) /* type 2 charger */
-#define ID_RES_200K (1 << 2) /* 5-wire carkit or
- type 1 charger */
-#define ID_RES_102K (1 << 1) /* phone */
-#define ID_RES_GND (1 << 0) /* mini-A */
-
/* In module TWL4030_MODULE_INTBR */
#define PMBR1 0x0D
#define GPIO_USB_4PIN_ULPI_2430C (3 << 0)
/* In module TWL4030_MODULE_INT */
-#define REG_PWR_ISR1 0x00
-#define REG_PWR_IMR1 0x01
-#define USB_PRES (1 << 2)
#define REG_PWR_EDR1 0x05
#define USB_PRES_FALLING (1 << 4)
#define USB_PRES_RISING (1 << 5)
-#define REG_PWR_SIH_CTRL 0x07
-#define COR (1 << 2)
-
-/* internal define on top of container_of */
-#define xceiv_to_twl(x) container_of((x), struct twl4030_usb, otg);
-
-/* bits in OTG_CTRL_REG */
+/* bits in OTG_CTRL */
#define OTG_XCEIV_OUTPUTS \
(OTG_ASESSVLD|OTG_BSESSEND|OTG_BSESSVLD|OTG_VBUSVLD|OTG_ID)
#define OTG_XCEIV_INPUTS \
OTG_CTRL_BITS)
-/*-------------------------------------------------------------------------*/
-
struct twl4030_usb {
+ struct work_struct irq_work;
struct otg_transceiver otg;
+ struct device *dev;
+
+ /* for vbus reporting with irqs disabled */
+ spinlock_t lock;
+
+ /* pin configuration */
+ enum twl4030_usb_mode usb_mode;
+
+ unsigned vbus:1;
int irq;
- u8 usb_mode; /* pin configuration */
-#define T2_USB_MODE_ULPI 1
-/* #define T2_USB_MODE_CEA2011_3PIN 2 */
u8 asleep;
+ bool irq_enabled;
};
-static struct twl4030_usb *the_transceiver;
+/* internal define on top of container_of */
+#define xceiv_to_twl(x) container_of((x), struct twl4030_usb, otg);
/*-------------------------------------------------------------------------*/
-static int twl4030_i2c_write_u8_verify(u8 module, u8 data, u8 address)
+static int twl4030_i2c_write_u8_verify(struct twl4030_usb *twl,
+ u8 module, u8 data, u8 address)
{
u8 check;
(check == data))
return 0;
/* Failed again: Return error */
+
return -EBUSY;
}
-#define twl4030_usb_write_verify(address, data) \
- twl4030_i2c_write_u8_verify(TWL4030_MODULE_USB, (data), (address))
+#define twl4030_usb_write_verify(twl, address, data) \
+ twl4030_i2c_write_u8_verify(twl, TWL4030_MODULE_USB, (data), (address))
-static inline int twl4030_usb_write(u8 address, u8 data)
+static inline int twl4030_usb_write(struct twl4030_usb *twl,
+ u8 address, u8 data)
{
int ret = 0;
+
ret = twl4030_i2c_write_u8(TWL4030_MODULE_USB, data, address);
if (ret >= 0) {
#if 0 /* debug */
u8 data1;
if (twl4030_i2c_read_u8(TWL4030_MODULE_USB, &data1,
address) < 0)
- printk(KERN_ERR "re-read failed\n");
+ dev_err(twl->dev, "re-read failed\n");
else
- printk(KERN_INFO
+ dev_dbg(twl->dev,
"Write %s wrote %x read %x from reg %x\n",
(data1 == data) ? "succeed" : "mismatch",
data, data1, address);
#endif
} else {
- printk(KERN_WARNING
+ dev_warn(twl->dev,
"TWL4030:USB:Write[0x%x] Error %d\n", address, ret);
}
+
return ret;
}
-static inline int twl4030_usb_read(u8 address)
+static inline int twl4030_usb_read(struct twl4030_usb *twl, u8 address)
{
u8 data;
int ret = 0;
+
ret = twl4030_i2c_read_u8(TWL4030_MODULE_USB, &data, address);
- if (ret >= 0) {
+ if (ret >= 0)
ret = data;
- } else {
- printk(KERN_WARNING
+ else
+ dev_warn(twl->dev,
"TWL4030:USB:Read[0x%x] Error %d\n", address, ret);
- }
+
return ret;
}
static inline int
twl4030_usb_set_bits(struct twl4030_usb *twl, u8 reg, u8 bits)
{
- return twl4030_usb_write(reg + 1, bits);
+ return twl4030_usb_write(twl, reg + 1, bits);
}
static inline int
twl4030_usb_clear_bits(struct twl4030_usb *twl, u8 reg, u8 bits)
{
- return twl4030_usb_write(reg + 2, bits);
-
+ return twl4030_usb_write(twl, reg + 2, bits);
}
/*-------------------------------------------------------------------------*/
};
}
-#ifdef CONFIG_TWL4030_USB_HS_ULPI
-static void hs_usb_init(struct twl4030_usb *twl)
-{
- twl->usb_mode = T2_USB_MODE_ULPI;
- return;
-}
-
-#endif
-
-static void twl4030_i2c_access(int on)
+static void twl4030_i2c_access(struct twl4030_usb *twl, int on)
{
unsigned long timeout;
- int val = twl4030_usb_read(PHY_CLK_CTRL);
+ int val = twl4030_usb_read(twl, PHY_CLK_CTRL);
if (val >= 0) {
if (on) {
/* enable DPLL to access PHY registers over I2C */
val |= REQ_PHY_DPLL_CLK;
- if (twl4030_usb_write_verify(PHY_CLK_CTRL,
- (u8)val) < 0) {
- printk(KERN_ERR "twl4030_usb: i2c write failed,"
- " line %d\n", __LINE__);
- return;
- }
+ WARN_ON(twl4030_usb_write_verify(twl, PHY_CLK_CTRL,
+ (u8)val) < 0);
timeout = jiffies + HZ;
- while (!(twl4030_usb_read(PHY_CLK_CTRL_STS) &
+ while (!(twl4030_usb_read(twl, PHY_CLK_CTRL_STS) &
PHY_DPLL_CLK)
&& time_before(jiffies, timeout))
udelay(10);
- if (!(twl4030_usb_read(PHY_CLK_CTRL_STS) &
+ if (!(twl4030_usb_read(twl, PHY_CLK_CTRL_STS) &
PHY_DPLL_CLK))
- printk(KERN_ERR "Timeout setting T2 HSUSB "
+ dev_err(twl->dev, "Timeout setting T2 HSUSB "
"PHY DPLL clock\n");
} else {
/* let ULPI control the DPLL clock */
val &= ~REQ_PHY_DPLL_CLK;
- if (twl4030_usb_write_verify(PHY_CLK_CTRL,
- (u8)val) < 0) {
- printk(KERN_ERR "twl4030_usb: i2c write failed,"
- " line %d\n", __LINE__);
- }
+ WARN_ON(twl4030_usb_write_verify(twl, PHY_CLK_CTRL,
+ (u8)val) < 0);
}
}
- return;
}
-static void usb_irq_enable(int rising, int falling)
+static void usb_irq_enable(struct twl4030_usb *twl, int rising, int falling)
{
u8 val;
+ /* FIXME use set_irq_type(...) when that (soon) works */
+
/* edge setup */
- if (twl4030_i2c_read_u8(TWL4030_MODULE_INT, &val, REG_PWR_EDR1) < 0) {
- printk(KERN_ERR "twl4030_usb: i2c read failed,"
- " line %d\n", __LINE__);
- return;
- }
+ WARN_ON(twl4030_i2c_read_u8(TWL4030_MODULE_INT,
+ &val, REG_PWR_EDR1) < 0);
+
val &= ~(USB_PRES_RISING | USB_PRES_FALLING);
if (rising)
val = val | USB_PRES_RISING;
if (falling)
val = val | USB_PRES_FALLING;
- if (twl4030_i2c_write_u8_verify(TWL4030_MODULE_INT, val,
- REG_PWR_EDR1) < 0) {
- printk(KERN_ERR "twl4030_usb: i2c write failed,"
- " line %d\n", __LINE__);
- return;
- }
+ WARN_ON(twl4030_i2c_write_u8_verify(twl, TWL4030_MODULE_INT,
+ val, REG_PWR_EDR1) < 0);
- /* un-mask interrupt */
- if (twl4030_i2c_read_u8(TWL4030_MODULE_INT, &val, REG_PWR_IMR1) < 0) {
- printk(KERN_ERR "twl4030_usb: i2c read failed,"
- " line %d\n", __LINE__);
- return;
+ if (!twl->irq_enabled) {
+ enable_irq(twl->irq);
+ twl->irq_enabled = true;
}
- val &= ~USB_PRES;
- if (twl4030_i2c_write_u8_verify(TWL4030_MODULE_INT, val,
- REG_PWR_IMR1) < 0)
- printk(KERN_ERR "twl4030_usb: i2c write failed,"
- " line %d\n", __LINE__);
-
- return;
}
-static void usb_irq_disable(void)
+static void usb_irq_disable(struct twl4030_usb *twl)
{
- u8 val;
-
- /* undo edge setup */
- if (twl4030_i2c_read_u8(TWL4030_MODULE_INT, &val, REG_PWR_EDR1) < 0) {
- printk(KERN_ERR "twl4030_usb: i2c read failed,"
- " line %d\n", __LINE__);
- return;
- }
- val &= ~(USB_PRES_RISING | USB_PRES_FALLING);
- if (twl4030_i2c_write_u8_verify(TWL4030_MODULE_INT, val,
- REG_PWR_EDR1) < 0) {
- printk(KERN_ERR "twl4030_usb: i2c write failed,"
- " line %d\n", __LINE__);
- return;
- }
-
- /* mask interrupt */
- if (twl4030_i2c_read_u8(TWL4030_MODULE_INT, &val, REG_PWR_IMR1) < 0) {
- printk(KERN_ERR "twl4030_usb: i2c read failed,"
- " line %d\n", __LINE__);
- return;
+ if (twl->irq_enabled) {
+ disable_irq(twl->irq);
+ twl->irq_enabled = false;
}
- val |= USB_PRES;
- if (twl4030_i2c_write_u8_verify(TWL4030_MODULE_INT, val,
- REG_PWR_IMR1) < 0)
- printk(KERN_ERR "twl4030_usb: i2c write failed,"
- " line %d\n", __LINE__);
-
- return;
}
static void twl4030_phy_power(struct twl4030_usb *twl, int on)
{
u8 pwr;
- pwr = twl4030_usb_read(PHY_PWR_CTRL);
+ pwr = twl4030_usb_read(twl, PHY_PWR_CTRL);
if (on) {
pwr &= ~PHY_PWR_PHYPWD;
- if (twl4030_usb_write_verify(PHY_PWR_CTRL, pwr) < 0) {
- printk(KERN_ERR "twl4030_usb: i2c write failed,"
- " line %d\n", __LINE__);
- return;
- }
- twl4030_usb_write(PHY_CLK_CTRL,
- twl4030_usb_read(PHY_CLK_CTRL) |
+ WARN_ON(twl4030_usb_write_verify(twl, PHY_PWR_CTRL, pwr) < 0);
+ twl4030_usb_write(twl, PHY_CLK_CTRL,
+ twl4030_usb_read(twl, PHY_CLK_CTRL) |
(PHY_CLK_CTRL_CLOCKGATING_EN |
PHY_CLK_CTRL_CLK32K_EN));
} else {
pwr |= PHY_PWR_PHYPWD;
- if (twl4030_usb_write_verify(PHY_PWR_CTRL, pwr) < 0) {
- printk(KERN_ERR "twl4030_usb: i2c write failed,"
- " line %d\n", __LINE__);
- }
+ WARN_ON(twl4030_usb_write_verify(twl, PHY_PWR_CTRL, pwr) < 0);
}
- return;
}
-static void twl4030_phy_suspend(int controller_off)
+static void twl4030_phy_suspend(struct twl4030_usb *twl, int controller_off)
{
- struct twl4030_usb *twl = the_transceiver;
-
if (controller_off)
- usb_irq_disable();
+ usb_irq_disable(twl);
if (twl->asleep)
return;
if (!controller_off)
/* enable rising edge interrupt to detect cable attach */
- usb_irq_enable(1, 0);
+ usb_irq_enable(twl, 1, 0);
twl4030_phy_power(twl, 0);
twl->asleep = 1;
- return;
}
-static void twl4030_phy_resume(void)
+static void twl4030_phy_resume(struct twl4030_usb *twl)
{
- struct twl4030_usb *twl = the_transceiver;
-
if (!twl->asleep)
return;
/* enable falling edge interrupt to detect cable detach */
- usb_irq_enable(0, 1);
+ usb_irq_enable(twl, 0, 1);
twl4030_phy_power(twl, 1);
- twl4030_i2c_access(1);
+ twl4030_i2c_access(twl, 1);
twl4030_usb_set_mode(twl, twl->usb_mode);
if (twl->usb_mode == T2_USB_MODE_ULPI)
- twl4030_i2c_access(0);
+ twl4030_i2c_access(twl, 0);
twl->asleep = 0;
- return;
}
static void twl4030_usb_ldo_init(struct twl4030_usb *twl)
twl4030_i2c_write_u8(TWL4030_MODULE_PM_RECEIVER, 0, VUSB1V8_TYPE);
/* disable access to power configuration registers */
- twl4030_i2c_write_u8(TWL4030_MODULE_PM_RECEIVER, 0, PROTECT_KEY);
+ twl4030_i2c_write_u8(TWL4030_MODULE_PM_MASTER, 0, PROTECT_KEY);
+}
+
+static ssize_t twl4030_usb_vbus_show(struct device *dev,
+ struct device_attribute *attr, char *buf)
+{
+ struct twl4030_usb *twl = dev_get_drvdata(dev);
+ unsigned long flags;
+ int ret = -EINVAL;
+
+ spin_lock_irqsave(&twl->lock, flags);
+ ret = sprintf(buf, "%s\n", twl->vbus ? "on" : "off");
+ spin_unlock_irqrestore(&twl->lock, flags);
+
+ return ret;
+}
+static DEVICE_ATTR(vbus, 0444, twl4030_usb_vbus_show, NULL);
+
+static void twl4030_usb_irq_work(struct work_struct *work)
+{
+ struct twl4030_usb *twl = container_of(work,
+ struct twl4030_usb, irq_work);
+
+ sysfs_notify(&twl->dev->kobj, NULL, "vbus");
}
static irqreturn_t twl4030_usb_irq(int irq, void *_twl)
{
- int ret = IRQ_NONE;
+ struct twl4030_usb *twl = _twl;
u8 val;
- /* action based on cable attach or detach */
- if (twl4030_i2c_read_u8(TWL4030_MODULE_INT, &val, REG_PWR_EDR1) < 0) {
- printk(KERN_ERR "twl4030_usb: i2c read failed,"
- " line %d\n", __LINE__);
- goto done;
- }
+#ifdef CONFIG_LOCKDEP
+ /* WORKAROUND for lockdep forcing IRQF_DISABLED on us, which
+ * we don't want and can't tolerate. Although it might be
+ * friendlier not to borrow this thread context...
+ */
+ local_irq_enable();
+#endif
- if (val & USB_PRES_RISING)
- twl4030_phy_resume();
- else
- twl4030_phy_suspend(0);
+ /* FIXME stop accessing PWR_EDR1 ... if nothing else, we
+ * know which edges we told the IRQ to trigger on. And
+ * there seem to be OTG_specific registers and irqs that
+ * provide the right info without guessing like this:
+ * USB_INT_STS, ID_STATUS, STS_HW_CONDITIONS, etc.
+ */
- ret = IRQ_HANDLED;
+ /* action based on cable attach or detach */
+ WARN_ON(twl4030_i2c_read_u8(TWL4030_MODULE_INT,
+ &val, REG_PWR_EDR1) < 0);
-done:
- return ret;
+ if (val & USB_PRES_RISING) {
+ twl4030_phy_resume(twl);
+ twl4030charger_usb_en(1);
+ twl->vbus = 1;
+ } else {
+ twl4030charger_usb_en(0);
+ twl->vbus = 0;
+ twl4030_phy_suspend(twl, 0);
+ }
+ schedule_work(&twl->irq_work);
+
+ return IRQ_HANDLED;
}
static int twl4030_set_suspend(struct otg_transceiver *x, int suspend)
{
+ struct twl4030_usb *twl = xceiv_to_twl(x);
+
if (suspend)
- twl4030_phy_suspend(1);
+ twl4030_phy_suspend(twl, 1);
else
- twl4030_phy_resume();
+ twl4030_phy_resume(twl);
return 0;
}
-static int twl4030_set_peripheral(struct otg_transceiver *xceiv,
+static int twl4030_set_peripheral(struct otg_transceiver *x,
struct usb_gadget *gadget)
{
- struct twl4030_usb *twl = xceiv_to_twl(xceiv);
+ struct twl4030_usb *twl;
+ u32 l;
- if (!xceiv)
+ if (!x)
return -ENODEV;
+ twl = xceiv_to_twl(x);
+
if (!gadget) {
- OTG_IRQ_EN_REG = 0;
- twl4030_phy_suspend(1);
+ omap_writew(0, OTG_IRQ_EN);
+ twl4030_phy_suspend(twl, 1);
twl->otg.gadget = NULL;
return -ENODEV;
}
twl->otg.gadget = gadget;
- twl4030_phy_resume();
+ twl4030_phy_resume(twl);
- OTG_CTRL_REG = (OTG_CTRL_REG & OTG_CTRL_MASK
- & ~(OTG_XCEIV_OUTPUTS|OTG_CTRL_BITS))
- | OTG_ID;
+ l = omap_readl(OTG_CTRL) & OTG_CTRL_MASK;
+ l &= ~(OTG_XCEIV_OUTPUTS|OTG_CTRL_BITS);
+ l |= OTG_ID;
+ omap_writel(l, OTG_CTRL);
twl->otg.state = OTG_STATE_B_IDLE;
return 0;
}
-static int twl4030_set_host(struct otg_transceiver *xceiv, struct usb_bus *host)
+static int twl4030_set_host(struct otg_transceiver *x, struct usb_bus *host)
{
- struct twl4030_usb *twl = xceiv_to_twl(xceiv);
+ struct twl4030_usb *twl;
- if (!xceiv)
+ if (!x)
return -ENODEV;
+ twl = xceiv_to_twl(x);
+
if (!host) {
- OTG_IRQ_EN_REG = 0;
- twl4030_phy_suspend(1);
+ omap_writew(0, OTG_IRQ_EN);
+ twl4030_phy_suspend(twl, 1);
twl->otg.host = NULL;
return -ENODEV;
}
twl->otg.host = host;
- twl4030_phy_resume();
+ twl4030_phy_resume(twl);
- twl4030_usb_set_bits(twl, OTG_CTRL,
- OTG_CTRL_DMPULLDOWN | OTG_CTRL_DPPULLDOWN);
+ twl4030_usb_set_bits(twl, TWL4030_OTG_CTRL,
+ TWL4030_OTG_CTRL_DMPULLDOWN
+ | TWL4030_OTG_CTRL_DPPULLDOWN);
twl4030_usb_set_bits(twl, USB_INT_EN_RISE, USB_INT_IDGND);
twl4030_usb_set_bits(twl, USB_INT_EN_FALL, USB_INT_IDGND);
twl4030_usb_set_bits(twl, FUNC_CTRL, FUNC_CTRL_SUSPENDM);
- twl4030_usb_set_bits(twl, OTG_CTRL, OTG_CTRL_DRVVBUS);
+ twl4030_usb_set_bits(twl, TWL4030_OTG_CTRL, TWL4030_OTG_CTRL_DRVVBUS);
return 0;
}
-static int __init twl4030_usb_init(void)
+static int __init twl4030_usb_probe(struct platform_device *pdev)
{
+ struct twl4030_usb_data *pdata = pdev->dev.platform_data;
struct twl4030_usb *twl;
int status;
-
- if (the_transceiver)
- return 0;
+ u8 vbus;
twl = kzalloc(sizeof *twl, GFP_KERNEL);
if (!twl)
- return 0;
+ return -ENOMEM;
- the_transceiver = twl;
+ if (!pdata) {
+ dev_info(&pdev->dev, "platform_data not available\n");
+ return -EINVAL;
+ }
- twl->irq = TWL4030_PWRIRQ_USB_PRES;
+ WARN_ON(twl4030_i2c_read_u8(TWL4030_MODULE_INT,
+ &vbus, REG_PWR_EDR1) < 0);
+ vbus &= USB_PRES_RISING;
+
+ twl->dev = &pdev->dev;
+ twl->irq = platform_get_irq(pdev, 0);
twl->otg.set_host = twl4030_set_host;
twl->otg.set_peripheral = twl4030_set_peripheral;
twl->otg.set_suspend = twl4030_set_suspend;
+ twl->usb_mode = pdata->usb_mode;
+ twl->vbus = vbus ? 1 : 0;
+
+ /* init spinlock for workqueue */
+ spin_lock_init(&twl->lock);
+
+ /* init irq workqueue before request_irq */
+ INIT_WORK(&twl->irq_work, twl4030_usb_irq_work);
- usb_irq_disable();
+ twl->irq_enabled = true;
status = request_irq(twl->irq, twl4030_usb_irq, 0, "twl4030_usb", twl);
if (status < 0) {
- printk(KERN_DEBUG "can't get IRQ %d, err %d\n",
+ dev_dbg(&pdev->dev, "can't get IRQ %d, err %d\n",
twl->irq, status);
kfree(twl);
- return -ENODEV;
+ return status;
}
-#if defined(CONFIG_TWL4030_USB_HS_ULPI)
- hs_usb_init(twl);
-#endif
twl4030_usb_ldo_init(twl);
twl4030_phy_power(twl, 1);
- twl4030_i2c_access(1);
+ twl4030_i2c_access(twl, 1);
twl4030_usb_set_mode(twl, twl->usb_mode);
- if (twl->usb_mode == T2_USB_MODE_ULPI)
- twl4030_i2c_access(0);
twl->asleep = 0;
- if (twl->usb_mode == T2_USB_MODE_ULPI)
- twl4030_phy_suspend(1);
+ if (twl->usb_mode == T2_USB_MODE_ULPI) {
+ twl4030_i2c_access(twl, 0);
+ twl4030_phy_suspend(twl, 0);
+ }
otg_set_transceiver(&twl->otg);
+ platform_set_drvdata(pdev, twl);
+ dev_info(&pdev->dev, "Initialized TWL4030 USB module\n");
- printk(KERN_INFO "Initialized TWL4030 USB module\n");
+ if (device_create_file(&pdev->dev, &dev_attr_vbus))
+ dev_warn(&pdev->dev, "could not create sysfs file\n");
return 0;
}
-
-static void __exit twl4030_usb_exit(void)
+static int __exit twl4030_usb_remove(struct platform_device *pdev)
{
- struct twl4030_usb *twl = the_transceiver;
+ struct twl4030_usb *twl = platform_get_drvdata(pdev);
int val;
- usb_irq_disable();
+ usb_irq_disable(twl);
free_irq(twl->irq, twl);
+ device_remove_file(twl->dev, &dev_attr_vbus);
/* set transceiver mode to power on defaults */
twl4030_usb_set_mode(twl, -1);
* clear dpll clock request for i2c access,
* disable 32KHz
*/
- val = twl4030_usb_read(PHY_CLK_CTRL);
+ val = twl4030_usb_read(twl, PHY_CLK_CTRL);
if (val >= 0) {
val |= PHY_CLK_CTRL_CLOCKGATING_EN;
val &= ~(PHY_CLK_CTRL_CLK32K_EN | REQ_PHY_DPLL_CLK);
- twl4030_usb_write(PHY_CLK_CTRL, (u8)val);
+ twl4030_usb_write(twl, PHY_CLK_CTRL, (u8)val);
}
/* disable complete OTG block */
twl4030_phy_power(twl, 0);
kfree(twl);
+
+ return 0;
}
+static struct platform_driver twl4030_driver = {
+ .probe = twl4030_usb_probe,
+ .remove = __exit_p(twl4030_remove),
+ .driver = {
+ .name = "twl4030_usb",
+ .owner = THIS_MODULE,
+ },
+};
+
+static int __init twl4030_usb_init(void)
+{
+ return platform_driver_register(&twl4030_driver);
+}
subsys_initcall(twl4030_usb_init);
+
+static void __exit twl4030_usb_exit(void)
+{
+ platform_driver_unregister(&twl4030_driver);
+}
module_exit(twl4030_usb_exit);
-MODULE_AUTHOR("Texas Instruments, Inc.");
+MODULE_ALIAS("platform:twl4030_usb");
+MODULE_AUTHOR("Texas Instruments, Inc, Nokia Corporation");
MODULE_DESCRIPTION("TWL4030 USB transceiver driver");
MODULE_LICENSE("GPL");