aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-socfpga/socfpga.c
diff options
context:
space:
mode:
authorSebastian Hesselbarth <sebastian.hesselbarth@gmail.com>2013-09-04 07:38:00 -0400
committerSebastian Hesselbarth <sebastian.hesselbarth@gmail.com>2013-09-29 15:09:41 -0400
commitdc8105817f634d50a91cea9464bbc73ebb36182e (patch)
tree6a3f7ca57b43f58c8951c5027d7aa3f2be89c762 /arch/arm/mach-socfpga/socfpga.c
parent2ab38d9343416f0de93bfeafbd2470fcc994f8ab (diff)
ARM: socfpga: remove custom .init_time hook
With arch/arm calling of_clk_init(NULL) from time_init(), we can now remove custom .init_time hooks. Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com> Acked-by: Dinh Nguyen <dinguyen@altera.com>
Diffstat (limited to 'arch/arm/mach-socfpga/socfpga.c')
-rw-r--r--arch/arm/mach-socfpga/socfpga.c9
1 files changed, 0 insertions, 9 deletions
diff --git a/arch/arm/mach-socfpga/socfpga.c b/arch/arm/mach-socfpga/socfpga.c
index 6df7bb9fe64a..dd0d49cdbe09 100644
--- a/arch/arm/mach-socfpga/socfpga.c
+++ b/arch/arm/mach-socfpga/socfpga.c
@@ -14,8 +14,6 @@
14 * You should have received a copy of the GNU General Public License 14 * You should have received a copy of the GNU General Public License
15 * along with this program. If not, see <http://www.gnu.org/licenses/>. 15 * along with this program. If not, see <http://www.gnu.org/licenses/>.
16 */ 16 */
17#include <linux/clk-provider.h>
18#include <linux/clocksource.h>
19#include <linux/irqchip.h> 17#include <linux/irqchip.h>
20#include <linux/of_address.h> 18#include <linux/of_address.h>
21#include <linux/of_irq.h> 19#include <linux/of_irq.h>
@@ -91,12 +89,6 @@ static void __init socfpga_init_irq(void)
91 socfpga_sysmgr_init(); 89 socfpga_sysmgr_init();
92} 90}
93 91
94static void __init socfpga_init_time(void)
95{
96 of_clk_init(NULL);
97 clocksource_of_init();
98}
99
100static void socfpga_cyclone5_restart(enum reboot_mode mode, const char *cmd) 92static void socfpga_cyclone5_restart(enum reboot_mode mode, const char *cmd)
101{ 93{
102 u32 temp; 94 u32 temp;
@@ -126,7 +118,6 @@ DT_MACHINE_START(SOCFPGA, "Altera SOCFPGA")
126 .smp = smp_ops(socfpga_smp_ops), 118 .smp = smp_ops(socfpga_smp_ops),
127 .map_io = socfpga_map_io, 119 .map_io = socfpga_map_io,
128 .init_irq = socfpga_init_irq, 120 .init_irq = socfpga_init_irq,
129 .init_time = socfpga_init_time,
130 .init_machine = socfpga_cyclone5_init, 121 .init_machine = socfpga_cyclone5_init,
131 .restart = socfpga_cyclone5_restart, 122 .restart = socfpga_cyclone5_restart,
132 .dt_compat = altera_dt_match, 123 .dt_compat = altera_dt_match,