Now that the only field in struct sys_timer is .init, delete the struct, and replace the machine descriptor .timer field with the initialization function itself. This will enable moving timer drivers into drivers/clocksource without having to place a public prototype of each struct sys_timer object into include/linux; the intent is to create a single of_clocksource_init() function that determines which timer driver to initialize by scanning the device dtree, much like the proposed irqchip_init() at: http://www.spinics.net/lists/arm-kernel/msg203686.html Includes mach-omap2 fixes from Igor Grinberg. Tested-by: Robert Jarzmik <robert.jarzmik@free.fr> Signed-off-by: Stephen Warren <swarren@nvidia.com>
		
			
				
	
	
		
			67 lines
		
	
	
	
		
			1.5 KiB
			
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			67 lines
		
	
	
	
		
			1.5 KiB
			
		
	
	
	
		
			C
		
	
	
	
	
	
/*
 | 
						|
 * Copyright 2011 Freescale Semiconductor, Inc. All Rights Reserved.
 | 
						|
 * Copyright 2011 Linaro Ltd.
 | 
						|
 *
 | 
						|
 * The code contained herein is licensed under the GNU General Public
 | 
						|
 * License. You may obtain a copy of the GNU General Public License
 | 
						|
 * Version 2 or later at the following locations:
 | 
						|
 *
 | 
						|
 * http://www.opensource.org/licenses/gpl-license.html
 | 
						|
 * http://www.gnu.org/copyleft/gpl.html
 | 
						|
 */
 | 
						|
 | 
						|
#include <linux/clk.h>
 | 
						|
#include <linux/clkdev.h>
 | 
						|
#include <linux/err.h>
 | 
						|
#include <linux/io.h>
 | 
						|
#include <linux/irq.h>
 | 
						|
#include <linux/of_irq.h>
 | 
						|
#include <linux/of_platform.h>
 | 
						|
#include <asm/mach/arch.h>
 | 
						|
#include <asm/mach/time.h>
 | 
						|
 | 
						|
#include "common.h"
 | 
						|
#include "mx53.h"
 | 
						|
 | 
						|
static void __init imx53_qsb_init(void)
 | 
						|
{
 | 
						|
	struct clk *clk;
 | 
						|
 | 
						|
	clk = clk_get_sys(NULL, "ssi_ext1");
 | 
						|
	if (IS_ERR(clk)) {
 | 
						|
		pr_err("failed to get clk ssi_ext1\n");
 | 
						|
		return;
 | 
						|
	}
 | 
						|
 | 
						|
	clk_register_clkdev(clk, NULL, "0-000a");
 | 
						|
}
 | 
						|
 | 
						|
static void __init imx53_dt_init(void)
 | 
						|
{
 | 
						|
	if (of_machine_is_compatible("fsl,imx53-qsb"))
 | 
						|
		imx53_qsb_init();
 | 
						|
 | 
						|
	of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
 | 
						|
}
 | 
						|
 | 
						|
static const char *imx53_dt_board_compat[] __initdata = {
 | 
						|
	"fsl,imx53",
 | 
						|
	NULL
 | 
						|
};
 | 
						|
 | 
						|
static void __init imx53_timer_init(void)
 | 
						|
{
 | 
						|
	mx53_clocks_init_dt();
 | 
						|
}
 | 
						|
 | 
						|
DT_MACHINE_START(IMX53_DT, "Freescale i.MX53 (Device Tree Support)")
 | 
						|
	.map_io		= mx53_map_io,
 | 
						|
	.init_early	= imx53_init_early,
 | 
						|
	.init_irq	= mx53_init_irq,
 | 
						|
	.handle_irq	= imx53_handle_irq,
 | 
						|
	.init_time	= imx53_timer_init,
 | 
						|
	.init_machine	= imx53_dt_init,
 | 
						|
	.init_late	= imx53_init_late,
 | 
						|
	.dt_compat	= imx53_dt_board_compat,
 | 
						|
	.restart	= mxc_restart,
 | 
						|
MACHINE_END
 |