diff options
author | John Crispin <john@phrozen.org> | 2016-12-25 20:11:34 +0100 |
---|---|---|
committer | John Crispin <john@phrozen.org> | 2017-08-05 08:46:36 +0200 |
commit | 74d00a8c3849c1340efd713eb94b786e304c201f (patch) | |
tree | de481743de61c34da96ab5f9dba3af3edcfb8260 /target/linux/generic/pending-4.4/083-0002-clk-Add-clk_hw-OF-clk-providers.patch | |
parent | de350550ef648d9728351b986b0516fa29465c45 (diff) | |
download | upstream-74d00a8c3849c1340efd713eb94b786e304c201f.tar.gz upstream-74d00a8c3849c1340efd713eb94b786e304c201f.tar.bz2 upstream-74d00a8c3849c1340efd713eb94b786e304c201f.zip |
kernel: split patches folder up into backport, pending and hack folders
* properly format/comment all patches
* merge debloat patches
* merge Kconfig patches
* merge swconfig patches
* merge hotplug patches
* drop 200-fix_localversion.patch - upstream
* drop 222-arm_zimage_none.patch - unused
* drop 252-mv_cesa_depends.patch - no longer required
* drop 410-mtd-move-forward-declaration-of-struct-mtd_info.patch - unused
* drop 661-fq_codel_keep_dropped_stats.patch - outdated
* drop 702-phy_add_aneg_done_function.patch - upstream
* drop 840-rtc7301.patch - unused
* drop 841-rtc_pt7c4338.patch - upstream
* drop 921-use_preinit_as_init.patch - unused
* drop spio-gpio-old and gpio-mmc - unused
Signed-off-by: John Crispin <john@phrozen.org>
Diffstat (limited to 'target/linux/generic/pending-4.4/083-0002-clk-Add-clk_hw-OF-clk-providers.patch')
-rw-r--r-- | target/linux/generic/pending-4.4/083-0002-clk-Add-clk_hw-OF-clk-providers.patch | 234 |
1 files changed, 234 insertions, 0 deletions
diff --git a/target/linux/generic/pending-4.4/083-0002-clk-Add-clk_hw-OF-clk-providers.patch b/target/linux/generic/pending-4.4/083-0002-clk-Add-clk_hw-OF-clk-providers.patch new file mode 100644 index 0000000000..0bcb5bb805 --- /dev/null +++ b/target/linux/generic/pending-4.4/083-0002-clk-Add-clk_hw-OF-clk-providers.patch @@ -0,0 +1,234 @@ +From 0861e5b8cf80038e91942f1005c8dfce79d18c38 Mon Sep 17 00:00:00 2001 +From: Stephen Boyd <sboyd@codeaurora.org> +Date: Fri, 5 Feb 2016 17:38:26 -0800 +Subject: [PATCH] clk: Add clk_hw OF clk providers + +Now that we have a clk registration API that doesn't return +struct clks, we need to have some way to hand out struct clks via +the clk_get() APIs that doesn't involve associating struct clk +pointers with an OF node. Currently we ask the OF provider to +give us a struct clk pointer for some clkspec, turn that struct +clk into a struct clk_hw and then allocate a new struct clk to +return to the caller. + +Let's add a clk_hw based OF provider hook that returns a struct +clk_hw directly, so that we skip the intermediate step of +converting from struct clk to struct clk_hw. Eventually when +we've converted all OF clk providers to struct clk_hw based APIs +we can remove the struct clk based ones. + +It should also be noted that we change the onecell provider to +have a flex array instead of a pointer for the array of clk_hw +pointers. This allows providers to allocate one structure of the +correct length in one step instead of two. + +Signed-off-by: Stephen Boyd <sboyd@codeaurora.org> +--- + drivers/clk/clk.c | 85 +++++++++++++++++++++++++++++++++++++++++--- + include/linux/clk-provider.h | 30 ++++++++++++++++ + 2 files changed, 111 insertions(+), 4 deletions(-) + +--- a/drivers/clk/clk.c ++++ b/drivers/clk/clk.c +@@ -3001,6 +3001,7 @@ struct of_clk_provider { + + struct device_node *node; + struct clk *(*get)(struct of_phandle_args *clkspec, void *data); ++ struct clk_hw *(*get_hw)(struct of_phandle_args *clkspec, void *data); + void *data; + }; + +@@ -3017,6 +3018,12 @@ struct clk *of_clk_src_simple_get(struct + } + EXPORT_SYMBOL_GPL(of_clk_src_simple_get); + ++struct clk_hw *of_clk_hw_simple_get(struct of_phandle_args *clkspec, void *data) ++{ ++ return data; ++} ++EXPORT_SYMBOL_GPL(of_clk_hw_simple_get); ++ + struct clk *of_clk_src_onecell_get(struct of_phandle_args *clkspec, void *data) + { + struct clk_onecell_data *clk_data = data; +@@ -3031,6 +3038,21 @@ struct clk *of_clk_src_onecell_get(struc + } + EXPORT_SYMBOL_GPL(of_clk_src_onecell_get); + ++struct clk_hw * ++of_clk_hw_onecell_get(struct of_phandle_args *clkspec, void *data) ++{ ++ struct clk_hw_onecell_data *hw_data = data; ++ unsigned int idx = clkspec->args[0]; ++ ++ if (idx >= hw_data->num) { ++ pr_err("%s: invalid index %u\n", __func__, idx); ++ return ERR_PTR(-EINVAL); ++ } ++ ++ return hw_data->hws[idx]; ++} ++EXPORT_SYMBOL_GPL(of_clk_hw_onecell_get); ++ + /** + * of_clk_add_provider() - Register a clock provider for a node + * @np: Device node pointer associated with clock provider +@@ -3067,6 +3089,41 @@ int of_clk_add_provider(struct device_no + EXPORT_SYMBOL_GPL(of_clk_add_provider); + + /** ++ * of_clk_add_hw_provider() - Register a clock provider for a node ++ * @np: Device node pointer associated with clock provider ++ * @get: callback for decoding clk_hw ++ * @data: context pointer for @get callback. ++ */ ++int of_clk_add_hw_provider(struct device_node *np, ++ struct clk_hw *(*get)(struct of_phandle_args *clkspec, ++ void *data), ++ void *data) ++{ ++ struct of_clk_provider *cp; ++ int ret; ++ ++ cp = kzalloc(sizeof(*cp), GFP_KERNEL); ++ if (!cp) ++ return -ENOMEM; ++ ++ cp->node = of_node_get(np); ++ cp->data = data; ++ cp->get_hw = get; ++ ++ mutex_lock(&of_clk_mutex); ++ list_add(&cp->link, &of_clk_providers); ++ mutex_unlock(&of_clk_mutex); ++ pr_debug("Added clk_hw provider from %s\n", np->full_name); ++ ++ ret = of_clk_set_defaults(np, true); ++ if (ret < 0) ++ of_clk_del_provider(np); ++ ++ return ret; ++} ++EXPORT_SYMBOL_GPL(of_clk_add_hw_provider); ++ ++/** + * of_clk_del_provider() - Remove a previously registered clock provider + * @np: Device node pointer associated with clock provider + */ +@@ -3087,11 +3144,32 @@ void of_clk_del_provider(struct device_n + } + EXPORT_SYMBOL_GPL(of_clk_del_provider); + ++static struct clk_hw * ++__of_clk_get_hw_from_provider(struct of_clk_provider *provider, ++ struct of_phandle_args *clkspec) ++{ ++ struct clk *clk; ++ struct clk_hw *hw = ERR_PTR(-EPROBE_DEFER); ++ ++ if (provider->get_hw) { ++ hw = provider->get_hw(clkspec, provider->data); ++ } else if (provider->get) { ++ clk = provider->get(clkspec, provider->data); ++ if (!IS_ERR(clk)) ++ hw = __clk_get_hw(clk); ++ else ++ hw = ERR_CAST(clk); ++ } ++ ++ return hw; ++} ++ + struct clk *__of_clk_get_from_provider(struct of_phandle_args *clkspec, + const char *dev_id, const char *con_id) + { + struct of_clk_provider *provider; + struct clk *clk = ERR_PTR(-EPROBE_DEFER); ++ struct clk_hw *hw = ERR_PTR(-EPROBE_DEFER); + + if (!clkspec) + return ERR_PTR(-EINVAL); +@@ -3100,10 +3178,9 @@ struct clk *__of_clk_get_from_provider(s + mutex_lock(&of_clk_mutex); + list_for_each_entry(provider, &of_clk_providers, link) { + if (provider->node == clkspec->np) +- clk = provider->get(clkspec, provider->data); +- if (!IS_ERR(clk)) { +- clk = __clk_create_clk(__clk_get_hw(clk), dev_id, +- con_id); ++ hw = __of_clk_get_hw_from_provider(provider, clkspec); ++ if (!IS_ERR(hw)) { ++ clk = __clk_create_clk(hw, dev_id, con_id); + + if (!IS_ERR(clk) && !__clk_get(clk)) { + __clk_free_clk(clk); +--- a/include/linux/clk-provider.h ++++ b/include/linux/clk-provider.h +@@ -693,6 +693,11 @@ struct clk_onecell_data { + unsigned int clk_num; + }; + ++struct clk_hw_onecell_data { ++ size_t num; ++ struct clk_hw *hws[]; ++}; ++ + extern struct of_device_id __clk_of_table; + + #define CLK_OF_DECLARE(name, compat, fn) OF_DECLARE_1(clk, name, compat, fn) +@@ -702,10 +707,19 @@ int of_clk_add_provider(struct device_no + struct clk *(*clk_src_get)(struct of_phandle_args *args, + void *data), + void *data); ++int of_clk_add_hw_provider(struct device_node *np, ++ struct clk_hw *(*get)(struct of_phandle_args *clkspec, ++ void *data), ++ void *data); + void of_clk_del_provider(struct device_node *np); + struct clk *of_clk_src_simple_get(struct of_phandle_args *clkspec, + void *data); ++ ++struct clk_hw *of_clk_hw_simple_get(struct of_phandle_args *clkspec, ++ void *data); + struct clk *of_clk_src_onecell_get(struct of_phandle_args *clkspec, void *data); ++struct clk_hw *of_clk_hw_onecell_get(struct of_phandle_args *clkspec, ++ void *data); + int of_clk_get_parent_count(struct device_node *np); + int of_clk_parent_fill(struct device_node *np, const char **parents, + unsigned int size); +@@ -722,6 +736,13 @@ static inline int of_clk_add_provider(st + { + return 0; + } ++static inline int of_clk_add_hw_provider(struct device_node *np, ++ struct clk_hw *(*get)(struct of_phandle_args *clkspec, ++ void *data), ++ void *data) ++{ ++ return 0; ++} + #define of_clk_del_provider(np) \ + { while (0); } + static inline struct clk *of_clk_src_simple_get( +@@ -729,11 +750,21 @@ static inline struct clk *of_clk_src_sim + { + return ERR_PTR(-ENOENT); + } ++static inline struct clk_hw * ++of_clk_hw_simple_get(struct of_phandle_args *clkspec, void *data) ++{ ++ return ERR_PTR(-ENOENT); ++} + static inline struct clk *of_clk_src_onecell_get( + struct of_phandle_args *clkspec, void *data) + { + return ERR_PTR(-ENOENT); + } ++static inline struct clk_hw * ++of_clk_hw_onecell_get(struct of_phandle_args *clkspec, void *data) ++{ ++ return ERR_PTR(-ENOENT); ++} + static inline int of_clk_get_parent_count(struct device_node *np) + { + return 0; |