diff options
Diffstat (limited to 'arch/blackfin/mach-bf527/boards/cm_bf527.c')
| -rw-r--r-- | arch/blackfin/mach-bf527/boards/cm_bf527.c | 245 | 
1 files changed, 183 insertions, 62 deletions
diff --git a/arch/blackfin/mach-bf527/boards/cm_bf527.c b/arch/blackfin/mach-bf527/boards/cm_bf527.c index 7ab0800e291..ebe76d1e874 100644 --- a/arch/blackfin/mach-bf527/boards/cm_bf527.c +++ b/arch/blackfin/mach-bf527/boards/cm_bf527.c @@ -18,7 +18,6 @@  #include <linux/i2c.h>  #include <linux/irq.h>  #include <linux/interrupt.h> -#include <linux/usb/sl811.h>  #include <linux/usb/musb.h>  #include <asm/dma.h>  #include <asm/bfin5xx_spi.h> @@ -270,50 +269,6 @@ static struct platform_device dm9000_device = {  };  #endif -#if defined(CONFIG_USB_SL811_HCD) || defined(CONFIG_USB_SL811_HCD_MODULE) -static struct resource sl811_hcd_resources[] = { -	{ -		.start = 0x20340000, -		.end = 0x20340000, -		.flags = IORESOURCE_MEM, -	}, { -		.start = 0x20340004, -		.end = 0x20340004, -		.flags = IORESOURCE_MEM, -	}, { -		.start = CONFIG_USB_SL811_BFIN_IRQ, -		.end = CONFIG_USB_SL811_BFIN_IRQ, -		.flags = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHLEVEL, -	}, -}; - -#if defined(CONFIG_USB_SL811_BFIN_USE_VBUS) -void sl811_port_power(struct device *dev, int is_on) -{ -	gpio_request(CONFIG_USB_SL811_BFIN_GPIO_VBUS, "usb:SL811_VBUS"); -	gpio_direction_output(CONFIG_USB_SL811_BFIN_GPIO_VBUS, is_on); -} -#endif - -static struct sl811_platform_data sl811_priv = { -	.potpg = 10, -	.power = 250,       /* == 500mA */ -#if defined(CONFIG_USB_SL811_BFIN_USE_VBUS) -	.port_power = &sl811_port_power, -#endif -}; - -static struct platform_device sl811_hcd_device = { -	.name = "sl811-hcd", -	.id = 0, -	.dev = { -		.platform_data = &sl811_priv, -	}, -	.num_resources = ARRAY_SIZE(sl811_hcd_resources), -	.resource = sl811_hcd_resources, -}; -#endif -  #if defined(CONFIG_BFIN_MAC) || defined(CONFIG_BFIN_MAC_MODULE)  static struct platform_device bfin_mii_bus = {  	.name = "bfin_mii_bus", @@ -384,8 +339,8 @@ static struct bfin5xx_spi_chip spi_adc_chip_info = {  };  #endif -#if defined(CONFIG_SND_BLACKFIN_AD1836) \ -	|| defined(CONFIG_SND_BLACKFIN_AD1836_MODULE) +#if defined(CONFIG_SND_BLACKFIN_AD183X) \ +	|| defined(CONFIG_SND_BLACKFIN_AD183X_MODULE)  static struct bfin5xx_spi_chip ad1836_spi_chip_info = {  	.enable_dma = 0,  	.bits_per_word = 16, @@ -462,8 +417,8 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {  	},  #endif -#if defined(CONFIG_SND_BLACKFIN_AD1836) \ -	|| defined(CONFIG_SND_BLACKFIN_AD1836_MODULE) +#if defined(CONFIG_SND_BLACKFIN_AD183X) \ +	|| defined(CONFIG_SND_BLACKFIN_AD183X_MODULE)  	{  		.modalias = "ad1836",  		.max_speed_hz = 3125000,     /* max spi clock (SCK) speed in HZ */ @@ -603,30 +558,105 @@ static struct platform_device cm_flash_device = {  #endif  #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 = 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 = 0xFFC02000, -		.end = 0xFFC020FF, +		.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, +	}, +#ifdef CONFIG_BFIN_UART1_CTSRTS +	{	/* CTS pin */ +		.start = GPIO_PF9, +		.end = GPIO_PF9, +		.flags = IORESOURCE_IO, +	}, +	{	/* RTS pin */ +		.start = GPIO_PF10, +		.end = GPIO_PF10, +		.flags = IORESOURCE_IO, +	},  #endif  }; -static struct platform_device bfin_uart_device = { +unsigned short bfin_uart1_peripherals[] = { +	P_UART1_TX, P_UART1_RX, 0 +}; + +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 @@ -725,16 +755,75 @@ static struct i2c_board_info __initdata bfin_i2c_board_info[] = {  };  #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  #if defined(CONFIG_KEYBOARD_GPIO) || defined(CONFIG_KEYBOARD_GPIO_MODULE)  #include <linux/input.h> @@ -795,10 +884,6 @@ static struct platform_device *cmbf527_devices[] __initdata = {  	&rtc_device,  #endif -#if defined(CONFIG_USB_SL811_HCD) || defined(CONFIG_USB_SL811_HCD_MODULE) -	&sl811_hcd_device, -#endif -  #if defined(CONFIG_USB_ISP1760_HCD) || defined(CONFIG_USB_ISP1760_HCD_MODULE)  	&bfin_isp1760_device,  #endif @@ -829,7 +914,12 @@ static struct platform_device *cmbf527_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) @@ -846,9 +936,13 @@ static struct platform_device *cmbf527_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  #if defined(CONFIG_KEYBOARD_GPIO) || defined(CONFIG_KEYBOARD_GPIO_MODULE)  	&bfin_device_gpiokeys, @@ -871,6 +965,33 @@ static int __init cm_init(void)  arch_initcall(cm_init); +static struct platform_device *cmbf527_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(cmbf527_early_devices, +		ARRAY_SIZE(cmbf527_early_devices)); +} +  void native_machine_restart(char *cmd)  {  	/* workaround reboot hang when booting from SPI */  |