diff linux-2.6-xlnx_arch-ppc-syslib-virtex_devices.c secretlab_arch-ppc-syslib-virtex_devices.c
77,92d76
<  * ML300/ML403 Video Device: shortcut macro for single instance
<  */
< #define XPAR_TFT(num) { \
< 	.name = "xilinxfb", \
< 	.id = num, \
< 	.num_resources = 1, \
< 	.resource = (struct resource[]) { \
< 		{ \
< 			.start = XPAR_TFT_##num##_BASEADDR, \
< 			.end = XPAR_TFT_##num##_BASEADDR+7, \
< 			.flags = IORESOURCE_IO, \
< 		}, \
< 	}, \
< }
< 
< /*
126,152d109
<  * EMAC: shortcut macro for single instance
<  */
< #define XPAR_EMACLITE(num) { \
< 	.name		= "xilinx_emaclite", \
< 	.id		= num, \
< 	.num_resources	= 2, \
< 	.resource = (struct resource[]) { \
< 		{ \
< 			.start	= XPAR_EMACLITE_##num##_BASEADDR, \
< 			.end	= XPAR_EMACLITE_##num##_HIGHADDR, \
< 			.flags	= IORESOURCE_MEM, \
< 		}, \
< 		{ \
< 			.start	= XPAR_INTC_0_EMACLITE_##num##_VEC_ID, \
< 			.flags	= IORESOURCE_IRQ, \
< 		}, \
< 	}, \
< 	.dev.platform_data = &(struct xemaclite_platform_data) { \
< 		.tx_ping_pong = XPAR_EMACLITE_##num##_TX_PING_PONG, \
< 		.rx_ping_pong = XPAR_EMACLITE_##num##_RX_PING_PONG, \
< 		/* locally administered default address */ \
< 		.mac_addr = {2, 0, 0, 0, 0, num}, \
< 	}, \
< }
< 
< 
< /*
199,288c156,160
< #define XPAR_LLTEMAC_RESOURCES(num) \
< 	.name = "xilinx_lltemac", \
< 	.id = XPAR_LLTEMAC_##num##_DEVICE_ID, \
< 	.num_resources = 2, \
< 	.resource = (struct resource[]) { \
< 		{ \
< 			.start = XPAR_LLTEMAC_##num##_BASEADDR, \
< 			.end = XPAR_LLTEMAC_##num##_BASEADDR + 0x1000, \
< 			.flags = IORESOURCE_MEM \
< 		}, \
< 		{ \
< 			.start = XPAR_INTC_0_LLTEMAC_##num##_VEC_ID, \
< 			.end = XPAR_INTC_0_LLTEMAC_##num##_VEC_ID, \
< 			.flags = IORESOURCE_IRQ \
< 		} \
< 	}
< 
< #ifdef XPAR_XLLDMA_USE_DCR
< #define DCRHOST 0xFF
< #else 
< #define DCRHOST 0x00
< #endif
< 
< #define XPAR_LLTEMAC(num) { \
< 	XPAR_LLTEMAC_RESOURCES(num), \
< 	.dev.platform_data = &(struct xlltemac_platform_data) { \
< 		.tx_csum = XPAR_LLTEMAC_##num##_TXCSUM, \
< 		.rx_csum = XPAR_LLTEMAC_##num##_RXCSUM, \
< 		.phy_type = XPAR_LLTEMAC_##num##_PHY_TYPE, \
< 		.dcr_host = DCRHOST, \
< 		.ll_dev_type = XPAR_LLTEMAC_##num##_LLINK_CONNECTED_TYPE, \
< 		.ll_dev_baseaddress = XPAR_LLTEMAC_##num##_LLINK_CONNECTED_BASEADDR, \
< 		.ll_dev_dma_rx_irq = XPAR_LLTEMAC_##num##_LLINK_CONNECTED_DMARX_INTR, \
< 		.ll_dev_dma_tx_irq = XPAR_LLTEMAC_##num##_LLINK_CONNECTED_DMATX_INTR, \
< 		.ll_dev_fifo_irq = XPAR_LLTEMAC_##num##_LLINK_CONNECTED_FIFO_INTR, \
< 		/* locally administered default address */ \
< 		.mac_addr = {2, 0, 0, 0, 0, num}, \
< 	}, \
< }
< 
< 
< #define XPAR_PS2(num) { \
< 	.name = "xilinx_ps2", \
< 	.id = num, \
< 	.num_resources = 2, \
< 	.resource = (struct resource[]) { \
< 		{ \
< 			.start = XPAR_PS2_##num##_BASEADDR, \
< 			.end = XPAR_PS2_##num##_HIGHADDR, \
< 			.flags = IORESOURCE_MEM, \
< 		}, \
< 		{ \
< 			.start = XPAR_INTC_0_PS2_##num##_VEC_ID, \
< 			.flags = IORESOURCE_IRQ, \
< 		}, \
< 	}, \
< }
< 
< #define XPAR_IIC(num) { \
<     .name = "xilinx_iic", \
<     .id = num, \
<     .num_resources = 2, \
<     .resource = (struct resource[]) { \
<         { \
<             .start = XPAR_IIC_##num##_BASEADDR, \
<             .end = XPAR_IIC_##num##_HIGHADDR, \
<             .flags = IORESOURCE_MEM, \
<         }, \
<         { \
<             .start = XPAR_INTC_0_IIC_##num##_VEC_ID, \
<             .flags = IORESOURCE_IRQ, \
<         }, \
<     }, \
< }
< 
< #ifdef CONFIG_XILINX_VIRTEX_II_PRO
< #define XPAR_HWICAP_FAMILY "virtex2p"
< #endif
< #ifdef CONFIG_XILINX_VIRTEX_4_FX
< #define XPAR_HWICAP_FAMILY "virtex4"
< #endif
< #ifdef CONFIG_XILINX_VIRTEX_5
< #define XPAR_HWICAP_FAMILY "virtex5"
< #endif
< #ifndef XPAR_HWICAP_FAMILY
< #define XPAR_HWICAP_FAMILY NULL
< #endif
< 
< #define XPAR_HWICAP(num) { \
< 	.name = "xilinx_icap", \
---
> /*
>  * ML300/ML403 Video Device: shortcut macro for single instance
>  */
> #define XPAR_TFT(num) { \
> 	.name = "xilinxfb", \
293,295c165,167
<                         .start = XPAR_HWICAP_##num##_BASEADDR,  \
< 			.end   = XPAR_HWICAP_##num##_HIGHADDR,    \
< 			.flags = IORESOURCE_MEM, \
---
> 			.start = XPAR_TFT_##num##_BASEADDR, \
> 			.end = XPAR_TFT_##num##_BASEADDR+7, \
> 			.flags = IORESOURCE_IO, \
298d169
< 	.dev.platform_data = XPAR_HWICAP_FAMILY,	\
409,410c280,281
< 		.name = "serial8250",
< 		.id = 0,
---
> 		.name		= "serial8250",
> 		.id		= 0,
437,450d307
< 	/* EMACLITE instances */
< #if defined(XPAR_EMACLITE_0_BASEADDR)
< 	XPAR_EMACLITE(0),
< #endif
< #if defined(XPAR_EMACLITE_1_BASEADDR)
< 	XPAR_EMACLITE(1),
< #endif
< #if defined(XPAR_EMACLITE_2_BASEADDR)
< 	XPAR_EMACLITE(2),
< #endif
< #if defined(XPAR_EMACLITE_3_BASEADDR)
< 	XPAR_EMACLITE(3),
< #endif
< 
484,518d340
< 	/* LLTEMAC instances */
< #if defined(XPAR_LLTEMAC_0_BASEADDR)
< 	XPAR_LLTEMAC(0),
< #endif
< #if defined(XPAR_LLTEMAC_1_BASEADDR)
< 	XPAR_LLTEMAC(1),
< #endif
< #if defined(XPAR_LLTEMAC_2_BASEADDR)
< 	XPAR_LLTEMAC(2),
< #endif
< #if defined(XPAR_LLTEMAC_3_BASEADDR)
< 	XPAR_LLTEMAC(3),
< #endif
< 
< #if defined(XPAR_PS2_0_BASEADDR)
< 	XPAR_PS2(0),
< #endif
< #if defined(XPAR_PS2_1_BASEADDR)
< 	XPAR_PS2(1),
< #endif
< #if defined(XPAR_PS2_2_BASEADDR)
< 	XPAR_PS2(2),
< #endif
< #if defined(XPAR_PS2_3_BASEADDR)
< 	XPAR_PS2(3),
< #endif
< 
< #if defined(XPAR_IIC_0_BASEADDR)
<     XPAR_IIC(0),
< #endif
< 
< #if defined(XPAR_HWICAP_0_BASEADDR)
< 	XPAR_HWICAP(0),
< #endif
< 
554d375
< 	extern void gen550_init(int i, struct uart_port *serial_req);
558,564c379,385
< 	serial_req.mapbase = pdata->mapbase;
< 	serial_req.membase = pdata->membase;
< 	serial_req.irq = pdata->irq;
< 	serial_req.uartclk = pdata->uartclk;
< 	serial_req.regshift = pdata->regshift;
< 	serial_req.iotype = pdata->iotype;
< 	serial_req.flags = pdata->flags;
---
> 	serial_req.mapbase	= pdata->mapbase;
> 	serial_req.membase	= pdata->membase;
> 	serial_req.irq		= pdata->irq;
> 	serial_req.uartclk	= pdata->uartclk;
> 	serial_req.regshift	= pdata->regshift;
> 	serial_req.iotype	= pdata->iotype;
> 	serial_req.flags	= pdata->flags;
608,609d428
< 		printk(KERN_INFO "Registering device %s:%d\n",
< 		       index->name, index->id);