diff options
author | Michael Turquette <mturquette@baylibre.com> | 2016-06-22 18:20:12 -0700 |
---|---|---|
committer | Michael Turquette <mturquette@baylibre.com> | 2016-06-22 18:20:12 -0700 |
commit | 367b30502d0717eb063d47112eb154076d479d92 (patch) | |
tree | a91d51c2db9c89ed34da795812a7ba321333c6f3 /include/dt-bindings/clock | |
parent | b6f4f1f2c6daaf5a7c856c8a6ad0735f09642257 (diff) | |
parent | 738f66d3211d7ae0cd0012ba6457dac9a03bfd6b (diff) | |
download | lwn-367b30502d0717eb063d47112eb154076d479d92.tar.gz lwn-367b30502d0717eb063d47112eb154076d479d92.zip |
Merge remote-tracking branch 'clk/clk-s905' into clk-next
Diffstat (limited to 'include/dt-bindings/clock')
-rw-r--r-- | include/dt-bindings/clock/gxbb-clkc.h | 12 | ||||
-rw-r--r-- | include/dt-bindings/clock/meson8b-clkc.h | 4 |
2 files changed, 15 insertions, 1 deletions
diff --git a/include/dt-bindings/clock/gxbb-clkc.h b/include/dt-bindings/clock/gxbb-clkc.h new file mode 100644 index 000000000000..f889d80246cb --- /dev/null +++ b/include/dt-bindings/clock/gxbb-clkc.h @@ -0,0 +1,12 @@ +/* + * GXBB clock tree IDs + */ + +#ifndef __GXBB_CLKC_H +#define __GXBB_CLKC_H + +#define CLKID_CPUCLK 1 +#define CLKID_CLK81 12 +#define CLKID_ETH 36 + +#endif /* __GXBB_CLKC_H */ diff --git a/include/dt-bindings/clock/meson8b-clkc.h b/include/dt-bindings/clock/meson8b-clkc.h index bd2720d58e0c..595a58d0969a 100644 --- a/include/dt-bindings/clock/meson8b-clkc.h +++ b/include/dt-bindings/clock/meson8b-clkc.h @@ -19,7 +19,9 @@ #define CLKID_MALI 11 #define CLKID_CPUCLK 12 #define CLKID_ZERO 13 +#define CLKID_MPEG_SEL 14 +#define CLKID_MPEG_DIV 15 -#define CLK_NR_CLKS (CLKID_ZERO + 1) +#define CLK_NR_CLKS (CLKID_MPEG_DIV + 1) #endif /* __MESON8B_CLKC_H */ |