6 files changed, 224 insertions, 3 deletions

diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index 130d825e5438..7441a2cf523e 100644
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -1042,6 +1042,9 @@ config SOC_AU1X00
         select SYS_SUPPORTS_APM_EMULATION
         select SYS_SUPPORTS_KGDB
 
+config SERIAL_RM9000
+        bool
+
 config PNX8550
         bool
         select SOC_PNX8550
diff --git a/arch/mips/cobalt/Makefile b/arch/mips/cobalt/Makefile
index de017c11f9b7..9565b2104dcd 100644
--- a/arch/mips/cobalt/Makefile
+++ b/arch/mips/cobalt/Makefile
@@ -2,7 +2,7 @@
 # Makefile for the Cobalt micro systems family specific parts of the kernel
 #
 
-obj-y    := irq.o reset.o setup.o
+obj-y    := irq.o reset.o setup.o buttons.o
 
 obj-$(CONFIG_PCI)               += pci.o
 obj-$(CONFIG_EARLY_PRINTK)      += console.o
diff --git a/arch/mips/cobalt/buttons.c b/arch/mips/cobalt/buttons.c
new file mode 100644
index 000000000000..9e143989c7b8
--- /dev/null
+++ b/arch/mips/cobalt/buttons.c
@@ -0,0 +1,54 @@
+/*
+ *  Cobalt buttons platform device.
+ *
+ *  Copyright (C) 2007  Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+#include <linux/platform_device.h>
+#include <linux/errno.h>
+#include <linux/init.h>
+
+static struct resource cobalt_buttons_resource __initdata = {
+        .start  = 0x1d000000,
+        .end    = 0x1d000003,
+        .flags  = IORESOURCE_MEM,
+};
+
+static __init int cobalt_add_buttons(void)
+{
+        struct platform_device *pd;
+        int error;
+
+        pd = platform_device_alloc("Cobalt buttons", -1);
+        if (!pd)
+                return -ENOMEM;
+
+        error = platform_device_add_resources(pd, &cobalt_buttons_resource, 1);
+        if (error)
+                goto err_free_device;
+
+        error = platform_device_add(pd);
+        if (error)
+                goto err_free_device;
+
+        return 0;
+
+ err_free_device:
+        platform_device_put(pd);
+        return error;
+}
+device_initcall(cobalt_add_buttons);
diff --git a/arch/mips/kernel/vmlinux.lds.S b/arch/mips/kernel/vmlinux.lds.S
index c76b793310c2..043f637e3d10 100644
--- a/arch/mips/kernel/vmlinux.lds.S
+++ b/arch/mips/kernel/vmlinux.lds.S
@@ -119,7 +119,7 @@ SECTIONS
   .init.ramfs : { *(.init.ramfs) }
   __initramfs_end = .;
 #endif
-  . = ALIGN(32);
+  . = ALIGN(_PAGE_SIZE);
   __per_cpu_start = .;
   .data.percpu  : { *(.data.percpu) }
   __per_cpu_end = .;
diff --git a/arch/mips/lib/iomap.c b/arch/mips/lib/iomap.c
index d51d5cb0a4a9..e3acb2dad33a 100644
--- a/arch/mips/lib/iomap.c
+++ b/arch/mips/lib/iomap.c
@@ -6,7 +6,6 @@
  * (C) Copyright 2007 MIPS Technologies, Inc.
  *     written by Ralf Baechle <ralf@linux-mips.org>
  */
-#include <linux/pci.h>
 #include <linux/module.h>
 #include <asm/io.h>
 
diff --git a/arch/mips/pmc-sierra/msp71xx/msp_serial.c b/arch/mips/pmc-sierra/msp71xx/msp_serial.c
new file mode 100644
index 000000000000..c41b53faa8f6
--- /dev/null
+++ b/arch/mips/pmc-sierra/msp71xx/msp_serial.c
@@ -0,0 +1,165 @@
+/*
+ * The setup file for serial related hardware on PMC-Sierra MSP processors.
+ *
+ * Copyright 2005 PMC-Sierra, Inc.
+ *
+ *  This program is free software; you can redistribute  it and/or modify it
+ *  under  the terms of  the GNU General  Public License as published by the
+ *  Free Software Foundation;  either version 2 of the  License, or (at your
+ *  option) any later version.
+ *
+ *  THIS  SOFTWARE  IS PROVIDED   ``AS  IS'' AND   ANY  EXPRESS OR IMPLIED
+ *  WARRANTIES,   INCLUDING, BUT NOT  LIMITED  TO, THE IMPLIED WARRANTIES OF
+ *  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN
+ *  NO  EVENT  SHALL   THE AUTHOR  BE    LIABLE FOR ANY   DIRECT, INDIRECT,
+ *  INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ *  NOT LIMITED   TO, PROCUREMENT OF  SUBSTITUTE GOODS  OR SERVICES; LOSS OF
+ *  USE, DATA,  OR PROFITS; OR  BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN  CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ *  THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ *  You should have received a copy of the  GNU General Public License along
+ *  with this program; if not, write  to the Free Software Foundation, Inc.,
+ *  675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include <linux/serial.h>
+#include <linux/serial_core.h>
+#include <linux/serial_reg.h>
+
+#include <asm/bootinfo.h>
+#include <asm/io.h>
+#include <asm/processor.h>
+#include <asm/serial.h>
+
+#include <msp_prom.h>
+#include <msp_int.h>
+#include <msp_regs.h>
+
+#ifdef CONFIG_KGDB
+/*
+ * kgdb uses serial port 1 so the console can remain on port 0.
+ * To use port 0 change the definition to read as follows:
+ * #define DEBUG_PORT_BASE KSEG1ADDR(MSP_UART0_BASE)
+ */
+#define DEBUG_PORT_BASE KSEG1ADDR(MSP_UART1_BASE)
+
+int putDebugChar(char c)
+{
+        volatile uint32_t *uart = (volatile uint32_t *)DEBUG_PORT_BASE;
+        uint32_t val = (uint32_t)c;
+
+        local_irq_disable();
+        while( !(uart[5] & 0x20) ); /* Wait for TXRDY */
+        uart[0] = val;
+        while( !(uart[5] & 0x20) ); /* Wait for TXRDY */
+        local_irq_enable();
+
+        return 1;
+}
+
+char getDebugChar(void)
+{
+        volatile uint32_t *uart = (volatile uint32_t *)DEBUG_PORT_BASE;
+        uint32_t val;
+
+        while( !(uart[5] & 0x01) ); /* Wait for RXRDY */
+        val = uart[0];
+
+        return (char)val;
+}
+
+void initDebugPort(unsigned int uartclk, unsigned int baudrate)
+{
+        unsigned int baud_divisor = (uartclk + 8 * baudrate)/(16 * baudrate);
+
+        /* Enable FIFOs */
+        writeb(UART_FCR_ENABLE_FIFO | UART_FCR_CLEAR_RCVR |
+                        UART_FCR_CLEAR_XMIT | UART_FCR_TRIGGER_4,
+                (char *)DEBUG_PORT_BASE + (UART_FCR * 4));
+
+        /* Select brtc divisor */
+        writeb(UART_LCR_DLAB, (char *)DEBUG_PORT_BASE + (UART_LCR * 4));
+
+        /* Store divisor lsb */
+        writeb(baud_divisor, (char *)DEBUG_PORT_BASE + (UART_TX * 4));
+
+        /* Store divisor msb */
+        writeb(baud_divisor >> 8, (char *)DEBUG_PORT_BASE + (UART_IER * 4));
+
+        /* Set 8N1 mode */
+        writeb(UART_LCR_WLEN8, (char *)DEBUG_PORT_BASE + (UART_LCR * 4));
+
+        /* Disable flow control */
+        writeb(0, (char *)DEBUG_PORT_BASE + (UART_MCR * 4));
+
+        /* Disable receive interrupt(!) */
+        writeb(0, (char *)DEBUG_PORT_BASE + (UART_IER * 4));
+}
+#endif
+
+void __init msp_serial_setup(void)
+{
+        char    *s;
+        char    *endp;
+        struct uart_port up;
+        unsigned int uartclk;
+
+        memset(&up, 0, sizeof(up));
+
+        /* Check if clock was specified in environment */
+        s = prom_getenv("uartfreqhz");
+        if(!(s && *s && (uartclk = simple_strtoul(s, &endp, 10)) && *endp == 0))
+                uartclk = MSP_BASE_BAUD;
+        ppfinit("UART clock set to %d\n", uartclk);
+
+        /* Initialize first serial port */
+        up.mapbase      = MSP_UART0_BASE;
+        up.membase      = ioremap_nocache(up.mapbase,MSP_UART_REG_LEN);
+        up.irq          = MSP_INT_UART0;
+        up.uartclk      = uartclk;
+        up.regshift     = 2;
+        up.iotype       = UPIO_DWAPB; /* UPIO_MEM like */
+        up.flags        = STD_COM_FLAGS;
+        up.type         = PORT_16550A;
+        up.line         = 0;
+        up.private_data         = (void*)UART0_STATUS_REG;
+        if (early_serial_setup(&up))
+                printk(KERN_ERR "Early serial init of port 0 failed\n");
+
+        /* Initialize the second serial port, if one exists */
+        switch (mips_machtype) {
+                case MACH_MSP4200_EVAL:
+                case MACH_MSP4200_GW:
+                case MACH_MSP4200_FPGA:
+                case MACH_MSP7120_EVAL:
+                case MACH_MSP7120_GW:
+                case MACH_MSP7120_FPGA:
+                        /* Enable UART1 on MSP4200 and MSP7120 */
+                        *GPIO_CFG2_REG = 0x00002299;
+
+#ifdef CONFIG_KGDB
+                        /* Initialize UART1 for kgdb since PMON doesn't */
+                        if( DEBUG_PORT_BASE == KSEG1ADDR(MSP_UART1_BASE) ) {
+                                if( mips_machtype == MACH_MSP4200_FPGA
+                                 || mips_machtype == MACH_MSP7120_FPGA )
+                                        initDebugPort(uartclk,19200);
+                                else
+                                        initDebugPort(uartclk,57600);
+                        }
+#endif
+                        break;
+
+                default:
+                        return; /* No second serial port, good-bye. */
+        }
+
+        up.mapbase      = MSP_UART1_BASE;
+        up.membase      = ioremap_nocache(up.mapbase,MSP_UART_REG_LEN);
+        up.irq          = MSP_INT_UART1;
+        up.line         = 1;
+        up.private_data         = (void*)UART1_STATUS_REG;
+        if (early_serial_setup(&up))
+                printk(KERN_ERR "Early serial init of port 1 failed\n");
+}