From patchwork Tue Dec 18 05:56:07 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vivek Gautam X-Patchwork-Id: 1890181 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by patchwork1.kernel.org (Postfix) with ESMTP id 4A4753FC64 for ; Tue, 18 Dec 2012 05:53:56 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1Tkq3v-0007m5-Pu; Tue, 18 Dec 2012 05:49:55 +0000 Received: from mailout2.samsung.com ([203.254.224.25]) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1Tkq3k-0007l7-GM for linux-arm-kernel@lists.infradead.org; Tue, 18 Dec 2012 05:49:45 +0000 Received: from epcpsbgm2.samsung.com (epcpsbgm2 [203.254.230.27]) by mailout2.samsung.com (Oracle Communications Messaging Server 7u4-24.01(7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0MF70081MPHCFJL0@mailout2.samsung.com> for linux-arm-kernel@lists.infradead.org; Tue, 18 Dec 2012 14:49:40 +0900 (KST) Received: from epcpsbgm2.samsung.com ( [172.20.52.124]) by epcpsbgm2.samsung.com (EPCPMTA) with SMTP id 51.6D.12699.4F300D05; Tue, 18 Dec 2012 14:49:40 +0900 (KST) X-AuditID: cbfee61b-b7f616d00000319b-b2-50d003f46f87 Received: from epmmp1.local.host ( [203.254.227.16]) by epcpsbgm2.samsung.com (EPCPMTA) with SMTP id 30.6D.12699.4F300D05; Tue, 18 Dec 2012 14:49:40 +0900 (KST) Received: from vivekkumarg-linuxpc.sisodomain.com ([107.108.73.134]) by mmp1.samsung.com (Oracle Communications Messaging Server 7u4-24.01(7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTPA id <0MF70006CPIGILA0@mmp1.samsung.com> for linux-arm-kernel@lists.infradead.org; Tue, 18 Dec 2012 14:49:40 +0900 (KST) From: Vivek Gautam To: linux-usb@vger.kernel.org Subject: [PATCH] usb: phy: samsung: Add support to set pmu isolation Date: Tue, 18 Dec 2012 11:26:07 +0530 Message-id: <1355810167-18425-2-git-send-email-gautam.vivek@samsung.com> X-Mailer: git-send-email 1.7.6.5 In-reply-to: <1355810167-18425-1-git-send-email-gautam.vivek@samsung.com> References: <1355810167-18425-1-git-send-email-gautam.vivek@samsung.com> DLP-Filter: Pass X-MTR: 20000000000000000@CPGS X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrDLMWRmVeSWpSXmKPExsWyRsSkRvcL84UAg1NNMhabHl9jdWD02Lyk PoAxissmJTUnsyy1SN8ugSuj+VALS8Ej9Yr5K26zNzCuVuhi5OSQEDCReLJzNjuELSZx4d56 ti5GLg4hgaWMEiuvvWCBKbp6dzM7RGIRo8Sbxa2sEM4eJonNS+4xg1SxCehKNL3dxQhiiwjI Shy+8psZpIhZYCezxNJ7/WwgCWEBF4lPR6cD2RwcLAKqEuffOoGEeQU8JL6fv8sIsU1B4s3t Z2AzOQU8JZ7OeQBmCwHV7Pn8BcxmERCQ+Db5EAvIGAmgXZsOgK2SELjOJtE2fw8zxBxJiYMr brBMYBRewMiwilE0tSC5oDgpPddIrzgxt7g0L10vOT93EyMwCE//eya9g3FVg8UhRgEORiUe 3p/x5wOEWBPLiitzDzFKcDArifDeXgMU4k1JrKxKLcqPLyrNSS0+xOgDdMlEZinR5HxghOSV xBsam5ibGptaGhmZmZriEFYS5232SAkQEkhPLEnNTk0tSC2CGcfEwSnVwCi5/cO5fl1vvoe7 f//veZwt/bB0M/PEHYX7ZWL1z13y0bl07HC8fMuXm19sin/HNUQtXGZ/KER42/ROWbFdHdw3 9R94txk/Yv9QzLDvIeeUA6WZMSZcfJe3T63wbczc1eR7cNns2SzTZBo4dpkKBHJXzLPvSdR+ GdmurPvB2nNHUL/tyv2JO5VYijMSDbWYi4oTASEptIhvAgAA X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFupmkeLIzCtJLcpLzFFi42I5/e+xgO4X5gsBBiffCFlsenyN1YHRY/OS +gDGqAZGm4zUxJTUIoXUvOT8lMy8dFsl7+B453hTMwNDXUNLC3MlhbzE3FRbJRefAF23zByg qUoKZYk5pUChgMTiYiV9O0wTQkPcdC1gGiN0fUOC4HqMDNBAwhrGjOZDLSwFj9Qr5q+4zd7A uFqhi5GTQ0LAROLq3c3sELaYxIV769m6GLk4hAQWMUq8WdzKCuHsYZLYvOQeM0gVm4CuRNPb XYwgtoiArMThK7+ZQYqYBXYySyy9188GkhAWcJH4dHQ6kM3BwSKgKnH+rRNImFfAQ+L7+buM ENsUJN7cfgY2k1PAU+LpnAdgthBQzZ7PX5gnMPIuYGRYxSiaWpBcUJyUnmukV5yYW1yal66X nJ+7iREc4s+kdzCuarA4xCjAwajEw/sz/nyAEGtiWXFl7iFGCQ5mJRHe22uAQrwpiZVVqUX5 8UWlOanFhxh9gI6ayCwlmpwPjL+8knhDYxNzU2NTSxMLEzNLHMJK4rzNHikBQgLpiSWp2amp BalFMOOYODilGhjtL5+bfO57+H627fLJPG6+fhz8om4b1tYqu5Z+ck7/9G/3vC1CczVaIkoK DJ6a3/O3Sk6cIz7VrFa2vINn/eXj55ackI/jm1fzcll66gSlAvXKRa1cqj+CGKIjXJyfuf3/ ess5qVDsjLDQnhcOt5f3Nn20VV6Rfepx4eHLLyereEtd9UzyqFRiKc5INNRiLipOBAAOlhJl ngIAAA== X-CFilter-Loop: Reflected X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20121218_004944_846323_9B7CF0E6 X-CRM114-Status: GOOD ( 16.07 ) X-Spam-Score: -4.6 (----) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-4.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.25 listed in list.dnswl.org] 3.0 KHOP_BIG_TO_CC Sent to 10+ recipients instaed of Bcc or a list -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, linux-samsung-soc@vger.kernel.org, heiko@sntech.de, p.paneri@samsung.com, gregkh@linuxfoundation.org, devicetree-discuss@lists.ozlabs.org, broonie@opensource.wolfsonmicro.com, linux-kernel@vger.kernel.org, balbi@ti.com, grant.likely@secretlab.ca, kyungmin.park@samsung.com, kgene.kim@samsung.com, thomas.abraham@linaro.org, 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 support to parse device node data in order to get required properties to set pmu isolation for usb-phy. Signed-off-by: Vivek Gautam --- .../devicetree/bindings/usb/samsung-usbphy.txt | 10 +++ drivers/usb/phy/samsung-usbphy.c | 80 ++++++++++++++++++-- 2 files changed, 82 insertions(+), 8 deletions(-) diff --git a/Documentation/devicetree/bindings/usb/samsung-usbphy.txt b/Documentation/devicetree/bindings/usb/samsung-usbphy.txt index 7b26e2d..112eaa6 100644 --- a/Documentation/devicetree/bindings/usb/samsung-usbphy.txt +++ b/Documentation/devicetree/bindings/usb/samsung-usbphy.txt @@ -9,3 +9,13 @@ Required properties: - compatible : should be "samsung,exynos4210-usbphy" - reg : base physical address of the phy registers and length of memory mapped region. +- samsung,usb-phyctrl : should point to usb-phyctrl sub-node which provides + binding data to enable/disable device PHY handled by + PMU register. + + Required properties: + - compatible : should be "samsung,usbdev-phyctrl" for + DEVICE type phy. + - samsung,phyctrl-reg: base physical address of + PHY_CONTROL register in PMU. +- samsung,enable-mask : should be '1' diff --git a/drivers/usb/phy/samsung-usbphy.c b/drivers/usb/phy/samsung-usbphy.c index 5c5e1bb5..ef394c3 100644 --- a/drivers/usb/phy/samsung-usbphy.c +++ b/drivers/usb/phy/samsung-usbphy.c @@ -72,6 +72,8 @@ enum samsung_cpu_type { * @dev: The parent device supplied to the probe function * @clk: usb phy clock * @regs: usb phy register memory base + * @devctrl_reg: usb phy-control pmu register memory base + * @en_mask: enable mask * @ref_clk_freq: reference clock frequency selection * @cpu_type: machine identifier */ @@ -81,12 +83,62 @@ struct samsung_usbphy { struct device *dev; struct clk *clk; void __iomem *regs; + void __iomem *devctrl_reg; + u32 en_mask; int ref_clk_freq; int cpu_type; }; #define phy_to_sphy(x) container_of((x), struct samsung_usbphy, phy) +static int samsung_usbphy_parse_dt_param(struct samsung_usbphy *sphy) +{ + struct device_node *usb_phyctrl; + u32 reg; + + if (!sphy->dev->of_node) { + sphy->devctrl_reg = NULL; + return -ENODEV; + } + + usb_phyctrl = of_parse_phandle(sphy->dev->of_node, + "samsung,usb-phyctrl", 0); + if (!usb_phyctrl) { + dev_dbg(sphy->dev, "Can't get usb-phy control node\n"); + sphy->devctrl_reg = NULL; + return -ENODEV; + } + + of_property_read_u32(usb_phyctrl, "samsung,phyctrl-reg", ®); + + sphy->devctrl_reg = ioremap(reg, SZ_4); + + of_property_read_u32(sphy->dev->of_node, "samsung,enable-mask", + &sphy->en_mask); + + return 0; +} + +/* + * Set isolation here for phy. + * SOCs control this by controlling corresponding PMU registers + */ +static void samsung_usbphy_set_isolation(struct samsung_usbphy *sphy, int on) +{ + void __iomem *usb_phyctrl_reg; + u32 en_mask = sphy->en_mask; + u32 reg; + + usb_phyctrl_reg = sphy->devctrl_reg; + + reg = readl(usb_phyctrl_reg); + + if (on) + writel(reg & ~en_mask, usb_phyctrl_reg); + else + writel(reg | en_mask, usb_phyctrl_reg); +} + /* * Returns reference clock frequency selection value */ @@ -199,6 +251,8 @@ static int samsung_usbphy_init(struct usb_phy *phy) /* Disable phy isolation */ if (sphy->plat && sphy->plat->pmu_isolation) sphy->plat->pmu_isolation(false); + else + samsung_usbphy_set_isolation(sphy, false); /* Initialize usb phy registers */ samsung_usbphy_enable(sphy); @@ -228,6 +282,8 @@ static void samsung_usbphy_shutdown(struct usb_phy *phy) /* Enable phy isolation */ if (sphy->plat && sphy->plat->pmu_isolation) sphy->plat->pmu_isolation(true); + else + samsung_usbphy_set_isolation(sphy, true); clk_disable_unprepare(sphy->clk); } @@ -249,17 +305,12 @@ static inline int samsung_usbphy_get_driver_data(struct platform_device *pdev) static int __devinit samsung_usbphy_probe(struct platform_device *pdev) { struct samsung_usbphy *sphy; - struct samsung_usbphy_data *pdata; + struct samsung_usbphy_data *pdata = pdev->dev.platform_data; struct device *dev = &pdev->dev; struct resource *phy_mem; void __iomem *phy_base; struct clk *clk; - - pdata = pdev->dev.platform_data; - if (!pdata) { - dev_err(&pdev->dev, "%s: no platform data defined\n", __func__); - return -EINVAL; - } + int ret; phy_mem = platform_get_resource(pdev, IORESOURCE_MEM, 0); if (!phy_mem) { @@ -283,7 +334,20 @@ static int __devinit samsung_usbphy_probe(struct platform_device *pdev) return PTR_ERR(clk); } - sphy->dev = &pdev->dev; + sphy->dev = &pdev->dev; + + ret = samsung_usbphy_parse_dt_param(sphy); + if (ret) { + /* fallback to pdata */ + if (!pdata) { + dev_err(&pdev->dev, + "%s: no device data found\n", __func__); + return -ENODEV; + } else { + sphy->plat = pdata; + } + } + sphy->plat = pdata; sphy->regs = phy_base; sphy->clk = clk;