From patchwork Wed Nov 14 10:27:16 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: p.paneri@samsung.com X-Patchwork-Id: 1740421 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by patchwork2.kernel.org (Postfix) with ESMTP id AA07ADF264 for ; Wed, 14 Nov 2012 10:22:29 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1TYa54-0006uI-9u; Wed, 14 Nov 2012 10:20:26 +0000 Received: from mailout1.samsung.com ([203.254.224.24]) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1TYa4y-0006rL-4J for linux-arm-kernel@lists.infradead.org; Wed, 14 Nov 2012 10:20:21 +0000 Received: from epcpsbgm2.samsung.com (epcpsbgm2 [203.254.230.27]) by mailout1.samsung.com (Oracle Communications Messaging Server 7u4-24.01(7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0MDH00E2Z3CQB950@mailout1.samsung.com> for linux-arm-kernel@lists.infradead.org; Wed, 14 Nov 2012 19:20:19 +0900 (KST) Received: from epcpsbgm2.samsung.com ( [172.20.52.126]) by epcpsbgm2.samsung.com (EPCPMTA) with SMTP id 34.FE.12699.36073A05; Wed, 14 Nov 2012 19:20:19 +0900 (KST) X-AuditID: cbfee61b-b7f616d00000319b-54-50a3706332fb Received: from epmmp1.local.host ( [203.254.227.16]) by epcpsbgm2.samsung.com (EPCPMTA) with SMTP id 03.FE.12699.26073A05; Wed, 14 Nov 2012 19:20:18 +0900 (KST) Received: from matrix.sisodomain.com ([107.108.73.199]) by mmp1.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTPA id <0MDH00MRI35YZ100@mmp1.samsung.com> for linux-arm-kernel@lists.infradead.org; Wed, 14 Nov 2012 19:20:18 +0900 (KST) From: Praveen Paneri To: linux-usb@vger.kernel.org Subject: [PATCH v8 2/2] usb: s3c-hsotg: Adding phy driver support Date: Wed, 14 Nov 2012 15:57:16 +0530 Message-id: <1352888836-17192-3-git-send-email-p.paneri@samsung.com> X-Mailer: git-send-email 1.7.1 In-reply-to: <1352888836-17192-1-git-send-email-p.paneri@samsung.com> References: <1352888836-17192-1-git-send-email-p.paneri@samsung.com> DLP-Filter: Pass X-MTR: 20000000000000000@CPGS X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrFLMWRmVeSWpSXmKPExsWyRsSkTje5YHGAwYIN7BabHl9jdWD02Lyk PoAxissmJTUnsyy1SN8ugStjbtti5oJG6Yrbr4+zNTD+Ee1i5OSQEDCRuHZoKQuELSZx4d56 ti5GLg4hgaWMEhP2dbLCFF1/8RHMFhJYxCixvrUcomgDk0TvuyVAHRwcbALaEg0zjUBqRARk JQ5f+c0MYjMLzGWW6L0hCGILCzhK3Dp1lQ3EZhFQlej98hfM5hVwkbh0opENYpecxI7VT5hA bE4BV4llEzdC7XWRaL3RyATRKyDxbfIhFpC1EkC7Nh1gBjlHQuAym8T3QweYIeZIShxccYNl AqPwAkaGVYyiqQXJBcVJ6blGesWJucWleel6yfm5mxiBAXj63zPpHYyrGiwOMQpwMCrx8Ab0 LwoQYk0sK67MPcQowcGsJMLLnbc4QIg3JbGyKrUoP76oNCe1+BCjD9AlE5mlRJPzgdGRVxJv aGxibmpsamlkZGZqikNYSZy32SMlQEggPbEkNTs1tSC1CGYcEwenVANj0vt7NyQ7j6xL/PTy rlnua/2XtWz1ezkYUuQNI29d0Gp1WXXYbF1lZeQPxt5HJzf2cTlvOdW8y99QdIe7JJ/Tj0u8 j0+eVLE6nHLqVIz/xcdORtN2piZJ+LW8zWavaPlZ+/1Lr7NEE3+f1T4hf4bVKxIPxB2d1cwS 06Eekjv/7e0zZa+Mm/4rsRRnJBpqMRcVJwIA5lARXW0CAAA= X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFupkkeLIzCtJLcpLzFFi42I5/e+xgG5SweIAg8+7TCw2Pb7G6sDosXlJ fQBjVAOjTUZqYkpqkUJqXnJ+SmZeuq2Sd3C8c7ypmYGhrqGlhbmSQl5ibqqtkotPgK5bZg7Q VCWFssScUqBQQGJxsZK+HaYJoSFuuhYwjRG6viFBcD1GBmggYQ1jxty2xcwFjdIVt18fZ2tg /CPaxcjJISFgInH9xUdWCFtM4sK99WwgtpDAIkaJ9a3lXYxcQPYGJoned0uAEhwcbALaEg0z jUBqRARkJQ5f+c0MYjMLzGWW6L0hCGILCzhK3Dp1FWwOi4CqRO+Xv2A2r4CLxKUTjWwQu+Qk dqx+wgRicwq4SiybuJEVYq+LROuNRqYJjLwLGBlWMYqmFiQXFCel5xrpFSfmFpfmpesl5+du YgSH9zPpHYyrGiwOMQpwMCrx8Ab0LwoQYk0sK67MPcQowcGsJMLLnbc4QIg3JbGyKrUoP76o NCe1+BCjD9BVE5mlRJPzgbGXVxJvaGxibmpsamliYWJmiUNYSZy32SMlQEggPbEkNTs1tSC1 CGYcEwenVAPjZJb9wTclHlkksnDdDNZ8m3nkxFPDaf+f3F6gYfEywtl0g79fl9fzA2kbZtzV Pi1RJnjidWG/W0PakVk1Sy++dy1OOXT7sW0M86PzMz6sKbrpVZBR+s865SHLPRnGF+cWX9Vi NWT3mXiA6xbrvx3lflHuKmpCt6s5RKpn9ckHx+44IWez8eZFJZbijERDLeai4kQAZeujvZwC AAA= X-CFilter-Loop: Reflected X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20121114_052020_698838_B9956FBC X-CRM114-Status: GOOD ( 14.75 ) X-Spam-Score: -7.6 (-------) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-7.6 points) pts rule name description ---- ---------------------- -------------------------------------------------- -5.0 RCVD_IN_DNSWL_HI RBL: Sender listed at http://www.dnswl.org/, high trust [203.254.224.24 listed in list.dnswl.org] -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -0.7 RP_MATCHES_RCVD Envelope sender domain matches handover relay domain -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: l.majewski@samsung.com, kgene.kim@samsung.com, heiko@sntech.de, gregkh@linuxfoundation.org, devicetree-discuss@lists.ozlabs.org, broonie@opensource.wolfsonmicro.com, balbi@ti.com, grant.likely@secretlab.ca, kyungmin.park@samsung.com, linux-samsung-soc@vger.kernel.org, thomas.abraham@linaro.org, gautam.vivek@samsung.com, ben-linux@fluff.org, t.figa@samsung.com, linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org 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 Acked-by: Kyungmin Park --- drivers/usb/gadget/s3c-hsotg.c | 37 +++++++++++++++++++++++++++---------- 1 files changed, 27 insertions(+), 10 deletions(-) diff --git a/drivers/usb/gadget/s3c-hsotg.c b/drivers/usb/gadget/s3c-hsotg.c index 6f696ee..bc30a2d 100644 --- a/drivers/usb/gadget/s3c-hsotg.c +++ b/drivers/usb/gadget/s3c-hsotg.c @@ -32,6 +32,7 @@ #include #include +#include #include #include @@ -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; } + 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->plat = plat; hsotg->clk = devm_clk_get(&pdev->dev, "otg"); if (IS_ERR(hsotg->clk)) {