diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-09-09 18:49:04 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-09-09 18:49:04 -0400 |
| commit | bef4a0ab984662d4ccd68d431a7c4ef3daebcb43 (patch) | |
| tree | 3f1a2797dbf2fde9235c47e023be929e32fa9265 /arch/arm/mach-imx | |
| parent | 7eb69529cbaf4229baf5559a400a7a46352c6e52 (diff) | |
| parent | 12d298865ec5d0f14dd570c3506c270880769ed7 (diff) | |
Merge tag 'clk-for-linus-3.12' of git://git.linaro.org/people/mturquette/linux
Pull clock framework changes from Michael Turquette:
"The common clk framework changes for 3.12 are dominated by clock
driver patches, both new drivers and fixes to existing. A high
percentage of these are for Samsung platforms like Exynos. Core
framework fixes and some new features like automagical clock
re-parenting round out the patches"
* tag 'clk-for-linus-3.12' of git://git.linaro.org/people/mturquette/linux: (102 commits)
clk: only call get_parent if there is one
clk: samsung: exynos5250: Simplify registration of PLL rate tables
clk: samsung: exynos4: Register PLL rate tables for Exynos4x12
clk: samsung: exynos4: Register PLL rate tables for Exynos4210
clk: samsung: exynos4: Reorder registration of mout_vpllsrc
clk: samsung: pll: Add support for rate configuration of PLL46xx
clk: samsung: pll: Use new registration method for PLL46xx
clk: samsung: pll: Add support for rate configuration of PLL45xx
clk: samsung: pll: Use new registration method for PLL45xx
clk: samsung: exynos4: Rename exynos4_plls to exynos4x12_plls
clk: samsung: exynos4: Remove checks for DT node
clk: samsung: exynos4: Remove unused static clkdev aliases
clk: samsung: Modify _get_rate() helper to use __clk_lookup()
clk: samsung: exynos4: Use separate aliases for cpufreq related clocks
clocksource: samsung_pwm_timer: Get clock from device tree
ARM: dts: exynos4: Specify PWM clocks in PWM node
pwm: samsung: Update DT bindings documentation to cover clocks
clk: Move symbol export to proper location
clk: fix new_parent dereference before null check
clk: wm831x: Initialise wm831x pointer on init
...
Diffstat (limited to 'arch/arm/mach-imx')
| -rw-r--r-- | arch/arm/mach-imx/clk.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/arm/mach-imx/clk.h b/arch/arm/mach-imx/clk.h index 3451f1f8ba1f..048c5ad8a80b 100644 --- a/arch/arm/mach-imx/clk.h +++ b/arch/arm/mach-imx/clk.h | |||
| @@ -89,7 +89,8 @@ static inline struct clk *imx_clk_gate(const char *name, const char *parent, | |||
| 89 | static inline struct clk *imx_clk_mux(const char *name, void __iomem *reg, | 89 | static inline struct clk *imx_clk_mux(const char *name, void __iomem *reg, |
| 90 | u8 shift, u8 width, const char **parents, int num_parents) | 90 | u8 shift, u8 width, const char **parents, int num_parents) |
| 91 | { | 91 | { |
| 92 | return clk_register_mux(NULL, name, parents, num_parents, 0, reg, shift, | 92 | return clk_register_mux(NULL, name, parents, num_parents, |
| 93 | CLK_SET_RATE_NO_REPARENT, reg, shift, | ||
| 93 | width, 0, &imx_ccm_lock); | 94 | width, 0, &imx_ccm_lock); |
| 94 | } | 95 | } |
| 95 | 96 | ||
| @@ -98,7 +99,7 @@ static inline struct clk *imx_clk_mux_flags(const char *name, | |||
| 98 | int num_parents, unsigned long flags) | 99 | int num_parents, unsigned long flags) |
| 99 | { | 100 | { |
| 100 | return clk_register_mux(NULL, name, parents, num_parents, | 101 | return clk_register_mux(NULL, name, parents, num_parents, |
| 101 | flags, reg, shift, width, 0, | 102 | flags | CLK_SET_RATE_NO_REPARENT, reg, shift, width, 0, |
| 102 | &imx_ccm_lock); | 103 | &imx_ccm_lock); |
| 103 | } | 104 | } |
| 104 | 105 | ||