Merge branch 'v4.6-shared/clkids' into v4.6-clk/next

6fdb9365 · Heiko Stuebner · 219a5859 · b682572f · 6fdb9365
Commit 6fdb9365 authored Jan 26, 2016 by Heiko Stuebner
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 0 deletions

include/dt-bindings/clock/rk3188-cru-common.h include/dt-bindings/clock/rk3188-cru-common.h +1 -0

No files found.
--- 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