Merge tag 'clk-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux

[linux-2.6-microblaze.git] / drivers / clk / mmp / clk.h

diff --git a/drivers/clk/mmp/clk.h b/drivers/clk/mmp/clk.h
index 20dc1e5..55ac053 100644 (file)
--- a/drivers/clk/mmp/clk.h
+++ b/drivers/clk/mmp/clk.h
@@ -3,6 +3,7 @@
 #define __MACH_MMP_CLK_H
 
 #include <linux/clk-provider.h>
+#include <linux/pm_domain.h>
 #include <linux/clkdev.h>
 
 #define APBC_NO_BUS_CTRL       BIT(0)
@@ -16,6 +17,7 @@ struct mmp_clk_factor_masks {
        unsigned int den_mask;
        unsigned int num_shift;
        unsigned int den_shift;
+       unsigned int enable_mask;
 };
 
 struct mmp_clk_factor_tbl {
@@ -251,4 +253,13 @@ void mmp_clk_init(struct device_node *np, struct mmp_clk_unit *unit,
                int nr_clks);
 void mmp_clk_add(struct mmp_clk_unit *unit, unsigned int id,
                struct clk *clk);
+
+/* Power islands */
+#define MMP_PM_DOMAIN_NO_DISABLE               BIT(0)
+
+struct generic_pm_domain *mmp_pm_domain_register(const char *name,
+               void __iomem *reg,
+               u32 power_on, u32 reset, u32 clock_enable,
+               unsigned int flags, spinlock_t *lock);
+
 #endif