From: Heiko Stuebner <heiko@sntech.de> To: kishon@ti.com, mturquette@baylibre.com, sboyd@codeaurora.org Cc: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-rockchip@lists.infradead.org, dianders@chromium.org, romain.perier@gmail.com, arnd@arndb.de, hl@rock-chips.com, Heiko Stuebner <heiko@sntech.de> Subject: [PATCH v2 2/8] phy: rockchip-usb: introduce a common data-struct for the device Date: Sun, 8 Nov 2015 17:04:35 +0100 [thread overview] Message-ID: <1446998681-26436-3-git-send-email-heiko@sntech.de> (raw) In-Reply-To: <1446998681-26436-1-git-send-email-heiko@sntech.de> This introduces a common struct that holds data belonging to the umbrella device that contains all the phys and that we want to use later. Signed-off-by: Heiko Stuebner <heiko@sntech.de> --- drivers/phy/phy-rockchip-usb.c | 26 +++++++++++++++++++------- 1 file changed, 19 insertions(+), 7 deletions(-) diff --git a/drivers/phy/phy-rockchip-usb.c b/drivers/phy/phy-rockchip-usb.c index dfc056b..e081053 100644 --- a/drivers/phy/phy-rockchip-usb.c +++ b/drivers/phy/phy-rockchip-usb.c @@ -36,9 +36,14 @@ #define SIDDQ_ON BIT(13) #define SIDDQ_OFF (0 << 13) +struct rockchip_usb_phy_base { + struct device *dev; + struct regmap *reg_base; +}; + struct rockchip_usb_phy { + struct rockchip_usb_phy_base *base; unsigned int reg_offset; - struct regmap *reg_base; struct clk *clk; struct phy *phy; }; @@ -46,7 +51,7 @@ struct rockchip_usb_phy { static int rockchip_usb_phy_power(struct rockchip_usb_phy *phy, bool siddq) { - return regmap_write(phy->reg_base, phy->reg_offset, + return regmap_write(phy->base->reg_base, phy->reg_offset, SIDDQ_WRITE_ENA | (siddq ? SIDDQ_ON : SIDDQ_OFF)); } @@ -101,17 +106,23 @@ static void rockchip_usb_phy_action(void *data) static int rockchip_usb_phy_probe(struct platform_device *pdev) { struct device *dev = &pdev->dev; + struct rockchip_usb_phy_base *phy_base; struct rockchip_usb_phy *rk_phy; struct phy_provider *phy_provider; struct device_node *child; - struct regmap *grf; unsigned int reg_offset; int err; - grf = syscon_regmap_lookup_by_phandle(dev->of_node, "rockchip,grf"); - if (IS_ERR(grf)) { + phy_base = devm_kzalloc(dev, sizeof(*phy_base), GFP_KERNEL); + if (!phy_base) + return -ENOMEM; + + phy_base->dev = dev; + phy_base->reg_base = syscon_regmap_lookup_by_phandle(dev->of_node, + "rockchip,grf"); + if (IS_ERR(phy_base->reg_base)) { dev_err(&pdev->dev, "Missing rockchip,grf property\n"); - return PTR_ERR(grf); + return PTR_ERR(phy_base->reg_base); } for_each_available_child_of_node(dev->of_node, child) { @@ -119,6 +130,8 @@ static int rockchip_usb_phy_probe(struct platform_device *pdev) if (!rk_phy) return -ENOMEM; + rk_phy->base = phy_base; + if (of_property_read_u32(child, "reg", ®_offset)) { dev_err(dev, "missing reg property in node %s\n", child->name); @@ -126,7 +139,6 @@ static int rockchip_usb_phy_probe(struct platform_device *pdev) } rk_phy->reg_offset = reg_offset; - rk_phy->reg_base = grf; rk_phy->clk = of_clk_get_by_name(child, "phyclk"); if (IS_ERR(rk_phy->clk)) -- 2.6.2
WARNING: multiple messages have this Message-ID (diff)
From: heiko@sntech.de (Heiko Stuebner) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH v2 2/8] phy: rockchip-usb: introduce a common data-struct for the device Date: Sun, 8 Nov 2015 17:04:35 +0100 [thread overview] Message-ID: <1446998681-26436-3-git-send-email-heiko@sntech.de> (raw) In-Reply-To: <1446998681-26436-1-git-send-email-heiko@sntech.de> This introduces a common struct that holds data belonging to the umbrella device that contains all the phys and that we want to use later. Signed-off-by: Heiko Stuebner <heiko@sntech.de> --- drivers/phy/phy-rockchip-usb.c | 26 +++++++++++++++++++------- 1 file changed, 19 insertions(+), 7 deletions(-) diff --git a/drivers/phy/phy-rockchip-usb.c b/drivers/phy/phy-rockchip-usb.c index dfc056b..e081053 100644 --- a/drivers/phy/phy-rockchip-usb.c +++ b/drivers/phy/phy-rockchip-usb.c @@ -36,9 +36,14 @@ #define SIDDQ_ON BIT(13) #define SIDDQ_OFF (0 << 13) +struct rockchip_usb_phy_base { + struct device *dev; + struct regmap *reg_base; +}; + struct rockchip_usb_phy { + struct rockchip_usb_phy_base *base; unsigned int reg_offset; - struct regmap *reg_base; struct clk *clk; struct phy *phy; }; @@ -46,7 +51,7 @@ struct rockchip_usb_phy { static int rockchip_usb_phy_power(struct rockchip_usb_phy *phy, bool siddq) { - return regmap_write(phy->reg_base, phy->reg_offset, + return regmap_write(phy->base->reg_base, phy->reg_offset, SIDDQ_WRITE_ENA | (siddq ? SIDDQ_ON : SIDDQ_OFF)); } @@ -101,17 +106,23 @@ static void rockchip_usb_phy_action(void *data) static int rockchip_usb_phy_probe(struct platform_device *pdev) { struct device *dev = &pdev->dev; + struct rockchip_usb_phy_base *phy_base; struct rockchip_usb_phy *rk_phy; struct phy_provider *phy_provider; struct device_node *child; - struct regmap *grf; unsigned int reg_offset; int err; - grf = syscon_regmap_lookup_by_phandle(dev->of_node, "rockchip,grf"); - if (IS_ERR(grf)) { + phy_base = devm_kzalloc(dev, sizeof(*phy_base), GFP_KERNEL); + if (!phy_base) + return -ENOMEM; + + phy_base->dev = dev; + phy_base->reg_base = syscon_regmap_lookup_by_phandle(dev->of_node, + "rockchip,grf"); + if (IS_ERR(phy_base->reg_base)) { dev_err(&pdev->dev, "Missing rockchip,grf property\n"); - return PTR_ERR(grf); + return PTR_ERR(phy_base->reg_base); } for_each_available_child_of_node(dev->of_node, child) { @@ -119,6 +130,8 @@ static int rockchip_usb_phy_probe(struct platform_device *pdev) if (!rk_phy) return -ENOMEM; + rk_phy->base = phy_base; + if (of_property_read_u32(child, "reg", ®_offset)) { dev_err(dev, "missing reg property in node %s\n", child->name); @@ -126,7 +139,6 @@ static int rockchip_usb_phy_probe(struct platform_device *pdev) } rk_phy->reg_offset = reg_offset; - rk_phy->reg_base = grf; rk_phy->clk = of_clk_get_by_name(child, "phyclk"); if (IS_ERR(rk_phy->clk)) -- 2.6.2
next prev parent reply other threads:[~2015-11-08 16:05 UTC|newest] Thread overview: 54+ messages / expand[flat|nested] mbox.gz Atom feed top 2015-11-08 16:04 [PATCH v2 0/8] phy: rockchip-usb: correct pll handling and usb-uart Heiko Stuebner 2015-11-08 16:04 ` Heiko Stuebner 2015-11-08 16:04 ` [PATCH v2 1/8] phy: rockchip-usb: fix clock get-put mismatch Heiko Stuebner 2015-11-08 16:04 ` Heiko Stuebner 2015-11-08 16:04 ` Heiko Stuebner 2015-11-08 16:04 ` Heiko Stuebner [this message] 2015-11-08 16:04 ` [PATCH v2 2/8] phy: rockchip-usb: introduce a common data-struct for the device Heiko Stuebner 2015-11-08 16:04 ` [PATCH v2 3/8] phy: rockchip-usb: move per-phy init into a separate function Heiko Stuebner 2015-11-08 16:04 ` Heiko Stuebner 2015-11-08 16:04 ` Heiko Stuebner 2015-11-08 16:04 ` [PATCH v2 4/8] phy: rockchip-usb: expose the phy-internal PLLs Heiko Stuebner 2015-11-08 16:04 ` Heiko Stuebner 2015-11-09 20:59 ` Doug Anderson 2015-11-09 20:59 ` Doug Anderson 2015-11-09 20:59 ` Doug Anderson 2015-11-09 21:08 ` Heiko Stuebner 2015-11-09 21:08 ` Heiko Stuebner 2015-11-09 21:08 ` Heiko Stuebner 2015-11-09 21:12 ` Doug Anderson 2015-11-09 21:12 ` Doug Anderson 2015-11-09 21:12 ` Doug Anderson 2015-11-08 16:04 ` [PATCH v2 5/8] clk: rockchip: fix usbphy-related clocks Heiko Stuebner 2015-11-08 16:04 ` Heiko Stuebner 2015-11-08 16:04 ` Heiko Stuebner 2015-11-09 21:01 ` Doug Anderson 2015-11-09 21:01 ` Doug Anderson 2015-11-09 21:01 ` Doug Anderson 2015-11-08 16:04 ` [PATCH v2 6/8] ARM: dts: rockchip: add clock-cells for usb phy nodes Heiko Stuebner 2015-11-08 16:04 ` Heiko Stuebner 2015-11-09 21:01 ` Doug Anderson 2015-11-09 21:01 ` Doug Anderson 2015-11-09 21:01 ` Doug Anderson 2015-11-08 16:04 ` [PATCH v2 7/8] ARM: dts: rockchip: assign usbphy480m_src to the new usbphy pll on veyron Heiko Stuebner 2015-11-08 16:04 ` Heiko Stuebner 2015-11-09 21:08 ` Doug Anderson 2015-11-09 21:08 ` Doug Anderson 2015-11-09 21:08 ` Doug Anderson 2015-11-09 22:08 ` Heiko Stuebner 2015-11-09 22:08 ` Heiko Stuebner 2015-11-09 22:08 ` Heiko Stuebner 2015-11-08 16:04 ` [PATCH v2 8/8] phy: rockchip-usb: add handler for usb-uart functionality Heiko Stuebner 2015-11-08 16:04 ` Heiko Stuebner 2015-11-09 21:11 ` [PATCH v2 0/8] phy: rockchip-usb: correct pll handling and usb-uart Doug Anderson 2015-11-09 21:11 ` Doug Anderson 2015-11-09 21:11 ` Doug Anderson 2015-11-09 21:27 ` Heiko Stuebner 2015-11-09 21:27 ` Heiko Stuebner 2015-11-09 21:27 ` Heiko Stuebner 2015-11-09 21:32 ` Doug Anderson 2015-11-09 21:32 ` Doug Anderson 2015-11-09 21:32 ` Doug Anderson 2015-11-09 21:48 ` Heiko Stuebner 2015-11-09 21:48 ` Heiko Stuebner 2015-11-09 21:48 ` Heiko Stuebner
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1446998681-26436-3-git-send-email-heiko@sntech.de \ --to=heiko@sntech.de \ --cc=arnd@arndb.de \ --cc=dianders@chromium.org \ --cc=hl@rock-chips.com \ --cc=kishon@ti.com \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-rockchip@lists.infradead.org \ --cc=mturquette@baylibre.com \ --cc=romain.perier@gmail.com \ --cc=sboyd@codeaurora.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.