From patchwork Tue Oct 30 04:57:34 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: 1668291 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 E574EDF2AB for ; Tue, 30 Oct 2012 04:52:25 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1TT3mI-0007cd-FI; Tue, 30 Oct 2012 04:50:14 +0000 Received: from mailout1.samsung.com ([203.254.224.24]) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1TT3mE-0007ax-Ip for linux-arm-kernel@lists.infradead.org; Tue, 30 Oct 2012 04:50:11 +0000 Received: from epcpsbgm1.samsung.com (epcpsbgm1 [203.254.230.26]) by mailout1.samsung.com (Oracle Communications Messaging Server 7u4-24.01(7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0MCO00A34W2PUZJ0@mailout1.samsung.com> for linux-arm-kernel@lists.infradead.org; Tue, 30 Oct 2012 13:50:06 +0900 (KST) Received: from epcpsbgm1.samsung.com ( [172.20.52.125]) by epcpsbgm1.samsung.com (EPCPMTA) with SMTP id C4.2B.01231.E7C5F805; Tue, 30 Oct 2012 13:50:06 +0900 (KST) X-AuditID: cbfee61a-b7fa66d0000004cf-70-508f5c7e44e6 Received: from epmmp2 ( [203.254.227.17]) by epcpsbgm1.samsung.com (EPCPMTA) with SMTP id 93.2B.01231.D7C5F805; Tue, 30 Oct 2012 13:50:05 +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 <0MCO00KD6VWRVA70@mmp2.samsung.com> for linux-arm-kernel@lists.infradead.org; Tue, 30 Oct 2012 13:50:05 +0900 (KST) From: Praveen Paneri To: linux-usb@vger.kernel.org Subject: [PATCH v7 2/5] usb: s3c-hsotg: Adding phy driver support Date: Tue, 30 Oct 2012 10:27:34 +0530 Message-id: <1351573057-22249-3-git-send-email-p.paneri@samsung.com> X-Mailer: git-send-email 1.7.1 In-reply-to: <1351573057-22249-1-git-send-email-p.paneri@samsung.com> References: <1351573057-22249-1-git-send-email-p.paneri@samsung.com> DLP-Filter: Pass X-MTR: 20000000000000000@CPGS X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrJLMWRmVeSWpSXmKPExsWyRsSkVrcupj/A4MZNXotNj6+xOjB6bF5S H8AYxWWTkpqTWZZapG+XwJUx8/McloJLUhV7b95laWC8JNrFyMEhIWAi8fiebxcjJ5ApJnHh 3nq2LkYuDiGBpYwSC5fOZ4dImEhcbL7BDpGYzihxeMN+ZghnA5PE549d7CCT2AS0JRpmGoE0 iAjIShy+8psZxGYWmMss0XtDEMQWFnCUaLjTwgJiswioShz+f5oNxOYVcJG4PfsTK8QyOYkd q58wgdicAq4SP5oaGUFsIaCa/j2/mSB6BSS+TT7EAvGArMSmA8wQrdfZJOZ9loGwJSUOrrjB MoFReAEjwypG0dSC5ILipPRcQ73ixNzi0rx0veT83E2MwPA7/e+Z1A7GlQ0WhxgFOBiVeHg3 rOkLEGJNLCuuzD3EKMHBrCTCm+/dHyDEm5JYWZValB9fVJqTWnyI0QfokInMUqLJ+cDYyCuJ NzQ2MTc1NrU0MjIzNcUhrCTO2+yREiAkkJ5YkpqdmlqQWgQzjomDU6qBUXKyUuLDWxtnfb7l 8WLmZmU/xrrkqrCuqGOXGPPv8wfmLNin17Ogaafe1yX3rx76JKfekLR4fpec7U4Z3+C+Ks+Q uw6mUz4Z7wvxuix6UjbvT3Z5Lv/8ohvn11afcAlVdrf6fvJZ2JlltpE7a2v2NfQVc3yyPxXK O0dbvm31ZiMvjeecvlISSizFGYmGWsxFxYkACezSNmwCAAA= X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFupikeLIzCtJLcpLzFFi42I5/e+xoG5tTH+Awboma4tNj6+xOjB6bF5S H8AY1cBok5GamJJapJCal5yfkpmXbqvkHRzvHG9qZmCoa2hpYa6kkJeYm2qr5OIToOuWmQM0 VUmhLDGnFCgUkFhcrKRvh2lCaIibrgVMY4Sub0gQXI+RARpIWMOYMfPzHJaCS1IVe2/eZWlg vCTaxcjJISFgInGx+QY7hC0mceHeerYuRi4OIYHpjBKHN+xnhnA2MEl8/tgFVMXBwSagLdEw 0wikQURAVuLwld/MIDazwFxmid4bgiC2sICjRMOdFhYQm0VAVeLw/9NsIDavgIvE7dmfWCGW yUnsWP2ECcTmFHCV+NHUyAhiCwHV9O/5zTSBkXcBI8MqRtHUguSC4qT0XEO94sTc4tK8dL3k /NxNjOAAfya1g3Flg8UhRgEORiUe3g1r+gKEWBPLiitzDzFKcDArifDme/cHCPGmJFZWpRbl xxeV5qQWH2L0AbpqIrOUaHI+MPrySuINjU3MTY1NLU0sTMwscQgrifM2e6QECAmkJ5akZqem FqQWwYxj4uCUamDkFphx4+BKhZdPPp5tVIoIdeM+s3qBuKT+8kMJ9bPD4pUOf3xXeXDz2zav H/ZXDsq7P+fNWNG5vMbF/9aZu/522qcmd2dtytGR5Q/bpb9r9wwdkY8zvtXN2nlow/Orur/T 3SYs8Nre/UKcNzFXxS1/S2iZS1TA2UOm8x98kG0U1V5sduyybXu5EktxRqKhFnNRcSIA41Jc BJ0CAAA= X-CFilter-Loop: Reflected X-Spam-Note: CRM114 invocation failed 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 --- 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)) {