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

Commit b2e587db authored by Praveen Paneri's avatar Praveen Paneri Committed by Felipe Balbi
Browse files

usb: phy: s3c-hsotg: adding phy driver support 



Adding the transceiver to hsotg driver. Keeping the platform data
for continuing the smooth operation for boards which still uses it

Signed-off-by: default avatarPraveen Paneri <p.paneri@samsung.com>
Acked-by: default avatarKyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: default avatarFelipe Balbi <balbi@ti.com>
parent 337dc3a7

drivers/usb/gadget/s3c-hsotg.c

+27 −10
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ 


#include <linux/usb/ch9.h>

#include <linux/usb/gadget.h>

#include <linux/usb/phy.h>

#include <linux/platform_data/s3c-hsotg.h>



#include <mach/map.h>
@@ -133,7 +134,9 @@ struct s3c_hsotg_ep { 
 * struct s3c_hsotg - driver state.

 * @dev: The parent device supplied to the probe function

 * @driver: USB gadget driver

 * @plat: The platform specific configuration data.

 * @phy: The otg phy transceiver structure for phy control.

 * @plat: The platform specific configuration data. This can be removed once

 * all SoCs support usb transceiver.

 * @regs: The memory area mapped for accessing registers.

 * @irq: The IRQ number we are using

 * @supplies: Definition of USB power supplies
@@ -153,6 +156,7 @@ struct s3c_hsotg_ep { 
struct s3c_hsotg {

	struct device		 *dev;

	struct usb_gadget_driver *driver;

	struct usb_phy		*phy;

	struct s3c_hsotg_plat	 *plat;



	spinlock_t              lock;
@@ -2854,7 +2858,10 @@ static void s3c_hsotg_phy_enable(struct s3c_hsotg *hsotg) 
	struct platform_device *pdev = to_platform_device(hsotg->dev);



	dev_dbg(hsotg->dev, "pdev 0x%p\n", pdev);

	if (hsotg->plat->phy_init)



	if (hsotg->phy)

		usb_phy_init(hsotg->phy);

	else if (hsotg->plat->phy_init)

		hsotg->plat->phy_init(pdev, hsotg->plat->phy_type);

}
@@ -2869,7 +2876,9 @@ static void s3c_hsotg_phy_disable(struct s3c_hsotg *hsotg) 
{

	struct platform_device *pdev = to_platform_device(hsotg->dev);



	if (hsotg->plat->phy_exit)

	if (hsotg->phy)

		usb_phy_shutdown(hsotg->phy);

	else if (hsotg->plat->phy_exit)

		hsotg->plat->phy_exit(pdev, hsotg->plat->phy_type);

}
@@ -3493,6 +3502,7 @@ static void s3c_hsotg_release(struct device *dev) 
static int s3c_hsotg_probe(struct platform_device *pdev)

{

	struct s3c_hsotg_plat *plat = pdev->dev.platform_data;

	struct usb_phy *phy;

	struct device *dev = &pdev->dev;

	struct s3c_hsotg_ep *eps;

	struct s3c_hsotg *hsotg;
@@ -3501,20 +3511,27 @@ static int s3c_hsotg_probe(struct platform_device *pdev) 
	int ret;

	int i;



	plat = pdev->dev.platform_data;

	if (!plat) {

		dev_err(&pdev->dev, "no platform data defined\n");

		return -EINVAL;

	}



	hsotg = devm_kzalloc(&pdev->dev, sizeof(struct s3c_hsotg), GFP_KERNEL);

	if (!hsotg) {

		dev_err(dev, "cannot get memory\n");

		return -ENOMEM;

	}



	hsotg->dev = dev;

	phy = devm_usb_get_phy(dev, USB_PHY_TYPE_USB2);

	if (IS_ERR_OR_NULL(phy)) {

		/* Fallback for pdata */

		plat = pdev->dev.platform_data;

		if (!plat) {

			dev_err(&pdev->dev, "no platform data or transceiver defined\n");

			return -EPROBE_DEFER;

		} else {

			hsotg->plat = plat;

		}

	} else {

		hsotg->phy = phy;

	}



	hsotg->dev = dev;



	hsotg->clk = devm_clk_get(&pdev->dev, "otg");

	if (IS_ERR(hsotg->clk)) {