diff options
| author | Stephen Boyd <sboyd@codeaurora.org> | 2013-06-17 10:43:19 -0700 |
|---|---|---|
| committer | David Brown <davidb@codeaurora.org> | 2013-06-24 13:08:05 -0700 |
| commit | 8cc7f5338e729b79194e6c22e3c794faaef974b8 (patch) | |
| tree | d9fad83dcb3e260ad862907a80431ad70d51883e /arch/arm/mach-msm/clock-pcom.h | |
| parent | 421faca0b538d1ed5f2065cbbc6bbec38f49a54f (diff) | |
| download | blackbird-op-linux-8cc7f5338e729b79194e6c22e3c794faaef974b8.tar.gz blackbird-op-linux-8cc7f5338e729b79194e6c22e3c794faaef974b8.zip | |
ARM: msm: Migrate to common clock framework
Move the existing clock code in mach-msm to the common clock
framework. We lose our capability to set the rate of and enable a
clock through debugfs. This is ok though because the debugfs
features are mainly used for testing and development of new clock
code.
To maintain compatibility with the original MSM clock code we
make a wrapper for clk_reset() that calls the struct msm_clk
specific reset function. This is necessary for the usb and sdcc
devices on MSM until a better suited API is made available.
Cc: Saravana Kannan <skannan@codeaurora.org>
Acked-by: Mike Turquette <mturquette@linaro.org>
Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
Signed-off-by: David Brown <davidb@codeaurora.org>
Diffstat (limited to 'arch/arm/mach-msm/clock-pcom.h')
| -rw-r--r-- | arch/arm/mach-msm/clock-pcom.h | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/arch/arm/mach-msm/clock-pcom.h b/arch/arm/mach-msm/clock-pcom.h index 87406a373d2b..5bb164fd46a8 100644 --- a/arch/arm/mach-msm/clock-pcom.h +++ b/arch/arm/mach-msm/clock-pcom.h @@ -1,4 +1,5 @@ -/* Copyright (c) 2009, Code Aurora Forum. All rights reserved. +/* + * Copyright (c) 2009-2012, The Linux Foundation. All rights reserved. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 and @@ -120,26 +121,25 @@ #define P_NR_CLKS 102 -struct clk_ops; -extern struct clk_ops clk_ops_pcom; +struct clk_pcom_desc { + unsigned id; + const char *name; + const char *con; + const char *dev; + unsigned long flags; +}; struct pcom_clk_pdata { - struct clk_lookup *lookup; + struct clk_pcom_desc *lookup; u32 num_lookups; }; -int pc_clk_reset(unsigned id, enum clk_reset_action action); - #define CLK_PCOM(clk_name, clk_id, clk_dev, clk_flags) { \ - .con_id = clk_name, \ - .dev_id = clk_dev, \ - .clk = &(struct clk){ \ - .id = P_##clk_id, \ - .remote_id = P_##clk_id, \ - .ops = &clk_ops_pcom, \ - .flags = clk_flags, \ - .dbg_name = #clk_id, \ - }, \ + .id = P_##clk_id, \ + .name = #clk_id, \ + .con = clk_name, \ + .dev = clk_dev, \ + .flags = clk_flags, \ } #endif |
