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

Commit fc21a2dd authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lliubbo/blackfin 

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lliubbo/blackfin:
  blackfin: Fixup export.h includes
  Blackfin: add serial TX IRQ in individual platform resource
parents bc5b8a90 90590543

arch/blackfin/include/asm/bfin_serial.h

+2 −0
Original line number Diff line number Diff line
@@ -32,6 +32,8 @@ struct work_struct; 
struct bfin_serial_port {

	struct uart_port port;

	unsigned int old_status;

	int tx_irq;

	int rx_irq;

	int status_irq;

#ifndef BFIN_UART_BF54X_STYLE

	unsigned int lsr;

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

+12 −2
Original line number Diff line number Diff line
@@ -372,9 +372,14 @@ static struct resource bfin_uart0_resources[] = { 
		.end = UART0_GCTL+2,

		.flags = IORESOURCE_MEM,

	},

	{

		.start = IRQ_UART0_TX,

		.end = IRQ_UART0_TX,

		.flags = IORESOURCE_IRQ,

	},

	{

		.start = IRQ_UART0_RX,

		.end = IRQ_UART0_RX+1,

		.end = IRQ_UART0_RX,

		.flags = IORESOURCE_IRQ,

	},

	{
@@ -415,9 +420,14 @@ static struct resource bfin_uart1_resources[] = { 
		.end = UART1_GCTL+2,

		.flags = IORESOURCE_MEM,

	},

	{

		.start = IRQ_UART1_TX,

		.end = IRQ_UART1_TX,

		.flags = IORESOURCE_IRQ,

	},

	{

		.start = IRQ_UART1_RX,

		.end = IRQ_UART1_RX+1,

		.end = IRQ_UART1_RX,

		.flags = IORESOURCE_IRQ,

	},

	{

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

+12 −2
Original line number Diff line number Diff line
@@ -308,9 +308,14 @@ static struct resource bfin_uart0_resources[] = { 
		.end = UART0_GCTL+2,

		.flags = IORESOURCE_MEM,

	},

	{

		.start = IRQ_UART0_TX,

		.end = IRQ_UART0_TX,

		.flags = IORESOURCE_IRQ,

	},

	{

		.start = IRQ_UART0_RX,

		.end = IRQ_UART0_RX+1,

		.end = IRQ_UART0_RX,

		.flags = IORESOURCE_IRQ,

	},

	{
@@ -351,9 +356,14 @@ static struct resource bfin_uart1_resources[] = { 
		.end = UART1_GCTL+2,

		.flags = IORESOURCE_MEM,

	},

	{

		.start = IRQ_UART1_TX,

		.end = IRQ_UART1_TX,

		.flags = IORESOURCE_IRQ,

	},

	{

		.start = IRQ_UART1_RX,

		.end = IRQ_UART1_RX+1,

		.end = IRQ_UART1_RX,

		.flags = IORESOURCE_IRQ,

	},

	{

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

+12 −2
Original line number Diff line number Diff line
@@ -380,9 +380,14 @@ static struct resource bfin_uart0_resources[] = { 
		.end = UART0_GCTL+2,

		.flags = IORESOURCE_MEM,

	},

	{

		.start = IRQ_UART0_TX,

		.end = IRQ_UART0_TX,

		.flags = IORESOURCE_IRQ,

	},

	{

		.start = IRQ_UART0_RX,

		.end = IRQ_UART0_RX+1,

		.end = IRQ_UART0_RX,

		.flags = IORESOURCE_IRQ,

	},

	{
@@ -423,9 +428,14 @@ static struct resource bfin_uart1_resources[] = { 
		.end = UART1_GCTL+2,

		.flags = IORESOURCE_MEM,

	},

	{

		.start = IRQ_UART1_TX,

		.end = IRQ_UART1_TX,

		.flags = IORESOURCE_IRQ,

	},

	{

		.start = IRQ_UART1_RX,

		.end = IRQ_UART1_RX+1,

		.end = IRQ_UART1_RX,

		.flags = IORESOURCE_IRQ,

	},

	{

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

+13 −3
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ 
 */



#include <linux/device.h>

#include <linux/export.h>

#include <linux/platform_device.h>

#include <linux/mtd/mtd.h>

#include <linux/mtd/partitions.h>
@@ -538,9 +539,14 @@ static struct resource bfin_uart0_resources[] = { 
		.end = UART0_GCTL+2,

		.flags = IORESOURCE_MEM,

	},

	{

		.start = IRQ_UART0_TX,

		.end = IRQ_UART0_TX,

		.flags = IORESOURCE_IRQ,

	},

	{

		.start = IRQ_UART0_RX,

		.end = IRQ_UART0_RX+1,

		.end = IRQ_UART0_RX,

		.flags = IORESOURCE_IRQ,

	},

	{
@@ -581,9 +587,14 @@ static struct resource bfin_uart1_resources[] = { 
		.end = UART1_GCTL+2,

		.flags = IORESOURCE_MEM,

	},

	{

		.start = IRQ_UART1_TX,

		.end = IRQ_UART1_TX,

		.flags = IORESOURCE_IRQ,

	},

	{

		.start = IRQ_UART1_RX,

		.end = IRQ_UART1_RX+1,

		.end = IRQ_UART1_RX,

		.flags = IORESOURCE_IRQ,

	},

	{
@@ -801,7 +812,6 @@ static struct platform_device bfin_sport1_uart_device = { 
#if defined(CONFIG_KEYBOARD_GPIO) || defined(CONFIG_KEYBOARD_GPIO_MODULE)

#include <linux/input.h>

#include <linux/gpio_keys.h>

#include <linux/export.h>



static struct gpio_keys_button bfin_gpio_keys_table[] = {

	{BTN_0, GPIO_PF14, 1, "gpio-keys: BTN0"},