Commit 42bd8bcb authored by Graf Yang's avatar Graf Yang Committed by Bryan Wu
Browse files

Blackfin arch: Modify bfin_sir device configuration to board file 



Signed-off-by: default avatarGraf Yang <graf.yang@analog.com>
Signed-off-by: default avatarBryan Wu <cooloney@kernel.org>
parent c0948d33

arch/blackfin/mach-bf518/boards/ezbrd.c

+41 −7
Original line number Diff line number Diff line
@@ -396,30 +396,59 @@ static struct platform_device bfin_uart_device = { 
#endif



#if defined(CONFIG_BFIN_SIR) || defined(CONFIG_BFIN_SIR_MODULE)

static struct resource bfin_sir_resources[] = {

#ifdef CONFIG_BFIN_SIR0

static struct resource bfin_sir0_resources[] = {

	{

		.start = 0xFFC00400,

		.end = 0xFFC004FF,

		.flags = IORESOURCE_MEM,

	},

	{

		.start = IRQ_UART0_RX,

		.end = IRQ_UART0_RX+1,

		.flags = IORESOURCE_IRQ,

	},

	{

		.start = CH_UART0_RX,

		.end = CH_UART0_RX+1,

		.flags = IORESOURCE_DMA,

	},

};



static struct platform_device bfin_sir0_device = {

	.name = "bfin_sir",

	.id = 0,

	.num_resources = ARRAY_SIZE(bfin_sir0_resources),

	.resource = bfin_sir0_resources,

};

#endif

#ifdef CONFIG_BFIN_SIR1

static struct resource bfin_sir1_resources[] = {

	{

		.start = 0xFFC02000,

		.end = 0xFFC020FF,

		.flags = IORESOURCE_MEM,

	},

#endif

	{

		.start = IRQ_UART1_RX,

		.end = IRQ_UART1_RX+1,

		.flags = IORESOURCE_IRQ,

	},

	{

		.start = CH_UART1_RX,

		.end = CH_UART1_RX+1,

		.flags = IORESOURCE_DMA,

	},

};



static struct platform_device bfin_sir_device = {

static struct platform_device bfin_sir1_device = {

	.name = "bfin_sir",

	.id = 0,

	.num_resources = ARRAY_SIZE(bfin_sir_resources),

	.resource = bfin_sir_resources,

	.id = 1,

	.num_resources = ARRAY_SIZE(bfin_sir1_resources),

	.resource = bfin_sir1_resources,

};

#endif

#endif



#if defined(CONFIG_I2C_BLACKFIN_TWI) || defined(CONFIG_I2C_BLACKFIN_TWI_MODULE)

static struct resource bfin_twi0_resource[] = {
@@ -550,7 +579,12 @@ static struct platform_device *stamp_devices[] __initdata = { 
#endif



#if defined(CONFIG_BFIN_SIR) || defined(CONFIG_BFIN_SIR_MODULE)

	&bfin_sir_device,

#ifdef CONFIG_BFIN_SIR0

	&bfin_sir0_device,

#endif

#ifdef CONFIG_BFIN_SIR1

	&bfin_sir1_device,

#endif

#endif



#if defined(CONFIG_I2C_BLACKFIN_TWI) || defined(CONFIG_I2C_BLACKFIN_TWI_MODULE)

arch/blackfin/mach-bf527/boards/cm_bf527.c

+41 −7
Original line number Diff line number Diff line
@@ -717,30 +717,59 @@ static struct platform_device bfin_uart_device = { 
#endif



#if defined(CONFIG_BFIN_SIR) || defined(CONFIG_BFIN_SIR_MODULE)

static struct resource bfin_sir_resources[] = {

#ifdef CONFIG_BFIN_SIR0

static struct resource bfin_sir0_resources[] = {

	{

		.start = 0xFFC00400,

		.end = 0xFFC004FF,

		.flags = IORESOURCE_MEM,

	},

	{

		.start = IRQ_UART0_RX,

		.end = IRQ_UART0_RX+1,

		.flags = IORESOURCE_IRQ,

	},

	{

		.start = CH_UART0_RX,

		.end = CH_UART0_RX+1,

		.flags = IORESOURCE_DMA,

	},

};



static struct platform_device bfin_sir0_device = {

	.name = "bfin_sir",

	.id = 0,

	.num_resources = ARRAY_SIZE(bfin_sir0_resources),

	.resource = bfin_sir0_resources,

};

#endif

#ifdef CONFIG_BFIN_SIR1

static struct resource bfin_sir1_resources[] = {

	{

		.start = 0xFFC02000,

		.end = 0xFFC020FF,

		.flags = IORESOURCE_MEM,

	},

#endif

	{

		.start = IRQ_UART1_RX,

		.end = IRQ_UART1_RX+1,

		.flags = IORESOURCE_IRQ,

	},

	{

		.start = CH_UART1_RX,

		.end = CH_UART1_RX+1,

		.flags = IORESOURCE_DMA,

	},

};



static struct platform_device bfin_sir_device = {

static struct platform_device bfin_sir1_device = {

	.name = "bfin_sir",

	.id = 0,

	.num_resources = ARRAY_SIZE(bfin_sir_resources),

	.resource = bfin_sir_resources,

	.id = 1,

	.num_resources = ARRAY_SIZE(bfin_sir1_resources),

	.resource = bfin_sir1_resources,

};

#endif

#endif



#if defined(CONFIG_I2C_BLACKFIN_TWI) || defined(CONFIG_I2C_BLACKFIN_TWI_MODULE)

static struct resource bfin_twi0_resource[] = {
@@ -911,7 +940,12 @@ static struct platform_device *stamp_devices[] __initdata = { 
#endif



#if defined(CONFIG_BFIN_SIR) || defined(CONFIG_BFIN_SIR_MODULE)

	&bfin_sir_device,

#ifdef CONFIG_BFIN_SIR0

	&bfin_sir0_device,

#endif

#ifdef CONFIG_BFIN_SIR1

	&bfin_sir1_device,

#endif

#endif



#if defined(CONFIG_I2C_BLACKFIN_TWI) || defined(CONFIG_I2C_BLACKFIN_TWI_MODULE)

arch/blackfin/mach-bf527/boards/ezbrd.c

+41 −7
Original line number Diff line number Diff line
@@ -478,30 +478,59 @@ static struct platform_device bfin_uart_device = { 
#endif



#if defined(CONFIG_BFIN_SIR) || defined(CONFIG_BFIN_SIR_MODULE)

static struct resource bfin_sir_resources[] = {

#ifdef CONFIG_BFIN_SIR0

static struct resource bfin_sir0_resources[] = {

	{

		.start = 0xFFC00400,

		.end = 0xFFC004FF,

		.flags = IORESOURCE_MEM,

	},

	{

		.start = IRQ_UART0_RX,

		.end = IRQ_UART0_RX+1,

		.flags = IORESOURCE_IRQ,

	},

	{

		.start = CH_UART0_RX,

		.end = CH_UART0_RX+1,

		.flags = IORESOURCE_DMA,

	},

};



static struct platform_device bfin_sir0_device = {

	.name = "bfin_sir",

	.id = 0,

	.num_resources = ARRAY_SIZE(bfin_sir0_resources),

	.resource = bfin_sir0_resources,

};

#endif

#ifdef CONFIG_BFIN_SIR1

static struct resource bfin_sir1_resources[] = {

	{

		.start = 0xFFC02000,

		.end = 0xFFC020FF,

		.flags = IORESOURCE_MEM,

	},

#endif

	{

		.start = IRQ_UART1_RX,

		.end = IRQ_UART1_RX+1,

		.flags = IORESOURCE_IRQ,

	},

	{

		.start = CH_UART1_RX,

		.end = CH_UART1_RX+1,

		.flags = IORESOURCE_DMA,

	},

};



static struct platform_device bfin_sir_device = {

static struct platform_device bfin_sir1_device = {

	.name = "bfin_sir",

	.id = 0,

	.num_resources = ARRAY_SIZE(bfin_sir_resources),

	.resource = bfin_sir_resources,

	.id = 1,

	.num_resources = ARRAY_SIZE(bfin_sir1_resources),

	.resource = bfin_sir1_resources,

};

#endif

#endif



#if defined(CONFIG_I2C_BLACKFIN_TWI) || defined(CONFIG_I2C_BLACKFIN_TWI_MODULE)

static struct resource bfin_twi0_resource[] = {
@@ -671,7 +700,12 @@ static struct platform_device *stamp_devices[] __initdata = { 
#endif



#if defined(CONFIG_BFIN_SIR) || defined(CONFIG_BFIN_SIR_MODULE)

	&bfin_sir_device,

#ifdef CONFIG_BFIN_SIR0

	&bfin_sir0_device,

#endif

#ifdef CONFIG_BFIN_SIR1

	&bfin_sir1_device,

#endif

#endif



#if defined(CONFIG_I2C_BLACKFIN_TWI) || defined(CONFIG_I2C_BLACKFIN_TWI_MODULE)

arch/blackfin/mach-bf527/boards/ezkit.c

+41 −7
Original line number Diff line number Diff line
@@ -718,30 +718,59 @@ static struct platform_device bfin_uart_device = { 
#endif



#if defined(CONFIG_BFIN_SIR) || defined(CONFIG_BFIN_SIR_MODULE)

static struct resource bfin_sir_resources[] = {

#ifdef CONFIG_BFIN_SIR0

static struct resource bfin_sir0_resources[] = {

	{

		.start = 0xFFC00400,

		.end = 0xFFC004FF,

		.flags = IORESOURCE_MEM,

	},

	{

		.start = IRQ_UART0_RX,

		.end = IRQ_UART0_RX+1,

		.flags = IORESOURCE_IRQ,

	},

	{

		.start = CH_UART0_RX,

		.end = CH_UART0_RX+1,

		.flags = IORESOURCE_DMA,

	},

};



static struct platform_device bfin_sir0_device = {

	.name = "bfin_sir",

	.id = 0,

	.num_resources = ARRAY_SIZE(bfin_sir0_resources),

	.resource = bfin_sir0_resources,

};

#endif

#ifdef CONFIG_BFIN_SIR1

static struct resource bfin_sir1_resources[] = {

	{

		.start = 0xFFC02000,

		.end = 0xFFC020FF,

		.flags = IORESOURCE_MEM,

	},

#endif

	{

		.start = IRQ_UART1_RX,

		.end = IRQ_UART1_RX+1,

		.flags = IORESOURCE_IRQ,

	},

	{

		.start = CH_UART1_RX,

		.end = CH_UART1_RX+1,

		.flags = IORESOURCE_DMA,

	},

};



static struct platform_device bfin_sir_device = {

static struct platform_device bfin_sir1_device = {

	.name = "bfin_sir",

	.id = 0,

	.num_resources = ARRAY_SIZE(bfin_sir_resources),

	.resource = bfin_sir_resources,

	.id = 1,

	.num_resources = ARRAY_SIZE(bfin_sir1_resources),

	.resource = bfin_sir1_resources,

};

#endif

#endif



#if defined(CONFIG_I2C_BLACKFIN_TWI) || defined(CONFIG_I2C_BLACKFIN_TWI_MODULE)

static struct resource bfin_twi0_resource[] = {
@@ -951,7 +980,12 @@ static struct platform_device *stamp_devices[] __initdata = { 
#endif



#if defined(CONFIG_BFIN_SIR) || defined(CONFIG_BFIN_SIR_MODULE)

	&bfin_sir_device,

#ifdef CONFIG_BFIN_SIR0

	&bfin_sir0_device,

#endif

#ifdef CONFIG_BFIN_SIR1

	&bfin_sir1_device,

#endif

#endif



#if defined(CONFIG_I2C_BLACKFIN_TWI) || defined(CONFIG_I2C_BLACKFIN_TWI_MODULE)

arch/blackfin/mach-bf533/boards/H8606.c

+18 −6
Original line number Diff line number Diff line
@@ -313,23 +313,33 @@ static struct platform_device bfin_uart_device = { 
#endif



#if defined(CONFIG_BFIN_SIR) || defined(CONFIG_BFIN_SIR_MODULE)

static struct resource bfin_sir_resources[] = {

#ifdef CONFIG_BFIN_SIR0

static struct resource bfin_sir0_resources[] = {

	{

		.start = 0xFFC00400,

		.end = 0xFFC004FF,

		.flags = IORESOURCE_MEM,

	},

#endif

	{

		.start = IRQ_UART0_RX,

		.end = IRQ_UART0_RX+1,

		.flags = IORESOURCE_IRQ,

	},

	{

		.start = CH_UART0_RX,

		.end = CH_UART0_RX+1,

		.flags = IORESOURCE_DMA,

	},

};



static struct platform_device bfin_sir_device = {

static struct platform_device bfin_sir0_device = {

	.name = "bfin_sir",

	.id = 0,

	.num_resources = ARRAY_SIZE(bfin_sir_resources),

	.resource = bfin_sir_resources,

	.num_resources = ARRAY_SIZE(bfin_sir0_resources),

	.resource = bfin_sir0_resources,

};

#endif

#endif



#if defined(CONFIG_SERIAL_8250) || defined(CONFIG_SERIAL_8250_MODULE)
@@ -431,7 +441,9 @@ static struct platform_device *h8606_devices[] __initdata = { 
#endif



#if defined(CONFIG_BFIN_SIR) || defined(CONFIG_BFIN_SIR_MODULE)

	&bfin_sir_device,

#ifdef CONFIG_BFIN_SIR0

	&bfin_sir0_device,

#endif

#endif



#if defined(CONFIG_KEYBOARD_OPENCORES) || defined(CONFIG_KEYBOARD_OPENCORES_MODULE)