diff options
author | Olof Johansson <olof@lixom.net> | 2013-04-11 03:38:03 -0700 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2013-04-11 03:38:03 -0700 |
commit | 83c15f4c05757b3c5fe1551a474458fd16d27bae (patch) | |
tree | c9631bf611794e15a0afc3fb0673e7e494ca94d0 /include/linux/clk | |
parent | d6e911b599517d3faaa53e125b174a318b33aca9 (diff) | |
parent | 918d7f6f68620e0721bb31402ebf87e15f826831 (diff) | |
download | linux-stable-83c15f4c05757b3c5fe1551a474458fd16d27bae.tar.gz linux-stable-83c15f4c05757b3c5fe1551a474458fd16d27bae.tar.bz2 linux-stable-83c15f4c05757b3c5fe1551a474458fd16d27bae.zip |
Merge branch 'depends/clk-for-3.10' into next/cleanup
Bringin in clk subsystem dependencies needed by sunxi.
* depends/clk-for-3.10: (26 commits)
clk: sunxi: drop an unnecesary kmalloc
clk: sunxi: drop CLK_IGNORE_UNUSED
clk: sunxi: Add support for AXI, AHB, APB0 and APB1 gates
clk: divider: Introduce CLK_DIVIDER_ALLOW_ZERO flag
clk: mvebu: Use common of_clk_init() function
clk: fix clk_mux::flags kerneldoc
clk: allow reentrant calls into the clk framework
clk: abstract locking out into helper functions
clk: zynq: Add missing zynq clk header
clk: sunxi: rename compatible strings
arm: sunxi: Add useful information about sunxi clocks
clk: arm: sunxi: Add a new clock driver for sunxi SOCs
clk: ux500: Fix prcmu clocks registration
ARM: imx: adapt clk_busy_mux to new clk_mux struct
clk: Add composite clock type
clk: add table lookup to mux
clk: Fix incorrect return type in clk.c
clk: prima2: fix return value check in sirfsoc_of_clk_init()
clk:SPEAr1340: Correct parent clock configuration
documentation: clk: fix couple of misspelling
...
Diffstat (limited to 'include/linux/clk')
-rw-r--r-- | include/linux/clk/sunxi.h | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/include/linux/clk/sunxi.h b/include/linux/clk/sunxi.h new file mode 100644 index 000000000000..e074fdd5a236 --- /dev/null +++ b/include/linux/clk/sunxi.h @@ -0,0 +1,22 @@ +/* + * Copyright 2012 Maxime Ripard + * + * Maxime Ripard <maxime.ripard@free-electrons.com> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + */ + +#ifndef __LINUX_CLK_SUNXI_H_ +#define __LINUX_CLK_SUNXI_H_ + +void __init sunxi_init_clocks(void); + +#endif |