summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorMichael Tretter <m.tretter@pengutronix.de>2019-09-05 11:06:06 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2019-09-06 09:14:59 +0200
commit971307cf0132d02b3d361117c2b1f90893404eab (patch)
tree9127ef5a2643bd477a13000cb94e2ddacb2427e3 /drivers
parente1f8820efbd13bf21becde89c1935c77f8bd3484 (diff)
downloadbarebox-971307cf0132d02b3d361117c2b1f90893404eab.tar.gz
barebox-971307cf0132d02b3d361117c2b1f90893404eab.tar.xz
clk: zynqmp: rename driver specific CLK_MUX_READ_ONLY
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> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/clk/zynqmp/clk-mux-zynqmp.c4
1 files 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;