diff options
Diffstat (limited to 'arch/blackfin/mach-bf533/boards/ezkit.c')
| -rw-r--r-- | arch/blackfin/mach-bf533/boards/ezkit.c | 102 | 
1 files changed, 92 insertions, 10 deletions
diff --git a/arch/blackfin/mach-bf533/boards/ezkit.c b/arch/blackfin/mach-bf533/boards/ezkit.c index d4689dcc198..739773cb7fc 100644 --- a/arch/blackfin/mach-bf533/boards/ezkit.c +++ b/arch/blackfin/mach-bf533/boards/ezkit.c @@ -222,7 +222,7 @@ 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, @@ -261,7 +261,7 @@ 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 */ @@ -320,21 +320,50 @@ 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 = BFIN_UART_THR, +		.end = BFIN_UART_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_uart_device = { +static struct platform_device bfin_uart0_device = {  	.name = "bfin-uart", -	.id = 1, -	.num_resources = ARRAY_SIZE(bfin_uart_resources), -	.resource = bfin_uart_resources, +	.id = 0, +	.num_resources = ARRAY_SIZE(bfin_uart0_resources), +	.resource = bfin_uart0_resources, +	.dev = { +		.platform_data = &bfin_uart0_peripherals, /* Passed to driver */ +	},  };  #endif +#endif  #if defined(CONFIG_BFIN_SIR) || defined(CONFIG_BFIN_SIR_MODULE)  #ifdef CONFIG_BFIN_SIR0 @@ -444,6 +473,30 @@ static struct i2c_board_info __initdata bfin_i2c_board_info[] = {  #endif  }; +#if defined(CONFIG_SND_BF5XX_I2S) || defined(CONFIG_SND_BF5XX_I2S_MODULE) +static struct platform_device bfin_i2s = { +	.name = "bfin-i2s", +	.id = CONFIG_SND_BF5XX_SPORT_NUM, +	/* TODO: add platform data here */ +}; +#endif + +#if defined(CONFIG_SND_BF5XX_TDM) || defined(CONFIG_SND_BF5XX_TDM_MODULE) +static struct platform_device bfin_tdm = { +	.name = "bfin-tdm", +	.id = CONFIG_SND_BF5XX_SPORT_NUM, +	/* TODO: add platform data here */ +}; +#endif + +#if defined(CONFIG_SND_BF5XX_AC97) || defined(CONFIG_SND_BF5XX_AC97_MODULE) +static struct platform_device bfin_ac97 = { +	.name = "bfin-ac97", +	.id = CONFIG_SND_BF5XX_SPORT_NUM, +	/* TODO: add platform data here */ +}; +#endif +  static struct platform_device *ezkit_devices[] __initdata = {  	&bfin_dpmc, @@ -471,7 +524,9 @@ static struct platform_device *ezkit_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  #endif  #if defined(CONFIG_BFIN_SIR) || defined(CONFIG_BFIN_SIR_MODULE) @@ -487,6 +542,18 @@ static struct platform_device *ezkit_devices[] __initdata = {  #if defined(CONFIG_I2C_GPIO) || defined(CONFIG_I2C_GPIO_MODULE)  	&i2c_gpio_device,  #endif + +#if defined(CONFIG_SND_BF5XX_I2S) || defined(CONFIG_SND_BF5XX_I2S_MODULE) +	&bfin_i2s, +#endif + +#if defined(CONFIG_SND_BF5XX_TDM) || defined(CONFIG_SND_BF5XX_TDM_MODULE) +	&bfin_tdm, +#endif + +#if defined(CONFIG_SND_BF5XX_AC97) || defined(CONFIG_SND_BF5XX_AC97_MODULE) +	&bfin_ac97, +#endif  };  static int __init ezkit_init(void) @@ -500,3 +567,18 @@ static int __init ezkit_init(void)  }  arch_initcall(ezkit_init); + +static struct platform_device *ezkit_early_devices[] __initdata = { +#if defined(CONFIG_SERIAL_BFIN_CONSOLE) || defined(CONFIG_EARLY_PRINTK) +#ifdef CONFIG_SERIAL_BFIN_UART0 +	&bfin_uart0_device, +#endif +#endif +}; + +void __init native_machine_early_platform_add_devices(void) +{ +	printk(KERN_INFO "register early platform devices\n"); +	early_platform_add_devices(ezkit_early_devices, +		ARRAY_SIZE(ezkit_early_devices)); +}  |