UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

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

This commit is contained in:
Jerome Brunet 2019-08-09 12:12:58 +02:00
parent ffae8475b9 85ab9d9546
commit 1d97657a47
2 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/clk/meson/g12a.h
View File

@ -216,7 +216,6 @@
#define CLKID_CPUB_CLK_DYN1_DIV 221 #define CLKID_CPUB_CLK_DYN1_DIV 221
#define CLKID_CPUB_CLK_DYN1 222 #define CLKID_CPUB_CLK_DYN1 222
#define CLKID_CPUB_CLK_DYN 223 #define CLKID_CPUB_CLK_DYN 223
#define CLKID_CPUB_CLK 224
#define CLKID_CPUB_CLK_DIV16_EN 225 #define CLKID_CPUB_CLK_DIV16_EN 225
#define CLKID_CPUB_CLK_DIV16 226 #define CLKID_CPUB_CLK_DIV16 226
#define CLKID_CPUB_CLK_DIV2 227 #define CLKID_CPUB_CLK_DIV2 227

1
include/dt-bindings/clock/g12a-clkc.h
View File

@ -137,5 +137,6 @@
#define CLKID_VDEC_HEVC 207 #define CLKID_VDEC_HEVC 207
#define CLKID_VDEC_HEVCF 210 #define CLKID_VDEC_HEVCF 210
#define CLKID_TS 212 #define CLKID_TS 212
#define CLKID_CPUB_CLK 224
#endif /* __G12A_CLKC_H */ #endif /* __G12A_CLKC_H */