On 11/19/21 9:12 AM, Patrick Delaunay wrote:
Define LOG_CATEGORY to allow filtering with log command for generic clock and CCF clocks.
This patch also change existing printf, debug and pr_ macro to log_ or dev_ macro.
Signed-off-by: Patrick Delaunay patrick.delaunay@foss.st.com
drivers/clk/clk-composite.c | 3 +++ drivers/clk/clk-divider.c | 6 +++++- drivers/clk/clk-fixed-factor.c | 4 ++++ drivers/clk/clk-gate.c | 6 +++++- drivers/clk/clk-mux.c | 8 ++++++-- drivers/clk/clk.c | 18 ++++++++++-------- drivers/clk/clk_fixed_factor.c | 3 +++ drivers/clk/clk_fixed_rate.c | 3 +++ 8 files changed, 39 insertions(+), 12 deletions(-)
diff --git a/drivers/clk/clk-composite.c b/drivers/clk/clk-composite.c index 12288e10b3..6eb2b8133a 100644 --- a/drivers/clk/clk-composite.c +++ b/drivers/clk/clk-composite.c @@ -4,9 +4,12 @@
- Copyright 2019 NXP
*/
+#define LOG_CATEGORY UCLASS_CLK
- #include <common.h> #include <clk.h> #include <clk-uclass.h>
+#include <log.h> #include <malloc.h> #include <asm/io.h> #include <dm/device.h> diff --git a/drivers/clk/clk-divider.c b/drivers/clk/clk-divider.c index 9df50a5e72..7e8e62feee 100644 --- a/drivers/clk/clk-divider.c +++ b/drivers/clk/clk-divider.c @@ -9,14 +9,18 @@
*/
+#define LOG_CATEGORY UCLASS_CLK
- #include <common.h> #include <asm/io.h> #include <malloc.h> #include <clk-uclass.h>
+#include <log.h> #include <dm/device.h> #include <dm/devres.h> #include <dm/uclass.h> #include <dm/lists.h> +#include <dm/device_compat.h> #include <dm/device-internal.h> #include <linux/bug.h> #include <linux/clk-provider.h> @@ -190,7 +194,7 @@ static struct clk *_register_divider(struct device *dev, const char *name,
if (clk_divider_flags & CLK_DIVIDER_HIWORD_MASK) { if (width + shift > 16) {
pr_warn("divider value exceeds LOWORD field\n");
dev_warn(dev, "divider value exceeds LOWORD field\n"); return ERR_PTR(-EINVAL);diff --git a/drivers/clk/clk-fixed-factor.c b/drivers/clk/clk-fixed-factor.c index 9fcf30fd2e..2a446788e1 100644 --- a/drivers/clk/clk-fixed-factor.c +++ b/drivers/clk/clk-fixed-factor.c @@ -5,10 +5,14 @@
- Copyright (C) 2011 Sascha Hauer, Pengutronix s.hauer@pengutronix.de
*/
+#define LOG_CATEGORY UCLASS_CLK
- #include <common.h> #include <clk.h> #include <clk-uclass.h> #include <div64.h>
+#include <log.h> #include <malloc.h> #include <dm/device.h> #include <dm/devres.h> diff --git a/drivers/clk/clk-gate.c b/drivers/clk/clk-gate.c index 708499d95a..aa40daf3d7 100644 --- a/drivers/clk/clk-gate.c +++ b/drivers/clk/clk-gate.c @@ -7,12 +7,16 @@
- Gated clock implementation
*/
+#define LOG_CATEGORY UCLASS_CLK
- #include <common.h> #include <clk.h>
+#include <log.h> #include <clk-uclass.h> #include <malloc.h> #include <asm/io.h> #include <dm/device.h> +#include <dm/device_compat.h> #include <dm/devres.h> #include <linux/bitops.h> #include <linux/clk-provider.h> @@ -124,7 +128,7 @@ struct clk *clk_register_gate(struct device *dev, const char *name,
if (clk_gate_flags & CLK_GATE_HIWORD_MASK) { if (bit_idx > 15) {
pr_err("gate bit exceeds LOWORD field\n");
dev_err(dev, "gate bit exceeds LOWORD field\n"); return ERR_PTR(-EINVAL);diff --git a/drivers/clk/clk-mux.c b/drivers/clk/clk-mux.c index fd746f2de3..b49946fbcd 100644 --- a/drivers/clk/clk-mux.c +++ b/drivers/clk/clk-mux.c @@ -21,12 +21,16 @@
- clock.
*/
+#define LOG_CATEGORY UCLASS_CLK
- #include <common.h> #include <clk.h> #include <clk-uclass.h>
+#include <log.h> #include <malloc.h> #include <asm/io.h> #include <dm/device.h> +#include <dm/device_compat.h> #include <dm/devres.h> #include <dm/uclass.h> #include <linux/bitops.h> @@ -124,7 +128,7 @@ static int clk_mux_set_parent(struct clk *clk, struct clk *parent)
index = clk_fetch_parent_index(clk, parent); if (index < 0) {
printf("Could not fetch index\n");
log_err("Could not fetch index\n");@@ -170,7 +174,7 @@ struct clk *clk_hw_register_mux_table(struct device *dev, const char *name, if (clk_mux_flags & CLK_MUX_HIWORD_MASK) { width = fls(mask) - ffs(mask) + 1; if (width + shift > 16) {
pr_err("mux value exceeds LOWORD field\n");
dev_err(dev, "mux value exceeds LOWORD field\n"); return ERR_PTR(-EINVAL);diff --git a/drivers/clk/clk.c b/drivers/clk/clk.c index d1a9787071..eff0fa134f 100644 --- a/drivers/clk/clk.c +++ b/drivers/clk/clk.c @@ -4,6 +4,8 @@
- Lukasz Majewski, DENX Software Engineering, lukma@denx.de
*/
+#define LOG_CATEGORY UCLASS_CLK
- #include <common.h> #include <clk.h> #include <clk-uclass.h>
@@ -22,24 +24,24 @@ int clk_register(struct clk *clk, const char *drv_name,
ret = uclass_get_device_by_name(UCLASS_CLK, parent_name, &parent); if (ret) {
printf("%s: failed to get %s device (parent of %s)\n",__func__, parent_name, name);
log_err("%s: failed to get %s device (parent of %s)\n",__func__, parent_name, name);
debug("%s: name: %s parent: %s [0x%p]\n", __func__, name,parent->name, parent);
log_debug("%s: name: %s parent: %s [0x%p]\n", __func__, name,parent->name, parent);}
drv = lists_driver_lookup_name(drv_name); if (!drv) {
printf("%s: %s is not a valid driver name\n",__func__, drv_name);
log_err("%s: %s is not a valid driver name\n",__func__, drv_name);return -ENOENT; }
ret = device_bind(parent, drv, name, NULL, ofnode_null(), &clk->dev); if (ret) {
printf("%s: CLK: %s driver bind error [%d]!\n", __func__, name,ret);
log_err("%s: CLK: %s driver bind error [%d]!\n", __func__, name,ret);diff --git a/drivers/clk/clk_fixed_factor.c b/drivers/clk/clk_fixed_factor.c index 41b0d9c060..6c1139e5c5 100644 --- a/drivers/clk/clk_fixed_factor.c +++ b/drivers/clk/clk_fixed_factor.c @@ -5,10 +5,13 @@
- Author: Anup Patel anup.patel@wdc.com
*/
+#define LOG_CATEGORY UCLASS_CLK
- #include <common.h> #include <clk-uclass.h> #include <div64.h> #include <dm.h>
+#include <log.h> #include <linux/err.h>
struct clk_fixed_factor { diff --git a/drivers/clk/clk_fixed_rate.c b/drivers/clk/clk_fixed_rate.c index c5a2a42c92..b5e78c7055 100644 --- a/drivers/clk/clk_fixed_rate.c +++ b/drivers/clk/clk_fixed_rate.c @@ -3,9 +3,12 @@
- Copyright (C) 2016 Masahiro Yamada yamada.masahiro@socionext.com
*/
+#define LOG_CATEGORY UCLASS_CLK
- #include <common.h> #include <clk-uclass.h> #include <dm.h>
+#include <log.h> #include <dm/device-internal.h> #include <linux/clk-provider.h>
Reviewed-by: Sean Anderson seanga2@gmail.com