mail archive of the barebox mailing list
 help / color / mirror / Atom feed
From: Michael Tretter <m.tretter@pengutronix.de>
To: barebox@lists.infradead.org
Cc: Michael Tretter <m.tretter@pengutronix.de>
Subject: [PATCH] clk: zynqmp: rename driver specific CLK_MUX_READ_ONLY
Date: Thu,  5 Sep 2019 11:06:06 +0200	[thread overview]
Message-ID: <20190905090606.17748-1-m.tretter@pengutronix.de> (raw)

Since commit c7cc27d006cc (clk: mux: Support CLK_MUX_READ_ONLY flag)
Barebox defines the CLK_MUX_READ_ONLY flag like Linux.

The ZynqMP clock driver used the flag before, because this flag is used
to convey this information from the PMU firmware to the Linux driver.
However, the flags of the common clock framework and the flag of the
protocol between PMU firmware and the ZynqMP clock driver should be
handled separately.

Therefore, add a driver specific prefix to the flag definition in the
ZynqMP driver.

Fixes the warning

	drivers/clk/zynqmp/clk-mux-zynqmp.c:18:0: warning: "CLK_MUX_READ_ONLY" redefined
	In file included from drivers/clk/zynqmp/clk-mux-zynqmp.c:13:0:
	include/linux/clk.h:350:0: note: this is the location of the previous definition

Signed-off-by: Michael Tretter <m.tretter@pengutronix.de>
---
 drivers/clk/zynqmp/clk-mux-zynqmp.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/clk/zynqmp/clk-mux-zynqmp.c b/drivers/clk/zynqmp/clk-mux-zynqmp.c
index 4003267bd1..4c15223980 100644
--- a/drivers/clk/zynqmp/clk-mux-zynqmp.c
+++ b/drivers/clk/zynqmp/clk-mux-zynqmp.c
@@ -15,7 +15,7 @@
 
 #include "clk-zynqmp.h"
 
-#define CLK_MUX_READ_ONLY		BIT(3)
+#define ZYNQMP_CLK_MUX_READ_ONLY		BIT(3)
 
 struct zynqmp_clk_mux {
 	struct clk clk;
@@ -83,7 +83,7 @@ struct clk *zynqmp_clk_register_mux(const char *name,
 	mux->ops = zynqmp_pm_get_eemi_ops();
 
 	mux->clk.name = strdup(name);
-	if (nodes->type_flag & CLK_MUX_READ_ONLY)
+	if (nodes->type_flag & ZYNQMP_CLK_MUX_READ_ONLY)
 		mux->clk.ops = &zynqmp_clk_mux_ro_ops;
 	else
 		mux->clk.ops = &zynqmp_clk_mux_ops;
-- 
2.20.1


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

             reply	other threads:[~2019-09-05  9:06 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-09-05  9:06 Michael Tretter [this message]
2019-09-06  7:15 ` Sascha Hauer

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=20190905090606.17748-1-m.tretter@pengutronix.de \
    --to=m.tretter@pengutronix.de \
    --cc=barebox@lists.infradead.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: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox