diff options
| author | Soren Brinkmann <soren.brinkmann@xilinx.com> | 2013-05-13 13:46:38 -0400 |
|---|---|---|
| committer | Michal Simek <michal.simek@xilinx.com> | 2013-05-27 03:21:22 -0400 |
| commit | 30e1e28598c2674c133148d8aec6d431d7acd314 (patch) | |
| tree | e17a5fba2151cf6d32d0f39b9d69910f85b71a9f /include | |
| parent | 0ee52b157b8ed88550ddd6291e54bb4bfabde364 (diff) | |
arm: zynq: Migrate platform to clock controller
Migrate the Zynq platform and its drivers to use the new clock
controller driver.
Signed-off-by: Soren Brinkmann <soren.brinkmann@xilinx.com>
Cc: John Stultz <john.stultz@linaro.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Jiri Slaby <jslaby@suse.cz>
Cc: linux-serial@vger.kernel.org
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
Acked-by: Mike Turquette <mturquette@linaro.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/clk/zynq.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/include/linux/clk/zynq.h b/include/linux/clk/zynq.h index 56be7cd9aa8b..e062d317ccce 100644 --- a/include/linux/clk/zynq.h +++ b/include/linux/clk/zynq.h | |||
| @@ -1,4 +1,5 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * Copyright (C) 2013 Xilinx Inc. | ||
| 2 | * Copyright (C) 2012 National Instruments | 3 | * Copyright (C) 2012 National Instruments |
| 3 | * | 4 | * |
| 4 | * This program is free software; you can redistribute it and/or modify | 5 | * This program is free software; you can redistribute it and/or modify |
| @@ -19,6 +20,11 @@ | |||
| 19 | #ifndef __LINUX_CLK_ZYNQ_H_ | 20 | #ifndef __LINUX_CLK_ZYNQ_H_ |
| 20 | #define __LINUX_CLK_ZYNQ_H_ | 21 | #define __LINUX_CLK_ZYNQ_H_ |
| 21 | 22 | ||
| 22 | void __init xilinx_zynq_clocks_init(void __iomem *slcr); | 23 | #include <linux/spinlock.h> |
| 23 | 24 | ||
| 25 | void zynq_clock_init(void __iomem *slcr); | ||
| 26 | |||
| 27 | struct clk *clk_register_zynq_pll(const char *name, const char *parent, | ||
| 28 | void __iomem *pll_ctrl, void __iomem *pll_status, u8 lock_index, | ||
| 29 | spinlock_t *lock); | ||
| 24 | #endif | 30 | #endif |
