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>
		
			
				
	
	
		
			109 lines
		
	
	
	
		
			2.4 KiB
			
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			109 lines
		
	
	
	
		
			2.4 KiB
			
		
	
	
	
		
			C
		
	
	
	
	
	
/*
 | 
						|
 * linux/arch/arm/mach-sa1100/shannon.c
 | 
						|
 */
 | 
						|
 | 
						|
#include <linux/init.h>
 | 
						|
#include <linux/device.h>
 | 
						|
#include <linux/kernel.h>
 | 
						|
#include <linux/platform_data/sa11x0-serial.h>
 | 
						|
#include <linux/tty.h>
 | 
						|
#include <linux/mtd/mtd.h>
 | 
						|
#include <linux/mtd/partitions.h>
 | 
						|
 | 
						|
#include <video/sa1100fb.h>
 | 
						|
 | 
						|
#include <mach/hardware.h>
 | 
						|
#include <asm/mach-types.h>
 | 
						|
#include <asm/setup.h>
 | 
						|
 | 
						|
#include <asm/mach/arch.h>
 | 
						|
#include <asm/mach/flash.h>
 | 
						|
#include <asm/mach/map.h>
 | 
						|
#include <linux/platform_data/mfd-mcp-sa11x0.h>
 | 
						|
#include <mach/shannon.h>
 | 
						|
#include <mach/irqs.h>
 | 
						|
 | 
						|
#include "generic.h"
 | 
						|
 | 
						|
static struct mtd_partition shannon_partitions[] = {
 | 
						|
	{
 | 
						|
		.name		= "BLOB boot loader",
 | 
						|
		.offset		= 0,
 | 
						|
		.size		= 0x20000
 | 
						|
	},
 | 
						|
	{
 | 
						|
		.name		= "kernel",
 | 
						|
		.offset		= MTDPART_OFS_APPEND,
 | 
						|
		.size		= 0xe0000
 | 
						|
	},
 | 
						|
	{
 | 
						|
		.name		= "initrd",
 | 
						|
		.offset		= MTDPART_OFS_APPEND,	
 | 
						|
		.size		= MTDPART_SIZ_FULL
 | 
						|
	}
 | 
						|
};
 | 
						|
 | 
						|
static struct flash_platform_data shannon_flash_data = {
 | 
						|
	.map_name	= "cfi_probe",
 | 
						|
	.parts		= shannon_partitions,
 | 
						|
	.nr_parts	= ARRAY_SIZE(shannon_partitions),
 | 
						|
};
 | 
						|
 | 
						|
static struct resource shannon_flash_resource =
 | 
						|
	DEFINE_RES_MEM(SA1100_CS0_PHYS, SZ_4M);
 | 
						|
 | 
						|
static struct mcp_plat_data shannon_mcp_data = {
 | 
						|
	.mccr0		= MCCR0_ADM,
 | 
						|
	.sclk_rate	= 11981000,
 | 
						|
};
 | 
						|
 | 
						|
static struct sa1100fb_mach_info shannon_lcd_info = {
 | 
						|
	.pixclock	= 152500,	.bpp		= 8,
 | 
						|
	.xres		= 640,		.yres		= 480,
 | 
						|
 | 
						|
	.hsync_len	= 4,		.vsync_len	= 3,
 | 
						|
	.left_margin	= 2,		.upper_margin	= 0,
 | 
						|
	.right_margin	= 1,		.lower_margin	= 0,
 | 
						|
 | 
						|
	.sync		= FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT,
 | 
						|
 | 
						|
	.lccr0		= LCCR0_Color | LCCR0_Dual | LCCR0_Pas,
 | 
						|
	.lccr3		= LCCR3_ACBsDiv(512),
 | 
						|
};
 | 
						|
 | 
						|
static void __init shannon_init(void)
 | 
						|
{
 | 
						|
	sa11x0_ppc_configure_mcp();
 | 
						|
	sa11x0_register_lcd(&shannon_lcd_info);
 | 
						|
	sa11x0_register_mtd(&shannon_flash_data, &shannon_flash_resource, 1);
 | 
						|
	sa11x0_register_mcp(&shannon_mcp_data);
 | 
						|
}
 | 
						|
 | 
						|
static void __init shannon_map_io(void)
 | 
						|
{
 | 
						|
	sa1100_map_io();
 | 
						|
 | 
						|
	sa1100_register_uart(0, 3);
 | 
						|
	sa1100_register_uart(1, 1);
 | 
						|
 | 
						|
	Ser1SDCR0 |= SDCR0_SUS;
 | 
						|
	GAFR |= (GPIO_UART_TXD | GPIO_UART_RXD);
 | 
						|
	GPDR |= GPIO_UART_TXD | SHANNON_GPIO_CODEC_RESET;
 | 
						|
	GPDR &= ~GPIO_UART_RXD;
 | 
						|
	PPAR |= PPAR_UPR;
 | 
						|
 | 
						|
	/* reset the codec */
 | 
						|
	GPCR = SHANNON_GPIO_CODEC_RESET;
 | 
						|
	GPSR = SHANNON_GPIO_CODEC_RESET;
 | 
						|
}
 | 
						|
 | 
						|
MACHINE_START(SHANNON, "Shannon (AKA: Tuxscreen)")
 | 
						|
	.atag_offset	= 0x100,
 | 
						|
	.map_io		= shannon_map_io,
 | 
						|
	.nr_irqs	= SA1100_NR_IRQS,
 | 
						|
	.init_irq	= sa1100_init_irq,
 | 
						|
	.init_time	= sa1100_timer_init,
 | 
						|
	.init_machine	= shannon_init,
 | 
						|
	.init_late	= sa11x0_init_late,
 | 
						|
	.restart	= sa11x0_restart,
 | 
						|
MACHINE_END
 |