Skip to content

L
linux
Commit fc21a2dd authored by Linus Torvalds's avatar Linus Torvalds
Browse files
Options

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
Show whitespace changes
Inline Side-by-side
Showing with 304 additions and 56 deletions
arch/blackfin/include/asm/bfin_serial.h
View file @ fc21a2dd
...@@ -32,6 +32,8 @@ struct work_struct; ...@@ -32,6 +32,8 @@ struct work_struct;
struct bfin_serial_port { struct bfin_serial_port {
struct uart_port port; struct uart_port port;
unsigned int old_status; unsigned int old_status;
int tx_irq;
int rx_irq;
int status_irq; int status_irq;
#ifndef BFIN_UART_BF54X_STYLE #ifndef BFIN_UART_BF54X_STYLE
unsigned int lsr; unsigned int lsr;
......
arch/blackfin/mach-bf518/boards/ezbrd.c
View file @ fc21a2dd
...@@ -372,9 +372,14 @@ static struct resource bfin_uart0_resources[] = { ...@@ -372,9 +372,14 @@ static struct resource bfin_uart0_resources[] = {
.end = UART0_GCTL+2, .end = UART0_GCTL+2,
.flags = IORESOURCE_MEM, .flags = IORESOURCE_MEM,
}, },
{
.start = IRQ_UART0_TX,
.end = IRQ_UART0_TX,
.flags = IORESOURCE_IRQ,
},
{ {
.start = IRQ_UART0_RX, .start = IRQ_UART0_RX,
.end = IRQ_UART0_RX+1, .end = IRQ_UART0_RX,
.flags = IORESOURCE_IRQ, .flags = IORESOURCE_IRQ,
}, },
{ {
...@@ -415,9 +420,14 @@ static struct resource bfin_uart1_resources[] = { ...@@ -415,9 +420,14 @@ static struct resource bfin_uart1_resources[] = {
.end = UART1_GCTL+2, .end = UART1_GCTL+2,
.flags = IORESOURCE_MEM, .flags = IORESOURCE_MEM,
}, },
{
.start = IRQ_UART1_TX,
.end = IRQ_UART1_TX,
.flags = IORESOURCE_IRQ,
},
{ {
.start = IRQ_UART1_RX, .start = IRQ_UART1_RX,
.end = IRQ_UART1_RX+1, .end = IRQ_UART1_RX,
.flags = IORESOURCE_IRQ, .flags = IORESOURCE_IRQ,
}, },
{ {
......
arch/blackfin/mach-bf518/boards/tcm-bf518.c
View file @ fc21a2dd
...@@ -308,9 +308,14 @@ static struct resource bfin_uart0_resources[] = { ...@@ -308,9 +308,14 @@ static struct resource bfin_uart0_resources[] = {
.end = UART0_GCTL+2, .end = UART0_GCTL+2,
.flags = IORESOURCE_MEM, .flags = IORESOURCE_MEM,
}, },
{
.start = IRQ_UART0_TX,
.end = IRQ_UART0_TX,
.flags = IORESOURCE_IRQ,
},
{ {
.start = IRQ_UART0_RX, .start = IRQ_UART0_RX,
.end = IRQ_UART0_RX+1, .end = IRQ_UART0_RX,
.flags = IORESOURCE_IRQ, .flags = IORESOURCE_IRQ,
}, },
{ {
...@@ -351,9 +356,14 @@ static struct resource bfin_uart1_resources[] = { ...@@ -351,9 +356,14 @@ static struct resource bfin_uart1_resources[] = {
.end = UART1_GCTL+2, .end = UART1_GCTL+2,
.flags = IORESOURCE_MEM, .flags = IORESOURCE_MEM,
}, },
{
.start = IRQ_UART1_TX,
.end = IRQ_UART1_TX,
.flags = IORESOURCE_IRQ,
},
{ {
.start = IRQ_UART1_RX, .start = IRQ_UART1_RX,
.end = IRQ_UART1_RX+1, .end = IRQ_UART1_RX,
.flags = IORESOURCE_IRQ, .flags = IORESOURCE_IRQ,
}, },
{ {
......
arch/blackfin/mach-bf527/boards/ad7160eval.c
View file @ fc21a2dd
...@@ -380,9 +380,14 @@ static struct resource bfin_uart0_resources[] = { ...@@ -380,9 +380,14 @@ static struct resource bfin_uart0_resources[] = {
.end = UART0_GCTL+2, .end = UART0_GCTL+2,
.flags = IORESOURCE_MEM, .flags = IORESOURCE_MEM,
}, },
{
.start = IRQ_UART0_TX,
.end = IRQ_UART0_TX,
.flags = IORESOURCE_IRQ,
},
{ {
.start = IRQ_UART0_RX, .start = IRQ_UART0_RX,
.end = IRQ_UART0_RX+1, .end = IRQ_UART0_RX,
.flags = IORESOURCE_IRQ, .flags = IORESOURCE_IRQ,
}, },
{ {
...@@ -423,9 +428,14 @@ static struct resource bfin_uart1_resources[] = { ...@@ -423,9 +428,14 @@ static struct resource bfin_uart1_resources[] = {
.end = UART1_GCTL+2, .end = UART1_GCTL+2,
.flags = IORESOURCE_MEM, .flags = IORESOURCE_MEM,
}, },
{
.start = IRQ_UART1_TX,
.end = IRQ_UART1_TX,
.flags = IORESOURCE_IRQ,
},
{ {
.start = IRQ_UART1_RX, .start = IRQ_UART1_RX,
.end = IRQ_UART1_RX+1, .end = IRQ_UART1_RX,
.flags = IORESOURCE_IRQ, .flags = IORESOURCE_IRQ,
}, },
{ {
......
arch/blackfin/mach-bf527/boards/cm_bf527.c
View file @ fc21a2dd
...@@ -8,6 +8,7 @@ ...@@ -8,6 +8,7 @@
*/ */
#include <linux/device.h> #include <linux/device.h>
#include <linux/export.h>
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <linux/mtd/mtd.h> #include <linux/mtd/mtd.h>
#include <linux/mtd/partitions.h> #include <linux/mtd/partitions.h>
...@@ -538,9 +539,14 @@ static struct resource bfin_uart0_resources[] = { ...@@ -538,9 +539,14 @@ static struct resource bfin_uart0_resources[] = {
.end = UART0_GCTL+2, .end = UART0_GCTL+2,
.flags = IORESOURCE_MEM, .flags = IORESOURCE_MEM,
}, },
{
.start = IRQ_UART0_TX,
.end = IRQ_UART0_TX,
.flags = IORESOURCE_IRQ,
},
{ {
.start = IRQ_UART0_RX, .start = IRQ_UART0_RX,
.end = IRQ_UART0_RX+1, .end = IRQ_UART0_RX,
.flags = IORESOURCE_IRQ, .flags = IORESOURCE_IRQ,
}, },
{ {
...@@ -581,9 +587,14 @@ static struct resource bfin_uart1_resources[] = { ...@@ -581,9 +587,14 @@ static struct resource bfin_uart1_resources[] = {
.end = UART1_GCTL+2, .end = UART1_GCTL+2,
.flags = IORESOURCE_MEM, .flags = IORESOURCE_MEM,
}, },
{
.start = IRQ_UART1_TX,
.end = IRQ_UART1_TX,
.flags = IORESOURCE_IRQ,
},
{ {
.start = IRQ_UART1_RX, .start = IRQ_UART1_RX,
.end = IRQ_UART1_RX+1, .end = IRQ_UART1_RX,
.flags = IORESOURCE_IRQ, .flags = IORESOURCE_IRQ,
}, },
{ {
...@@ -801,7 +812,6 @@ static struct platform_device bfin_sport1_uart_device = { ...@@ -801,7 +812,6 @@ static struct platform_device bfin_sport1_uart_device = {
#if defined(CONFIG_KEYBOARD_GPIO) || defined(CONFIG_KEYBOARD_GPIO_MODULE) #if defined(CONFIG_KEYBOARD_GPIO) || defined(CONFIG_KEYBOARD_GPIO_MODULE)
#include <linux/input.h> #include <linux/input.h>
#include <linux/gpio_keys.h> #include <linux/gpio_keys.h>
#include <linux/export.h>
static struct gpio_keys_button bfin_gpio_keys_table[] = { static struct gpio_keys_button bfin_gpio_keys_table[] = {
{BTN_0, GPIO_PF14, 1, "gpio-keys: BTN0"}, {BTN_0, GPIO_PF14, 1, "gpio-keys: BTN0"},
......
arch/blackfin/mach-bf527/boards/ezbrd.c
View file @ fc21a2dd
...@@ -7,6 +7,7 @@ ...@@ -7,6 +7,7 @@
*/ */
#include <linux/device.h> #include <linux/device.h>
#include <linux/export.h>
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <linux/mtd/mtd.h> #include <linux/mtd/mtd.h>
#include <linux/mtd/partitions.h> #include <linux/mtd/partitions.h>
...@@ -416,9 +417,14 @@ static struct resource bfin_uart0_resources[] = { ...@@ -416,9 +417,14 @@ static struct resource bfin_uart0_resources[] = {
.end = UART0_GCTL+2, .end = UART0_GCTL+2,
.flags = IORESOURCE_MEM, .flags = IORESOURCE_MEM,
}, },
{
.start = IRQ_UART0_TX,
.end = IRQ_UART0_TX,
.flags = IORESOURCE_IRQ,
},
{ {
.start = IRQ_UART0_RX, .start = IRQ_UART0_RX,
.end = IRQ_UART0_RX+1, .end = IRQ_UART0_RX,
.flags = IORESOURCE_IRQ, .flags = IORESOURCE_IRQ,
}, },
{ {
...@@ -459,9 +465,14 @@ static struct resource bfin_uart1_resources[] = { ...@@ -459,9 +465,14 @@ static struct resource bfin_uart1_resources[] = {
.end = UART1_GCTL+2, .end = UART1_GCTL+2,
.flags = IORESOURCE_MEM, .flags = IORESOURCE_MEM,
}, },
{
.start = IRQ_UART1_TX,
.end = IRQ_UART1_TX,
.flags = IORESOURCE_IRQ,
},
{ {
.start = IRQ_UART1_RX, .start = IRQ_UART1_RX,
.end = IRQ_UART1_RX+1, .end = IRQ_UART1_RX,
.flags = IORESOURCE_IRQ, .flags = IORESOURCE_IRQ,
}, },
{ {
...@@ -674,7 +685,6 @@ static struct platform_device bfin_sport1_uart_device = { ...@@ -674,7 +685,6 @@ static struct platform_device bfin_sport1_uart_device = {
#if defined(CONFIG_KEYBOARD_GPIO) || defined(CONFIG_KEYBOARD_GPIO_MODULE) #if defined(CONFIG_KEYBOARD_GPIO) || defined(CONFIG_KEYBOARD_GPIO_MODULE)
#include <linux/input.h> #include <linux/input.h>
#include <linux/gpio_keys.h> #include <linux/gpio_keys.h>
#include <linux/export.h>
static struct gpio_keys_button bfin_gpio_keys_table[] = { static struct gpio_keys_button bfin_gpio_keys_table[] = {
{BTN_0, GPIO_PG0, 1, "gpio-keys: BTN0"}, {BTN_0, GPIO_PG0, 1, "gpio-keys: BTN0"},
......
arch/blackfin/mach-bf527/boards/ezkit.c
View file @ fc21a2dd
...@@ -710,9 +710,14 @@ static struct resource bfin_uart0_resources[] = { ...@@ -710,9 +710,14 @@ static struct resource bfin_uart0_resources[] = {
.end = UART0_GCTL+2, .end = UART0_GCTL+2,
.flags = IORESOURCE_MEM, .flags = IORESOURCE_MEM,
}, },
{
.start = IRQ_UART0_TX,
.end = IRQ_UART0_TX,
.flags = IORESOURCE_IRQ,
},
{ {
.start = IRQ_UART0_RX, .start = IRQ_UART0_RX,
.end = IRQ_UART0_RX+1, .end = IRQ_UART0_RX,
.flags = IORESOURCE_IRQ, .flags = IORESOURCE_IRQ,
}, },
{ {
...@@ -753,9 +758,14 @@ static struct resource bfin_uart1_resources[] = { ...@@ -753,9 +758,14 @@ static struct resource bfin_uart1_resources[] = {
.end = UART1_GCTL+2, .end = UART1_GCTL+2,
.flags = IORESOURCE_MEM, .flags = IORESOURCE_MEM,
}, },
{
.start = IRQ_UART1_TX,
.end = IRQ_UART1_TX,
.flags = IORESOURCE_IRQ,
},
{ {
.start = IRQ_UART1_RX, .start = IRQ_UART1_RX,
.end = IRQ_UART1_RX+1, .end = IRQ_UART1_RX,
.flags = IORESOURCE_IRQ, .flags = IORESOURCE_IRQ,
}, },
{ {
......
arch/blackfin/mach-bf527/boards/tll6527m.c
View file @ fc21a2dd
...@@ -495,9 +495,14 @@ static struct resource bfin_uart0_resources[] = { ...@@ -495,9 +495,14 @@ static struct resource bfin_uart0_resources[] = {
.end = UART0_GCTL+2, .end = UART0_GCTL+2,
.flags = IORESOURCE_MEM, .flags = IORESOURCE_MEM,
}, },
{
.start = IRQ_UART0_TX,
.end = IRQ_UART0_TX,
.flags = IORESOURCE_IRQ,
},
{ {
.start = IRQ_UART0_RX, .start = IRQ_UART0_RX,
.end = IRQ_UART0_RX+1, .end = IRQ_UART0_RX,
.flags = IORESOURCE_IRQ, .flags = IORESOURCE_IRQ,
}, },
{ {
...@@ -539,9 +544,14 @@ static struct resource bfin_uart1_resources[] = { ...@@ -539,9 +544,14 @@ static struct resource bfin_uart1_resources[] = {
.end = UART1_GCTL+2, .end = UART1_GCTL+2,
.flags = IORESOURCE_MEM, .flags = IORESOURCE_MEM,
}, },
{
.start = IRQ_UART1_TX,
.end = IRQ_UART1_TX,
.flags = IORESOURCE_IRQ,
},
{ {
.start = IRQ_UART1_RX, .start = IRQ_UART1_RX,
.end = IRQ_UART1_RX+1, .end = IRQ_UART1_RX,
.flags = IORESOURCE_IRQ, .flags = IORESOURCE_IRQ,
}, },
{ {
......
arch/blackfin/mach-bf533/boards/H8606.c
View file @ fc21a2dd
...@@ -237,9 +237,14 @@ static struct resource bfin_uart0_resources[] = { ...@@ -237,9 +237,14 @@ static struct resource bfin_uart0_resources[] = {
.end = BFIN_UART_GCTL+2, .end = BFIN_UART_GCTL+2,
.flags = IORESOURCE_MEM, .flags = IORESOURCE_MEM,
}, },
{
.start = IRQ_UART0_TX,
.end = IRQ_UART0_TX,
.flags = IORESOURCE_IRQ,
},
{ {
.start = IRQ_UART0_RX, .start = IRQ_UART0_RX,
.end = IRQ_UART0_RX + 1, .end = IRQ_UART0_RX,
.flags = IORESOURCE_IRQ, .flags = IORESOURCE_IRQ,
}, },
{ {
......
arch/blackfin/mach-bf533/boards/blackstamp.c
View file @ fc21a2dd
...@@ -192,9 +192,14 @@ static struct resource bfin_uart0_resources[] = { ...@@ -192,9 +192,14 @@ static struct resource bfin_uart0_resources[] = {
.end = BFIN_UART_GCTL+2, .end = BFIN_UART_GCTL+2,
.flags = IORESOURCE_MEM, .flags = IORESOURCE_MEM,
}, },
{
.start = IRQ_UART0_TX,
.end = IRQ_UART0_TX,
.flags = IORESOURCE_IRQ,
},
{ {
.start = IRQ_UART0_RX, .start = IRQ_UART0_RX,
.end = IRQ_UART0_RX + 1, .end = IRQ_UART0_RX,
.flags = IORESOURCE_IRQ, .flags = IORESOURCE_IRQ,
}, },
{ {
......
arch/blackfin/mach-bf533/boards/cm_bf533.c
View file @ fc21a2dd
...@@ -220,9 +220,14 @@ static struct resource bfin_uart0_resources[] = { ...@@ -220,9 +220,14 @@ static struct resource bfin_uart0_resources[] = {
.end = BFIN_UART_GCTL+2, .end = BFIN_UART_GCTL+2,
.flags = IORESOURCE_MEM, .flags = IORESOURCE_MEM,
}, },
{
.start = IRQ_UART0_TX,
.end = IRQ_UART0_TX,
.flags = IORESOURCE_IRQ,
},
{ {
.start = IRQ_UART0_RX, .start = IRQ_UART0_RX,
.end = IRQ_UART0_RX + 1, .end = IRQ_UART0_RX,
.flags = IORESOURCE_IRQ, .flags = IORESOURCE_IRQ,
}, },
{ {
......
arch/blackfin/mach-bf533/boards/ezkit.c
View file @ fc21a2dd
...@@ -291,9 +291,14 @@ static struct resource bfin_uart0_resources[] = { ...@@ -291,9 +291,14 @@ static struct resource bfin_uart0_resources[] = {
.end = BFIN_UART_GCTL+2, .end = BFIN_UART_GCTL+2,
.flags = IORESOURCE_MEM, .flags = IORESOURCE_MEM,
}, },
{
.start = IRQ_UART0_TX,
.end = IRQ_UART0_TX,
.flags = IORESOURCE_IRQ,
},
{ {
.start = IRQ_UART0_RX, .start = IRQ_UART0_RX,
.end = IRQ_UART0_RX + 1, .end = IRQ_UART0_RX,
.flags = IORESOURCE_IRQ, .flags = IORESOURCE_IRQ,
}, },
{ {
......
arch/blackfin/mach-bf533/boards/ip0x.c
View file @ fc21a2dd
...@@ -150,9 +150,14 @@ static struct resource bfin_uart0_resources[] = { ...@@ -150,9 +150,14 @@ static struct resource bfin_uart0_resources[] = {
.end = BFIN_UART_GCTL+2, .end = BFIN_UART_GCTL+2,
.flags = IORESOURCE_MEM, .flags = IORESOURCE_MEM,
}, },
{
.start = IRQ_UART0_TX,
.end = IRQ_UART0_TX,
.flags = IORESOURCE_IRQ,
},
{ {
.start = IRQ_UART0_RX, .start = IRQ_UART0_RX,
.end = IRQ_UART0_RX + 1, .end = IRQ_UART0_RX,
.flags = IORESOURCE_IRQ, .flags = IORESOURCE_IRQ,
}, },
{ {
......
arch/blackfin/mach-bf533/boards/stamp.c
View file @ fc21a2dd
...@@ -297,9 +297,14 @@ static struct resource bfin_uart0_resources[] = { ...@@ -297,9 +297,14 @@ static struct resource bfin_uart0_resources[] = {
.end = BFIN_UART_GCTL+2, .end = BFIN_UART_GCTL+2,
.flags = IORESOURCE_MEM, .flags = IORESOURCE_MEM,
}, },
{
.start = IRQ_UART0_TX,
.end = IRQ_UART0_TX,
.flags = IORESOURCE_IRQ,
},
{ {
.start = IRQ_UART0_RX, .start = IRQ_UART0_RX,
.end = IRQ_UART0_RX + 1, .end = IRQ_UART0_RX,
.flags = IORESOURCE_IRQ, .flags = IORESOURCE_IRQ,
}, },
{ {
......
arch/blackfin/mach-bf537/boards/cm_bf537e.c
View file @ fc21a2dd
...@@ -8,6 +8,7 @@ ...@@ -8,6 +8,7 @@
*/ */
#include <linux/device.h> #include <linux/device.h>
#include <linux/export.h>
#include <linux/etherdevice.h> #include <linux/etherdevice.h>
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <linux/mtd/mtd.h> #include <linux/mtd/mtd.h>
...@@ -304,9 +305,14 @@ static struct resource bfin_uart0_resources[] = { ...@@ -304,9 +305,14 @@ static struct resource bfin_uart0_resources[] = {
.end = UART0_GCTL+2, .end = UART0_GCTL+2,
.flags = IORESOURCE_MEM, .flags = IORESOURCE_MEM,
}, },
{
.start = IRQ_UART0_TX,
.end = IRQ_UART0_TX,
.flags = IORESOURCE_IRQ,
},
{ {
.start = IRQ_UART0_RX, .start = IRQ_UART0_RX,
.end = IRQ_UART0_RX+1, .end = IRQ_UART0_RX,
.flags = IORESOURCE_IRQ, .flags = IORESOURCE_IRQ,
}, },
{ {
...@@ -365,9 +371,14 @@ static struct resource bfin_uart1_resources[] = { ...@@ -365,9 +371,14 @@ static struct resource bfin_uart1_resources[] = {
.end = UART1_GCTL+2, .end = UART1_GCTL+2,
.flags = IORESOURCE_MEM, .flags = IORESOURCE_MEM,
}, },
{
.start = IRQ_UART1_TX,
.end = IRQ_UART1_TX,
.flags = IORESOURCE_IRQ,
},
{ {
.start = IRQ_UART1_RX, .start = IRQ_UART1_RX,
.end = IRQ_UART1_RX+1, .end = IRQ_UART1_RX,
.flags = IORESOURCE_IRQ, .flags = IORESOURCE_IRQ,
}, },
{ {
...@@ -569,7 +580,6 @@ static struct platform_device bfin_sport1_uart_device = { ...@@ -569,7 +580,6 @@ static struct platform_device bfin_sport1_uart_device = {
#if defined(CONFIG_BFIN_MAC) || defined(CONFIG_BFIN_MAC_MODULE) #if defined(CONFIG_BFIN_MAC) || defined(CONFIG_BFIN_MAC_MODULE)
#include <linux/bfin_mac.h> #include <linux/bfin_mac.h>
#include <linux/export.h>
static const unsigned short bfin_mac_peripherals[] = P_MII0; static const unsigned short bfin_mac_peripherals[] = P_MII0;
static struct bfin_phydev_platform_data bfin_phydev_data[] = { static struct bfin_phydev_platform_data bfin_phydev_data[] = {
......
arch/blackfin/mach-bf537/boards/cm_bf537u.c
View file @ fc21a2dd
...@@ -9,6 +9,7 @@ ...@@ -9,6 +9,7 @@
#include <linux/device.h> #include <linux/device.h>
#include <linux/etherdevice.h> #include <linux/etherdevice.h>
#include <linux/export.h>
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <linux/mtd/mtd.h> #include <linux/mtd/mtd.h>
#include <linux/mtd/partitions.h> #include <linux/mtd/partitions.h>
...@@ -305,9 +306,14 @@ static struct resource bfin_uart0_resources[] = { ...@@ -305,9 +306,14 @@ static struct resource bfin_uart0_resources[] = {
.end = UART0_GCTL+2, .end = UART0_GCTL+2,
.flags = IORESOURCE_MEM, .flags = IORESOURCE_MEM,
}, },
{
.start = IRQ_UART0_TX,
.end = IRQ_UART0_TX,
.flags = IORESOURCE_IRQ,
},
{ {
.start = IRQ_UART0_RX, .start = IRQ_UART0_RX,
.end = IRQ_UART0_RX+1, .end = IRQ_UART0_RX,
.flags = IORESOURCE_IRQ, .flags = IORESOURCE_IRQ,
}, },
{ {
...@@ -348,9 +354,14 @@ static struct resource bfin_uart1_resources[] = { ...@@ -348,9 +354,14 @@ static struct resource bfin_uart1_resources[] = {
.end = UART1_GCTL+2, .end = UART1_GCTL+2,
.flags = IORESOURCE_MEM, .flags = IORESOURCE_MEM,
}, },
{
.start = IRQ_UART1_TX,
.end = IRQ_UART1_TX,
.flags = IORESOURCE_IRQ,
},
{ {
.start = IRQ_UART1_RX, .start = IRQ_UART1_RX,
.end = IRQ_UART1_RX+1, .end = IRQ_UART1_RX,
.flags = IORESOURCE_IRQ, .flags = IORESOURCE_IRQ,
}, },
{ {
...@@ -534,7 +545,6 @@ static struct platform_device bfin_sport1_uart_device = { ...@@ -534,7 +545,6 @@ static struct platform_device bfin_sport1_uart_device = {
#if defined(CONFIG_BFIN_MAC) || defined(CONFIG_BFIN_MAC_MODULE) #if defined(CONFIG_BFIN_MAC) || defined(CONFIG_BFIN_MAC_MODULE)
#include <linux/bfin_mac.h> #include <linux/bfin_mac.h>
#include <linux/export.h>
static const unsigned short bfin_mac_peripherals[] = P_MII0; static const unsigned short bfin_mac_peripherals[] = P_MII0;
static struct bfin_phydev_platform_data bfin_phydev_data[] = { static struct bfin_phydev_platform_data bfin_phydev_data[] = {
......
arch/blackfin/mach-bf537/boards/dnp5370.c
View file @ fc21a2dd
...@@ -12,6 +12,7 @@ ...@@ -12,6 +12,7 @@
*/ */
#include <linux/device.h> #include <linux/device.h>
#include <linux/export.h>
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <linux/io.h> #include <linux/io.h>
...@@ -49,7 +50,6 @@ static struct platform_device rtc_device = { ...@@ -49,7 +50,6 @@ static struct platform_device rtc_device = {
#if defined(CONFIG_BFIN_MAC) || defined(CONFIG_BFIN_MAC_MODULE) #if defined(CONFIG_BFIN_MAC) || defined(CONFIG_BFIN_MAC_MODULE)
#include <linux/bfin_mac.h> #include <linux/bfin_mac.h>
#include <linux/export.h>
static const unsigned short bfin_mac_peripherals[] = P_RMII0; static const unsigned short bfin_mac_peripherals[] = P_RMII0;
static struct bfin_phydev_platform_data bfin_phydev_data[] = { static struct bfin_phydev_platform_data bfin_phydev_data[] = {
...@@ -236,9 +236,14 @@ static struct resource bfin_uart0_resources[] = { ...@@ -236,9 +236,14 @@ static struct resource bfin_uart0_resources[] = {
.end = UART0_GCTL+2, .end = UART0_GCTL+2,
.flags = IORESOURCE_MEM, .flags = IORESOURCE_MEM,
}, },
{
.start = IRQ_UART0_TX,
.end = IRQ_UART0_TX,
.flags = IORESOURCE_IRQ,
},
{ {
.start = IRQ_UART0_RX, .start = IRQ_UART0_RX,
.end = IRQ_UART0_RX+1, .end = IRQ_UART0_RX,
.flags = IORESOURCE_IRQ, .flags = IORESOURCE_IRQ,
}, },
{ {
...@@ -280,9 +285,14 @@ static struct resource bfin_uart1_resources[] = { ...@@ -280,9 +285,14 @@ static struct resource bfin_uart1_resources[] = {
.end = UART1_GCTL+2, .end = UART1_GCTL+2,
.flags = IORESOURCE_MEM, .flags = IORESOURCE_MEM,
}, },
{
.start = IRQ_UART1_TX,
.end = IRQ_UART1_TX,
.flags = IORESOURCE_IRQ,
},
{ {
.start = IRQ_UART1_RX, .start = IRQ_UART1_RX,
.end = IRQ_UART1_RX+1, .end = IRQ_UART1_RX,
.flags = IORESOURCE_IRQ, .flags = IORESOURCE_IRQ,
}, },
{ {
......
arch/blackfin/mach-bf537/boards/minotaur.c
View file @ fc21a2dd
...@@ -239,9 +239,14 @@ static struct resource bfin_uart0_resources[] = { ...@@ -239,9 +239,14 @@ static struct resource bfin_uart0_resources[] = {
.end = UART0_GCTL+2, .end = UART0_GCTL+2,
.flags = IORESOURCE_MEM, .flags = IORESOURCE_MEM,
}, },
{
.start = IRQ_UART0_TX,
.end = IRQ_UART0_TX,
.flags = IORESOURCE_IRQ,
},
{ {
.start = IRQ_UART0_RX, .start = IRQ_UART0_RX,
.end = IRQ_UART0_RX+1, .end = IRQ_UART0_RX,
.flags = IORESOURCE_IRQ, .flags = IORESOURCE_IRQ,
}, },
{ {
...@@ -282,9 +287,14 @@ static struct resource bfin_uart1_resources[] = { ...@@ -282,9 +287,14 @@ static struct resource bfin_uart1_resources[] = {
.end = UART1_GCTL+2, .end = UART1_GCTL+2,
.flags = IORESOURCE_MEM, .flags = IORESOURCE_MEM,
}, },
{
.start = IRQ_UART1_TX,
.end = IRQ_UART1_TX,
.flags = IORESOURCE_IRQ,
},
{ {
.start = IRQ_UART1_RX, .start = IRQ_UART1_RX,
.end = IRQ_UART1_RX+1, .end = IRQ_UART1_RX,
.flags = IORESOURCE_IRQ, .flags = IORESOURCE_IRQ,
}, },
{ {
......
arch/blackfin/mach-bf537/boards/pnav10.c
View file @ fc21a2dd
...@@ -8,6 +8,7 @@ ...@@ -8,6 +8,7 @@
#include <linux/device.h> #include <linux/device.h>
#include <linux/etherdevice.h> #include <linux/etherdevice.h>
#include <linux/export.h>
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <linux/mtd/mtd.h> #include <linux/mtd/mtd.h>
#include <linux/mtd/partitions.h> #include <linux/mtd/partitions.h>
...@@ -308,9 +309,14 @@ static struct resource bfin_uart0_resources[] = { ...@@ -308,9 +309,14 @@ static struct resource bfin_uart0_resources[] = {
.end = UART0_GCTL+2, .end = UART0_GCTL+2,
.flags = IORESOURCE_MEM, .flags = IORESOURCE_MEM,
}, },
{
.start = IRQ_UART0_TX,
.end = IRQ_UART0_TX,
.flags = IORESOURCE_IRQ,
},
{ {
.start = IRQ_UART0_RX, .start = IRQ_UART0_RX,
.end = IRQ_UART0_RX+1, .end = IRQ_UART0_RX,
.flags = IORESOURCE_IRQ, .flags = IORESOURCE_IRQ,
}, },
{ {
...@@ -351,9 +357,14 @@ static struct resource bfin_uart1_resources[] = { ...@@ -351,9 +357,14 @@ static struct resource bfin_uart1_resources[] = {
.end = UART1_GCTL+2, .end = UART1_GCTL+2,
.flags = IORESOURCE_MEM, .flags = IORESOURCE_MEM,
}, },
{
.start = IRQ_UART1_TX,
.end = IRQ_UART1_TX,
.flags = IORESOURCE_IRQ,
},
{ {
.start = IRQ_UART1_RX, .start = IRQ_UART1_RX,
.end = IRQ_UART1_RX+1, .end = IRQ_UART1_RX,
.flags = IORESOURCE_IRQ, .flags = IORESOURCE_IRQ,
}, },
{ {
......
arch/blackfin/mach-bf537/boards/stamp.c
View file @ fc21a2dd
...@@ -7,6 +7,7 @@ ...@@ -7,6 +7,7 @@
*/ */
#include <linux/device.h> #include <linux/device.h>
#include <linux/export.h>
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <linux/io.h> #include <linux/io.h>
...@@ -1565,9 +1566,14 @@ static struct resource bfin_uart0_resources[] = { ...@@ -1565,9 +1566,14 @@ static struct resource bfin_uart0_resources[] = {
.end = UART0_GCTL+2, .end = UART0_GCTL+2,
.flags = IORESOURCE_MEM, .flags = IORESOURCE_MEM,
}, },
{
.start = IRQ_UART0_TX,
.end = IRQ_UART0_TX,
.flags = IORESOURCE_IRQ,
},
{ {
.start = IRQ_UART0_RX, .start = IRQ_UART0_RX,
.end = IRQ_UART0_RX+1, .end = IRQ_UART0_RX,
.flags = IORESOURCE_IRQ, .flags = IORESOURCE_IRQ,
}, },
{ {
...@@ -1620,9 +1626,14 @@ static struct resource bfin_uart1_resources[] = { ...@@ -1620,9 +1626,14 @@ static struct resource bfin_uart1_resources[] = {
.end = UART1_GCTL+2, .end = UART1_GCTL+2,
.flags = IORESOURCE_MEM, .flags = IORESOURCE_MEM,
}, },
{
.start = IRQ_UART1_TX,
.end = IRQ_UART1_TX,
.flags = IORESOURCE_IRQ,
},
{ {
.start = IRQ_UART1_RX, .start = IRQ_UART1_RX,
.end = IRQ_UART1_RX+1, .end = IRQ_UART1_RX,
.flags = IORESOURCE_IRQ, .flags = IORESOURCE_IRQ,
}, },
{ {
...@@ -1992,7 +2003,6 @@ static struct adp8870_backlight_platform_data adp8870_pdata = { ...@@ -1992,7 +2003,6 @@ static struct adp8870_backlight_platform_data adp8870_pdata = {
#if defined(CONFIG_BACKLIGHT_ADP8860) || defined(CONFIG_BACKLIGHT_ADP8860_MODULE) #if defined(CONFIG_BACKLIGHT_ADP8860) || defined(CONFIG_BACKLIGHT_ADP8860_MODULE)
#include <linux/i2c/adp8860.h> #include <linux/i2c/adp8860.h>
#include <linux/export.h>
static struct led_info adp8860_leds[] = { static struct led_info adp8860_leds[] = {
{ {
.name = "adp8860-led7", .name = "adp8860-led7",
......
arch/blackfin/mach-bf537/boards/tcm_bf537.c
View file @ fc21a2dd
...@@ -9,6 +9,7 @@ ...@@ -9,6 +9,7 @@
#include <linux/device.h> #include <linux/device.h>
#include <linux/etherdevice.h> #include <linux/etherdevice.h>
#include <linux/export.h>
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <linux/mtd/mtd.h> #include <linux/mtd/mtd.h>
#include <linux/mtd/partitions.h> #include <linux/mtd/partitions.h>
...@@ -305,9 +306,14 @@ static struct resource bfin_uart0_resources[] = { ...@@ -305,9 +306,14 @@ static struct resource bfin_uart0_resources[] = {
.end = UART0_GCTL+2, .end = UART0_GCTL+2,
.flags = IORESOURCE_MEM, .flags = IORESOURCE_MEM,
}, },
{
.start = IRQ_UART0_TX,
.end = IRQ_UART0_TX,
.flags = IORESOURCE_IRQ,
},
{ {
.start = IRQ_UART0_RX, .start = IRQ_UART0_RX,
.end = IRQ_UART0_RX+1, .end = IRQ_UART0_RX,
.flags = IORESOURCE_IRQ, .flags = IORESOURCE_IRQ,
}, },
{ {
...@@ -348,9 +354,14 @@ static struct resource bfin_uart1_resources[] = { ...@@ -348,9 +354,14 @@ static struct resource bfin_uart1_resources[] = {
.end = UART1_GCTL+2, .end = UART1_GCTL+2,
.flags = IORESOURCE_MEM, .flags = IORESOURCE_MEM,
}, },
{
.start = IRQ_UART1_TX,
.end = IRQ_UART1_TX,
.flags = IORESOURCE_IRQ,
},
{ {
.start = IRQ_UART1_RX, .start = IRQ_UART1_RX,
.end = IRQ_UART1_RX+1, .end = IRQ_UART1_RX,
.flags = IORESOURCE_IRQ, .flags = IORESOURCE_IRQ,
}, },
{ {
...@@ -536,7 +547,6 @@ static struct platform_device bfin_sport1_uart_device = { ...@@ -536,7 +547,6 @@ static struct platform_device bfin_sport1_uart_device = {
#if defined(CONFIG_BFIN_MAC) || defined(CONFIG_BFIN_MAC_MODULE) #if defined(CONFIG_BFIN_MAC) || defined(CONFIG_BFIN_MAC_MODULE)
#include <linux/bfin_mac.h> #include <linux/bfin_mac.h>
#include <linux/export.h>
static const unsigned short bfin_mac_peripherals[] = P_MII0; static const unsigned short bfin_mac_peripherals[] = P_MII0;
static struct bfin_phydev_platform_data bfin_phydev_data[] = { static struct bfin_phydev_platform_data bfin_phydev_data[] = {
......
arch/blackfin/mach-bf538/boards/ezkit.c
View file @ fc21a2dd
...@@ -48,9 +48,14 @@ static struct resource bfin_uart0_resources[] = { ...@@ -48,9 +48,14 @@ static struct resource bfin_uart0_resources[] = {
.end = UART0_GCTL+2, .end = UART0_GCTL+2,
.flags = IORESOURCE_MEM, .flags = IORESOURCE_MEM,
}, },
{
.start = IRQ_UART0_TX,
.end = IRQ_UART0_TX,
.flags = IORESOURCE_IRQ,
},
{ {
.start = IRQ_UART0_RX, .start = IRQ_UART0_RX,
.end = IRQ_UART0_RX+1, .end = IRQ_UART0_RX,
.flags = IORESOURCE_IRQ, .flags = IORESOURCE_IRQ,
}, },
{ {
...@@ -103,9 +108,14 @@ static struct resource bfin_uart1_resources[] = { ...@@ -103,9 +108,14 @@ static struct resource bfin_uart1_resources[] = {
.end = UART1_GCTL+2, .end = UART1_GCTL+2,
.flags = IORESOURCE_MEM, .flags = IORESOURCE_MEM,
}, },
{
.start = IRQ_UART1_TX,
.end = IRQ_UART1_TX,
.flags = IORESOURCE_IRQ,
},
{ {
.start = IRQ_UART1_RX, .start = IRQ_UART1_RX,
.end = IRQ_UART1_RX+1, .end = IRQ_UART1_RX,
.flags = IORESOURCE_IRQ, .flags = IORESOURCE_IRQ,
}, },
{ {
...@@ -146,9 +156,14 @@ static struct resource bfin_uart2_resources[] = { ...@@ -146,9 +156,14 @@ static struct resource bfin_uart2_resources[] = {
.end = UART2_GCTL+2, .end = UART2_GCTL+2,
.flags = IORESOURCE_MEM, .flags = IORESOURCE_MEM,
}, },
{
.start = IRQ_UART2_TX,
.end = IRQ_UART2_TX,
.flags = IORESOURCE_IRQ,
},
{ {
.start = IRQ_UART2_RX, .start = IRQ_UART2_RX,
.end = IRQ_UART2_RX+1, .end = IRQ_UART2_RX,
.flags = IORESOURCE_IRQ, .flags = IORESOURCE_IRQ,
}, },
{ {
......
arch/blackfin/mach-bf548/boards/cm_bf548.c
View file @ fc21a2dd
...@@ -134,9 +134,14 @@ static struct resource bfin_uart0_resources[] = { ...@@ -134,9 +134,14 @@ static struct resource bfin_uart0_resources[] = {
.end = UART0_RBR+2, .end = UART0_RBR+2,
.flags = IORESOURCE_MEM, .flags = IORESOURCE_MEM,
}, },
{
.start = IRQ_UART0_TX,
.end = IRQ_UART0_TX,
.flags = IORESOURCE_IRQ,
},
{ {
.start = IRQ_UART0_RX, .start = IRQ_UART0_RX,
.end = IRQ_UART0_RX+1, .end = IRQ_UART0_RX,
.flags = IORESOURCE_IRQ, .flags = IORESOURCE_IRQ,
}, },
{ {
...@@ -177,9 +182,14 @@ static struct resource bfin_uart1_resources[] = { ...@@ -177,9 +182,14 @@ static struct resource bfin_uart1_resources[] = {
.end = UART1_RBR+2, .end = UART1_RBR+2,
.flags = IORESOURCE_MEM, .flags = IORESOURCE_MEM,
}, },
{
.start = IRQ_UART1_TX,
.end = IRQ_UART1_TX,
.flags = IORESOURCE_IRQ,
},
{ {
.start = IRQ_UART1_RX, .start = IRQ_UART1_RX,
.end = IRQ_UART1_RX+1, .end = IRQ_UART1_RX,
.flags = IORESOURCE_IRQ, .flags = IORESOURCE_IRQ,
}, },
{ {
...@@ -236,9 +246,14 @@ static struct resource bfin_uart2_resources[] = { ...@@ -236,9 +246,14 @@ static struct resource bfin_uart2_resources[] = {
.end = UART2_RBR+2, .end = UART2_RBR+2,
.flags = IORESOURCE_MEM, .flags = IORESOURCE_MEM,
}, },
{
.start = IRQ_UART2_TX,
.end = IRQ_UART2_TX,
.flags = IORESOURCE_IRQ,
},
{ {
.start = IRQ_UART2_RX, .start = IRQ_UART2_RX,
.end = IRQ_UART2_RX+1, .end = IRQ_UART2_RX,
.flags = IORESOURCE_IRQ, .flags = IORESOURCE_IRQ,
}, },
{ {
...@@ -279,9 +294,14 @@ static struct resource bfin_uart3_resources[] = { ...@@ -279,9 +294,14 @@ static struct resource bfin_uart3_resources[] = {
.end = UART3_RBR+2, .end = UART3_RBR+2,
.flags = IORESOURCE_MEM, .flags = IORESOURCE_MEM,
}, },
{
.start = IRQ_UART3_TX,
.end = IRQ_UART3_TX,
.flags = IORESOURCE_IRQ,
},
{ {
.start = IRQ_UART3_RX, .start = IRQ_UART3_RX,
.end = IRQ_UART3_RX+1, .end = IRQ_UART3_RX,
.flags = IORESOURCE_IRQ, .flags = IORESOURCE_IRQ,
}, },
{ {
......
arch/blackfin/mach-bf548/boards/ezkit.c
View file @ fc21a2dd
...@@ -240,9 +240,14 @@ static struct resource bfin_uart0_resources[] = { ...@@ -240,9 +240,14 @@ static struct resource bfin_uart0_resources[] = {
.end = UART0_RBR+2, .end = UART0_RBR+2,
.flags = IORESOURCE_MEM, .flags = IORESOURCE_MEM,
}, },
{
.start = IRQ_UART0_TX,
.end = IRQ_UART0_TX,
.flags = IORESOURCE_IRQ,
},
{ {
.start = IRQ_UART0_RX, .start = IRQ_UART0_RX,
.end = IRQ_UART0_RX+1, .end = IRQ_UART0_RX,
.flags = IORESOURCE_IRQ, .flags = IORESOURCE_IRQ,
}, },
{ {
...@@ -283,9 +288,14 @@ static struct resource bfin_uart1_resources[] = { ...@@ -283,9 +288,14 @@ static struct resource bfin_uart1_resources[] = {
.end = UART1_RBR+2, .end = UART1_RBR+2,
.flags = IORESOURCE_MEM, .flags = IORESOURCE_MEM,
}, },
{
.start = IRQ_UART1_TX,
.end = IRQ_UART1_TX,
.flags = IORESOURCE_IRQ,
},
{ {
.start = IRQ_UART1_RX, .start = IRQ_UART1_RX,
.end = IRQ_UART1_RX+1, .end = IRQ_UART1_RX,
.flags = IORESOURCE_IRQ, .flags = IORESOURCE_IRQ,
}, },
{ {
...@@ -342,9 +352,14 @@ static struct resource bfin_uart2_resources[] = { ...@@ -342,9 +352,14 @@ static struct resource bfin_uart2_resources[] = {
.end = UART2_RBR+2, .end = UART2_RBR+2,
.flags = IORESOURCE_MEM, .flags = IORESOURCE_MEM,
}, },
{
.start = IRQ_UART2_TX,
.end = IRQ_UART2_TX,
.flags = IORESOURCE_IRQ,
},
{ {
.start = IRQ_UART2_RX, .start = IRQ_UART2_RX,
.end = IRQ_UART2_RX+1, .end = IRQ_UART2_RX,
.flags = IORESOURCE_IRQ, .flags = IORESOURCE_IRQ,
}, },
{ {
...@@ -385,9 +400,14 @@ static struct resource bfin_uart3_resources[] = { ...@@ -385,9 +400,14 @@ static struct resource bfin_uart3_resources[] = {
.end = UART3_RBR+2, .end = UART3_RBR+2,
.flags = IORESOURCE_MEM, .flags = IORESOURCE_MEM,
}, },
{
.start = IRQ_UART3_TX,
.end = IRQ_UART3_TX,
.flags = IORESOURCE_IRQ,
},
{ {
.start = IRQ_UART3_RX, .start = IRQ_UART3_RX,
.end = IRQ_UART3_RX+1, .end = IRQ_UART3_RX,
.flags = IORESOURCE_IRQ, .flags = IORESOURCE_IRQ,
}, },
{ {
......
arch/blackfin/mach-bf561/boards/acvilon.c
View file @ fc21a2dd
...@@ -202,9 +202,14 @@ static struct resource bfin_uart0_resources[] = { ...@@ -202,9 +202,14 @@ static struct resource bfin_uart0_resources[] = {
.end = BFIN_UART_GCTL + 2, .end = BFIN_UART_GCTL + 2,
.flags = IORESOURCE_MEM, .flags = IORESOURCE_MEM,
}, },
{
.start = IRQ_UART_TX,
.end = IRQ_UART_TX,
.flags = IORESOURCE_IRQ,
},
{ {
.start = IRQ_UART_RX, .start = IRQ_UART_RX,
.end = IRQ_UART_RX + 1, .end = IRQ_UART_RX,
.flags = IORESOURCE_IRQ, .flags = IORESOURCE_IRQ,
}, },
{ {
......
arch/blackfin/mach-bf561/boards/cm_bf561.c
View file @ fc21a2dd
...@@ -276,9 +276,14 @@ static struct resource bfin_uart0_resources[] = { ...@@ -276,9 +276,14 @@ static struct resource bfin_uart0_resources[] = {
.end = BFIN_UART_GCTL+2, .end = BFIN_UART_GCTL+2,
.flags = IORESOURCE_MEM, .flags = IORESOURCE_MEM,
}, },
{
.start = IRQ_UART_TX,
.end = IRQ_UART_TX,
.flags = IORESOURCE_IRQ,
},
{ {
.start = IRQ_UART_RX, .start = IRQ_UART_RX,
.end = IRQ_UART_RX+1, .end = IRQ_UART_RX,
.flags = IORESOURCE_IRQ, .flags = IORESOURCE_IRQ,
}, },
{ {
......
arch/blackfin/mach-bf561/boards/ezkit.c
View file @ fc21a2dd
...@@ -171,9 +171,14 @@ static struct resource bfin_uart0_resources[] = { ...@@ -171,9 +171,14 @@ static struct resource bfin_uart0_resources[] = {
.end = BFIN_UART_GCTL+2, .end = BFIN_UART_GCTL+2,
.flags = IORESOURCE_MEM, .flags = IORESOURCE_MEM,
}, },
{
.start = IRQ_UART_TX,
.end = IRQ_UART_TX,
.flags = IORESOURCE_IRQ,
},
{ {
.start = IRQ_UART_RX, .start = IRQ_UART_RX,
.end = IRQ_UART_RX+1, .end = IRQ_UART_RX,
.flags = IORESOURCE_IRQ, .flags = IORESOURCE_IRQ,
}, },
{ {
......
arch/blackfin/mach-bf561/boards/tepla.c
View file @ fc21a2dd
...@@ -50,9 +50,14 @@ static struct resource bfin_uart0_resources[] = { ...@@ -50,9 +50,14 @@ static struct resource bfin_uart0_resources[] = {
.end = BFIN_UART_GCTL+2, .end = BFIN_UART_GCTL+2,
.flags = IORESOURCE_MEM, .flags = IORESOURCE_MEM,
}, },
{
.start = IRQ_UART_TX,
.end = IRQ_UART_TX,
.flags = IORESOURCE_IRQ,
},
{ {
.start = IRQ_UART_RX, .start = IRQ_UART_RX,
.end = IRQ_UART_RX+1, .end = IRQ_UART_RX,
.flags = IORESOURCE_IRQ, .flags = IORESOURCE_IRQ,
}, },
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7