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

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

Blackfin: move on-chip 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 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 57d54889

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

+78 −10
Original line number Diff line number Diff line
@@ -382,30 +382,93 @@ static struct platform_device bfin_spi1_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 = 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,

	},

#endif

	{

		.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,

	},

};



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
@@ -593,7 +656,12 @@ static struct platform_device *stamp_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)

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

+89 −9
Original line number Diff line number Diff line
@@ -603,30 +603,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
@@ -829,7 +904,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)

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

+89 −9
Original line number Diff line number Diff line
@@ -439,30 +439,105 @@ 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 = 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_PG0,

		.end = GPIO_PG0,

		.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
@@ -665,7 +740,12 @@ static struct platform_device *stamp_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_FB_BFIN_LQ035Q1) || defined(CONFIG_FB_BFIN_LQ035Q1_MODULE)

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

+89 −9
Original line number Diff line number Diff line
@@ -647,30 +647,105 @@ 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 = 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
@@ -910,7 +985,12 @@ static struct platform_device *stamp_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)

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

+39 −8
Original line number Diff line number Diff line
@@ -257,21 +257,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
@@ -394,7 +423,9 @@ static struct platform_device *h8606_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_SERIAL_8250) || defined(CONFIG_SERIAL_8250_MODULE)