Commit 1d97657a authored by Jerome Brunet's avatar Jerome Brunet
Browse files

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

parents ffae8475 85ab9d95

drivers/clk/meson/g12a.h

+0 −1
Original line number Diff line number Diff line
@@ -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

include/dt-bindings/clock/g12a-clkc.h

+1 −0
Original line number Diff line number Diff line
@@ -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 */