diff options
Diffstat (limited to 'arch/blackfin/mach-bf537/boards/minotaur.c')
| -rw-r--r-- | arch/blackfin/mach-bf537/boards/minotaur.c | 183 | 
1 files changed, 173 insertions, 10 deletions
diff --git a/arch/blackfin/mach-bf537/boards/minotaur.c b/arch/blackfin/mach-bf537/boards/minotaur.c index 0da92725270..c489d602c59 100644 --- a/arch/blackfin/mach-bf537/boards/minotaur.c +++ b/arch/blackfin/mach-bf537/boards/minotaur.c @@ -211,25 +211,93 @@ static struct platform_device bfin_spi0_device = {  #endif  /* spi master and devices */  #if defined(CONFIG_SERIAL_BFIN) || defined(CONFIG_SERIAL_BFIN_MODULE) -static struct resource bfin_uart_resources[] = { +#ifdef CONFIG_SERIAL_BFIN_UART0 +static struct resource bfin_uart0_resources[] = {  	{ -		.start = 0xFFC00400, -		.end = 0xFFC004FF, +		.start = UART0_THR, +		.end = UART0_GCTL+2,  		.flags = IORESOURCE_MEM, -	}, { -		.start = 0xFFC02000, -		.end = 0xFFC020FF, +	}, +	{ +		.start = IRQ_UART0_RX, +		.end = IRQ_UART0_RX+1, +		.flags = IORESOURCE_IRQ, +	}, +	{ +		.start = IRQ_UART0_ERROR, +		.end = IRQ_UART0_ERROR, +		.flags = IORESOURCE_IRQ, +	}, +	{ +		.start = CH_UART0_TX, +		.end = CH_UART0_TX, +		.flags = IORESOURCE_DMA, +	}, +	{ +		.start = CH_UART0_RX, +		.end = CH_UART0_RX, +		.flags = IORESOURCE_DMA, +	}, +}; + +unsigned short bfin_uart0_peripherals[] = { +	P_UART0_TX, P_UART0_RX, 0 +}; + +static struct platform_device bfin_uart0_device = { +	.name = "bfin-uart", +	.id = 0, +	.num_resources = ARRAY_SIZE(bfin_uart0_resources), +	.resource = bfin_uart0_resources, +	.dev = { +		.platform_data = &bfin_uart0_peripherals, /* Passed to driver */ +	}, +}; +#endif +#ifdef CONFIG_SERIAL_BFIN_UART1 +static struct resource bfin_uart1_resources[] = { +	{ +		.start = UART1_THR, +		.end = UART1_GCTL+2,  		.flags = IORESOURCE_MEM,  	}, +	{ +		.start = IRQ_UART1_RX, +		.end = IRQ_UART1_RX+1, +		.flags = IORESOURCE_IRQ, +	}, +	{ +		.start = IRQ_UART1_ERROR, +		.end = IRQ_UART1_ERROR, +		.flags = IORESOURCE_IRQ, +	}, +	{ +		.start = CH_UART1_TX, +		.end = CH_UART1_TX, +		.flags = IORESOURCE_DMA, +	}, +	{ +		.start = CH_UART1_RX, +		.end = CH_UART1_RX, +		.flags = IORESOURCE_DMA, +	}, +}; + +unsigned short bfin_uart1_peripherals[] = { +	P_UART1_TX, P_UART1_RX, 0  }; -static struct platform_device bfin_uart_device = { +static struct platform_device bfin_uart1_device = {  	.name = "bfin-uart",  	.id = 1, -	.num_resources = ARRAY_SIZE(bfin_uart_resources), -	.resource = bfin_uart_resources, +	.num_resources = ARRAY_SIZE(bfin_uart1_resources), +	.resource = bfin_uart1_resources, +	.dev = { +		.platform_data = &bfin_uart1_peripherals, /* Passed to driver */ +	},  };  #endif +#endif  #if defined(CONFIG_BFIN_SIR) || defined(CONFIG_BFIN_SIR_MODULE)  #ifdef CONFIG_BFIN_SIR0 @@ -309,16 +377,75 @@ static struct platform_device i2c_bfin_twi_device = {  #endif  #if defined(CONFIG_SERIAL_BFIN_SPORT) || defined(CONFIG_SERIAL_BFIN_SPORT_MODULE) +#ifdef CONFIG_SERIAL_BFIN_SPORT0_UART +static struct resource bfin_sport0_uart_resources[] = { +	{ +		.start = SPORT0_TCR1, +		.end = SPORT0_MRCS3+4, +		.flags = IORESOURCE_MEM, +	}, +	{ +		.start = IRQ_SPORT0_RX, +		.end = IRQ_SPORT0_RX+1, +		.flags = IORESOURCE_IRQ, +	}, +	{ +		.start = IRQ_SPORT0_ERROR, +		.end = IRQ_SPORT0_ERROR, +		.flags = IORESOURCE_IRQ, +	}, +}; + +unsigned short bfin_sport0_peripherals[] = { +	P_SPORT0_TFS, P_SPORT0_DTPRI, P_SPORT0_TSCLK, P_SPORT0_RFS, +	P_SPORT0_DRPRI, P_SPORT0_RSCLK, P_SPORT0_DRSEC, P_SPORT0_DTSEC, 0 +}; +  static struct platform_device bfin_sport0_uart_device = {  	.name = "bfin-sport-uart",  	.id = 0, +	.num_resources = ARRAY_SIZE(bfin_sport0_uart_resources), +	.resource = bfin_sport0_uart_resources, +	.dev = { +		.platform_data = &bfin_sport0_peripherals, /* Passed to driver */ +	}, +}; +#endif +#ifdef CONFIG_SERIAL_BFIN_SPORT1_UART +static struct resource bfin_sport1_uart_resources[] = { +	{ +		.start = SPORT1_TCR1, +		.end = SPORT1_MRCS3+4, +		.flags = IORESOURCE_MEM, +	}, +	{ +		.start = IRQ_SPORT1_RX, +		.end = IRQ_SPORT1_RX+1, +		.flags = IORESOURCE_IRQ, +	}, +	{ +		.start = IRQ_SPORT1_ERROR, +		.end = IRQ_SPORT1_ERROR, +		.flags = IORESOURCE_IRQ, +	}, +}; + +unsigned short bfin_sport1_peripherals[] = { +	P_SPORT1_TFS, P_SPORT1_DTPRI, P_SPORT1_TSCLK, P_SPORT1_RFS, +	P_SPORT1_DRPRI, P_SPORT1_RSCLK, P_SPORT1_DRSEC, P_SPORT1_DTSEC, 0  };  static struct platform_device bfin_sport1_uart_device = {  	.name = "bfin-sport-uart",  	.id = 1, +	.num_resources = ARRAY_SIZE(bfin_sport1_uart_resources), +	.resource = bfin_sport1_uart_resources, +	.dev = { +		.platform_data = &bfin_sport1_peripherals, /* Passed to driver */ +	},  };  #endif +#endif  static struct platform_device *minotaur_devices[] __initdata = {  #if defined(CONFIG_BFIN_CFPCMCIA) || defined(CONFIG_BFIN_CFPCMCIA_MODULE) @@ -343,7 +470,12 @@ static struct platform_device *minotaur_devices[] __initdata = {  #endif  #if defined(CONFIG_SERIAL_BFIN) || defined(CONFIG_SERIAL_BFIN_MODULE) -	&bfin_uart_device, +#ifdef CONFIG_SERIAL_BFIN_UART0 +	&bfin_uart0_device, +#endif +#ifdef CONFIG_SERIAL_BFIN_UART1 +	&bfin_uart1_device, +#endif  #endif  #if defined(CONFIG_BFIN_SIR) || defined(CONFIG_BFIN_SIR_MODULE) @@ -360,9 +492,13 @@ static struct platform_device *minotaur_devices[] __initdata = {  #endif  #if defined(CONFIG_SERIAL_BFIN_SPORT) || defined(CONFIG_SERIAL_BFIN_SPORT_MODULE) +#ifdef CONFIG_SERIAL_BFIN_SPORT0_UART  	&bfin_sport0_uart_device, +#endif +#ifdef CONFIG_SERIAL_BFIN_SPORT1_UART  	&bfin_sport1_uart_device,  #endif +#endif  }; @@ -380,6 +516,33 @@ static int __init minotaur_init(void)  arch_initcall(minotaur_init); +static struct platform_device *minotaur_early_devices[] __initdata = { +#if defined(CONFIG_SERIAL_BFIN_CONSOLE) || defined(CONFIG_EARLY_PRINTK) +#ifdef CONFIG_SERIAL_BFIN_UART0 +	&bfin_uart0_device, +#endif +#ifdef CONFIG_SERIAL_BFIN_UART1 +	&bfin_uart1_device, +#endif +#endif + +#if defined(CONFIG_SERIAL_BFIN_SPORT_CONSOLE) +#ifdef CONFIG_SERIAL_BFIN_SPORT0_UART +	&bfin_sport0_uart_device, +#endif +#ifdef CONFIG_SERIAL_BFIN_SPORT1_UART +	&bfin_sport1_uart_device, +#endif +#endif +}; + +void __init native_machine_early_platform_add_devices(void) +{ +	printk(KERN_INFO "register early platform devices\n"); +	early_platform_add_devices(minotaur_early_devices, +		ARRAY_SIZE(minotaur_early_devices)); +} +  void native_machine_restart(char *cmd)  {  	/* workaround reboot hang when booting from SPI */  |