소스 검색

[PATCH] chardev: GPIO for SCx200 & PC-8736x: add proper Kconfig, Makefile entries

Replace the temp makefile hacks with proper CONFIG entries, which are also
added to Kconfig.

Signed-off-by: Jim Cromie <jim.cromie@gmail.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Jim Cromie 19 년 전
부모
커밋
7a8e2a5ea4
2개의 변경된 파일26개의 추가작업 그리고 1개의 파일을 삭제
  1. 23 0
      drivers/char/Kconfig
  2. 3 1
      drivers/char/Makefile

+ 23 - 0
drivers/char/Kconfig

@@ -939,12 +939,35 @@ config MWAVE
 config SCx200_GPIO
 config SCx200_GPIO
 	tristate "NatSemi SCx200 GPIO Support"
 	tristate "NatSemi SCx200 GPIO Support"
 	depends on SCx200
 	depends on SCx200
+	select NSC_GPIO
 	help
 	help
 	  Give userspace access to the GPIO pins on the National
 	  Give userspace access to the GPIO pins on the National
 	  Semiconductor SCx200 processors.
 	  Semiconductor SCx200 processors.
 
 
 	  If compiled as a module, it will be called scx200_gpio.
 	  If compiled as a module, it will be called scx200_gpio.
 
 
+config PC8736x_GPIO
+	tristate "NatSemi PC8736x GPIO Support"
+	depends on X86
+	default SCx200_GPIO	# mostly N
+	select NSC_GPIO		# needed for support routines
+	help
+	  Give userspace access to the GPIO pins on the National
+	  Semiconductor PC-8736x (x=[03456]) SuperIO chip.  The chip
+	  has multiple functional units, inc several managed by
+	  hwmon/pc87360 driver.  Tested with PC-87366
+
+	  If compiled as a module, it will be called pc8736x_gpio.
+
+config NSC_GPIO
+	tristate "NatSemi Base GPIO Support"
+	# selected by SCx200_GPIO and PC8736x_GPIO
+	# what about 2 selectors differing: m != y
+	help
+	  Common support used (and needed) by scx200_gpio and
+	  pc8736x_gpio drivers.  If those drivers are built as
+	  modules, this one will be too, named nsc_gpio
+
 config CS5535_GPIO
 config CS5535_GPIO
 	tristate "AMD CS5535/CS5536 GPIO (Geode Companion Device)"
 	tristate "AMD CS5535/CS5536 GPIO (Geode Companion Device)"
 	depends on X86_32
 	depends on X86_32

+ 3 - 1
drivers/char/Makefile

@@ -81,7 +81,9 @@ obj-$(CONFIG_COBALT_LCD)	+= lcd.o
 obj-$(CONFIG_PPDEV)		+= ppdev.o
 obj-$(CONFIG_PPDEV)		+= ppdev.o
 obj-$(CONFIG_NWBUTTON)		+= nwbutton.o
 obj-$(CONFIG_NWBUTTON)		+= nwbutton.o
 obj-$(CONFIG_NWFLASH)		+= nwflash.o
 obj-$(CONFIG_NWFLASH)		+= nwflash.o
-obj-$(CONFIG_SCx200_GPIO)	+= scx200_gpio.o nsc_gpio.o pc8736x_gpio.o
+obj-$(CONFIG_SCx200_GPIO)	+= scx200_gpio.o
+obj-$(CONFIG_PC8736x_GPIO)	+= pc8736x_gpio.o
+obj-$(CONFIG_NSC_GPIO)		+= nsc_gpio.o
 obj-$(CONFIG_CS5535_GPIO)	+= cs5535_gpio.o
 obj-$(CONFIG_CS5535_GPIO)	+= cs5535_gpio.o
 obj-$(CONFIG_GPIO_VR41XX)	+= vr41xx_giu.o
 obj-$(CONFIG_GPIO_VR41XX)	+= vr41xx_giu.o
 obj-$(CONFIG_TANBAC_TB0219)	+= tb0219.o
 obj-$(CONFIG_TANBAC_TB0219)	+= tb0219.o