diff options
| author | Michael Turquette <mturquette@linaro.org> | 2015-01-27 16:33:45 -0800 |
|---|---|---|
| committer | Michael Turquette <mturquette@linaro.org> | 2015-01-27 16:33:45 -0800 |
| commit | 8f101aa0272c21b116fd2b53c4ff7815698e4814 (patch) | |
| tree | 2e20c4751888aee4f10745fbf41939fbbc161a36 /include/linux/clk | |
| parent | b80418f3c05061094c57ad7a661c9fb14e3f8b73 (diff) | |
| parent | 76820fcf7aa5a418b69cb7bed31b62d1feb1d6ad (diff) | |
Merge tag 'sunxi-clocks-for-3.20' of https://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux into clk-next
Allwinner clock changes for 3.20
The set of clock changes for the 3.20 merge window, with mostly:
- Some PLL fixes for the A80 and A31
- The MMC custom phase functions are removed, and moved over to the generic
phase API.
- Add the A80 MMC clocks
Some DT changes slipped here as well, to preserve bisectability.
Diffstat (limited to 'include/linux/clk')
| -rw-r--r-- | include/linux/clk/sunxi.h | 22 |
1 files changed, 0 insertions, 22 deletions
diff --git a/include/linux/clk/sunxi.h b/include/linux/clk/sunxi.h deleted file mode 100644 index aed28c4451d9..000000000000 --- a/include/linux/clk/sunxi.h +++ /dev/null @@ -1,22 +0,0 @@ -/* - * Copyright 2013 - Hans de Goede <hdegoede@redhat.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_ - -#include <linux/clk.h> - -void clk_sunxi_mmc_phase_control(struct clk *clk, u8 sample, u8 output); - -#endif |