ARM: omap3: clock: fix wrong container_of in clock36xx.c
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>
This commit is contained in:
parent
768dc16397
commit
a93d8a1cea
@ -20,11 +20,12 @@
|
|||||||
|
|
||||||
#include <linux/kernel.h>
|
#include <linux/kernel.h>
|
||||||
#include <linux/clk.h>
|
#include <linux/clk.h>
|
||||||
|
#include <linux/clk-provider.h>
|
||||||
#include <linux/io.h>
|
#include <linux/io.h>
|
||||||
|
|
||||||
#include "clock.h"
|
#include "clock.h"
|
||||||
#include "clock36xx.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
|
* omap36xx_pwrdn_clk_enable_with_hsdiv_restore - enable clocks suffering
|
||||||
@ -39,29 +40,28 @@
|
|||||||
*/
|
*/
|
||||||
int omap36xx_pwrdn_clk_enable_with_hsdiv_restore(struct clk_hw *clk)
|
int omap36xx_pwrdn_clk_enable_with_hsdiv_restore(struct clk_hw *clk)
|
||||||
{
|
{
|
||||||
struct clk_hw_omap *parent;
|
struct clk_divider *parent;
|
||||||
struct clk_hw *parent_hw;
|
struct clk_hw *parent_hw;
|
||||||
u32 dummy_v, orig_v, clksel_shift;
|
u32 dummy_v, orig_v;
|
||||||
int ret;
|
int ret;
|
||||||
|
|
||||||
/* Clear PWRDN bit of HSDIVIDER */
|
/* Clear PWRDN bit of HSDIVIDER */
|
||||||
ret = omap2_dflt_clk_enable(clk);
|
ret = omap2_dflt_clk_enable(clk);
|
||||||
|
|
||||||
parent_hw = __clk_get_hw(__clk_get_parent(clk->clk));
|
parent_hw = __clk_get_hw(__clk_get_parent(clk->clk));
|
||||||
parent = to_clk_hw_omap(parent_hw);
|
parent = to_clk_divider(parent_hw);
|
||||||
|
|
||||||
/* Restore the dividers */
|
/* Restore the dividers */
|
||||||
if (!ret) {
|
if (!ret) {
|
||||||
clksel_shift = __ffs(parent->clksel_mask);
|
orig_v = __raw_readl(parent->reg);
|
||||||
orig_v = __raw_readl(parent->clksel_reg);
|
|
||||||
dummy_v = orig_v;
|
dummy_v = orig_v;
|
||||||
|
|
||||||
/* Write any other value different from the Read value */
|
/* Write any other value different from the Read value */
|
||||||
dummy_v ^= (1 << clksel_shift);
|
dummy_v ^= (1 << parent->shift);
|
||||||
__raw_writel(dummy_v, parent->clksel_reg);
|
__raw_writel(dummy_v, parent->reg);
|
||||||
|
|
||||||
/* Write the original divider */
|
/* Write the original divider */
|
||||||
__raw_writel(orig_v, parent->clksel_reg);
|
__raw_writel(orig_v, parent->reg);
|
||||||
}
|
}
|
||||||
|
|
||||||
return ret;
|
return ret;
|
||||||
|
Loading…
Reference in New Issue
Block a user