Merge branch 'clockevents/3.19' of http://git.linaro.org/people/daniel.lezcano/linux into timers/core

Daniel Lezcano muttered:

 * Marvell timer updates from Ezequiel Garcia
   - Add missing clock enable calls for armada
   - Change source clock for clocksource and watchdog
 * SIRF timer updates from Yanchang Li
   - Make clock rate configurable

1 files changed, 41 insertions, 1 deletions

diff --git a/drivers/watchdog/orion_wdt.c b/drivers/watchdog/orion_wdt.c
index 00d0741228fc..8cb1ff3bcd90 100644
--- a/drivers/watchdog/orion_wdt.c
+++ b/drivers/watchdog/orion_wdt.c
@@ -114,6 +114,46 @@ static int armada370_wdt_clock_init(struct platform_device *pdev,
         return 0;
 }
 
+static int armada375_wdt_clock_init(struct platform_device *pdev,
+                                    struct orion_watchdog *dev)
+{
+        int ret;
+
+        dev->clk = of_clk_get_by_name(pdev->dev.of_node, "fixed");
+        if (!IS_ERR(dev->clk)) {
+                ret = clk_prepare_enable(dev->clk);
+                if (ret) {
+                        clk_put(dev->clk);
+                        return ret;
+                }
+
+                atomic_io_modify(dev->reg + TIMER_CTRL,
+                                WDT_AXP_FIXED_ENABLE_BIT,
+                                WDT_AXP_FIXED_ENABLE_BIT);
+                dev->clk_rate = clk_get_rate(dev->clk);
+
+                return 0;
+        }
+
+        /* Mandatory fallback for proper devicetree backward compatibility */
+        dev->clk = clk_get(&pdev->dev, NULL);
+        if (IS_ERR(dev->clk))
+                return PTR_ERR(dev->clk);
+
+        ret = clk_prepare_enable(dev->clk);
+        if (ret) {
+                clk_put(dev->clk);
+                return ret;
+        }
+
+        atomic_io_modify(dev->reg + TIMER_CTRL,
+                        WDT_A370_RATIO_MASK(WDT_A370_RATIO_SHIFT),
+                        WDT_A370_RATIO_MASK(WDT_A370_RATIO_SHIFT));
+        dev->clk_rate = clk_get_rate(dev->clk) / WDT_A370_RATIO;
+
+        return 0;
+}
+
 static int armadaxp_wdt_clock_init(struct platform_device *pdev,
                                    struct orion_watchdog *dev)
 {
@@ -394,7 +434,7 @@ static const struct orion_watchdog_data armada375_data = {
         .rstout_mask_bit = BIT(10),
         .wdt_enable_bit = BIT(8),
         .wdt_counter_offset = 0x34,
-        .clock_init = armada370_wdt_clock_init,
+        .clock_init = armada375_wdt_clock_init,
         .enabled = armada375_enabled,
         .start = armada375_start,
         .stop = armada375_stop,