Skip to contentSkip to conversation

update vr41xx GPIO driver using gpiolib

PATCH In review Yoichi Yuasa 2 participants 2 messages Jun 29, 2009

Subsystems (3)
MIPS GPIO Char and misc drivers
lore
Share & tools
lore

Yoichi Yuasa

author
#0 lore raw

PATCH v2 1/1 update vr41xx GPIO driver using gpiolib

checked by checkpatch.pl .

Signed-off-by Yoichi Yuasa <[email protected]>
arch/mips/Kconfig +1 -0
diff -pruN -X /home/yuasa/Memo/dontdiff linux-orig/arch/mips/Kconfig linux/arch/mips/Kconfig
@@ -247,6 +247,7 @@ config MACH_VR41XX
 	select CEVT_R4K
 	select CSRC_R4K
 	select SYS_HAS_CPU_VR41XX
+	select ARCH_REQUIRE_GPIOLIB
 
 config NXP_STB220
 	bool "NXP STB220 board"
arch/mips/include/asm/vr41xx/giu.h +3 -19
diff -pruN -X /home/yuasa/Memo/dontdiff linux-orig/arch/mips/include/asm/vr41xx/giu.h linux/arch/mips/include/asm/vr41xx/giu.h
@@ -1,7 +1,7 @@
 /*
  *  Include file for NEC VR4100 series General-purpose I/O Unit.
  *
- *  Copyright (C) 2005  Yoichi Yuasa <[email protected]>
+ *  Copyright (C) 2005-2009  Yoichi Yuasa <[email protected]>
  *
  *  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

@@ -41,7 +41,8 @@ typedef enum {
 	IRQ_SIGNAL_HOLD,
 } irq_signal_t;
 
-extern void vr41xx_set_irq_trigger(unsigned int pin, irq_trigger_t trigger, irq_signal_t signal);
+extern void vr41xx_set_irq_trigger(unsigned int pin, irq_trigger_t trigger,
+				   irq_signal_t signal);
 
 typedef enum {
 	IRQ_LEVEL_LOW,

@@ -51,23 +52,6 @@ typedef enum {
 extern void vr41xx_set_irq_level(unsigned int pin, irq_level_t level);
 
 typedef enum {
-	GPIO_DATA_LOW,
-	GPIO_DATA_HIGH,
-	GPIO_DATA_INVAL,
-} gpio_data_t;
-
-extern gpio_data_t vr41xx_gpio_get_pin(unsigned int pin);
-extern int vr41xx_gpio_set_pin(unsigned int pin, gpio_data_t data);
-
-typedef enum {
-	GPIO_INPUT,
-	GPIO_OUTPUT,
-	GPIO_OUTPUT_DISABLE,
-} gpio_direction_t;
-
-extern int vr41xx_gpio_set_direction(unsigned int pin, gpio_direction_t dir);
-
-typedef enum {
 	GPIO_PULL_DOWN,
 	GPIO_PULL_UP,
 	GPIO_PULL_DISABLE,
drivers/char/Kconfig +0 -4
diff -pruN -X /home/yuasa/Memo/dontdiff linux-orig/drivers/char/Kconfig linux/drivers/char/Kconfig
@@ -1029,10 +1029,6 @@ config CS5535_GPIO
 
 	  If compiled as a module, it will be called cs5535_gpio.
 
-config GPIO_VR41XX
-	tristate "NEC VR4100 series General-purpose I/O Unit support"
-	depends on CPU_VR41XX
-
 config RAW_DRIVER
 	tristate "RAW driver (/dev/raw/rawN)"
 	depends on BLOCK
drivers/char/Makefile +0 -1
diff -pruN -X /home/yuasa/Memo/dontdiff linux-orig/drivers/char/Makefile linux/drivers/char/Makefile
@@ -95,7 +95,6 @@ obj-$(CONFIG_SCx200_GPIO)	+= scx200_gpio
 obj-$(CONFIG_PC8736x_GPIO)	+= pc8736x_gpio.o
 obj-$(CONFIG_NSC_GPIO)		+= nsc_gpio.o
 obj-$(CONFIG_CS5535_GPIO)	+= cs5535_gpio.o
-obj-$(CONFIG_GPIO_VR41XX)	+= vr41xx_giu.o
 obj-$(CONFIG_GPIO_TB0219)	+= tb0219.o
 obj-$(CONFIG_TELCLOCK)		+= tlclk.o
drivers/char/vr41xx_giu.c +0 -680

680 lines not on this page · raw message

drivers/gpio/Kconfig +6 -0
diff -pruN -X /home/yuasa/Memo/dontdiff linux-orig/drivers/gpio/Kconfig linux/drivers/gpio/Kconfig
@@ -79,6 +79,12 @@ config GPIO_XILINX
 	help
 	  Say yes here to support the Xilinx FPGA GPIO device
 
+config GPIO_VR41XX
+	tristate "NEC VR4100 series General-purpose I/O Uint support"
+	depends on CPU_VR41XX
+	help
+	  Say yes here to support the NEC VR4100 series General-purpose I/O Uint
+
 comment "I2C GPIO expanders:"
 
 config GPIO_MAX732X
drivers/gpio/Makefile +1 -0
diff -pruN -X /home/yuasa/Memo/dontdiff linux-orig/drivers/gpio/Makefile linux/drivers/gpio/Makefile
@@ -13,3 +13,4 @@ obj-$(CONFIG_GPIO_PL061)	+= pl061.o
 obj-$(CONFIG_GPIO_TWL4030)	+= twl4030-gpio.o
 obj-$(CONFIG_GPIO_XILINX)	+= xilinx_gpio.o
 obj-$(CONFIG_GPIO_BT8XX)	+= bt8xxgpio.o
+obj-$(CONFIG_GPIO_VR41XX)	+= vr41xx_giu.o
drivers/gpio/vr41xx_giu.c +586 -0

586 lines not on this page · raw message

#1 lore raw

On Mon, Jun 29, 2009 at 11:11:05AM +0900, Yoichi Yuasa wrote:

Applied - after sorting out the remaining checkpatch complaint.

Thanks,

Ralf