evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

clk: mvebu: Use common of_clk_init() function

Browse source 
The use common of_clk_init() function simplifies the clock initialization
and adds handling of the DT "fixed-clock".

Signed-off-by: Jean-Francois Moine <moinejf@free.fr>
Signed-off-by: Mike Turquette <mturquette@linaro.org>
[mturquette@linaro.org: fixed $SUBJECT to reflect correct file path]
This commit is contained in:
Jean-Francois Moine 2013-04-02 13:02:36 +02:00 • committed by Mike Turquette
parent 3566d40c1a
commit f640c0fad6
3 changed files with 3 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
drivers/clk/mvebu/clk-cpu.c
View file

@ -16,7 +16,6 @@
#include <linux/io.h> #include <linux/io.h>
#include <linux/of.h> #include <linux/of.h>
#include <linux/delay.h> #include <linux/delay.h>
#include "clk-cpu.h"
#define SYS_CTRL_CLK_DIVIDER_CTRL_OFFSET 0x0 #define SYS_CTRL_CLK_DIVIDER_CTRL_OFFSET 0x0
#define SYS_CTRL_CLK_DIVIDER_VALUE_OFFSET 0xC #define SYS_CTRL_CLK_DIVIDER_VALUE_OFFSET 0xC
@ -173,17 +172,5 @@ clks_out:
kfree(cpuclk); kfree(cpuclk);
} }
static const __initconst struct of_device_id clk_cpu_match[] = { CLK_OF_DECLARE(armada_xp_cpu_clock, "marvell,armada-xp-cpu-clock",
{ of_cpu_clk_setup);
.compatible = "marvell,armada-xp-cpu-clock",
.data = of_cpu_clk_setup,
},
{
/* sentinel */
},
};
void __init mvebu_cpu_clk_init(void)
{
of_clk_init(clk_cpu_match);
}

22
drivers/clk/mvebu/clk-cpu.h
View file

@ -1,22 +0,0 @@
/*
* Marvell MVEBU CPU clock handling.
*
* Copyright (C) 2012 Marvell
*
* Gregory CLEMENT <gregory.clement@free-electrons.com>
*
* This file is licensed under the terms of the GNU General Public
* License version 2. This program is licensed "as is" without any
* warranty of any kind, whether express or implied.
*/
#ifndef __MVEBU_CLK_CPU_H
#define __MVEBU_CLK_CPU_H
#ifdef CONFIG_MVEBU_CLK_CPU
void __init mvebu_cpu_clk_init(void);
#else
static inline void mvebu_cpu_clk_init(void) {}
#endif
#endif

6
drivers/clk/mvebu/clk.c
View file

@ -10,18 +10,14 @@
* warranty of any kind, whether express or implied. * warranty of any kind, whether express or implied.
*/ */
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/clk.h>
#include <linux/clk-provider.h> #include <linux/clk-provider.h>
#include <linux/of_address.h>
#include <linux/clk/mvebu.h>
#include <linux/of.h> #include <linux/of.h>
#include "clk-core.h" #include "clk-core.h"
#include "clk-cpu.h"
#include "clk-gating-ctrl.h" #include "clk-gating-ctrl.h"
void __init mvebu_clocks_init(void) void __init mvebu_clocks_init(void)
{ {
mvebu_core_clk_init(); mvebu_core_clk_init();
mvebu_gating_clk_init(); mvebu_gating_clk_init();
mvebu_cpu_clk_init(); of_clk_init(NULL);
} }