diff options
| author | Jerome Brunet <jbrunet@baylibre.com> | 2019-08-09 13:12:58 +0300 |
|---|---|---|
| committer | Jerome Brunet <jbrunet@baylibre.com> | 2019-08-09 13:12:58 +0300 |
| commit | 1d97657a4794ab23b47bd9921978ddd82569fcf4 (patch) | |
| tree | c54802e76532ea7e4d3a48f6f1a7a35f5f8975f8 | |
| parent | ffae8475b90c045ca508675794c08a0c8c12d202 (diff) | |
| parent | 85ab9d954698961960240622de4fad85c7d8a61e (diff) | |
| download | linux-1d97657a4794ab23b47bd9921978ddd82569fcf4.tar.xz | |
Merge branch 'v5.4/dt' into v5.4/drivers
| -rw-r--r-- | drivers/clk/meson/g12a.h | 1 | ||||
| -rw-r--r-- | include/dt-bindings/clock/g12a-clkc.h | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/drivers/clk/meson/g12a.h b/drivers/clk/meson/g12a.h index c8aed31fbe17..559a34cfdfeb 100644 --- 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 diff --git a/include/dt-bindings/clock/g12a-clkc.h b/include/dt-bindings/clock/g12a-clkc.h index b6b127e45634..8ccc29ac7a72 100644 --- 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 */ |