From patchwork Fri Dec 21 08:16:19 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vivek Gautam X-Patchwork-Id: 1902371 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 9D8003FC64 for ; Fri, 21 Dec 2012 08:13:35 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1Tlxgr-0007EB-NG; Fri, 21 Dec 2012 08:10:45 +0000 Received: from mailout1.samsung.com ([203.254.224.24]) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1Tlxge-0007BN-TD for linux-arm-kernel@lists.infradead.org; Fri, 21 Dec 2012 08:10:34 +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 <0MFD00653G024DS0@mailout1.samsung.com> for linux-arm-kernel@lists.infradead.org; Fri, 21 Dec 2012 17:09:49 +0900 (KST) Received: from epcpsbgm1.samsung.com ( [172.20.52.123]) by epcpsbgm1.samsung.com (EPCPMTA) with SMTP id 7E.A2.01231.D4914D05; Fri, 21 Dec 2012 17:09:49 +0900 (KST) X-AuditID: cbfee61a-b7fa66d0000004cf-6c-50d4194dc8ec Received: from epmmp2 ( [203.254.227.17]) by epcpsbgm1.samsung.com (EPCPMTA) with SMTP id 8D.A2.01231.D4914D05; Fri, 21 Dec 2012 17:09:49 +0900 (KST) Received: from vivekkumarg-linuxpc.sisodomain.com ([107.108.73.134]) by mmp2.samsung.com (Oracle Communications Messaging Server 7u4-24.01(7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTPA id <0MFD00KN4G01Q430@mmp2.samsung.com> for linux-arm-kernel@lists.infradead.org; Fri, 21 Dec 2012 17:09:49 +0900 (KST) From: Vivek Gautam To: linux-usb@vger.kernel.org Subject: [PATCH v3] usb: phy: samsung: Add support to set pmu isolation Date: Fri, 21 Dec 2012 13:46:19 +0530 Message-id: <1356077779-5759-2-git-send-email-gautam.vivek@samsung.com> X-Mailer: git-send-email 1.7.6.5 In-reply-to: <1356077779-5759-1-git-send-email-gautam.vivek@samsung.com> References: <1356077779-5759-1-git-send-email-gautam.vivek@samsung.com> DLP-Filter: Pass X-MTR: 20000000000000000@CPGS X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrNLMWRmVeSWpSXmKPExsWyRsSkWtdX8kqAwflbohabHl9jdWD02Lyk PoAxissmJTUnsyy1SN8ugStjRfd3poIm/4o/JyMaGP/adzFyckgImEjs+7ieHcIWk7hwbz1b FyMXh5DAUkaJiZfOssEUzevczQyRmM4oseTMD1YIZw+TxPJHX1lAqtgEdCWa3u5iBLFFBGQl Dl/5DdbBLPCOWaJ711tmkISwgLvEiw/XgBo4OFgEVCWWfy0BCfMChVctARkKsk1B4s3tZ2Dl nAIeErPeXwCbKQRUs6FpFdhFLAICEt8mHwIbIwG0a9MBsFUSApfZJG5sncQCMUdS4uCKGywT GIUXMDKsYhRNLUguKE5KzzXUK07MLS7NS9dLzs/dxAgMwdP/nkntYFzZYHGIUYCDUYmHl9Hs coAQa2JZcWXuIUYJDmYlEV6mr0Ah3pTEyqrUovz4otKc1OJDjD5Al0xklhJNzgfGR15JvKGx ibmpsamlkZGZqSkOYSVx3maPlAAhgfTEktTs1NSC1CKYcUwcnFINjLLS5tZ6nevuBWncSXhU ysY3R9239trL2ftXfvNcvEPMXWHr6dmVMUFlEpM+3FNwerlM/5vpZp5LojVBXx48c10w5XLc /jzfYqUaFhPPA94v5l/fWRz4ekXzt2mivyYJcF+8ft9uS8tKv7DC1GvR67zvJ25JSni04uwl 8TiL6OpVZT5Hv0wNuKLEUpyRaKjFXFScCACqxtD1bgIAAA== X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFupikeLIzCtJLcpLzFFi42I5/e+xoK6v5JUAg7WfOC02Pb7G6sDosXlJ fQBjVAOjTUZqYkpqkUJqXnJ+SmZeuq2Sd3C8c7ypmYGhrqGlhbmSQl5ibqqtkotPgK5bZg7Q VCWFssScUqBQQGJxsZK+HaYJoSFuuhYwjRG6viFBcD1GBmggYQ1jxoru70wFTf4Vf05GNDD+ te9i5OSQEDCRmNe5mxnCFpO4cG89WxcjF4eQwHRGiSVnfrBCOHuYJJY/+soCUsUmoCvR9HYX I4gtIiArcfjKb2aQImaBd8wS3bvego0SFnCXePHhGlADBweLgKrE8q8lIGFeoPCqJSBDQbYp SLy5/QysnFPAQ2LW+wtgM4WAajY0rWKbwMi7gJFhFaNoakFyQXFSeq6hXnFibnFpXrpecn7u JkZwgD+T2sG4ssHiEKMAB6MSDy+j2eUAIdbEsuLK3EOMEhzMSiK8TF+BQrwpiZVVqUX58UWl OanFhxh9gI6ayCwlmpwPjL68knhDYxNzU2NTSxMLEzNLHMJK4rzNHikBQgLpiSWp2ampBalF MOOYODilGhijC9iOhCcYlq6zs3RK6w/b5rj+c7RFWfJ0vn2Zfxre7KsNuvsgza/F+V3/1gWL 0y/xCD64wXUn/+epXaw35s2S6Aq/lFfeGrx7Rk+/qSSXfKfLmUSDN5FhN2Z+X/w90PzCvzaP q5WL2Nt9Z+Ud8TbYz77EX2/R+4drBB0TGfgupfm4iVhy6iixFGckGmoxFxUnAgDR3F6WnQIA AA== X-CFilter-Loop: Reflected X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20121221_031033_248142_31273911 X-CRM114-Status: GOOD ( 20.67 ) 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.24 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, dianders@chromium.org, grant.likely@secretlab.ca, kyungmin.park@samsung.com, kgene.kim@samsung.com, thomas.abraham@linaro.org, ben-linux@fluff.org, sylvester.nawrocki@gmail.com, 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 | 28 ++++ drivers/usb/phy/samsung-usbphy.c | 145 +++++++++++++++++--- 2 files changed, 152 insertions(+), 21 deletions(-) diff --git a/Documentation/devicetree/bindings/usb/samsung-usbphy.txt b/Documentation/devicetree/bindings/usb/samsung-usbphy.txt index 7b26e2d..09f06f8 100644 --- a/Documentation/devicetree/bindings/usb/samsung-usbphy.txt +++ b/Documentation/devicetree/bindings/usb/samsung-usbphy.txt @@ -9,3 +9,31 @@ Required properties: - compatible : should be "samsung,exynos4210-usbphy" - reg : base physical address of the phy registers and length of memory mapped region. +- #address-cells: should be 1. +- #size-cells: should be 0. + +Optional properties: +- The samsung usbphy nodes should provide the following information required + by USB-phy controller to enable/disable the phy controller. + - reg : base physical address of PHY control register in PMU which + enables/disables the phy controller. + The size of this register is the total sum of size of all phy-control + registers that the SoC has. For example, the size will be + '0x4' in case we have only one phy-control register (like in S3C64XX) or + '0x8' in case we have two phy-control registers (like in Exynos4210) + and so on. + +Example: + - Exysno4210 + + usbphy@125B0000 { + #address-cells = <1>; + #size-cells = <1>; + compatible = "samsung,exynos4210-usbphy"; + reg = <0x125B0000 0x100>; + + usbphy-pmu { + /* USB device and host PHY_CONTROL registers */ + reg = <0x10020704 0x8>; + }; + }; diff --git a/drivers/usb/phy/samsung-usbphy.c b/drivers/usb/phy/samsung-usbphy.c index 5c5e1bb5..2260029 100644 --- a/drivers/usb/phy/samsung-usbphy.c +++ b/drivers/usb/phy/samsung-usbphy.c @@ -60,20 +60,43 @@ #define MHZ (1000*1000) #endif +#define S3C64XX_USBPHY_ENABLE (0x1 << 16) +#define EXYNOS_USBPHY_ENABLE (0x1 << 0) + enum samsung_cpu_type { TYPE_S3C64XX, TYPE_EXYNOS4210, }; /* + * struct samsung_usbphy_drvdata - driver data for various SoC variants + * @cpu_type: machine identifier + * @devphy_en_mask: device phy enable mask for PHY CONTROL register + * @hostphy_en_mask: host phy enable mask for PHY CONTROL register + * + * having different mask for host and device type phy + * helps in setting independent masks in case of SoCs like + * S5PV210 in which PHY0 and PHY1 enable bits belong to same + * register placed at [0] and [1] respectively. + * Although for newer SoCs like exynos these bits belong to + * different registers altogether placed at [0]. + */ +struct samsung_usbphy_drvdata { + int cpu_type; + int devphy_en_mask; + int hostphy_en_mask; +}; + +/* * struct samsung_usbphy - transceiver driver state * @phy: transceiver structure * @plat: platform data * @dev: The parent device supplied to the probe function * @clk: usb phy clock * @regs: usb phy register memory base + * @phyctrl_pmureg: usb device phy-control pmu register memory base * @ref_clk_freq: reference clock frequency selection - * @cpu_type: machine identifier + * @drv_data: driver data available for different cpu types */ struct samsung_usbphy { struct usb_phy phy; @@ -81,12 +104,66 @@ struct samsung_usbphy { struct device *dev; struct clk *clk; void __iomem *regs; + void __iomem *phyctrl_pmureg; int ref_clk_freq; - int cpu_type; + struct samsung_usbphy_drvdata *drv_data; }; #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 *usbphy_pmu; + u32 reg[2]; + int ret; + + if (!sphy->dev->of_node) { + dev_err(sphy->dev, "Can't get usb-phy node\n"); + return -ENODEV; + } + + usbphy_pmu = of_get_child_by_name(sphy->dev->of_node, "usbphy-pmu"); + if (!usbphy_pmu) + dev_warn(sphy->dev, "Can't get usb-phy pmu control node\n"); + + ret = of_property_read_u32_array(usbphy_pmu, "reg", reg, 2); + if (!ret) + sphy->phyctrl_pmureg = ioremap(reg[0], reg[1]); + + of_node_put(usbphy_pmu); + + if (IS_ERR_OR_NULL(sphy->phyctrl_pmureg)) { + dev_err(sphy->dev, "Can't get usb-phy pmu control register\n"); + return -ENODEV; + } + + 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) +{ + u32 reg; + int en_mask; + + if (!sphy->phyctrl_pmureg) { + dev_warn(sphy->dev, "Can't set pmu isolation\n"); + return; + } + + reg = readl(sphy->phyctrl_pmureg); + + en_mask = sphy->drv_data->devphy_en_mask; + + if (on) + writel(reg & ~en_mask, sphy->phyctrl_pmureg); + else + writel(reg | en_mask, sphy->phyctrl_pmureg); +} + /* * Returns reference clock frequency selection value */ @@ -112,7 +189,7 @@ static int samsung_usbphy_get_refclk_freq(struct samsung_usbphy *sphy) refclk_freq = PHYCLK_CLKSEL_48M; break; default: - if (sphy->cpu_type == TYPE_S3C64XX) + if (sphy->drv_data->cpu_type == TYPE_S3C64XX) refclk_freq = PHYCLK_CLKSEL_48M; else refclk_freq = PHYCLK_CLKSEL_24M; @@ -135,7 +212,7 @@ static void samsung_usbphy_enable(struct samsung_usbphy *sphy) phypwr = readl(regs + SAMSUNG_PHYPWR); rstcon = readl(regs + SAMSUNG_RSTCON); - switch (sphy->cpu_type) { + switch (sphy->drv_data->cpu_type) { case TYPE_S3C64XX: phyclk &= ~PHYCLK_COMMON_ON_N; phypwr &= ~PHYPWR_NORMAL_MASK; @@ -165,7 +242,7 @@ static void samsung_usbphy_disable(struct samsung_usbphy *sphy) phypwr = readl(regs + SAMSUNG_PHYPWR); - switch (sphy->cpu_type) { + switch (sphy->drv_data->cpu_type) { case TYPE_S3C64XX: phypwr |= PHYPWR_NORMAL_MASK; break; @@ -199,6 +276,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,38 +307,37 @@ 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); } static const struct of_device_id samsung_usbphy_dt_match[]; -static inline int samsung_usbphy_get_driver_data(struct platform_device *pdev) +static inline struct samsung_usbphy_drvdata +*samsung_usbphy_get_driver_data(struct platform_device *pdev) { if (pdev->dev.of_node) { const struct of_device_id *match; match = of_match_node(samsung_usbphy_dt_match, pdev->dev.of_node); - return (int) match->data; + return (struct samsung_usbphy_drvdata *) match->data; } - return platform_get_device_id(pdev)->driver_data; + return ((struct samsung_usbphy_drvdata *) + platform_get_device_id(pdev)->driver_data); } 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 +361,19 @@ static int __devinit samsung_usbphy_probe(struct platform_device *pdev) return PTR_ERR(clk); } - sphy->dev = &pdev->dev; + sphy->dev = dev; + + if (dev->of_node) { + ret = samsung_usbphy_parse_dt_param(sphy); + if (ret < 0) + return ret; + } else { + if (!pdata) { + dev_err(dev, "no platform data specified\n"); + return -EINVAL; + } + } + sphy->plat = pdata; sphy->regs = phy_base; sphy->clk = clk; @@ -291,7 +381,7 @@ static int __devinit samsung_usbphy_probe(struct platform_device *pdev) sphy->phy.label = "samsung-usbphy"; sphy->phy.init = samsung_usbphy_init; sphy->phy.shutdown = samsung_usbphy_shutdown; - sphy->cpu_type = samsung_usbphy_get_driver_data(pdev); + sphy->drv_data = samsung_usbphy_get_driver_data(pdev); sphy->ref_clk_freq = samsung_usbphy_get_refclk_freq(sphy); platform_set_drvdata(pdev, sphy); @@ -305,17 +395,30 @@ static int __exit samsung_usbphy_remove(struct platform_device *pdev) usb_remove_phy(&sphy->phy); + if (sphy->phyctrl_pmureg) + iounmap(sphy->phyctrl_pmureg); + return 0; } +static struct samsung_usbphy_drvdata usbphy_s3c64xx = { + .cpu_type = TYPE_S3C64XX, + .devphy_en_mask = S3C64XX_USBPHY_ENABLE, +}; + +static struct samsung_usbphy_drvdata usbphy_exynos4 = { + .cpu_type = TYPE_EXYNOS4210, + .devphy_en_mask = EXYNOS_USBPHY_ENABLE, +}; + #ifdef CONFIG_OF static const struct of_device_id samsung_usbphy_dt_match[] = { { .compatible = "samsung,s3c64xx-usbphy", - .data = (void *)TYPE_S3C64XX, + .data = (void *)&usbphy_s3c64xx, }, { .compatible = "samsung,exynos4210-usbphy", - .data = (void *)TYPE_EXYNOS4210, + .data = (void *)&usbphy_exynos4, }, {}, }; @@ -325,10 +428,10 @@ MODULE_DEVICE_TABLE(of, samsung_usbphy_dt_match); static struct platform_device_id samsung_usbphy_driver_ids[] = { { .name = "s3c64xx-usbphy", - .driver_data = TYPE_S3C64XX, + .driver_data = (unsigned long)&usbphy_s3c64xx, }, { .name = "exynos4210-usbphy", - .driver_data = TYPE_EXYNOS4210, + .driver_data = (unsigned long)&usbphy_exynos4, }, {}, };