linux-mips
[Top] [All Lists]

[PATCH 2/2] MIPS: Cobalt move to 8250/16550 serial early printk driver

To: Ralf Baechle <ralf@linux-mips.org>
Subject: [PATCH 2/2] MIPS: Cobalt move to 8250/16550 serial early printk driver
From: Yoichi Yuasa <yuasa@linux-mips.org>
Date: Fri, 5 Feb 2010 23:30:31 +0900
Cc: yuasa@linux-mips.org, linux-mips <linux-mips@linux-mips.org>
Dkim-signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:sender:date:from:to:cc :subject:message-id:in-reply-to:references:x-mailer:mime-version :content-type:content-transfer-encoding; bh=toRsyyfK3NJNbwu0r8axAZVHDTeeSKh5qnVNH6rvKfw=; b=awt7HKi3ZObqsUcFYSxNpEuaArKOq//UPnnRHj+7vrMce/nJsSuLsGxY6yZNKOn9td ABMfebMMqL5KzYsN8cCZkv039Rq7EWOH4JpDOThMkiqTF3Il1quI5wmjockq30H6E7U8 fBoEYA9n0Z7KJHb/aowgK4SMAcd6u+zFAbckE=
Domainkey-signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=sender:date:from:to:cc:subject:message-id:in-reply-to:references :x-mailer:mime-version:content-type:content-transfer-encoding; b=rQLNDnIZsHZ21r/dwkyDuLf5NVXlfKlJbvPW4mZ6I6cHUkgNaf6baHLNoIN7vixGRe SHA0kganF2PyR1yU+60k2McDjh2sFBKUyqvkIu8hUeH7ZM/LZoEaB+p1ZtFardcwVyXK S/cIon9z9VCZyGr0/gM8yLsL9IdQNP1NcCBRA=
In-reply-to: <20100205232857.eb65967f.yuasa@linux-mips.org>
Original-recipient: rfc822;linux-mips@linux-mips.org
References: <20100205232857.eb65967f.yuasa@linux-mips.org>
Sender: linux-mips-bounce@linux-mips.org
Signed-off-by: Yoichi Yuasa <yuasa@linux-mips.org>
---
 arch/mips/Kconfig          |    1 +
 arch/mips/cobalt/Makefile  |    1 -
 arch/mips/cobalt/console.c |   20 --------------------
 arch/mips/cobalt/setup.c   |    3 +++
 4 files changed, 4 insertions(+), 21 deletions(-)
 delete mode 100644 arch/mips/cobalt/console.c

diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index 591ca0c..b848512 100644
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -90,6 +90,7 @@ config MIPS_COBALT
        select CSRC_R4K
        select CEVT_GT641XX
        select DMA_NONCOHERENT
+       select EARLY_PRINTK_8250 if EARLY_PRINTK
        select HW_HAS_PCI
        select I8253
        select I8259
diff --git a/arch/mips/cobalt/Makefile b/arch/mips/cobalt/Makefile
index 2379262..5cfe90f 100644
--- a/arch/mips/cobalt/Makefile
+++ b/arch/mips/cobalt/Makefile
@@ -5,7 +5,6 @@
 obj-y := buttons.o irq.o lcd.o led.o reset.o rtc.o serial.o setup.o time.o
 
 obj-$(CONFIG_PCI)              += pci.o
-obj-$(CONFIG_EARLY_PRINTK)     += console.o
 obj-$(CONFIG_MTD_PHYSMAP)      += mtd.o
 
 EXTRA_CFLAGS += -Werror
diff --git a/arch/mips/cobalt/console.c b/arch/mips/cobalt/console.c
deleted file mode 100644
index d1ba701..0000000
--- a/arch/mips/cobalt/console.c
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * (C) P. Horton 2006
- */
-#include <linux/io.h>
-#include <linux/serial_reg.h>
-
-#include <cobalt.h>
-
-#define UART_BASE      ((void __iomem *)CKSEG1ADDR(0x1c800000))
-
-void prom_putchar(char c)
-{
-       if (cobalt_board_id <= COBALT_BRD_ID_QUBE1)
-               return;
-
-       while (!(readb(UART_BASE + UART_LSR) & UART_LSR_THRE))
-               ;
-
-       writeb(c, UART_BASE + UART_TX);
-}
diff --git a/arch/mips/cobalt/setup.c b/arch/mips/cobalt/setup.c
index ec3b2c4..9a8c2fe 100644
--- a/arch/mips/cobalt/setup.c
+++ b/arch/mips/cobalt/setup.c
@@ -17,6 +17,7 @@
 
 #include <asm/bootinfo.h>
 #include <asm/reboot.h>
+#include <asm/setup.h>
 #include <asm/gt64120.h>
 
 #include <cobalt.h>
@@ -112,6 +113,8 @@ void __init prom_init(void)
        }
 
        add_memory_region(0x0, memsz, BOOT_MEM_RAM);
+
+       setup_8250_early_printk_port(CKSEG1ADDR(0x1c800000), 0, 0);
 }
 
 void __init prom_free_prom_memory(void)
-- 
1.6.6.1


<Prev in Thread] Current Thread [Next in Thread>