Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit df5de261 authored by Sonic Zhang's avatar Sonic Zhang Committed by Mike Frysinger
Browse files

Blackfin: move SPORT UART resources to boards files 



Rather than keeping the pins in the actual driver and worrying about a
mess of Kconfig options, declare all the desired pin resources in the
boards file.  This lets people easily select the specific pins/ports for
the normal emulated UART as well as GPIOs for CTS/RTS.

Signed-off-by: default avatarSonic Zhang <sonic.zhang@analog.com>
Signed-off-by: default avatarMike Frysinger <vapier@gentoo.org>
parent 08a54bff

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

+63 −0
Original line number Diff line number Diff line
@@ -562,16 +562,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>
@@ -678,9 +737,13 @@ static struct platform_device *stamp_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,

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

+63 −0
Original line number Diff line number Diff line
@@ -800,16 +800,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>
@@ -926,9 +985,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,

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

+63 −0
Original line number Diff line number Diff line
@@ -631,16 +631,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>
@@ -766,9 +825,13 @@ static struct platform_device *stamp_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,

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

+63 −0
Original line number Diff line number Diff line
@@ -844,16 +844,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>
@@ -1007,9 +1066,13 @@ static struct platform_device *stamp_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,

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

+63 −0
Original line number Diff line number Diff line
@@ -270,16 +270,75 @@ static struct platform_device bfin_sir0_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



#if defined(CONFIG_KEYBOARD_GPIO) || defined(CONFIG_KEYBOARD_GPIO_MODULE)

#include <linux/input.h>
@@ -385,9 +444,13 @@ static struct platform_device *stamp_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,