[PATCH] clk: zynqmp: rename driver specific CLK_MUX_READ_ONLY

[PATCH] clk: zynqmp: rename driver specific CLK_MUX_READ_ONLY

[Michael Tretter]

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

Re: [PATCH] clk: zynqmp: rename driver specific CLK_MUX_READ_ONLY

[Sascha Hauer]

On Thu, Sep 05, 2019 at 11:06:06AM +0200, Michael Tretter wrote:
> 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(-)

Applied, thanks

Sascha


-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

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