Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu

[karo-tx-linux.git] / drivers / clk / sunxi-ng / ccu_common.h

diff --git a/drivers/clk/sunxi-ng/ccu_common.h b/drivers/clk/sunxi-ng/ccu_common.h
index b3d9abfbd721d6f1def3e366044e8bd13fa1fe94..73d81dc58fc5ad91f8a293530aa89e2b22fcbdb3 100644 (file)
--- a/drivers/clk/sunxi-ng/ccu_common.h
+++ b/drivers/clk/sunxi-ng/ccu_common.h
@@ -21,6 +21,8 @@
 #define CCU_FEATURE_VARIABLE_PREDIV    BIT(1)
 #define CCU_FEATURE_FIXED_PREDIV       BIT(2)
 #define CCU_FEATURE_FIXED_POSTDIV      BIT(3)
+#define CCU_FEATURE_ALL_PREDIV         BIT(4)
+#define CCU_FEATURE_LOCK_REG           BIT(5)
 
 struct device_node;
 
@@ -56,6 +58,8 @@ struct device_node;
 struct ccu_common {
        void __iomem    *base;
        u16             reg;
+       u16             lock_reg;
+       u32             prediv;
 
        unsigned long   features;
        spinlock_t      *lock;