 6bb27d7349
			
		
	
	
	6bb27d7349
	
	
	
		
			
			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>
		
			
				
	
	
		
			79 lines
		
	
	
	
		
			2.2 KiB
			
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			79 lines
		
	
	
	
		
			2.2 KiB
			
		
	
	
	
		
			C
		
	
	
	
	
	
| /*
 | |
|  * Copyright 2012 (C), Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
 | |
|  *
 | |
|  * arch/arm/mach-orion5x/board-dt.c
 | |
|  *
 | |
|  * Flattened Device Tree board initialization
 | |
|  *
 | |
|  * This file is licensed under the terms of the GNU General Public
 | |
|  * License version 2.  This program is licensed "as is" without any
 | |
|  * warranty of any kind, whether express or implied.
 | |
|  */
 | |
| 
 | |
| #include <linux/kernel.h>
 | |
| #include <linux/init.h>
 | |
| #include <linux/of.h>
 | |
| #include <linux/of_platform.h>
 | |
| #include <asm/system_misc.h>
 | |
| #include <asm/mach/arch.h>
 | |
| #include <mach/orion5x.h>
 | |
| #include <plat/irq.h>
 | |
| #include "common.h"
 | |
| 
 | |
| struct of_dev_auxdata orion5x_auxdata_lookup[] __initdata = {
 | |
| 	OF_DEV_AUXDATA("marvell,orion-spi", 0xf1010600, "orion_spi.0", NULL),
 | |
| 	OF_DEV_AUXDATA("marvell,mv64xxx-i2c", 0xf1011000, "mv64xxx_i2c.0",
 | |
| 		       NULL),
 | |
| 	OF_DEV_AUXDATA("marvell,orion-wdt", 0xf1020300, "orion_wdt", NULL),
 | |
| 	OF_DEV_AUXDATA("marvell,orion-sata", 0xf1080000, "sata_mv.0", NULL),
 | |
| 	OF_DEV_AUXDATA("marvell,orion-crypto", 0xf1090000, "mv_crypto", NULL),
 | |
| 	{},
 | |
| };
 | |
| 
 | |
| static void __init orion5x_dt_init(void)
 | |
| {
 | |
| 	char *dev_name;
 | |
| 	u32 dev, rev;
 | |
| 
 | |
| 	orion5x_id(&dev, &rev, &dev_name);
 | |
| 	printk(KERN_INFO "Orion ID: %s. TCLK=%d.\n", dev_name, orion5x_tclk);
 | |
| 
 | |
| 	/*
 | |
| 	 * Setup Orion address map
 | |
| 	 */
 | |
| 	orion5x_setup_cpu_mbus_bridge();
 | |
| 
 | |
| 	/* Setup root of clk tree */
 | |
| 	clk_init();
 | |
| 
 | |
| 	/*
 | |
| 	 * Don't issue "Wait for Interrupt" instruction if we are
 | |
| 	 * running on D0 5281 silicon.
 | |
| 	 */
 | |
| 	if (dev == MV88F5281_DEV_ID && rev == MV88F5281_REV_D0) {
 | |
| 		printk(KERN_INFO "Orion: Applying 5281 D0 WFI workaround.\n");
 | |
| 		disable_hlt();
 | |
| 	}
 | |
| 
 | |
| 	if (of_machine_is_compatible("lacie,ethernet-disk-mini-v2"))
 | |
| 		edmini_v2_init();
 | |
| 
 | |
| 	of_platform_populate(NULL, of_default_bus_match_table,
 | |
| 			     orion5x_auxdata_lookup, NULL);
 | |
| }
 | |
| 
 | |
| static const char *orion5x_dt_compat[] = {
 | |
| 	"marvell,orion5x",
 | |
| 	NULL,
 | |
| };
 | |
| 
 | |
| DT_MACHINE_START(ORION5X_DT, "Marvell Orion5x (Flattened Device Tree)")
 | |
| 	/* Maintainer: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> */
 | |
| 	.map_io		= orion5x_map_io,
 | |
| 	.init_early	= orion5x_init_early,
 | |
| 	.init_irq	= orion_dt_init_irq,
 | |
| 	.init_time	= orion5x_timer_init,
 | |
| 	.init_machine	= orion5x_dt_init,
 | |
| 	.restart	= orion5x_restart,
 | |
| 	.dt_compat	= orion5x_dt_compat,
 | |
| MACHINE_END
 |