Merge master.kernel.org:/home/rmk/linux-2.6-serial
This commit is contained in:
commit
0db7443b2b
|
@ -354,7 +354,7 @@ static struct plat_serial8250_port serial_platform_data[] = {
|
|||
|
||||
static struct platform_device serial_device = {
|
||||
.name = "serial8250",
|
||||
.id = 0,
|
||||
.id = PLAT8250_DEV_PLATFORM,
|
||||
.dev = {
|
||||
.platform_data = serial_platform_data,
|
||||
},
|
||||
|
|
|
@ -219,7 +219,7 @@ static struct plat_serial8250_port serial_platform_data[] = {
|
|||
|
||||
static struct platform_device serial_device = {
|
||||
.name = "serial8250",
|
||||
.id = 0,
|
||||
.id = PLAT8250_DEV_PLATFORM,
|
||||
.dev = {
|
||||
.platform_data = serial_platform_data,
|
||||
},
|
||||
|
|
|
@ -52,7 +52,7 @@ static struct plat_serial8250_port serial_platform_data[] = {
|
|||
|
||||
static struct platform_device serial_device = {
|
||||
.name = "serial8250",
|
||||
.id = 0,
|
||||
.id = PLAT8250_DEV_PLATFORM,
|
||||
.dev = {
|
||||
.platform_data = serial_platform_data,
|
||||
},
|
||||
|
|
|
@ -34,7 +34,7 @@ static struct plat_serial8250_port serial_platform_data[] = {
|
|||
|
||||
static struct platform_device serial_device = {
|
||||
.name = "serial8250",
|
||||
.id = 0,
|
||||
.id = PLAT8250_DEV_PLATFORM,
|
||||
.dev = {
|
||||
.platform_data = serial_platform_data,
|
||||
},
|
||||
|
|
|
@ -90,7 +90,7 @@ static struct plat_serial8250_port serial_platform_data[] = {
|
|||
|
||||
static struct platform_device serial_device = {
|
||||
.name = "serial8250",
|
||||
.id = 0,
|
||||
.id = PLAT8250_DEV_PLATFORM,
|
||||
.dev = {
|
||||
.platform_data = serial_platform_data,
|
||||
},
|
||||
|
|
|
@ -174,7 +174,7 @@ static struct resource ixp2000_uart_resource = {
|
|||
|
||||
static struct platform_device ixp2000_serial_device = {
|
||||
.name = "serial8250",
|
||||
.id = 0,
|
||||
.id = PLAT8250_DEV_PLATFORM,
|
||||
.dev = {
|
||||
.platform_data = ixp2000_serial_port,
|
||||
},
|
||||
|
|
|
@ -66,7 +66,7 @@ static struct plat_serial8250_port coyote_uart_data[] = {
|
|||
|
||||
static struct platform_device coyote_uart = {
|
||||
.name = "serial8250",
|
||||
.id = 0,
|
||||
.id = PLAT8250_DEV_PLATFORM,
|
||||
.dev = {
|
||||
.platform_data = coyote_uart_data,
|
||||
},
|
||||
|
|
|
@ -93,7 +93,7 @@ static struct plat_serial8250_port gtwx5715_uart_platform_data[] = {
|
|||
|
||||
static struct platform_device gtwx5715_uart_device = {
|
||||
.name = "serial8250",
|
||||
.id = 0,
|
||||
.id = PLAT8250_DEV_PLATFORM,
|
||||
.dev = {
|
||||
.platform_data = gtwx5715_uart_platform_data,
|
||||
},
|
||||
|
|
|
@ -96,7 +96,7 @@ static struct plat_serial8250_port ixdp425_uart_data[] = {
|
|||
|
||||
static struct platform_device ixdp425_uart = {
|
||||
.name = "serial8250",
|
||||
.id = 0,
|
||||
.id = PLAT8250_DEV_PLATFORM,
|
||||
.dev.platform_data = ixdp425_uart_data,
|
||||
.num_resources = 2,
|
||||
.resource = ixdp425_uart_resources
|
||||
|
|
|
@ -75,7 +75,7 @@ static struct plat_serial8250_port voiceblue_ports[] = {
|
|||
|
||||
static struct platform_device serial_device = {
|
||||
.name = "serial8250",
|
||||
.id = 1,
|
||||
.id = PLAT8250_DEV_PLATFORM1,
|
||||
.dev = {
|
||||
.platform_data = voiceblue_ports,
|
||||
},
|
||||
|
|
|
@ -98,7 +98,7 @@ static struct plat_serial8250_port serial_platform_data[] = {
|
|||
|
||||
static struct platform_device serial_device = {
|
||||
.name = "serial8250",
|
||||
.id = 0,
|
||||
.id = PLAT8250_DEV_PLATFORM,
|
||||
.dev = {
|
||||
.platform_data = serial_platform_data,
|
||||
},
|
||||
|
|
|
@ -140,7 +140,7 @@ static struct plat_serial8250_port serial_platform_data[] = {
|
|||
|
||||
static struct platform_device serial_device = {
|
||||
.name = "serial8250",
|
||||
.id = 0,
|
||||
.id = PLAT8250_DEV_PLATFORM,
|
||||
.dev = {
|
||||
.platform_data = serial_platform_data,
|
||||
},
|
||||
|
|
|
@ -381,7 +381,7 @@ static struct plat_serial8250_port bast_sio_data[] = {
|
|||
|
||||
static struct platform_device bast_sio = {
|
||||
.name = "serial8250",
|
||||
.id = 0,
|
||||
.id = PLAT8250_DEV_PLATFORM,
|
||||
.dev = {
|
||||
.platform_data = &bast_sio_data,
|
||||
},
|
||||
|
|
|
@ -221,7 +221,7 @@ static struct plat_serial8250_port serial_platform_data[] = {
|
|||
|
||||
static struct platform_device serial_device = {
|
||||
.name = "serial8250",
|
||||
.id = 0,
|
||||
.id = PLAT8250_DEV_PLATFORM,
|
||||
.dev = {
|
||||
.platform_data = serial_platform_data,
|
||||
},
|
||||
|
|
|
@ -41,7 +41,7 @@ static struct plat_serial8250_port serial_platform_data[] = {
|
|||
|
||||
static struct platform_device serial_device = {
|
||||
.name = "serial8250",
|
||||
.id = 0,
|
||||
.id = PLAT8250_DEV_PLATFORM,
|
||||
.dev = {
|
||||
.platform_data = serial_platform_data,
|
||||
},
|
||||
|
|
|
@ -140,12 +140,12 @@ struct platform_device ppc_sys_platform_devices[] = {
|
|||
},
|
||||
[MPC10X_UART0] = {
|
||||
.name = "serial8250",
|
||||
.id = 0,
|
||||
.id = PLAT8250_DEV_PLATFORM,
|
||||
.dev.platform_data = serial_plat_uart0,
|
||||
},
|
||||
[MPC10X_UART1] = {
|
||||
.name = "serial8250",
|
||||
.id = 1,
|
||||
.id = PLAT8250_DEV_PLATFORM1,
|
||||
.dev.platform_data = serial_plat_uart1,
|
||||
},
|
||||
|
||||
|
|
|
@ -165,7 +165,7 @@ struct platform_device ppc_sys_platform_devices[] = {
|
|||
},
|
||||
[MPC83xx_DUART] = {
|
||||
.name = "serial8250",
|
||||
.id = 0,
|
||||
.id = PLAT8250_DEV_PLATFORM,
|
||||
.dev.platform_data = serial_platform_data,
|
||||
},
|
||||
[MPC83xx_SEC2] = {
|
||||
|
|
|
@ -282,7 +282,7 @@ struct platform_device ppc_sys_platform_devices[] = {
|
|||
},
|
||||
[MPC85xx_DUART] = {
|
||||
.name = "serial8250",
|
||||
.id = 0,
|
||||
.id = PLAT8250_DEV_PLATFORM,
|
||||
.dev.platform_data = serial_platform_data,
|
||||
},
|
||||
[MPC85xx_PERFMON] = {
|
||||
|
|
|
@ -1283,7 +1283,7 @@ void __init generic_find_legacy_serial_ports(u64 *physport,
|
|||
|
||||
static struct platform_device serial_device = {
|
||||
.name = "serial8250",
|
||||
.id = 0,
|
||||
.id = PLAT8250_DEV_PLATFORM,
|
||||
.dev = {
|
||||
.platform_data = serial_ports,
|
||||
},
|
||||
|
|
|
@ -2536,7 +2536,7 @@ static int __init serial8250_init(void)
|
|||
goto out;
|
||||
|
||||
serial8250_isa_devs = platform_device_register_simple("serial8250",
|
||||
-1, NULL, 0);
|
||||
PLAT8250_DEV_LEGACY, NULL, 0);
|
||||
if (IS_ERR(serial8250_isa_devs)) {
|
||||
ret = PTR_ERR(serial8250_isa_devs);
|
||||
goto unreg;
|
||||
|
|
|
@ -29,7 +29,7 @@ static struct plat_serial8250_port accent_data[] = {
|
|||
|
||||
static struct platform_device accent_device = {
|
||||
.name = "serial8250",
|
||||
.id = 2,
|
||||
.id = PLAT8250_DEV_ACCENT,
|
||||
.dev = {
|
||||
.platform_data = accent_data,
|
||||
},
|
||||
|
|
|
@ -43,7 +43,7 @@ static struct plat_serial8250_port boca_data[] = {
|
|||
|
||||
static struct platform_device boca_device = {
|
||||
.name = "serial8250",
|
||||
.id = 3,
|
||||
.id = PLAT8250_DEV_BOCA,
|
||||
.dev = {
|
||||
.platform_data = boca_data,
|
||||
},
|
||||
|
|
|
@ -35,7 +35,7 @@ static struct plat_serial8250_port fourport_data[] = {
|
|||
|
||||
static struct platform_device fourport_device = {
|
||||
.name = "serial8250",
|
||||
.id = 1,
|
||||
.id = PLAT8250_DEV_FOURPORT,
|
||||
.dev = {
|
||||
.platform_data = fourport_data,
|
||||
},
|
||||
|
|
|
@ -40,7 +40,7 @@ static struct plat_serial8250_port hub6_data[] = {
|
|||
|
||||
static struct platform_device hub6_device = {
|
||||
.name = "serial8250",
|
||||
.id = 4,
|
||||
.id = PLAT8250_DEV_HUB6,
|
||||
.dev = {
|
||||
.platform_data = hub6_data,
|
||||
},
|
||||
|
|
|
@ -44,7 +44,7 @@ static struct plat_serial8250_port mca_data[] = {
|
|||
|
||||
static struct platform_device mca_device = {
|
||||
.name = "serial8250",
|
||||
.id = 5,
|
||||
.id = PLAT8250_DEV_MCA,
|
||||
.dev = {
|
||||
.platform_data = mca_data,
|
||||
},
|
||||
|
|
|
@ -29,6 +29,21 @@ struct plat_serial8250_port {
|
|||
unsigned int flags; /* UPF_* flags */
|
||||
};
|
||||
|
||||
/*
|
||||
* Allocate 8250 platform device IDs. Nothing is implied by
|
||||
* the numbering here, except for the legacy entry being -1.
|
||||
*/
|
||||
enum {
|
||||
PLAT8250_DEV_LEGACY = -1,
|
||||
PLAT8250_DEV_PLATFORM,
|
||||
PLAT8250_DEV_PLATFORM1,
|
||||
PLAT8250_DEV_FOURPORT,
|
||||
PLAT8250_DEV_ACCENT,
|
||||
PLAT8250_DEV_BOCA,
|
||||
PLAT8250_DEV_HUB6,
|
||||
PLAT8250_DEV_MCA,
|
||||
};
|
||||
|
||||
/*
|
||||
* This should be used by drivers which want to register
|
||||
* their own 8250 ports without registering their own
|
||||
|
|
Loading…
Reference in a new issue