7 files changed, 169 insertions, 14 deletions

diff --git a/arch/mips/loongson/common/Makefile b/arch/mips/loongson/common/Makefile
index 7668c4de1151..cdd2e812ba1a 100644
--- a/arch/mips/loongson/common/Makefile
+++ b/arch/mips/loongson/common/Makefile
@@ -4,6 +4,7 @@
 
 obj-y += setup.o init.o cmdline.o env.o time.o reset.o irq.o \
     pci.o bonito-irq.o mem.o machtype.o platform.o
+obj-$(CONFIG_GENERIC_GPIO) += gpio.o
 
 #
 # Serial port support
diff --git a/arch/mips/loongson/common/gpio.c b/arch/mips/loongson/common/gpio.c
new file mode 100644
index 000000000000..e8a0ffa935b4
--- /dev/null
+++ b/arch/mips/loongson/common/gpio.c
@@ -0,0 +1,139 @@
+/*
+ *  STLS2F GPIO Support
+ *
+ *  Copyright (c) 2008 Richard Liu,  STMicroelectronics  <richard.liu@st.com>
+ *  Copyright (c) 2008-2010 Arnaud Patard <apatard@mandriva.com>
+ *
+ *  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.
+ */
+
+#include <linux/kernel.h>
+#include <linux/init.h>
+#include <linux/module.h>
+#include <linux/spinlock.h>
+#include <linux/err.h>
+#include <asm/types.h>
+#include <loongson.h>
+#include <linux/gpio.h>
+
+#define STLS2F_N_GPIO           4
+#define STLS2F_GPIO_IN_OFFSET   16
+
+static DEFINE_SPINLOCK(gpio_lock);
+
+int gpio_get_value(unsigned gpio)
+{
+        u32 val;
+        u32 mask;
+
+        if (gpio >= STLS2F_N_GPIO)
+                return __gpio_get_value(gpio);
+
+        mask = 1 << (gpio + STLS2F_GPIO_IN_OFFSET);
+        spin_lock(&gpio_lock);
+        val = LOONGSON_GPIODATA;
+        spin_unlock(&gpio_lock);
+
+        return ((val & mask) != 0);
+}
+EXPORT_SYMBOL(gpio_get_value);
+
+void gpio_set_value(unsigned gpio, int state)
+{
+        u32 val;
+        u32 mask;
+
+        if (gpio >= STLS2F_N_GPIO) {
+                __gpio_set_value(gpio, state);
+                return ;
+        }
+
+        mask = 1 << gpio;
+
+        spin_lock(&gpio_lock);
+        val = LOONGSON_GPIODATA;
+        if (state)
+                val |= mask;
+        else
+                val &= (~mask);
+        LOONGSON_GPIODATA = val;
+        spin_unlock(&gpio_lock);
+}
+EXPORT_SYMBOL(gpio_set_value);
+
+int gpio_cansleep(unsigned gpio)
+{
+        if (gpio < STLS2F_N_GPIO)
+                return 0;
+        else
+                return __gpio_cansleep(gpio);
+}
+EXPORT_SYMBOL(gpio_cansleep);
+
+static int ls2f_gpio_direction_input(struct gpio_chip *chip, unsigned gpio)
+{
+        u32 temp;
+        u32 mask;
+
+        if (gpio >= STLS2F_N_GPIO)
+                return -EINVAL;
+
+        spin_lock(&gpio_lock);
+        mask = 1 << gpio;
+        temp = LOONGSON_GPIOIE;
+        temp |= mask;
+        LOONGSON_GPIOIE = temp;
+        spin_unlock(&gpio_lock);
+
+        return 0;
+}
+
+static int ls2f_gpio_direction_output(struct gpio_chip *chip,
+                unsigned gpio, int level)
+{
+        u32 temp;
+        u32 mask;
+
+        if (gpio >= STLS2F_N_GPIO)
+                return -EINVAL;
+
+        gpio_set_value(gpio, level);
+        spin_lock(&gpio_lock);
+        mask = 1 << gpio;
+        temp = LOONGSON_GPIOIE;
+        temp &= (~mask);
+        LOONGSON_GPIOIE = temp;
+        spin_unlock(&gpio_lock);
+
+        return 0;
+}
+
+static int ls2f_gpio_get_value(struct gpio_chip *chip, unsigned gpio)
+{
+        return gpio_get_value(gpio);
+}
+
+static void ls2f_gpio_set_value(struct gpio_chip *chip,
+                unsigned gpio, int value)
+{
+        gpio_set_value(gpio, value);
+}
+
+static struct gpio_chip ls2f_chip = {
+        .label                  = "ls2f",
+        .direction_input        = ls2f_gpio_direction_input,
+        .get                    = ls2f_gpio_get_value,
+        .direction_output       = ls2f_gpio_direction_output,
+        .set                    = ls2f_gpio_set_value,
+        .base                   = 0,
+        .ngpio                  = STLS2F_N_GPIO,
+};
+
+static int __init ls2f_gpio_setup(void)
+{
+        return gpiochip_add(&ls2f_chip);
+}
+arch_initcall(ls2f_gpio_setup);
diff --git a/arch/mips/loongson/common/machtype.c b/arch/mips/loongson/common/machtype.c
index 853f184b793e..81fbe6b73f91 100644
--- a/arch/mips/loongson/common/machtype.c
+++ b/arch/mips/loongson/common/machtype.c
@@ -24,7 +24,7 @@ static const char *system_types[] = {
         [MACH_LEMOTE_FL2F]              "lemote-fuloong-2f-box",
         [MACH_LEMOTE_ML2F7]             "lemote-mengloong-2f-7inches",
         [MACH_LEMOTE_YL2F89]            "lemote-yeeloong-2f-8.9inches",
-        [MACH_DEXXON_GDIUM2F10]         "dexxon-gidum-2f-10inches",
+        [MACH_DEXXON_GDIUM2F10]         "dexxon-gdium-2f",
         [MACH_LEMOTE_NAS]               "lemote-nas-2f",
         [MACH_LEMOTE_LL2F]              "lemote-lynloong-2f",
         [MACH_LOONGSON_END]             NULL,
diff --git a/arch/mips/loongson/common/mem.c b/arch/mips/loongson/common/mem.c
index ec2f7964a0b0..30eba6001205 100644
--- a/arch/mips/loongson/common/mem.c
+++ b/arch/mips/loongson/common/mem.c
@@ -75,7 +75,7 @@ pgprot_t phys_mem_access_prot(struct file *file, unsigned long pfn,
         unsigned long end = offset + size;
 
         if (__uncached_access(file, offset)) {
-                if (((uca_start && offset) >= uca_start) &&
+                if (uca_start && (offset >= uca_start) &&
                     (end <= uca_end))
                         return __pgprot((pgprot_val(vma_prot) &
                                          ~_CACHE_MASK) |
@@ -96,7 +96,7 @@ static int __init find_vga_mem_init(void)
                 return 0;
 
         for_each_pci_dev(dev) {
-                if ((dev->class >> 8) == PCI_CLASS_DISPLAY_VGA) {
+                if ((dev->class >> 16) == PCI_BASE_CLASS_DISPLAY) {
                         for (idx = 0; idx < PCI_NUM_RESOURCES; idx++) {
                                 r = &dev->resource[idx];
                                 if (!r->start && r->end)
diff --git a/arch/mips/loongson/common/reset.c b/arch/mips/loongson/common/reset.c
index 4bd9c18b07a5..9e10d6225d9b 100644
--- a/arch/mips/loongson/common/reset.c
+++ b/arch/mips/loongson/common/reset.c
@@ -16,13 +16,31 @@
 
 #include <loongson.h>
 
+static inline void loongson_reboot(void)
+{
+#ifndef CONFIG_CPU_JUMP_WORKAROUNDS
+        ((void (*)(void))ioremap_nocache(LOONGSON_BOOT_BASE, 4)) ();
+#else
+        void (*func)(void);
+
+        func = (void *)ioremap_nocache(LOONGSON_BOOT_BASE, 4);
+
+        __asm__ __volatile__(
+        "       .set    noat                                            \n"
+        "       jr      %[func]                                         \n"
+        "       .set    at                                              \n"
+        : /* No outputs */
+        : [func] "r" (func));
+#endif
+}
+
 static void loongson_restart(char *command)
 {
         /* do preparation for reboot */
         mach_prepare_reboot();
 
         /* reboot via jumping to boot base address */
-        ((void (*)(void))ioremap_nocache(LOONGSON_BOOT_BASE, 4)) ();
+        loongson_reboot();
 }
 
 static void loongson_poweroff(void)
diff --git a/arch/mips/loongson/common/setup.c b/arch/mips/loongson/common/setup.c
index 4cd2aa9a342c..27d826bc7103 100644
--- a/arch/mips/loongson/common/setup.c
+++ b/arch/mips/loongson/common/setup.c
@@ -41,15 +41,12 @@ void __init plat_mem_setup(void)
         conswitchp = &vga_con;
 
         screen_info = (struct screen_info) {
-                0, 25,          /* orig-x, orig-y */
-                    0,          /* unused */
-                    0,          /* orig-video-page */
-                    0,          /* orig-video-mode */
-                    80,         /* orig-video-cols */
-                    0, 0, 0,    /* ega_ax, ega_bx, ega_cx */
-                    25,         /* orig-video-lines */
-                    VIDEO_TYPE_VGAC,    /* orig-video-isVGA */
-                    16          /* orig-video-points */
+                .orig_x                 = 0,
+                .orig_y                 = 25,
+                .orig_video_cols        = 80,
+                .orig_video_lines       = 25,
+                .orig_video_isVGA       = VIDEO_TYPE_VGAC,
+                .orig_video_points      = 16,
         };
 #elif defined(CONFIG_DUMMY_CONSOLE)
         conswitchp = &dummy_con;
diff --git a/arch/mips/loongson/lemote-2f/irq.c b/arch/mips/loongson/lemote-2f/irq.c
index 882dfcd42c00..1d8b4d28a058 100644
--- a/arch/mips/loongson/lemote-2f/irq.c
+++ b/arch/mips/loongson/lemote-2f/irq.c
@@ -79,7 +79,7 @@ void mach_irq_dispatch(unsigned int pending)
         if (pending & CAUSEF_IP7)
                 do_IRQ(LOONGSON_TIMER_IRQ);
         else if (pending & CAUSEF_IP6) {        /* North Bridge, Perf counter */
-#ifdef CONFIG_OPROFILE
+#if defined(CONFIG_OPROFILE) || defined(CONFIG_OPROFILE_MODULE)
                 do_IRQ(LOONGSON2_PERFCNT_IRQ);
 #endif
                 bonito_irqdispatch();