msm: clock: Migrate to clkdev

[karo-tx-linux.git] / arch / arm / mach-msm / clock-7x30.h

diff --git a/arch/arm/mach-msm/clock-7x30.h b/arch/arm/mach-msm/clock-7x30.h
index e16f72f32829fbfce4df03f7997504406bc24c09..14104453688bd3fed7db46f35f183a6140e6376e 100644 (file)
--- a/arch/arm/mach-msm/clock-7x30.h
+++ b/arch/arm/mach-msm/clock-7x30.h
@@ -1,30 +1,13 @@
 /* Copyright (c) 2009, Code Aurora Forum. All rights reserved.
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above
- *       copyright notice, this list of conditions and the following
- *       disclaimer in the documentation and/or other materials provided
- *       with the distribution.
- *     * Neither the name of Code Aurora Forum, Inc. nor the names of its
- *       contributors may be used to endorse or promote products derived
- *       from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
- * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
- * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
- * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * 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
+ * only version 2 as published by the Free Software Foundation.
  *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
  */
 
 #ifndef __ARCH_ARM_MACH_MSM_CLOCK_7X30_H
@@ -147,22 +130,26 @@ void pll_disable(uint32_t pll);
 extern int internal_pwr_rail_ctl_auto(unsigned rail_id, bool enable);
 
 #define CLK_7X30(clk_name, clk_id, clk_dev, clk_flags) {       \
-       .name = clk_name, \
-       .id = L_7X30_##clk_id, \
-       .remote_id = P_##clk_id, \
-       .flags = clk_flags, \
-       .dev = clk_dev, \
-       .dbg_name = #clk_id, \
+       .con_id = clk_name, \
+       .dev_id = clk_dev, \
+       .clk = &(struct clk){ \
+               .id = L_7X30_##clk_id, \
+               .remote_id = P_##clk_id, \
+               .flags = clk_flags, \
+               .dbg_name = #clk_id, \
+       }, \
        }
 
 #define CLK_7X30S(clk_name, l_id, r_id, clk_dev, clk_flags) {  \
-       .name = clk_name, \
-       .id = L_7X30_##l_id, \
-       .remote_id = P_##r_id, \
-       .flags = clk_flags, \
-       .dev = clk_dev, \
-       .dbg_name = #l_id, \
+       .con_id = clk_name, \
+       .dev_id = clk_dev, \
+       .clk = &(struct clk){ \
+               .id = L_7X30_##l_id, \
+               .remote_id = P_##r_id, \
+               .flags = clk_flags, \
+               .dbg_name = #l_id, \
+               .ops = &clk_ops_pcom, \
+       }, \
        }
 
 #endif
-