diff options
| author | Michael Turquette <mturquette@baylibre.com> | 2016-09-02 18:13:40 -0700 |
|---|---|---|
| committer | Michael Turquette <mturquette@baylibre.com> | 2016-09-02 18:13:40 -0700 |
| commit | e918a18d2eb36abb05614ccc866c82f6c3bfd666 (patch) | |
| tree | f05fd0f2eac5c291dcd298f07932bf7b6c802a8d /include/dt-bindings | |
| parent | 54fe0791fa0dbe075f6465860bdd38a4b4e6e59c (diff) | |
| parent | 19a2a85d7157373b3540e9a0baff97d7cdca0dd5 (diff) | |
Merge branch 'clk-meson-gxbb' into clk-next
Diffstat (limited to 'include/dt-bindings')
| -rw-r--r-- | include/dt-bindings/clock/gxbb-clkc.h | 3 | ||||
| -rw-r--r-- | include/dt-bindings/clock/meson8b-clkc.h | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/include/dt-bindings/clock/gxbb-clkc.h b/include/dt-bindings/clock/gxbb-clkc.h index 7d418643cdcc..ce4ad637083d 100644 --- a/include/dt-bindings/clock/gxbb-clkc.h +++ b/include/dt-bindings/clock/gxbb-clkc.h @@ -6,7 +6,10 @@ #define __GXBB_CLKC_H #define CLKID_CPUCLK 1 +#define CLKID_HDMI_PLL 2 #define CLKID_FCLK_DIV2 4 +#define CLKID_FCLK_DIV3 5 +#define CLKID_FCLK_DIV4 6 #define CLKID_CLK81 12 #define CLKID_ETH 36 #define CLKID_SD_EMMC_A 94 diff --git a/include/dt-bindings/clock/meson8b-clkc.h b/include/dt-bindings/clock/meson8b-clkc.h index 595a58d0969a..a55ff8c9b30f 100644 --- a/include/dt-bindings/clock/meson8b-clkc.h +++ b/include/dt-bindings/clock/meson8b-clkc.h @@ -22,6 +22,4 @@ #define CLKID_MPEG_SEL 14 #define CLKID_MPEG_DIV 15 -#define CLK_NR_CLKS (CLKID_MPEG_DIV + 1) - #endif /* __MESON8B_CLKC_H */ |