diff options
| author | Michael Turquette <mturquette@baylibre.com> | 2016-02-15 11:59:45 -0800 |
|---|---|---|
| committer | Michael Turquette <mturquette@baylibre.com> | 2016-02-15 11:59:45 -0800 |
| commit | 70750ff2c91049beca635e0a31ac19f8b54aebee (patch) | |
| tree | bd63e9999741ecda668f74bdd83d97432eac0aea /include | |
| parent | 7208d1d9c568de02ca89cc976d206e4196803140 (diff) | |
| parent | 36714529f8bbd4f8eaf93b50f4a64c52a24879aa (diff) | |
| download | talos-obmc-linux-70750ff2c91049beca635e0a31ac19f8b54aebee.tar.gz talos-obmc-linux-70750ff2c91049beca635e0a31ac19f8b54aebee.zip | |
Merge tag 'v4.6-rockchip-clk1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into clk-next
Introduction of a factor type and a variant containing a gate
to be able to also declare factor clocks in their correct
place in the clock tree instead of having to register factor
clocks in the init callback separately. And as always some more
clock-ids and non-regression fixes for mistakes introduced in
past kernel releases.
Diffstat (limited to 'include')
| -rw-r--r-- | include/dt-bindings/clock/rk3188-cru-common.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/dt-bindings/clock/rk3188-cru-common.h b/include/dt-bindings/clock/rk3188-cru-common.h index 8df77a7c030b..4f53e70f68ee 100644 --- a/include/dt-bindings/clock/rk3188-cru-common.h +++ b/include/dt-bindings/clock/rk3188-cru-common.h @@ -55,6 +55,7 @@ #define SCLK_TIMER6 90 #define SCLK_JTAG 91 #define SCLK_SMC 92 +#define SCLK_TSADC 93 #define DCLK_LCDC0 190 #define DCLK_LCDC1 191 |
