evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[ARM] 3217/1: iop331 uarts as platform devices

Browse source 
Patch from Dan Williams

Convert old-style serial devices to platform devices so that printk's are visible during the boot process.

Signed-off-by: Dan Williams <dan.j.williams@intel.com>
Signed-off-by: Deepak Saxena <dsaxena@plexity.net>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
This commit is contained in:
Dan Williams 2006-01-05 20:53:02 +00:00 • committed by Russell King
parent 6a2273d6fc
commit 2b9ac7c15c
1 changed files with 68 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

78
arch/arm/mach-iop3xx/iop331-setup.c
View file

@ -18,7 +18,7 @@
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <linux/serial.h> #include <linux/serial.h>
#include <linux/tty.h> #include <linux/tty.h>
#include <linux/serial_core.h> #include <linux/serial_8250.h>
#include <asm/io.h> #include <asm/io.h>
#include <asm/pgtable.h> #include <asm/pgtable.h>
@ -50,30 +50,72 @@ static struct map_desc iop331_std_desc[] __initdata = {
} }
}; };
static struct uart_port iop331_serial_ports[] = { static struct resource iop33x_uart0_resources[] = {
[0] = {
.start = IOP331_UART0_PHYS,
.end = IOP331_UART0_PHYS + 0x3f,
.flags = IORESOURCE_MEM,
},
[1] = {
.start = IRQ_IOP331_UART0,
.end = IRQ_IOP331_UART0,
.flags = IORESOURCE_IRQ
}
};
static struct resource iop33x_uart1_resources[] = {
[0] = {
.start = IOP331_UART1_PHYS,
.end = IOP331_UART1_PHYS + 0x3f,
.flags = IORESOURCE_MEM,
},
[1] = {
.start = IRQ_IOP331_UART1,
.end = IRQ_IOP331_UART1,
.flags = IORESOURCE_IRQ
}
};
static struct plat_serial8250_port iop33x_uart0_data[] = {
{ {
.membase = (char*)(IOP331_UART0_VIRT), .membase = (char*)(IOP331_UART0_VIRT),
.mapbase = (IOP331_UART0_PHYS), .mapbase = (IOP331_UART0_PHYS),
.irq = IRQ_IOP331_UART0, .irq = IRQ_IOP331_UART0,
.flags = UPF_SKIP_TEST,
.iotype = UPIO_MEM,
.regshift = 2,
.uartclk = IOP331_UART_XTAL, .uartclk = IOP331_UART_XTAL,
.line = 0, .regshift = 2,
.type = PORT_XSCALE, .iotype = UPIO_MEM,
.fifosize = 32 .flags = UPF_SKIP_TEST,
} , { },
{ },
};
static struct plat_serial8250_port iop33x_uart1_data[] = {
{
.membase = (char*)(IOP331_UART1_VIRT), .membase = (char*)(IOP331_UART1_VIRT),
.mapbase = (IOP331_UART1_PHYS), .mapbase = (IOP331_UART1_PHYS),
.irq = IRQ_IOP331_UART1, .irq = IRQ_IOP331_UART1,
.flags = UPF_SKIP_TEST,
.iotype = UPIO_MEM,
.regshift = 2,
.uartclk = IOP331_UART_XTAL, .uartclk = IOP331_UART_XTAL,
.line = 1, .regshift = 2,
.type = PORT_XSCALE, .iotype = UPIO_MEM,
.fifosize = 32 .flags = UPF_SKIP_TEST,
} },
{ },
};
static struct platform_device iop33x_uart0 = {
.name = "serial8250",
.id = 0,
.dev.platform_data = iop33x_uart0_data,
.num_resources = 2,
.resource = iop33x_uart0_resources,
};
static struct platform_device iop33x_uart1 = {
.name = "serial8250",
.id = 1,
.dev.platform_data = iop33x_uart1_data,
.num_resources = 2,
.resource = iop33x_uart1_resources,
}; };
static struct resource iop33x_i2c_0_resources[] = { static struct resource iop33x_i2c_0_resources[] = {
@ -117,6 +159,8 @@ static struct platform_device iop33x_i2c_1_controller = {
}; };
static struct platform_device *iop33x_devices[] __initdata = { static struct platform_device *iop33x_devices[] __initdata = {
&iop33x_uart0,
&iop33x_uart1,
&iop33x_i2c_0_controller, &iop33x_i2c_0_controller,
&iop33x_i2c_1_controller &iop33x_i2c_1_controller
}; };
@ -133,8 +177,6 @@ void __init iop33x_init(void)
void __init iop331_map_io(void) void __init iop331_map_io(void)
{ {
iotable_init(iop331_std_desc, ARRAY_SIZE(iop331_std_desc)); iotable_init(iop331_std_desc, ARRAY_SIZE(iop331_std_desc));
early_serial_setup(&iop331_serial_ports[0]);
early_serial_setup(&iop331_serial_ports[1]);
} }
#ifdef CONFIG_ARCH_IOP331 #ifdef CONFIG_ARCH_IOP331