msm: generalize clock support.

The 'PCOM' method of clock control (commands issued to the radio
CPU) is shared across several (but not all) Qualcomm SOCs.
Generalize this clock mechanism so these other SOCs can be added.

Signed-off-by: Gregory Bean <gbean@codeaurora.org>
Signed-off-by: David Brown <davidb@codeaurora.org>
Signed-off-by: Daniel Walker <dwalker@codeaurora.org>
Signed-off-by: Abhijeet Dharmapurikar <adharmap@codeaurora.org>
Signed-off-by: Stepan Moskovchenko <stepanm@codeaurora.org>

1 files changed, 65 insertions, 5 deletions

diff --git a/arch/arm/mach-msm/clock.h b/arch/arm/mach-msm/clock.h
index f875e1544e5f..598db9290422 100644
--- a/arch/arm/mach-msm/clock.h
+++ b/arch/arm/mach-msm/clock.h
@@ -1,7 +1,7 @@
 /* arch/arm/mach-msm/clock.h
  *
  * Copyright (C) 2007 Google, Inc.
- * Copyright (c) 2007 QUALCOMM Incorporated
+ * Copyright (c) 2007-2010, Code Aurora Forum. All rights reserved.
  *
  * This software is licensed under the terms of the GNU General Public
  * License version 2, as published by the Free Software Foundation, and
@@ -18,6 +18,9 @@
 #define __ARCH_ARM_MACH_MSM_CLOCK_H
 
 #include <linux/list.h>
+#include <mach/clk.h>
+
+#include "clock-pcom.h"
 
 #define CLKFLAG_INVERT                  0x00000001
 #define CLKFLAG_NOINVERT                0x00000002
@@ -25,14 +28,32 @@
 #define CLKFLAG_NORESET                 0x00000008
 
 #define CLK_FIRST_AVAILABLE_FLAG        0x00000100
-#define CLKFLAG_USE_MIN_MAX_TO_SET      0x00000200
-#define CLKFLAG_AUTO_OFF                0x00000400
+#define CLKFLAG_AUTO_OFF                0x00000200
+#define CLKFLAG_MIN                     0x00000400
+#define CLKFLAG_MAX                     0x00000800
+
+struct clk_ops {
+        int (*enable)(unsigned id);
+        void (*disable)(unsigned id);
+        void (*auto_off)(unsigned id);
+        int (*reset)(unsigned id, enum clk_reset_action action);
+        int (*set_rate)(unsigned id, unsigned rate);
+        int (*set_min_rate)(unsigned id, unsigned rate);
+        int (*set_max_rate)(unsigned id, unsigned rate);
+        int (*set_flags)(unsigned id, unsigned flags);
+        unsigned (*get_rate)(unsigned id);
+        unsigned (*is_enabled)(unsigned id);
+        long (*round_rate)(unsigned id, unsigned rate);
+};
 
 struct clk {
         uint32_t id;
+        uint32_t remote_id;
         uint32_t count;
         uint32_t flags;
         const char *name;
+        struct clk_ops *ops;
+        const char *dbg_name;
         struct list_head list;
         struct device *dev;
 };
@@ -41,8 +62,47 @@ struct clk {
 #define A11S_CLK_SEL_ADDR               (MSM_CSR_BASE + 0x104)
 #define A11S_VDD_SVS_PLEVEL_ADDR        (MSM_CSR_BASE + 0x124)
 
-extern struct clk msm_clocks[];
-extern unsigned msm_num_clocks;
+#ifdef CONFIG_DEBUG_FS
+#define CLOCK_DBG_NAME(x) .dbg_name = x,
+#else
+#define CLOCK_DBG_NAME(x)
+#endif
+
+#define CLOCK(clk_name, clk_id, clk_dev, clk_flags) {   \
+        .name = clk_name, \
+        .id = clk_id, \
+        .flags = clk_flags, \
+        .dev = clk_dev, \
+         CLOCK_DBG_NAME(#clk_id) \
+        }
+
+#define OFF CLKFLAG_AUTO_OFF
+#define CLK_MIN CLKFLAG_MIN
+#define CLK_MAX CLKFLAG_MAX
+#define CLK_MINMAX (CLK_MIN | CLK_MAX)
+#define NR_CLKS P_NR_CLKS
+
+enum {
+        PLL_0 = 0,
+        PLL_1,
+        PLL_2,
+        PLL_3,
+        PLL_4,
+        PLL_5,
+        PLL_6,
+        NUM_PLL
+};
+
+enum clkvote_client {
+        CLKVOTE_ACPUCLK = 0,
+        CLKVOTE_PMQOS,
+        CLKVOTE_MAX,
+};
+
+int msm_clock_require_tcxo(unsigned long *reason, int nbits);
+int msm_clock_get_name(uint32_t id, char *name, uint32_t size);
+int ebi1_clk_set_min_rate(enum clkvote_client client, unsigned long rate);
+unsigned long clk_get_max_axi_khz(void);
 
 #endif