From mboxrd@z Thu Jan 1 00:00:00 1970 From: Stephen Boyd Subject: [PATCH 15/21] usb: chipidea: msm: Mux over secondary phy at the right time Date: Sun, 26 Jun 2016 00:28:32 -0700 Message-ID: <20160626072838.28082-16-stephen.boyd@linaro.org> References: <20160626072838.28082-1-stephen.boyd@linaro.org> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <20160626072838.28082-1-stephen.boyd@linaro.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=m.gmane.org@lists.infradead.org To: linux-usb@vger.kernel.org Cc: Felipe Balbi , Arnd Bergmann , Neil Armstrong , linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, Bjorn Andersson , Peter Chen , Greg Kroah-Hartman , Andy Gross , linux-arm-kernel@lists.infradead.org List-Id: linux-arm-msm@vger.kernel.org We need to pick the correct phy at runtime based on how the SoC has been wired onto the board. If the secondary phy is used, take it out of reset and mux over to it by writing into the TCSR register. Make sure to do this on reset too, because this register is reset to the default value (primary phy) after the RESET bit is set in USBCMD. Cc: Peter Chen Cc: Greg Kroah-Hartman Signed-off-by: Stephen Boyd --- drivers/usb/chipidea/ci_hdrc_msm.c | 78 +++++++++++++++++++++++++++++++++++--- 1 file changed, 73 insertions(+), 5 deletions(-) diff --git a/drivers/usb/chipidea/ci_hdrc_msm.c b/drivers/usb/chipidea/ci_hdrc_msm.c index 40249b0e3e93..df0f8b31db4f 100644 --- a/drivers/usb/chipidea/ci_hdrc_msm.c +++ b/drivers/usb/chipidea/ci_hdrc_msm.c @@ -8,30 +8,40 @@ #include #include #include -#include #include #include #include +#include +#include +#include #include "ci.h" #define HS_PHY_AHB_MODE 0x0098 +#define HS_PHY_SEC_CTRL 0x0278 +# define HS_PHY_DIG_CLAMP_N BIT(16) struct ci_hdrc_msm { struct platform_device *ci; struct clk *core_clk; struct clk *iface_clk; + bool secondary_phy; + void __iomem *base; }; static void ci_hdrc_msm_notify_event(struct ci_hdrc *ci, unsigned event) { - struct device *dev = ci->gadget.dev.parent; + struct device *dev = ci->dev->parent; + struct ci_hdrc_msm *msm_ci = dev_get_drvdata(dev); switch (event) { case CI_HDRC_CONTROLLER_RESET_EVENT: dev_dbg(dev, "CI_HDRC_CONTROLLER_RESET_EVENT received\n"); /* use AHB transactor, allow posted data writes */ hw_write_id_reg(ci, HS_PHY_AHB_MODE, 0xffffffff, 0x8); + if (msm_ci->secondary_phy) + hw_write_id_reg(ci, HS_PHY_SEC_CTRL, HS_PHY_DIG_CLAMP_N, + HS_PHY_DIG_CLAMP_N); break; default: dev_dbg(dev, "unknown ci_hdrc event\n"); @@ -49,12 +59,58 @@ static struct ci_hdrc_platform_data ci_hdrc_msm_platdata = { .notify_event = ci_hdrc_msm_notify_event, }; +static int ci_hdrc_msm_mux_phy(struct ci_hdrc_msm *ci, + struct platform_device *pdev) +{ + struct regmap *regmap; + struct device_node *syscon; + struct device *dev = &pdev->dev; + u32 off, val; + int ret; + + syscon = of_parse_phandle(dev->of_node, "phy-select", 0); + if (!syscon) + return 0; + + regmap = syscon_node_to_regmap(syscon); + if (IS_ERR(regmap)) + return PTR_ERR(regmap); + + ret = of_property_read_u32_index(dev->of_node, "phy-select", 1, &off); + if (ret < 0) { + dev_err(dev, "no offset in syscon\n"); + return -EINVAL; + } + + ret = of_property_read_u32_index(dev->of_node, "phy-select", 2, &val); + if (ret < 0) { + dev_err(dev, "no value in syscon\n"); + return -EINVAL; + } + + ret = regmap_write(regmap, off, val); + if (ret) + return ret; + + ci->secondary_phy = !!val; + if (ci->secondary_phy) { + val = readl_relaxed(ci->base + HS_PHY_SEC_CTRL); + val |= HS_PHY_DIG_CLAMP_N; + writel_relaxed(val, ci->base + HS_PHY_SEC_CTRL); + } + + return 0; +} + static int ci_hdrc_msm_probe(struct platform_device *pdev) { struct ci_hdrc_msm *ci; struct platform_device *plat_ci; struct clk *clk; struct reset_control *reset; + struct resource *res; + void __iomem *base; + resource_size_t size; int ret; dev_dbg(&pdev->dev, "ci_hdrc_msm_probe\n"); @@ -76,6 +132,15 @@ static int ci_hdrc_msm_probe(struct platform_device *pdev) if (IS_ERR(clk)) return PTR_ERR(clk); + res = platform_get_resource(pdev, IORESOURCE_MEM, 0); + if (!res) + return -ENODEV; + + size = resource_size(res); + ci->base = base = devm_ioremap(&pdev->dev, res->start, size); + if (!base) + return -ENOMEM; + reset_control_assert(reset); usleep_range(10000, 12000); reset_control_deassert(reset); @@ -88,9 +153,12 @@ static int ci_hdrc_msm_probe(struct platform_device *pdev) if (ret) goto err_iface; - plat_ci = ci_hdrc_add_device(&pdev->dev, - pdev->resource, pdev->num_resources, - &ci_hdrc_msm_platdata); + ret = ci_hdrc_msm_mux_phy(ci, pdev); + if (ret) + goto err_mux; + + plat_ci = ci_hdrc_add_device(&pdev->dev, pdev->resource, + pdev->num_resources, &ci_hdrc_msm_platdata); if (IS_ERR(plat_ci)) { dev_err(&pdev->dev, "ci_hdrc_add_device failed!\n"); ret = PTR_ERR(plat_ci); -- 2.9.0.rc2.8.ga28705d From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752322AbcFZHe0 (ORCPT ); Sun, 26 Jun 2016 03:34:26 -0400 Received: from mail-pf0-f172.google.com ([209.85.192.172]:35630 "EHLO mail-pf0-f172.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751855AbcFZH3B (ORCPT ); Sun, 26 Jun 2016 03:29:01 -0400 From: Stephen Boyd To: linux-usb@vger.kernel.org Cc: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org, Andy Gross , Bjorn Andersson , Neil Armstrong , Arnd Bergmann , Felipe Balbi , Peter Chen , Greg Kroah-Hartman Subject: [PATCH 15/21] usb: chipidea: msm: Mux over secondary phy at the right time Date: Sun, 26 Jun 2016 00:28:32 -0700 Message-Id: <20160626072838.28082-16-stephen.boyd@linaro.org> X-Mailer: git-send-email 2.9.0.rc2.8.ga28705d In-Reply-To: <20160626072838.28082-1-stephen.boyd@linaro.org> References: <20160626072838.28082-1-stephen.boyd@linaro.org> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org We need to pick the correct phy at runtime based on how the SoC has been wired onto the board. If the secondary phy is used, take it out of reset and mux over to it by writing into the TCSR register. Make sure to do this on reset too, because this register is reset to the default value (primary phy) after the RESET bit is set in USBCMD. Cc: Peter Chen Cc: Greg Kroah-Hartman Signed-off-by: Stephen Boyd --- drivers/usb/chipidea/ci_hdrc_msm.c | 78 +++++++++++++++++++++++++++++++++++--- 1 file changed, 73 insertions(+), 5 deletions(-) diff --git a/drivers/usb/chipidea/ci_hdrc_msm.c b/drivers/usb/chipidea/ci_hdrc_msm.c index 40249b0e3e93..df0f8b31db4f 100644 --- a/drivers/usb/chipidea/ci_hdrc_msm.c +++ b/drivers/usb/chipidea/ci_hdrc_msm.c @@ -8,30 +8,40 @@ #include #include #include -#include #include #include #include +#include +#include +#include #include "ci.h" #define HS_PHY_AHB_MODE 0x0098 +#define HS_PHY_SEC_CTRL 0x0278 +# define HS_PHY_DIG_CLAMP_N BIT(16) struct ci_hdrc_msm { struct platform_device *ci; struct clk *core_clk; struct clk *iface_clk; + bool secondary_phy; + void __iomem *base; }; static void ci_hdrc_msm_notify_event(struct ci_hdrc *ci, unsigned event) { - struct device *dev = ci->gadget.dev.parent; + struct device *dev = ci->dev->parent; + struct ci_hdrc_msm *msm_ci = dev_get_drvdata(dev); switch (event) { case CI_HDRC_CONTROLLER_RESET_EVENT: dev_dbg(dev, "CI_HDRC_CONTROLLER_RESET_EVENT received\n"); /* use AHB transactor, allow posted data writes */ hw_write_id_reg(ci, HS_PHY_AHB_MODE, 0xffffffff, 0x8); + if (msm_ci->secondary_phy) + hw_write_id_reg(ci, HS_PHY_SEC_CTRL, HS_PHY_DIG_CLAMP_N, + HS_PHY_DIG_CLAMP_N); break; default: dev_dbg(dev, "unknown ci_hdrc event\n"); @@ -49,12 +59,58 @@ static struct ci_hdrc_platform_data ci_hdrc_msm_platdata = { .notify_event = ci_hdrc_msm_notify_event, }; +static int ci_hdrc_msm_mux_phy(struct ci_hdrc_msm *ci, + struct platform_device *pdev) +{ + struct regmap *regmap; + struct device_node *syscon; + struct device *dev = &pdev->dev; + u32 off, val; + int ret; + + syscon = of_parse_phandle(dev->of_node, "phy-select", 0); + if (!syscon) + return 0; + + regmap = syscon_node_to_regmap(syscon); + if (IS_ERR(regmap)) + return PTR_ERR(regmap); + + ret = of_property_read_u32_index(dev->of_node, "phy-select", 1, &off); + if (ret < 0) { + dev_err(dev, "no offset in syscon\n"); + return -EINVAL; + } + + ret = of_property_read_u32_index(dev->of_node, "phy-select", 2, &val); + if (ret < 0) { + dev_err(dev, "no value in syscon\n"); + return -EINVAL; + } + + ret = regmap_write(regmap, off, val); + if (ret) + return ret; + + ci->secondary_phy = !!val; + if (ci->secondary_phy) { + val = readl_relaxed(ci->base + HS_PHY_SEC_CTRL); + val |= HS_PHY_DIG_CLAMP_N; + writel_relaxed(val, ci->base + HS_PHY_SEC_CTRL); + } + + return 0; +} + static int ci_hdrc_msm_probe(struct platform_device *pdev) { struct ci_hdrc_msm *ci; struct platform_device *plat_ci; struct clk *clk; struct reset_control *reset; + struct resource *res; + void __iomem *base; + resource_size_t size; int ret; dev_dbg(&pdev->dev, "ci_hdrc_msm_probe\n"); @@ -76,6 +132,15 @@ static int ci_hdrc_msm_probe(struct platform_device *pdev) if (IS_ERR(clk)) return PTR_ERR(clk); + res = platform_get_resource(pdev, IORESOURCE_MEM, 0); + if (!res) + return -ENODEV; + + size = resource_size(res); + ci->base = base = devm_ioremap(&pdev->dev, res->start, size); + if (!base) + return -ENOMEM; + reset_control_assert(reset); usleep_range(10000, 12000); reset_control_deassert(reset); @@ -88,9 +153,12 @@ static int ci_hdrc_msm_probe(struct platform_device *pdev) if (ret) goto err_iface; - plat_ci = ci_hdrc_add_device(&pdev->dev, - pdev->resource, pdev->num_resources, - &ci_hdrc_msm_platdata); + ret = ci_hdrc_msm_mux_phy(ci, pdev); + if (ret) + goto err_mux; + + plat_ci = ci_hdrc_add_device(&pdev->dev, pdev->resource, + pdev->num_resources, &ci_hdrc_msm_platdata); if (IS_ERR(plat_ci)) { dev_err(&pdev->dev, "ci_hdrc_add_device failed!\n"); ret = PTR_ERR(plat_ci); -- 2.9.0.rc2.8.ga28705d From mboxrd@z Thu Jan 1 00:00:00 1970 From: stephen.boyd@linaro.org (Stephen Boyd) Date: Sun, 26 Jun 2016 00:28:32 -0700 Subject: [PATCH 15/21] usb: chipidea: msm: Mux over secondary phy at the right time In-Reply-To: <20160626072838.28082-1-stephen.boyd@linaro.org> References: <20160626072838.28082-1-stephen.boyd@linaro.org> Message-ID: <20160626072838.28082-16-stephen.boyd@linaro.org> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org We need to pick the correct phy at runtime based on how the SoC has been wired onto the board. If the secondary phy is used, take it out of reset and mux over to it by writing into the TCSR register. Make sure to do this on reset too, because this register is reset to the default value (primary phy) after the RESET bit is set in USBCMD. Cc: Peter Chen Cc: Greg Kroah-Hartman Signed-off-by: Stephen Boyd --- drivers/usb/chipidea/ci_hdrc_msm.c | 78 +++++++++++++++++++++++++++++++++++--- 1 file changed, 73 insertions(+), 5 deletions(-) diff --git a/drivers/usb/chipidea/ci_hdrc_msm.c b/drivers/usb/chipidea/ci_hdrc_msm.c index 40249b0e3e93..df0f8b31db4f 100644 --- a/drivers/usb/chipidea/ci_hdrc_msm.c +++ b/drivers/usb/chipidea/ci_hdrc_msm.c @@ -8,30 +8,40 @@ #include #include #include -#include #include #include #include +#include +#include +#include #include "ci.h" #define HS_PHY_AHB_MODE 0x0098 +#define HS_PHY_SEC_CTRL 0x0278 +# define HS_PHY_DIG_CLAMP_N BIT(16) struct ci_hdrc_msm { struct platform_device *ci; struct clk *core_clk; struct clk *iface_clk; + bool secondary_phy; + void __iomem *base; }; static void ci_hdrc_msm_notify_event(struct ci_hdrc *ci, unsigned event) { - struct device *dev = ci->gadget.dev.parent; + struct device *dev = ci->dev->parent; + struct ci_hdrc_msm *msm_ci = dev_get_drvdata(dev); switch (event) { case CI_HDRC_CONTROLLER_RESET_EVENT: dev_dbg(dev, "CI_HDRC_CONTROLLER_RESET_EVENT received\n"); /* use AHB transactor, allow posted data writes */ hw_write_id_reg(ci, HS_PHY_AHB_MODE, 0xffffffff, 0x8); + if (msm_ci->secondary_phy) + hw_write_id_reg(ci, HS_PHY_SEC_CTRL, HS_PHY_DIG_CLAMP_N, + HS_PHY_DIG_CLAMP_N); break; default: dev_dbg(dev, "unknown ci_hdrc event\n"); @@ -49,12 +59,58 @@ static struct ci_hdrc_platform_data ci_hdrc_msm_platdata = { .notify_event = ci_hdrc_msm_notify_event, }; +static int ci_hdrc_msm_mux_phy(struct ci_hdrc_msm *ci, + struct platform_device *pdev) +{ + struct regmap *regmap; + struct device_node *syscon; + struct device *dev = &pdev->dev; + u32 off, val; + int ret; + + syscon = of_parse_phandle(dev->of_node, "phy-select", 0); + if (!syscon) + return 0; + + regmap = syscon_node_to_regmap(syscon); + if (IS_ERR(regmap)) + return PTR_ERR(regmap); + + ret = of_property_read_u32_index(dev->of_node, "phy-select", 1, &off); + if (ret < 0) { + dev_err(dev, "no offset in syscon\n"); + return -EINVAL; + } + + ret = of_property_read_u32_index(dev->of_node, "phy-select", 2, &val); + if (ret < 0) { + dev_err(dev, "no value in syscon\n"); + return -EINVAL; + } + + ret = regmap_write(regmap, off, val); + if (ret) + return ret; + + ci->secondary_phy = !!val; + if (ci->secondary_phy) { + val = readl_relaxed(ci->base + HS_PHY_SEC_CTRL); + val |= HS_PHY_DIG_CLAMP_N; + writel_relaxed(val, ci->base + HS_PHY_SEC_CTRL); + } + + return 0; +} + static int ci_hdrc_msm_probe(struct platform_device *pdev) { struct ci_hdrc_msm *ci; struct platform_device *plat_ci; struct clk *clk; struct reset_control *reset; + struct resource *res; + void __iomem *base; + resource_size_t size; int ret; dev_dbg(&pdev->dev, "ci_hdrc_msm_probe\n"); @@ -76,6 +132,15 @@ static int ci_hdrc_msm_probe(struct platform_device *pdev) if (IS_ERR(clk)) return PTR_ERR(clk); + res = platform_get_resource(pdev, IORESOURCE_MEM, 0); + if (!res) + return -ENODEV; + + size = resource_size(res); + ci->base = base = devm_ioremap(&pdev->dev, res->start, size); + if (!base) + return -ENOMEM; + reset_control_assert(reset); usleep_range(10000, 12000); reset_control_deassert(reset); @@ -88,9 +153,12 @@ static int ci_hdrc_msm_probe(struct platform_device *pdev) if (ret) goto err_iface; - plat_ci = ci_hdrc_add_device(&pdev->dev, - pdev->resource, pdev->num_resources, - &ci_hdrc_msm_platdata); + ret = ci_hdrc_msm_mux_phy(ci, pdev); + if (ret) + goto err_mux; + + plat_ci = ci_hdrc_add_device(&pdev->dev, pdev->resource, + pdev->num_resources, &ci_hdrc_msm_platdata); if (IS_ERR(plat_ci)) { dev_err(&pdev->dev, "ci_hdrc_add_device failed!\n"); ret = PTR_ERR(plat_ci); -- 2.9.0.rc2.8.ga28705d