Merge tag 'pm-merge' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

[can-eth-gw-linux.git] / arch / arm / mach-omap2 / clock_common_data.c

diff --git a/arch/arm/mach-omap2/clock_common_data.c b/arch/arm/mach-omap2/clock_common_data.c
index b9f3ba68148c793d368f51174ca164c4a1081c4f..ef4d21bfb96478da0b9ef681c931303aa9fb1bf4 100644 (file)
--- a/arch/arm/mach-omap2/clock_common_data.c
+++ b/arch/arm/mach-omap2/clock_common_data.c
@@ -16,6 +16,7 @@
  * OMAP3xxx clock definition files.
  */
 
+#include <linux/clk-private.h>
 #include "clock.h"
 
 /* clksel_rate data common to 24xx/343x */
@@ -52,6 +53,13 @@ const struct clksel_rate div_1_0_rates[] = {
        { .div = 0 },
 };
 
+const struct clksel_rate div3_1to4_rates[] = {
+       { .div = 1, .val = 0, .flags = RATE_IN_4430 },
+       { .div = 2, .val = 1, .flags = RATE_IN_4430 },
+       { .div = 4, .val = 2, .flags = RATE_IN_4430 },
+       { .div = 0 },
+};
+
 const struct clksel_rate div_1_1_rates[] = {
        { .div = 1, .val = 1, .flags = RATE_IN_4430 | RATE_IN_AM33XX },
        { .div = 0 },
@@ -109,14 +117,10 @@ const struct clksel_rate div31_1to31_rates[] = {
 
 /* Clocks shared between various OMAP SoCs */
 
-struct clk virt_19200000_ck = {
-       .name           = "virt_19200000_ck",
-       .ops            = &clkops_null,
-       .rate           = 19200000,
-};
+static struct clk_ops dummy_ck_ops = {};
 
-struct clk virt_26000000_ck = {
-       .name           = "virt_26000000_ck",
-       .ops            = &clkops_null,
-       .rate           = 26000000,
+struct clk dummy_ck = {
+       .name = "dummy_clk",
+       .ops = &dummy_ck_ops,
+       .flags = CLK_IS_BASIC,
 };