| Message ID | 1351573057-22249-3-git-send-email-p.paneri@samsung.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Hi, On Tue, Oct 30, 2012 at 10:27:34AM +0530, Praveen Paneri wrote: > @@ -3501,20 +3511,27 @@ static int __devinit 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; > } > > + plat = pdev->dev.platform_data; > + if (!plat) { > + /* Fallback for transceiver */ > + phy = devm_usb_get_phy(dev, USB_PHY_TYPE_USB2); > + if (IS_ERR_OR_NULL(phy)) { > + dev_err(&pdev->dev, "no platform data or transceiver defined\n"); > + return -EPROBE_DEFER; > + } else { > + hsotg->phy = phy; > + } > + } else { > + hsotg->plat = plat; > + } I think this should be the other way around, meaning you try to grab the phy, if you can't, then you fallback to pdata.
Hi Felipe, > Hi, > > On Tue, Oct 30, 2012 at 10:27:34AM +0530, Praveen Paneri wrote: > > @@ -3501,20 +3511,27 @@ static int __devinit 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; > > } > > > > + plat = pdev->dev.platform_data; > > + if (!plat) { > > + /* Fallback for transceiver */ > > + phy = devm_usb_get_phy(dev, USB_PHY_TYPE_USB2); > > + if (IS_ERR_OR_NULL(phy)) { > > + dev_err(&pdev->dev, "no platform data or > > transceiver defined\n"); > > + return -EPROBE_DEFER; > > + } else { > > + hsotg->phy = phy; > > + } > > + } else { > > + hsotg->plat = plat; > > + } > > I think this should be the other way around, meaning you try to grab > the phy, if you can't, then you fallback to pdata. > I agree. The new approach is to use new PHY driver. And only when failed we shall use legacy approach.
On Wed, Oct 31, 2012 at 8:14 PM, Lukasz Majewski <l.majewski@samsung.com> wrote: > Hi Felipe, > >> Hi, >> >> On Tue, Oct 30, 2012 at 10:27:34AM +0530, Praveen Paneri wrote: >> > @@ -3501,20 +3511,27 @@ static int __devinit 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; >> > } >> > >> > + plat = pdev->dev.platform_data; >> > + if (!plat) { >> > + /* Fallback for transceiver */ >> > + phy = devm_usb_get_phy(dev, USB_PHY_TYPE_USB2); >> > + if (IS_ERR_OR_NULL(phy)) { >> > + dev_err(&pdev->dev, "no platform data or >> > transceiver defined\n"); >> > + return -EPROBE_DEFER; >> > + } else { >> > + hsotg->phy = phy; >> > + } >> > + } else { >> > + hsotg->plat = plat; >> > + } >> >> I think this should be the other way around, meaning you try to grab >> the phy, if you can't, then you fallback to pdata. Agreed! Will swap it regards, Praveen >> > > I agree. > > The new approach is to use new PHY driver. And only when failed we > shall use legacy approach. > > -- > Best regards, > > Lukasz Majewski > > Samsung Poland R&D Center | Linux Platform Group > -- > To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/usb/gadget/s3c-hsotg.c b/drivers/usb/gadget/s3c-hsotg.c index 6f696ee..29815b9 100644 --- a/drivers/usb/gadget/s3c-hsotg.c +++ b/drivers/usb/gadget/s3c-hsotg.c @@ -32,6 +32,7 @@ #include <linux/usb/ch9.h> #include <linux/usb/gadget.h> +#include <linux/usb/otg.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 __devinit 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 __devinit 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; } + plat = pdev->dev.platform_data; + if (!plat) { + /* Fallback for transceiver */ + phy = devm_usb_get_phy(dev, USB_PHY_TYPE_USB2); + if (IS_ERR_OR_NULL(phy)) { + dev_err(&pdev->dev, "no platform data or transceiver defined\n"); + return -EPROBE_DEFER; + } else { + hsotg->phy = phy; + } + } else { + hsotg->plat = plat; + } + hsotg->dev = dev; - hsotg->plat = plat; hsotg->clk = devm_clk_get(&pdev->dev, "otg"); if (IS_ERR(hsotg->clk)) {
Adding the transceiver to hsotg driver. Keeping the platform data for continuing the smooth operation for boards which still uses it Signed-off-by: Praveen Paneri <p.paneri@samsung.com> --- drivers/usb/gadget/s3c-hsotg.c | 37 +++++++++++++++++++++++++++---------- 1 files changed, 27 insertions(+), 10 deletions(-)