--- v6
+++ vrfc
@@ -1,179 +1,124 @@
-This patch introduces of_clk_bulk_get_all and clk_bulk_x_all APIs
-to users who just want to handle all available clocks from device tree
-without need to know the detailed clock information likes clock numbers
-and names. This is useful in writing some generic drivers to handle clock
-part.
+Switching to use clk_bulk API to simplify clock operations.
+Cc: Hans de Goede <hdegoede@redhat.com>
+Cc: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
+Cc: linux-fbdev at vger.kernel.org
+Cc: Masahiro Yamada <yamada.masahiro@socionext.com>
Cc: Stephen Boyd <sboyd@codeaurora.org>
-Cc: Masahiro Yamada <yamada.masahiro@socionext.com>
-Tested-by: Thor Thayer <thor.thayer@linux.intel.com>
Signed-off-by: Dong Aisheng <aisheng.dong@nxp.com>
---
-v3->v4:
- * no changes
-v2->v3:
- * remove #if define condition
- * use kmalloc_array
-v1->v2:
- * make of_clk_bulk_get_all private
- * add clk_bulk_get/put_all
----
- drivers/clk/clk-bulk.c | 51 ++++++++++++++++++++++++++++++++++++++++++++++++++
- include/linux/clk.h | 42 ++++++++++++++++++++++++++++++++++++++++-
- 2 files changed, 92 insertions(+), 1 deletion(-)
+ drivers/video/fbdev/simplefb.c | 70 ++++++++----------------------------------
+ 1 file changed, 13 insertions(+), 57 deletions(-)
-diff --git a/drivers/clk/clk-bulk.c b/drivers/clk/clk-bulk.c
-index 4460ac5..6a7118d 100644
---- a/drivers/clk/clk-bulk.c
-+++ b/drivers/clk/clk-bulk.c
-@@ -17,9 +17,11 @@
- */
+diff --git a/drivers/video/fbdev/simplefb.c b/drivers/video/fbdev/simplefb.c
+index a3c44ec..3ce2e5b 100644
+--- a/drivers/video/fbdev/simplefb.c
++++ b/drivers/video/fbdev/simplefb.c
+@@ -181,8 +181,7 @@ struct simplefb_par {
+ u32 palette[PSEUDO_PALETTE_SIZE];
+ #if defined CONFIG_OF && defined CONFIG_COMMON_CLK
+ bool clks_enabled;
+- unsigned int clk_count;
+- struct clk **clks;
++ struct clk_bulk *clk_bulk;
+ #endif
+ #if defined CONFIG_OF && defined CONFIG_REGULATOR
+ bool regulators_enabled;
+@@ -214,37 +213,13 @@ static int simplefb_clocks_get(struct simplefb_par *par,
+ struct platform_device *pdev)
+ {
+ struct device_node *np = pdev->dev.of_node;
+- struct clk *clock;
+- int i;
- #include <linux/clk.h>
-+#include <linux/clk-provider.h>
- #include <linux/device.h>
- #include <linux/export.h>
- #include <linux/of.h>
-+#include <linux/slab.h>
+ if (dev_get_platdata(&pdev->dev) || !np)
+ return 0;
- static int __must_check of_clk_bulk_get(struct device_node *np, int num_clks,
- struct clk_bulk_data *clks)
-@@ -49,6 +51,32 @@ static int __must_check of_clk_bulk_get(struct device_node *np, int num_clks,
- return ret;
+- par->clk_count = of_clk_get_parent_count(np);
+- if (!par->clk_count)
+- return 0;
+-
+- par->clks = kcalloc(par->clk_count, sizeof(struct clk *), GFP_KERNEL);
+- if (!par->clks)
+- return -ENOMEM;
+-
+- for (i = 0; i < par->clk_count; i++) {
+- clock = of_clk_get(np, i);
+- if (IS_ERR(clock)) {
+- if (PTR_ERR(clock) == -EPROBE_DEFER) {
+- while (--i >= 0) {
+- if (par->clks[i])
+- clk_put(par->clks[i]);
+- }
+- kfree(par->clks);
+- return -EPROBE_DEFER;
+- }
+- dev_err(&pdev->dev, "%s: clock %d not found: %ld\n",
+- __func__, i, PTR_ERR(clock));
+- continue;
+- }
+- par->clks[i] = clock;
+- }
++ par->clk_bulk = of_clk_bulk_get_all(np);
++ if (IS_ERR(par->clk_bulk) && PTR_ERR(par->clk_bulk) == -EPROBE_DEFER)
++ return -EPROBE_DEFER;
+
+ return 0;
+ }
+@@ -252,45 +227,26 @@ static int simplefb_clocks_get(struct simplefb_par *par,
+ static void simplefb_clocks_enable(struct simplefb_par *par,
+ struct platform_device *pdev)
+ {
+- int i, ret;
++ int ret;
++
++ ret = clk_bulk_enable_all(par->clk_bulk);
++ if (ret)
++ dev_warn(&pdev->dev, "failed to enable clocks\n");
+
+- for (i = 0; i < par->clk_count; i++) {
+- if (par->clks[i]) {
+- ret = clk_prepare_enable(par->clks[i]);
+- if (ret) {
+- dev_err(&pdev->dev,
+- "%s: failed to enable clock %d: %d\n",
+- __func__, i, ret);
+- clk_put(par->clks[i]);
+- par->clks[i] = NULL;
+- }
+- }
+- }
+ par->clks_enabled = true;
}
-+static int __must_check of_clk_bulk_get_all(struct device_node *np,
-+ struct clk_bulk_data **clks)
-+{
-+ struct clk_bulk_data *clk_bulk;
-+ int num_clks;
-+ int ret;
-+
-+ num_clks = of_clk_get_parent_count(np);
-+ if (!num_clks)
-+ return 0;
-+
-+ clk_bulk = kmalloc_array(num_clks, sizeof(*clk_bulk), GFP_KERNEL);
-+ if (!clk_bulk)
-+ return -ENOMEM;
-+
-+ ret = of_clk_bulk_get(np, num_clks, clk_bulk);
-+ if (ret) {
-+ kfree(clk_bulk);
-+ return ret;
-+ }
-+
-+ *clks = clk_bulk;
-+
-+ return num_clks;
-+}
-+
- void clk_bulk_put(int num_clks, struct clk_bulk_data *clks)
+ static void simplefb_clocks_destroy(struct simplefb_par *par)
{
- while (--num_clks >= 0) {
-@@ -88,6 +116,29 @@ int __must_check clk_bulk_get(struct device *dev, int num_clks,
+- int i;
+-
+- if (!par->clks)
+- return;
++ if (par->clks_enabled)
++ clk_bulk_disable_all(par->clk_bulk);
+
+- for (i = 0; i < par->clk_count; i++) {
+- if (par->clks[i]) {
+- if (par->clks_enabled)
+- clk_disable_unprepare(par->clks[i]);
+- clk_put(par->clks[i]);
+- }
+- }
+-
+- kfree(par->clks);
++ of_clk_bulk_put_all(par->clk_bulk);
}
- EXPORT_SYMBOL(clk_bulk_get);
-
-+void clk_bulk_put_all(int num_clks, struct clk_bulk_data *clks)
-+{
-+ if (IS_ERR_OR_NULL(clks))
-+ return;
-+
-+ clk_bulk_put(num_clks, clks);
-+
-+ kfree(clks);
-+}
-+EXPORT_SYMBOL(clk_bulk_put_all);
-+
-+int __must_check clk_bulk_get_all(struct device *dev,
-+ struct clk_bulk_data **clks)
-+{
-+ struct device_node *np = dev_of_node(dev);
-+
-+ if (!np)
-+ return 0;
-+
-+ return of_clk_bulk_get_all(np, clks);
-+}
-+EXPORT_SYMBOL(clk_bulk_get_all);
-+
- #ifdef CONFIG_HAVE_CLK_PREPARE
-
- /**
-diff --git a/include/linux/clk.h b/include/linux/clk.h
-index 4f750c4..e9433c7 100644
---- a/include/linux/clk.h
-+++ b/include/linux/clk.h
-@@ -312,7 +312,26 @@ struct clk *clk_get(struct device *dev, const char *id);
- */
- int __must_check clk_bulk_get(struct device *dev, int num_clks,
- struct clk_bulk_data *clks);
--
-+/**
-+ * clk_bulk_get_all - lookup and obtain all available references to clock
-+ * producer.
-+ * @dev: device for clock "consumer"
-+ * @clks: pointer to the clk_bulk_data table of consumer
-+ *
-+ * This helper function allows drivers to get all clk consumers in one
-+ * operation. If any of the clk cannot be acquired then any clks
-+ * that were obtained will be freed before returning to the caller.
-+ *
-+ * Returns a positive value for the number of clocks obtained while the
-+ * clock references are stored in the clk_bulk_data table in @clks field.
-+ * Returns 0 if there're none and a negative value if something failed.
-+ *
-+ * Drivers must assume that the clock source is not enabled.
-+ *
-+ * clk_bulk_get should not be called from within interrupt context.
-+ */
-+int __must_check clk_bulk_get_all(struct device *dev,
-+ struct clk_bulk_data **clks);
- /**
- * devm_clk_bulk_get - managed get multiple clk consumers
- * @dev: device for clock "consumer"
-@@ -488,6 +507,19 @@ void clk_put(struct clk *clk);
- void clk_bulk_put(int num_clks, struct clk_bulk_data *clks);
-
- /**
-+ * clk_bulk_put_all - "free" all the clock source
-+ * @num_clks: the number of clk_bulk_data
-+ * @clks: the clk_bulk_data table of consumer
-+ *
-+ * Note: drivers must ensure that all clk_bulk_enable calls made on this
-+ * clock source are balanced by clk_bulk_disable calls prior to calling
-+ * this function.
-+ *
-+ * clk_bulk_put_all should not be called from within interrupt context.
-+ */
-+void clk_bulk_put_all(int num_clks, struct clk_bulk_data *clks);
-+
-+/**
- * devm_clk_put - "free" a managed clock source
- * @dev: device used to acquire the clock
- * @clk: clock source acquired with devm_clk_get()
-@@ -642,6 +674,12 @@ static inline int __must_check clk_bulk_get(struct device *dev, int num_clks,
- return 0;
- }
-
-+static inline int __must_check clk_bulk_get_all(struct device *dev,
-+ struct clk_bulk_data **clks)
-+{
-+ return 0;
-+}
-+
- static inline struct clk *devm_clk_get(struct device *dev, const char *id)
- {
- return NULL;
-@@ -663,6 +701,8 @@ static inline void clk_put(struct clk *clk) {}
-
- static inline void clk_bulk_put(int num_clks, struct clk_bulk_data *clks) {}
-
-+static inline void clk_bulk_put_all(int num_clks, struct clk_bulk_data *clks) {}
-+
- static inline void devm_clk_put(struct device *dev, struct clk *clk) {}
-
+ #else
+ static int simplefb_clocks_get(struct simplefb_par *par,
+ struct platform_device *pdev) { return 0; }
+-static void simplefb_clocks_enable(struct simplefb_par *par,
+- struct platform_device *pdev) { }
++static int simplefb_clocks_enable(struct simplefb_par *par) { }
+ static void simplefb_clocks_destroy(struct simplefb_par *par) { }
+ #endif
--
2.7.4