MIPS: Move Loongson GPIO driver to drivers/gpio

Move Loongson-2's GPIO driver to drivers/gpio and add Kconfig options.

Acked-by: Ralf Baechle <ralf@linux-mips.org>
Signed-off-by: Huacai Chen <chenhc@lemote.com>
Reviewed-by: Alexandre Courbot <acourbot@nvidia.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>

diff --git a/arch/mips/configs/lemote2f_defconfig b/arch/mips/configs/lemote2f_defconfig
index e51aad9..0cbc986 100644 (file)
--- a/arch/mips/configs/lemote2f_defconfig
+++ b/arch/mips/configs/lemote2f_defconfig
@@ -171,6 +171,7 @@ CONFIG_SERIAL_8250_FOURPORT=y
 CONFIG_LEGACY_PTY_COUNT=16
 CONFIG_HW_RANDOM=y
 CONFIG_RTC=y
+CONFIG_GPIO_LOONGSON=y
 CONFIG_THERMAL=y
 CONFIG_MEDIA_SUPPORT=m
 CONFIG_VIDEO_DEV=m

diff --git a/arch/mips/loongson/common/Makefile b/arch/mips/loongson/common/Makefile
index d87e033..e70c33f 100644 (file)
--- a/arch/mips/loongson/common/Makefile
+++ b/arch/mips/loongson/common/Makefile
@@ -4,7 +4,6 @@
 
 obj-y += setup.o init.o cmdline.o env.o time.o reset.o irq.o \
     bonito-irq.o mem.o machtype.o platform.o
-obj-$(CONFIG_GPIOLIB) += gpio.o
 obj-$(CONFIG_PCI) += pci.o
 
 #

diff --git a/arch/mips/loongson/common/gpio.c b/arch/mips/loongson/common/gpio.c
deleted file mode 100644 (file)
index b4e69e0..0000000
--- a/arch/mips/loongson/common/gpio.c
+++ /dev/null
@@ -1,105 +0,0 @@
-/*
- *  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);
-
-static int ls2f_gpio_direction_input(struct gpio_chip *chip, unsigned gpio)
-{
-       u32 temp;
-       u32 mask;
-
-       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;
-
-       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)
-{
-       u32 val;
-       u32 mask;
-
-       mask = 1 << (gpio + STLS2F_GPIO_IN_OFFSET);
-       spin_lock(&gpio_lock);
-       val = LOONGSON_GPIODATA;
-       spin_unlock(&gpio_lock);
-
-       return (val & mask) != 0;
-}
-
-static void ls2f_gpio_set_value(struct gpio_chip *chip,
-               unsigned gpio, int value)
-{
-       u32 val;
-       u32 mask;
-
-       mask = 1 << gpio;
-
-       spin_lock(&gpio_lock);
-       val = LOONGSON_GPIODATA;
-       if (value)
-               val |= mask;
-       else
-               val &= (~mask);
-       LOONGSON_GPIODATA = val;
-       spin_unlock(&gpio_lock);
-}
-
-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,
-       .can_sleep              = false,
-};
-
-static int __init ls2f_gpio_setup(void)
-{
-       return gpiochip_add(&ls2f_chip);
-}
-arch_initcall(ls2f_gpio_setup);

diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig
index 9b2d350..473511f 100644 (file)
--- a/drivers/gpio/Kconfig
+++ b/drivers/gpio/Kconfig
@@ -508,6 +508,12 @@ config GPIO_GRGPIO
          Select this to support Aeroflex Gaisler GRGPIO cores from the GRLIB
          VHDL IP core library.
 
+config GPIO_LOONGSON
+       bool "Loongson-2 GPIO support"
+       depends on CPU_LOONGSON2
+       help
+         driver for GPIO functionality on Loongson-2F processors.
+
 config GPIO_TB10X
        bool
        select GENERIC_IRQ_CHIP

diff --git a/drivers/gpio/Makefile b/drivers/gpio/Makefile
index a452b14..07b816b 100644 (file)
--- a/drivers/gpio/Makefile
+++ b/drivers/gpio/Makefile
@@ -42,6 +42,7 @@ obj-$(CONFIG_GPIO_JANZ_TTL)   += gpio-janz-ttl.o
 obj-$(CONFIG_GPIO_KEMPLD)      += gpio-kempld.o
 obj-$(CONFIG_ARCH_KS8695)      += gpio-ks8695.o
 obj-$(CONFIG_GPIO_INTEL_MID)   += gpio-intel-mid.o
+obj-$(CONFIG_GPIO_LOONGSON)    += gpio-loongson.o
 obj-$(CONFIG_GPIO_LP3943)      += gpio-lp3943.o
 obj-$(CONFIG_ARCH_LPC32XX)     += gpio-lpc32xx.o
 obj-$(CONFIG_GPIO_LYNXPOINT)   += gpio-lynxpoint.o

diff --git a/drivers/gpio/gpio-loongson.c b/drivers/gpio/gpio-loongson.c
new file mode 100644 (file)
index 0000000..b4e69e0
--- /dev/null
+++ b/drivers/gpio/gpio-loongson.c
@@ -0,0 +1,105 @@
+/*
+ *  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);
+
+static int ls2f_gpio_direction_input(struct gpio_chip *chip, unsigned gpio)
+{
+       u32 temp;
+       u32 mask;
+
+       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;
+
+       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)
+{
+       u32 val;
+       u32 mask;
+
+       mask = 1 << (gpio + STLS2F_GPIO_IN_OFFSET);
+       spin_lock(&gpio_lock);
+       val = LOONGSON_GPIODATA;
+       spin_unlock(&gpio_lock);
+
+       return (val & mask) != 0;
+}
+
+static void ls2f_gpio_set_value(struct gpio_chip *chip,
+               unsigned gpio, int value)
+{
+       u32 val;
+       u32 mask;
+
+       mask = 1 << gpio;
+
+       spin_lock(&gpio_lock);
+       val = LOONGSON_GPIODATA;
+       if (value)
+               val |= mask;
+       else
+               val &= (~mask);
+       LOONGSON_GPIODATA = val;
+       spin_unlock(&gpio_lock);
+}
+
+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,
+       .can_sleep              = false,
+};
+
+static int __init ls2f_gpio_setup(void)
+{
+       return gpiochip_add(&ls2f_chip);
+}
+arch_initcall(ls2f_gpio_setup);