[PATCH v3 2/3] watchdog: orion: Use the reference clock on Armada 375 SoC
From: Gregory CLEMENT <hidden>
Date: 2014-11-10 14:41:52
Also in:
linux-watchdog
Hi Ezequiel, [...]
+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;
+}
Shouldn't be possible to do the following:
static int armada375_wdt_clock_init(struct platform_device *pdev,
struct orion_watchdog *dev)
{
if (armadaxp_wdt_clock_init(pdev, dev)) {
/* Mandatory fallback for proper devicetree backward compatibility */
return armadaxp_wdt_clock_init(pdev, dev));
}
return 0;
}
Actually reusing the armadaxp_wdt_clock_init() function was also suggested by Thomas
on your first version but I didn't find your answer about it.
Thanks,
Gregory
quoted hunk ↗ jump to hunk
+ 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,
-- Gregory Clement, Free Electrons Kernel, drivers, real-time and embedded Linux development, consulting, training and support. http://free-electrons.com