Merge branch 'v5.4/dt' into v5.4/drivers

1d97657a · Jerome Brunet · ffae8475 · 85ab9d95 · 1d97657a · 1d97657a
Commit 1d97657a authored Aug 09, 2019 by Jerome Brunet
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

drivers/clk/meson/g12a.h drivers/clk/meson/g12a.h +0 -1

include/dt-bindings/clock/g12a-clkc.h include/dt-bindings/clock/g12a-clkc.h +1 -0

No files found.
--- a/drivers/clk/meson/g12a.h
+++ b/drivers/clk/meson/g12a.h
@@ -216,7 +216,6 @@
 #define CLKID_CPUB_CLK_DYN1_DIV			221
 #define CLKID_CPUB_CLK_DYN1			222
 #define CLKID_CPUB_CLK_DYN			223
-#define CLKID_CPUB_CLK				224
 #define CLKID_CPUB_CLK_DIV16_EN			225
 #define CLKID_CPUB_CLK_DIV16			226
 #define CLKID_CPUB_CLK_DIV2			227

--- a/include/dt-bindings/clock/g12a-clkc.h
+++ b/include/dt-bindings/clock/g12a-clkc.h
@@ -137,5 +137,6 @@
 #define CLKID_VDEC_HEVC				207
 #define CLKID_VDEC_HEVCF			210
 #define CLKID_TS				212
+#define CLKID_CPUB_CLK				224

 #endif /* __G12A_CLKC_H */