Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 86753811 authored by Heikki Krogerus's avatar Heikki Krogerus Committed by Felipe Balbi
Browse files

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: default avatarHeikki Krogerus <heikki.krogerus@linux.intel.com>
Acked-by: default avatarSascha Hauer <s.hauer@pengutronix.de>
Acked-by: default avatarPavankumar Kondeti <pkondeti@codeaurora.org>
Acked-by: default avatarLi Yang <leoli@freescale.com>
Acked-by: default avatarAlan Stern <stern@rowland.harvard.edu>
Acked-by: default avatarIgor Grinberg <grinberg@compulab.co.il>
Reviewed-by: default avatarMarek Vasut <marek.vasut@gmail.com>
Signed-off-by: default avatarFelipe Balbi <balbi@ti.com>
parent 62aa2b53

arch/arm/mach-imx/mx31moboard-devboard.c

+3 −3
Original line number Diff line number Diff line
@@ -158,7 +158,7 @@ static int devboard_usbh1_hw_init(struct platform_device *pdev) 
#define USBH1_VBUSEN_B	IOMUX_TO_GPIO(MX31_PIN_NFRE_B)

#define USBH1_MODE	IOMUX_TO_GPIO(MX31_PIN_NFALE)



static int devboard_isp1105_init(struct otg_transceiver *otg)

static int devboard_isp1105_init(struct usb_phy *otg)

{

	int ret = gpio_request(USBH1_MODE, "usbh1-mode");

	if (ret)
@@ -177,7 +177,7 @@ static int devboard_isp1105_init(struct otg_transceiver *otg) 
}





static int devboard_isp1105_set_vbus(struct otg_transceiver *otg, bool on)

static int devboard_isp1105_set_vbus(struct usb_phy *otg, bool on)

{

	if (on)

		gpio_set_value(USBH1_VBUSEN_B, 0);
@@ -194,7 +194,7 @@ static struct mxc_usbh_platform_data usbh1_pdata __initdata = { 


static int __init devboard_usbh1_init(void)

{

	struct otg_transceiver *otg;

	struct usb_phy *otg;

	struct platform_device *pdev;



	otg = kzalloc(sizeof(*otg), GFP_KERNEL);

arch/arm/mach-imx/mx31moboard-marxbot.c

+3 −3
Original line number Diff line number Diff line
@@ -272,7 +272,7 @@ static int marxbot_usbh1_hw_init(struct platform_device *pdev) 
#define USBH1_VBUSEN_B	IOMUX_TO_GPIO(MX31_PIN_NFRE_B)

#define USBH1_MODE	IOMUX_TO_GPIO(MX31_PIN_NFALE)



static int marxbot_isp1105_init(struct otg_transceiver *otg)

static int marxbot_isp1105_init(struct usb_phy *otg)

{

	int ret = gpio_request(USBH1_MODE, "usbh1-mode");

	if (ret)
@@ -291,7 +291,7 @@ static int marxbot_isp1105_init(struct otg_transceiver *otg) 
}





static int marxbot_isp1105_set_vbus(struct otg_transceiver *otg, bool on)

static int marxbot_isp1105_set_vbus(struct usb_phy *otg, bool on)

{

	if (on)

		gpio_set_value(USBH1_VBUSEN_B, 0);
@@ -308,7 +308,7 @@ static struct mxc_usbh_platform_data usbh1_pdata __initdata = { 


static int __init marxbot_usbh1_init(void)

{

	struct otg_transceiver *otg;

	struct usb_phy *otg;

	struct platform_device *pdev;



	otg = kzalloc(sizeof(*otg), GFP_KERNEL);

arch/arm/mach-pxa/pxa3xx-ulpi.c

+3 −3
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ struct pxa3xx_u2d_ulpi { 
	struct clk		*clk;

	void __iomem		*mmio_base;



	struct otg_transceiver	*otg;

	struct usb_phy		*otg;

	unsigned int		ulpi_mode;

};
@@ -79,7 +79,7 @@ static int pxa310_ulpi_poll(void) 
	return -ETIMEDOUT;

}



static int pxa310_ulpi_read(struct otg_transceiver *otg, u32 reg)

static int pxa310_ulpi_read(struct usb_phy *otg, u32 reg)

{

	int err;
@@ -98,7 +98,7 @@ static int pxa310_ulpi_read(struct otg_transceiver *otg, u32 reg) 
	return u2d_readl(U2DOTGUCR) & U2DOTGUCR_RDATA;

}



static int pxa310_ulpi_write(struct otg_transceiver *otg, u32 val, u32 reg)

static int pxa310_ulpi_write(struct usb_phy *otg, u32 val, u32 reg)

{

	if (pxa310_ulpi_get_phymode() != SYNCH) {

		pr_warning("%s: PHY is not in SYNCH mode!\n", __func__);

arch/arm/mach-tegra/include/mach/usb_phy.h

+1 −1
Original line number Diff line number Diff line
@@ -58,7 +58,7 @@ struct tegra_usb_phy { 
	struct clk *pad_clk;

	enum tegra_usb_phy_mode mode;

	void *config;

	struct otg_transceiver *ulpi;

	struct usb_phy *ulpi;

};



struct tegra_usb_phy *tegra_usb_phy_open(int instance, void __iomem *regs,

arch/arm/plat-mxc/include/mach/mxc_ehci.h

+1 −1
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ struct mxc_usbh_platform_data { 
	int (*exit)(struct platform_device *pdev);



	unsigned int		 portsc;

	struct otg_transceiver	*otg;

	struct usb_phy		*otg;

};



int mx51_initialize_usb_hw(int port, unsigned int flags);