linux-mips
[Top] [All Lists]

[PATCH 1/2] MIPS: Octeon: Get rid of early serial.

To: linux-mips@linux-mips.org, ralf@linux-mips.org
Subject: [PATCH 1/2] MIPS: Octeon: Get rid of early serial.
From: David Daney <ddaney@caviumnetworks.com>
Date: Wed, 19 May 2010 14:16:31 -0700
Cc: David Daney <ddaney@caviumnetworks.com>
In-reply-to: <1274303792-10190-1-git-send-email-ddaney@caviumnetworks.com>
Original-recipient: rfc822;linux-mips@linux-mips.org
References: <1274303792-10190-1-git-send-email-ddaney@caviumnetworks.com>
Sender: linux-mips-bounce@linux-mips.org
Get rid of early_serial_setup, we use CONFIG_EARLY_PRINTK instead.

Signed-off-by: David Daney <ddaney@caviumnetworks.com>
---
 arch/mips/cavium-octeon/setup.c |   25 -------------------------
 1 files changed, 0 insertions(+), 25 deletions(-)

diff --git a/arch/mips/cavium-octeon/setup.c b/arch/mips/cavium-octeon/setup.c
index 4ac78a6..8640af3 100644
--- a/arch/mips/cavium-octeon/setup.c
+++ b/arch/mips/cavium-octeon/setup.c
@@ -403,7 +403,6 @@ void __init prom_init(void)
        const int coreid = cvmx_get_core_num();
        int i;
        int argc;
-       struct uart_port octeon_port;
 #ifdef CONFIG_CAVIUM_RESERVE32
        int64_t addr = -1;
 #endif
@@ -615,30 +614,6 @@ void __init prom_init(void)
        _machine_restart = octeon_restart;
        _machine_halt = octeon_halt;
 
-       memset(&octeon_port, 0, sizeof(octeon_port));
-       /*
-        * For early_serial_setup we don't set the port type or
-        * UPF_FIXED_TYPE.
-        */
-       octeon_port.flags = ASYNC_SKIP_TEST | UPF_SHARE_IRQ;
-       octeon_port.iotype = UPIO_MEM;
-       /* I/O addresses are every 8 bytes */
-       octeon_port.regshift = 3;
-       /* Clock rate of the chip */
-       octeon_port.uartclk = mips_hpt_frequency;
-       octeon_port.fifosize = 64;
-       octeon_port.mapbase = 0x0001180000000800ull + (1024 * octeon_uart);
-       octeon_port.membase = cvmx_phys_to_ptr(octeon_port.mapbase);
-       octeon_port.serial_in = octeon_serial_in;
-       octeon_port.serial_out = octeon_serial_out;
-#ifdef CONFIG_CAVIUM_OCTEON_2ND_KERNEL
-       octeon_port.line = 0;
-#else
-       octeon_port.line = octeon_uart;
-#endif
-       octeon_port.irq = 42 + octeon_uart;
-       early_serial_setup(&octeon_port);
-
        octeon_user_io_init();
        register_smp_ops(&octeon_smp_ops);
 }
-- 
1.6.6.1


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