From f7e6b7a1bcc8ae3bd4e54f5815d5882aaa57b4c6 Mon Sep 17 00:00:00 2001 From: Taniya Das Date: Fri, 5 Aug 2016 18:16:50 +0530 Subject: clk: qcom: Add support for dummy reset controller The consumers of the dummy clock provider would require support for dummy resets, which would make a dummy assert/deassert reset signals. The dummy reset controller registers for 0-100 reset signals. The consumers node would have the reset phandle and reset specific pairs and the reset signal names. test_node { .... resets = <&clock_gcc GCC_PHY_BCR>; reset-names = "phy_reset"; }; Change-Id: I242d2f36a6b4af53c658dbaa7a0f32e46cd3af33 Signed-off-by: Taniya Das --- drivers/clk/qcom/clk-dummy.c | 49 ++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 45 insertions(+), 4 deletions(-) (limited to 'drivers') diff --git a/drivers/clk/qcom/clk-dummy.c b/drivers/clk/qcom/clk-dummy.c index 3205fbc6b8ba..b62277e74f68 100644 --- a/drivers/clk/qcom/clk-dummy.c +++ b/drivers/clk/qcom/clk-dummy.c @@ -15,14 +15,18 @@ #include #include #include +#include struct clk_dummy { struct clk_hw hw; + struct reset_controller_dev reset; unsigned long rrate; }; #define to_clk_dummy(_hw) container_of(_hw, struct clk_dummy, hw) +#define RESET_MAX 100 + static int dummy_clk_set_rate(struct clk_hw *hw, unsigned long rate, unsigned long parent_rate) { @@ -58,15 +62,35 @@ struct clk_ops clk_dummy_ops = { }; EXPORT_SYMBOL_GPL(clk_dummy_ops); +static int dummy_reset_assert(struct reset_controller_dev *rcdev, + unsigned long id) +{ + pr_debug("%s\n", __func__); + return 0; +} + +static int dummy_reset_deassert(struct reset_controller_dev *rcdev, + unsigned long id) +{ + pr_debug("%s\n", __func__); + return 0; +} + +static struct reset_control_ops dummy_reset_ops = { + .assert = dummy_reset_assert, + .deassert = dummy_reset_deassert, +}; + /** * clk_register_dummy - register dummy clock with the * clock framework * @dev: device that is registering this clock * @name: name of this clock * @flags: framework-specific flags + * @node: device node */ static struct clk *clk_register_dummy(struct device *dev, const char *name, - unsigned long flags) + unsigned long flags, struct device_node *node) { struct clk_dummy *dummy; struct clk *clk; @@ -85,8 +109,20 @@ static struct clk *clk_register_dummy(struct device *dev, const char *name, /* register the clock */ clk = clk_register(dev, &dummy->hw); - if (IS_ERR(clk)) + if (IS_ERR(clk)) { kfree(dummy); + return clk; + } + + dummy->reset.of_node = node; + dummy->reset.ops = &dummy_reset_ops; + dummy->reset.nr_resets = RESET_MAX; + + if (reset_controller_register(&dummy->reset)) + pr_err("Failed to register reset controller for %s\n", name); + else + pr_info("Successfully registered a dummy reset controller for %s\n", + name); return clk; } @@ -101,10 +137,15 @@ static void of_dummy_clk_setup(struct device_node *node) of_property_read_string(node, "clock-output-names", &clk_name); - clk = clk_register_dummy(NULL, clk_name, 0); + clk = clk_register_dummy(NULL, clk_name, 0, node); if (!IS_ERR(clk)) of_clk_add_provider(node, of_clk_src_simple_get, clk); + else { + pr_err("Failed to register dummy clock controller for %s\n", + clk_name); + return; + } - pr_info("%s: Dummy clock registered\n", clk_name); + pr_info("Successfully registered dummy clock for %s\n", clk_name); } CLK_OF_DECLARE(dummy_clk, "qcom,dummycc", of_dummy_clk_setup); -- cgit v1.2.3