]> git.karo-electronics.de Git - karo-tx-linux.git/commit
usb: rename phy to usb_phy in OTG
authorAntoine Tenart <antoine.tenart@free-electrons.com>
Thu, 30 Oct 2014 17:41:14 +0000 (18:41 +0100)
committerNitin Garg <nitin.garg@freescale.com>
Fri, 16 Jan 2015 03:19:04 +0000 (21:19 -0600)
commit026995b210da5c063cffd5be4f270b9b3c69f390
treeb6ab6d9c726003a249cd912874cd71e250f625a1
parent40c4ac0148a08f48ac8f8ea1a24de172ef8387a3
usb: rename phy to usb_phy in OTG

This patch prepares the introduction of the generic PHY support in the
USB OTG common functions. The USB PHY member of the OTG structure is
renamed to 'usb_phy' and modifications are done in all drivers accessing
it. Renaming this pointer will allow to keep the compatibility for USB
PHY drivers.

Signed-off-by: Antoine Tenart <antoine.tenart@free-electrons.com>
Signed-off-by: Felipe Balbi <balbi@ti.com>
(cherry picked from commit 19c1eac2685b62640ca2386a0a885ac2152668c8)

Conflicts:

drivers/phy/phy-omap-usb2.c
drivers/usb/phy/phy-msm-usb.c
12 files changed:
drivers/phy/phy-omap-usb2.c
drivers/usb/chipidea/otg_fsm.c
drivers/usb/phy/phy-ab8500-usb.c
drivers/usb/phy/phy-fsl-usb.c
drivers/usb/phy/phy-generic.c
drivers/usb/phy/phy-gpio-vbus-usb.c
drivers/usb/phy/phy-isp1301-omap.c
drivers/usb/phy/phy-msm-usb.c
drivers/usb/phy/phy-mv-usb.c
drivers/usb/phy/phy-tahvo.c
drivers/usb/phy/phy-ulpi.c
include/linux/usb/otg.h