diff options
| author | Olof Johansson <olof@lixom.net> | 2015-01-26 20:23:45 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2015-01-26 20:23:45 -0800 |
| commit | 688a4994cc23c5fdab22183d804f8d93a142bca9 (patch) | |
| tree | d551552518a34fd09a1b4123ff0b1326fcde74fe /drivers/clk | |
| parent | 02685cd20a6f2b0b92fef749d9b9a6c03631c9c2 (diff) | |
| parent | f91b7c62e0cdb8a1a72b61b16fcd48858a7d9193 (diff) | |
| download | linux-688a4994cc23c5fdab22183d804f8d93a142bca9.tar.gz linux-688a4994cc23c5fdab22183d804f8d93a142bca9.tar.bz2 linux-688a4994cc23c5fdab22183d804f8d93a142bca9.zip | |
Merge tag 'sunxi-core-for-3.20' of https://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux into next/soc
Merge "Allwinner core changes for 3.20" from Maxime Ripard:
- Support for the A31s
- Adding support for cpufreq using cpufreq-dt
* tag 'sunxi-core-for-3.20' of https://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux:
ARM: sunxi: Register cpufreq-dt for sun[45678]i
ARM: sunxi: Add "allwinner,sun6i-a31s" to mach-sunxi
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'drivers/clk')
| -rw-r--r-- | drivers/clk/sunxi/clk-sunxi.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/clk/sunxi/clk-sunxi.c b/drivers/clk/sunxi/clk-sunxi.c index 570202582dcf..1818f404538d 100644 --- a/drivers/clk/sunxi/clk-sunxi.c +++ b/drivers/clk/sunxi/clk-sunxi.c @@ -1226,6 +1226,7 @@ static void __init sun6i_init_clocks(struct device_node *node) ARRAY_SIZE(sun6i_critical_clocks)); } CLK_OF_DECLARE(sun6i_a31_clk_init, "allwinner,sun6i-a31", sun6i_init_clocks); +CLK_OF_DECLARE(sun6i_a31s_clk_init, "allwinner,sun6i-a31s", sun6i_init_clocks); CLK_OF_DECLARE(sun8i_a23_clk_init, "allwinner,sun8i-a23", sun6i_init_clocks); static void __init sun9i_init_clocks(struct device_node *node) |