diff options
Diffstat (limited to 'arch/arm/mach-omap2/clock3517.c')
| -rw-r--r-- | arch/arm/mach-omap2/clock3517.c | 24 |
1 files changed, 9 insertions, 15 deletions
diff --git a/arch/arm/mach-omap2/clock3517.c b/arch/arm/mach-omap2/clock3517.c index 622ea0502610..4d79ae2c0241 100644 --- a/arch/arm/mach-omap2/clock3517.c +++ b/arch/arm/mach-omap2/clock3517.c | |||
| @@ -47,7 +47,7 @@ | |||
| 47 | * in the enable register itsel at a bit offset of 4 from the enable | 47 | * in the enable register itsel at a bit offset of 4 from the enable |
| 48 | * bit. A value of 1 indicates that clock is enabled. | 48 | * bit. A value of 1 indicates that clock is enabled. |
| 49 | */ | 49 | */ |
| 50 | static void am35xx_clk_find_idlest(struct clk *clk, | 50 | static void am35xx_clk_find_idlest(struct clk_hw_omap *clk, |
| 51 | void __iomem **idlest_reg, | 51 | void __iomem **idlest_reg, |
| 52 | u8 *idlest_bit, | 52 | u8 *idlest_bit, |
| 53 | u8 *idlest_val) | 53 | u8 *idlest_val) |
| @@ -71,8 +71,9 @@ static void am35xx_clk_find_idlest(struct clk *clk, | |||
| 71 | * associate this type of code with per-module data structures to | 71 | * associate this type of code with per-module data structures to |
| 72 | * avoid this issue, and remove the casts. No return value. | 72 | * avoid this issue, and remove the casts. No return value. |
| 73 | */ | 73 | */ |
| 74 | static void am35xx_clk_find_companion(struct clk *clk, void __iomem **other_reg, | 74 | static void am35xx_clk_find_companion(struct clk_hw_omap *clk, |
| 75 | u8 *other_bit) | 75 | void __iomem **other_reg, |
| 76 | u8 *other_bit) | ||
| 76 | { | 77 | { |
| 77 | *other_reg = (__force void __iomem *)(clk->enable_reg); | 78 | *other_reg = (__force void __iomem *)(clk->enable_reg); |
| 78 | if (clk->enable_bit & AM35XX_IPSS_ICK_MASK) | 79 | if (clk->enable_bit & AM35XX_IPSS_ICK_MASK) |
| @@ -80,10 +81,7 @@ static void am35xx_clk_find_companion(struct clk *clk, void __iomem **other_reg, | |||
| 80 | else | 81 | else |
| 81 | *other_bit = clk->enable_bit - AM35XX_IPSS_ICK_FCK_OFFSET; | 82 | *other_bit = clk->enable_bit - AM35XX_IPSS_ICK_FCK_OFFSET; |
| 82 | } | 83 | } |
| 83 | 84 | const struct clk_hw_omap_ops clkhwops_am35xx_ipss_module_wait = { | |
| 84 | const struct clkops clkops_am35xx_ipss_module_wait = { | ||
| 85 | .enable = omap2_dflt_clk_enable, | ||
| 86 | .disable = omap2_dflt_clk_disable, | ||
| 87 | .find_idlest = am35xx_clk_find_idlest, | 85 | .find_idlest = am35xx_clk_find_idlest, |
| 88 | .find_companion = am35xx_clk_find_companion, | 86 | .find_companion = am35xx_clk_find_companion, |
| 89 | }; | 87 | }; |
| @@ -99,7 +97,7 @@ const struct clkops clkops_am35xx_ipss_module_wait = { | |||
| 99 | * CM_{I,F}CLKEN bit. Pass back the correct info via @idlest_reg | 97 | * CM_{I,F}CLKEN bit. Pass back the correct info via @idlest_reg |
| 100 | * and @idlest_bit. No return value. | 98 | * and @idlest_bit. No return value. |
| 101 | */ | 99 | */ |
| 102 | static void am35xx_clk_ipss_find_idlest(struct clk *clk, | 100 | static void am35xx_clk_ipss_find_idlest(struct clk_hw_omap *clk, |
| 103 | void __iomem **idlest_reg, | 101 | void __iomem **idlest_reg, |
| 104 | u8 *idlest_bit, | 102 | u8 *idlest_bit, |
| 105 | u8 *idlest_val) | 103 | u8 *idlest_val) |
| @@ -112,13 +110,9 @@ static void am35xx_clk_ipss_find_idlest(struct clk *clk, | |||
| 112 | *idlest_val = OMAP34XX_CM_IDLEST_VAL; | 110 | *idlest_val = OMAP34XX_CM_IDLEST_VAL; |
| 113 | } | 111 | } |
| 114 | 112 | ||
| 115 | const struct clkops clkops_am35xx_ipss_wait = { | 113 | const struct clk_hw_omap_ops clkhwops_am35xx_ipss_wait = { |
| 116 | .enable = omap2_dflt_clk_enable, | ||
| 117 | .disable = omap2_dflt_clk_disable, | ||
| 118 | .find_idlest = am35xx_clk_ipss_find_idlest, | ||
| 119 | .find_companion = omap2_clk_dflt_find_companion, | ||
| 120 | .allow_idle = omap2_clkt_iclk_allow_idle, | 114 | .allow_idle = omap2_clkt_iclk_allow_idle, |
| 121 | .deny_idle = omap2_clkt_iclk_deny_idle, | 115 | .deny_idle = omap2_clkt_iclk_deny_idle, |
| 116 | .find_idlest = am35xx_clk_ipss_find_idlest, | ||
| 117 | .find_companion = omap2_clk_dflt_find_companion, | ||
| 122 | }; | 118 | }; |
| 123 | |||
| 124 | |||