| From aac5b796df5c5322b8646f83804db6d83aca46c3 Mon Sep 17 00:00:00 2001 |
| From: Linus Torvalds <torvalds@linux-foundation.org> |
| Date: Mon, 2 Dec 2013 10:39:23 +0900 |
| Subject: 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 |
| |
| (cherry picked from commit bef4a0ab984662d4ccd68d431a7c4ef3daebcb43) |
| Signed-off-by: Daniel Sangorrin <daniel.sangorrin@toshiba.co.jp> |
| Signed-off-by: Yoshitake Kobayashi <yoshitake.kobayashi@toshiba.co.jp> |
| --- |
| drivers/clk/zynq/clkc.c | 8 +++++--- |
| 1 file changed, 5 insertions(+), 3 deletions(-) |
| |
| diff --git a/drivers/clk/zynq/clkc.c b/drivers/clk/zynq/clkc.c |
| index 6169d56fb6f1..cc40fe64f2dc 100644 |
| --- a/drivers/clk/zynq/clkc.c |
| +++ b/drivers/clk/zynq/clkc.c |
| @@ -297,7 +297,7 @@ static void __init zynq_clk_setup(struct device_node *np) |
| clks[swdt] = clk_register_mux(NULL, clk_output_name[swdt], |
| swdt_ext_clk_mux_parents, 2, CLK_SET_RATE_PARENT | |
| CLK_SET_RATE_NO_REPARENT, SLCR_SWDT_CLK_SEL, 0, 1, 0, |
| - &gem0clk_lock); |
| + &swdtclk_lock); |
| |
| /* DDR clocks */ |
| clk = clk_register_divider(NULL, "ddr2x_div", "ddrpll", 0, |
| @@ -370,7 +370,8 @@ static void __init zynq_clk_setup(struct device_node *np) |
| CLK_DIVIDER_ONE_BASED | CLK_DIVIDER_ALLOW_ZERO, |
| &gem0clk_lock); |
| clk = clk_register_mux(NULL, "gem0_emio_mux", gem0_mux_parents, 2, |
| - CLK_SET_RATE_NO_REPARENT, SLCR_GEM0_CLK_CTRL, 6, 1, 0, |
| + CLK_SET_RATE_PARENT | CLK_SET_RATE_NO_REPARENT, |
| + SLCR_GEM0_CLK_CTRL, 6, 1, 0, |
| &gem0clk_lock); |
| clks[gem0] = clk_register_gate(NULL, clk_output_name[gem0], |
| "gem0_emio_mux", CLK_SET_RATE_PARENT, |
| @@ -394,7 +395,8 @@ static void __init zynq_clk_setup(struct device_node *np) |
| CLK_DIVIDER_ONE_BASED | CLK_DIVIDER_ALLOW_ZERO, |
| &gem1clk_lock); |
| clk = clk_register_mux(NULL, "gem1_emio_mux", gem1_mux_parents, 2, |
| - CLK_SET_RATE_NO_REPARENT, SLCR_GEM1_CLK_CTRL, 6, 1, 0, |
| + CLK_SET_RATE_PARENT | CLK_SET_RATE_NO_REPARENT, |
| + SLCR_GEM1_CLK_CTRL, 6, 1, 0, |
| &gem1clk_lock); |
| clks[gem1] = clk_register_gate(NULL, clk_output_name[gem1], |
| "gem1_emio_mux", CLK_SET_RATE_PARENT, |
| -- |
| 1.8.5.rc3 |
| |