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

mariux64 · Jan 26, 2016 · 6fdb936 · 6fdb936
2 parents 219a585 + b682572
commit 6fdb936
Showing 1 changed file with 1 addition and 0 deletions.
diff --git 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