aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/power
diff options
context:
space:
mode:
authorHeikki Krogerus <heikki.krogerus@linux.intel.com>2012-02-13 06:24:02 -0500
committerFelipe Balbi <balbi@ti.com>2012-02-13 06:34:36 -0500
commit8675381109b0eb1c948a423c2b35e3f4509cb25e (patch)
tree1b71e8d77114a75f5871569fd0784fe0b4c861e3 /drivers/power
parent62aa2b537c6f5957afd98e29f96897419ed5ebab (diff)
usb: otg: Rename otg_transceiver to usb_phy
This is the first step in separating USB transceivers from USB OTG utilities. Includes fixes to IMX code from Sascha Hauer. Signed-off-by: Heikki Krogerus <heikki.krogerus@linux.intel.com> Acked-by: Sascha Hauer <s.hauer@pengutronix.de> Acked-by: Pavankumar Kondeti <pkondeti@codeaurora.org> Acked-by: Li Yang <leoli@freescale.com> Acked-by: Alan Stern <stern@rowland.harvard.edu> Acked-by: Igor Grinberg <grinberg@compulab.co.il> Reviewed-by: Marek Vasut <marek.vasut@gmail.com> Signed-off-by: Felipe Balbi <balbi@ti.com>
Diffstat (limited to 'drivers/power')
-rw-r--r--drivers/power/isp1704_charger.c2
-rw-r--r--drivers/power/pda_power.c2
-rw-r--r--drivers/power/twl4030_charger.c2
3 files changed, 3 insertions, 3 deletions
diff --git a/drivers/power/isp1704_charger.c b/drivers/power/isp1704_charger.c
index b806667b59ae..51cdea4fc034 100644
--- a/drivers/power/isp1704_charger.c
+++ b/drivers/power/isp1704_charger.c
@@ -56,7 +56,7 @@ static u16 isp170x_id[] = {
56struct isp1704_charger { 56struct isp1704_charger {
57 struct device *dev; 57 struct device *dev;
58 struct power_supply psy; 58 struct power_supply psy;
59 struct otg_transceiver *otg; 59 struct usb_phy *otg;
60 struct notifier_block nb; 60 struct notifier_block nb;
61 struct work_struct work; 61 struct work_struct work;
62 62
diff --git a/drivers/power/pda_power.c b/drivers/power/pda_power.c
index fd49689738af..dcf07f55eb04 100644
--- a/drivers/power/pda_power.c
+++ b/drivers/power/pda_power.c
@@ -40,7 +40,7 @@ static struct timer_list polling_timer;
40static int polling; 40static int polling;
41 41
42#ifdef CONFIG_USB_OTG_UTILS 42#ifdef CONFIG_USB_OTG_UTILS
43static struct otg_transceiver *transceiver; 43static struct usb_phy *transceiver;
44static struct notifier_block otg_nb; 44static struct notifier_block otg_nb;
45#endif 45#endif
46 46
diff --git a/drivers/power/twl4030_charger.c b/drivers/power/twl4030_charger.c
index 54b9198fa576..b3ead2305b4c 100644
--- a/drivers/power/twl4030_charger.c
+++ b/drivers/power/twl4030_charger.c
@@ -69,7 +69,7 @@ struct twl4030_bci {
69 struct device *dev; 69 struct device *dev;
70 struct power_supply ac; 70 struct power_supply ac;
71 struct power_supply usb; 71 struct power_supply usb;
72 struct otg_transceiver *transceiver; 72 struct usb_phy *transceiver;
73 struct notifier_block otg_nb; 73 struct notifier_block otg_nb;
74 struct work_struct work; 74 struct work_struct work;
75 int irq_chg; 75 int irq_chg;