mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2024-11-28 22:20:18 +02:00
2f1b56443c
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@15581 3c298f89-4303-0410-b956-a3cf2f4a3e73
84 lines
2.1 KiB
Diff
84 lines
2.1 KiB
Diff
Auto-detection works just fine, so use it instead of specifying the type
|
|
manually. Also define a platform device for the uart, as suggested by
|
|
David Daney.
|
|
|
|
Signed-off-by: Phil Sutter <n0-1@freewrt.org>
|
|
---
|
|
arch/mips/rb532/devices.c | 26 ++++++++++++++++++++++++++
|
|
arch/mips/rb532/serial.c | 2 +-
|
|
2 files changed, 27 insertions(+), 1 deletions(-)
|
|
|
|
--- a/arch/mips/rb532/devices.c
|
|
+++ b/arch/mips/rb532/devices.c
|
|
@@ -24,6 +24,7 @@
|
|
#include <linux/mtd/partitions.h>
|
|
#include <linux/gpio_keys.h>
|
|
#include <linux/input.h>
|
|
+#include <linux/serial_8250.h>
|
|
|
|
#include <asm/bootinfo.h>
|
|
|
|
@@ -39,6 +40,8 @@
|
|
#define ETH0_RX_DMA_ADDR (DMA0_BASE_ADDR + 0 * DMA_CHAN_OFFSET)
|
|
#define ETH0_TX_DMA_ADDR (DMA0_BASE_ADDR + 1 * DMA_CHAN_OFFSET)
|
|
|
|
+extern unsigned int idt_cpu_freq;
|
|
+
|
|
static struct resource korina_dev0_res[] = {
|
|
{
|
|
.name = "korina_regs",
|
|
@@ -214,12 +217,32 @@ static struct platform_device rb532_wdt
|
|
.num_resources = ARRAY_SIZE(rb532_wdt_res),
|
|
};
|
|
|
|
+static struct plat_serial8250_port rb532_uart_res[] = {
|
|
+ {
|
|
+ .membase = (char *)KSEG1ADDR(REGBASE + UART0BASE),
|
|
+ .irq = UART0_IRQ,
|
|
+ .regshift = 2,
|
|
+ .iotype = UPIO_MEM,
|
|
+ .flags = UPF_BOOT_AUTOCONF,
|
|
+ },
|
|
+ {
|
|
+ .flags = 0,
|
|
+ }
|
|
+};
|
|
+
|
|
+static struct platform_device rb532_uart = {
|
|
+ .name = "serial8250",
|
|
+ .id = PLAT8250_DEV_PLATFORM,
|
|
+ .dev.platform_data = &rb532_uart_res,
|
|
+};
|
|
+
|
|
static struct platform_device *rb532_devs[] = {
|
|
&korina_dev0,
|
|
&nand_slot0,
|
|
&cf_slot0,
|
|
&rb532_led,
|
|
&rb532_button,
|
|
+ &rb532_uart,
|
|
&rb532_wdt
|
|
};
|
|
|
|
@@ -294,6 +317,9 @@ static int __init plat_setup_devices(voi
|
|
/* Initialise the NAND device */
|
|
rb532_nand_setup();
|
|
|
|
+ /* set the uart clock to the current cpu frequency */
|
|
+ rb532_uart_res[0].uartclk = idt_cpu_freq;
|
|
+
|
|
return platform_add_devices(rb532_devs, ARRAY_SIZE(rb532_devs));
|
|
}
|
|
|
|
--- a/arch/mips/rb532/serial.c
|
|
+++ b/arch/mips/rb532/serial.c
|
|
@@ -36,7 +36,7 @@
|
|
extern unsigned int idt_cpu_freq;
|
|
|
|
static struct uart_port rb532_uart = {
|
|
- .type = PORT_16550A,
|
|
+ .flags = UPF_BOOT_AUTOCONF,
|
|
.line = 0,
|
|
.irq = UART0_IRQ,
|
|
.iotype = UPIO_MEM,
|