mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-21 10:01:00 +00:00
a93d8a1cea
omap36xx_pwrdn_clk_enable_with_hsdiv_restore expects the parent hw of the clock to be a clk_hw_omap. However, looking at cclock3xxx_data.c, all concerned clock have parent defined as clk_divider. Fix the function to use clk_divider. Tested with 3.9 on dm3730. Signed-off-by: Jean-Philippe François <jp.francois@cynove.com> Cc: NeilBrown <neilb@suse.de> Cc: Mike Turquette <mturquette@linaro.org> Signed-off-by: Paul Walmsley <paul@pwsan.com>
68 lines
1.8 KiB
C
68 lines
1.8 KiB
C
/*
|
|
* OMAP36xx-specific clkops
|
|
*
|
|
* Copyright (C) 2010 Texas Instruments, Inc.
|
|
* Copyright (C) 2010 Nokia Corporation
|
|
*
|
|
* Mike Turquette
|
|
* Vijaykumar GN
|
|
* Paul Walmsley
|
|
*
|
|
* Parts of this code are based on code written by
|
|
* Richard Woodruff, Tony Lindgren, Tuukka Tikkanen, Karthik Dasu,
|
|
* Russell King
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License version 2 as
|
|
* published by the Free Software Foundation.
|
|
*/
|
|
#undef DEBUG
|
|
|
|
#include <linux/kernel.h>
|
|
#include <linux/clk.h>
|
|
#include <linux/clk-provider.h>
|
|
#include <linux/io.h>
|
|
|
|
#include "clock.h"
|
|
#include "clock36xx.h"
|
|
#define to_clk_divider(_hw) container_of(_hw, struct clk_divider, hw)
|
|
|
|
/**
|
|
* omap36xx_pwrdn_clk_enable_with_hsdiv_restore - enable clocks suffering
|
|
* from HSDivider PWRDN problem Implements Errata ID: i556.
|
|
* @clk: DPLL output struct clk
|
|
*
|
|
* 3630 only: dpll3_m3_ck, dpll4_m2_ck, dpll4_m3_ck, dpll4_m4_ck,
|
|
* dpll4_m5_ck & dpll4_m6_ck dividers gets loaded with reset
|
|
* valueafter their respective PWRDN bits are set. Any dummy write
|
|
* (Any other value different from the Read value) to the
|
|
* corresponding CM_CLKSEL register will refresh the dividers.
|
|
*/
|
|
int omap36xx_pwrdn_clk_enable_with_hsdiv_restore(struct clk_hw *clk)
|
|
{
|
|
struct clk_divider *parent;
|
|
struct clk_hw *parent_hw;
|
|
u32 dummy_v, orig_v;
|
|
int ret;
|
|
|
|
/* Clear PWRDN bit of HSDIVIDER */
|
|
ret = omap2_dflt_clk_enable(clk);
|
|
|
|
parent_hw = __clk_get_hw(__clk_get_parent(clk->clk));
|
|
parent = to_clk_divider(parent_hw);
|
|
|
|
/* Restore the dividers */
|
|
if (!ret) {
|
|
orig_v = __raw_readl(parent->reg);
|
|
dummy_v = orig_v;
|
|
|
|
/* Write any other value different from the Read value */
|
|
dummy_v ^= (1 << parent->shift);
|
|
__raw_writel(dummy_v, parent->reg);
|
|
|
|
/* Write the original divider */
|
|
__raw_writel(orig_v, parent->reg);
|
|
}
|
|
|
|
return ret;
|
|
}
|