From patchwork Mon Sep 17 12:54:41 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: 1466811 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 6EC0ADF2D8 for ; Mon, 17 Sep 2012 12:52:09 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1TDajo-00014Z-8Q; Mon, 17 Sep 2012 12:47:44 +0000 Received: from mailout1.samsung.com ([203.254.224.24]) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1TDajj-00012n-DK for linux-arm-kernel@lists.infradead.org; Mon, 17 Sep 2012 12:47:40 +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 <0MAH00DEAVJCVVX0@mailout1.samsung.com> for linux-arm-kernel@lists.infradead.org; Mon, 17 Sep 2012 21:47:36 +0900 (KST) Received: from epcpsbgm2.samsung.com ( [172.20.52.123]) by epcpsbgm2.samsung.com (EPCPMTA) with SMTP id 88.B0.03860.8EB17505; Mon, 17 Sep 2012 21:47:36 +0900 (KST) X-AuditID: cbfee61b-b7f2b6d000000f14-ce-50571be874ed Received: from epmmp2 ( [203.254.227.17]) by epcpsbgm2.samsung.com (EPCPMTA) with SMTP id 87.B0.03860.8EB17505; Mon, 17 Sep 2012 21:47:36 +0900 (KST) Received: from matrix.sisodomain.com ([107.108.73.199]) by mmp2.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTPA id <0MAH00JKBVDCHZB0@mmp2.samsung.com> for linux-arm-kernel@lists.infradead.org; Mon, 17 Sep 2012 21:47:36 +0900 (KST) From: Praveen Paneri To: linux-usb@vger.kernel.org Subject: [PATCH v6 2/5] usb: s3c-hsotg: Adding phy driver support Date: Mon, 17 Sep 2012 18:24:41 +0530 Message-id: <1347886484-16064-3-git-send-email-p.paneri@samsung.com> X-Mailer: git-send-email 1.7.1 In-reply-to: <1347886484-16064-1-git-send-email-p.paneri@samsung.com> References: <1347886484-16064-1-git-send-email-p.paneri@samsung.com> DLP-Filter: Pass X-MTR: 20000000000000000@CPGS X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrJLMWRmVeSWpSXmKPExsWyRsSkWveFdHiAwZMJZhabHl9jdWD02Lyk PoAxissmJTUnsyy1SN8ugStj5uc5LAWXpCr23rzL0sB4SbSLkZNDQsBE4t3Wv2wQtpjEhXvr gWwuDiGBpYwS7z6cYoYpejDjNStEYjqjxLUtvYwQzgYmiau3GoBaODjYBLQlGmYagTSICMhK HL7yG6yZWeAtk8TzM2EgJcICjhIfGl1BwiwCqhLff05nAbF5BVwk/uzbwQ6xS05ix+onTCDl nAKuEg8WCoKEhYBK3iz4zg7RKiDxbfIhFpASCaBNmw4wgxwjIXCdTeLj7ElMEGMkJQ6uuMEy gVF4ASPDKkbR1ILkguKk9FwjveLE3OLSvHS95PzcTYzA8Dv975n0DsZVDRaHGAU4GJV4eC9c DgsQYk0sK67MPcQowcGsJMJ7WyA8QIg3JbGyKrUoP76oNCe1+BCjD9AlE5mlRJPzgbGRVxJv aGxibmpsamlkZGZqikNYSZxX+FNggJBAemJJanZqakFqEcw4Jg5OqQZGneJ1rE7nK1qONn/X WOIhYPCg/Nez/PnK5XsjTp3PFpklEf2jfG8e0wNvGR6D+KP6FmJSEsFtHjKv2jx/eW3Zoj5b 3O6j2cJ0gcJC1qyNv+Waxdu2b7hmcc5EepdZ1oO3V3QmKqzza2n+8MD/161p2vGdUYuj2jWv 2D/uXBJ4Y/qWlj8JuVeVWIozEg21mIuKEwEWMvRLbAIAAA== X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFupgkeLIzCtJLcpLzFFi42I5/e+xoO4L6fAAg9l3NSw2Pb7G6sDosXlJ fQBjVAOjTUZqYkpqkUJqXnJ+SmZeuq2Sd3C8c7ypmYGhrqGlhbmSQl5ibqqtkotPgK5bZg7Q VCWFssScUqBQQGJxsZK+HaYJoSFuuhYwjRG6viFBcD1GBmggYQ1jxszPc1gKLklV7L15l6WB 8ZJoFyMnh4SAicSDGa9ZIWwxiQv31rN1MXJxCAlMZ5S4tqWXEcLZwCRx9VYDUIaDg01AW6Jh phFIg4iArMThK7+ZQWxmgbdMEs/PhIGUCAs4SnxodAUJswioSnz/OZ0FxOYVcJH4s28HO8Qu OYkdq58wgZRzCrhKPFgoCBIWAip5s+A7+wRG3gWMDKsYRVMLkguKk9JzjfSKE3OLS/PS9ZLz czcxgoP7mfQOxlUNFocYBTgYlXh4L1wOCxBiTSwrrsw9xCjBwawkwntbIDxAiDclsbIqtSg/ vqg0J7X4EKMP0FETmaVEk/OBkZdXEm9obGJuamxqaWJhYmaJQ1hJnFf4U2CAkEB6Yklqdmpq QWoRzDgmDk6pBsYai/CAQweDFu5xmhbJusDToeXwY3+7HzrWSW2xny2vz/TfIbn3Ufkyf7ad T6adK96j8T3ib2Gs64stk2+Z/fn6YvOdJsddm1n9hW/FlLyI+rhy1pHIL2EffCQPq3JOvvr5 ufzrstLPj43M7l7srP3I9vtD9B6JL44eM93VnzLus2zbbFnRceuNEktxRqKhFnNRcSIAOPet 7ZsCAAA= X-CFilter-Loop: Reflected X-Spam-Note: CRM114 invocation failed X-Spam-Score: -7.4 (-------) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-7.4 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.5 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, ben-linux@fluff.org, 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 --- 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..29815b9 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; } + 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)) {