diff options
| author | Emilio López <emilio@elopez.com.ar> | 2013-02-25 11:44:26 -0300 | 
|---|---|---|
| committer | Mike Turquette <mturquette@linaro.org> | 2013-03-27 08:35:34 -0700 | 
| commit | e874a6697710f52fa8ab29487a99034d5d96fdcc (patch) | |
| tree | 1743abc90ee2d604fe5f8a0f4b69f171179ced31 /drivers/clocksource | |
| parent | b54891685162e09c4292cd38f067ca118604353c (diff) | |
| download | olio-linux-3.10-e874a6697710f52fa8ab29487a99034d5d96fdcc.tar.xz olio-linux-3.10-e874a6697710f52fa8ab29487a99034d5d96fdcc.zip | |
clk: arm: sunxi: Add a new clock driver for sunxi SOCs
This commit implements the base CPU clocks for sunxi devices. It has
been tested using a slightly modified cpufreq driver from the
linux-sunxi 3.0 tree.
Additionally, document the new bindings introduced by this patch.
Idling:
    / # cat /sys/kernel/debug/clk/clk_summary
       clock                        enable_cnt  prepare_cnt  rate
    ---------------------------------------------------------------------
     osc32k                         0           0            32768
     osc24M_fixed                   0           0            24000000
        osc24M                      0           0            24000000
           apb1_mux                 0           0            24000000
              apb1                  0           0            24000000
           pll1                     0           0            60000000
              cpu                   0           0            60000000
                 axi                0           0            60000000
                    ahb             0           0            60000000
                       apb0         0           0            30000000
     dummy                          0           0            0
After "yes >/dev/null &":
    / # cat /sys/kernel/debug/clk/clk_summary
       clock                        enable_cnt  prepare_cnt  rate
    ---------------------------------------------------------------------
     osc32k                         0           0            32768
     osc24M_fixed                   0           0            24000000
        osc24M                      0           0            24000000
           apb1_mux                 0           0            24000000
              apb1                  0           0            24000000
           pll1                     0           0            1008000000
              cpu                   0           0            1008000000
                 axi                0           0            336000000
                    ahb             0           0            168000000
                       apb0         0           0            84000000
     dummy                          0           0            0
Signed-off-by: Emilio López <emilio@elopez.com.ar>
Acked-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Signed-off-by: Mike Turquette <mturquette@linaro.org>
Diffstat (limited to 'drivers/clocksource')
| -rw-r--r-- | drivers/clocksource/sunxi_timer.c | 4 | 
1 files changed, 2 insertions, 2 deletions
| diff --git a/drivers/clocksource/sunxi_timer.c b/drivers/clocksource/sunxi_timer.c index 4086b916715..0ce85e29769 100644 --- a/drivers/clocksource/sunxi_timer.c +++ b/drivers/clocksource/sunxi_timer.c @@ -23,7 +23,7 @@  #include <linux/of_address.h>  #include <linux/of_irq.h>  #include <linux/sunxi_timer.h> -#include <linux/clk-provider.h> +#include <linux/clk/sunxi.h>  #define TIMER_CTL_REG		0x00  #define TIMER_CTL_ENABLE		(1 << 0) @@ -123,7 +123,7 @@ void __init sunxi_timer_init(void)  	if (irq <= 0)  		panic("Can't parse IRQ"); -	of_clk_init(NULL); +	sunxi_init_clocks();  	clk = of_clk_get(node, 0);  	if (IS_ERR(clk)) |