Skip to contentSkip to conversation

CS5535: Drop the Geode-specific MFGPT/GPIO code

PATCH New Andres Salomon 1 participant 1 message Nov 8, 2009

Subsystems (4)
lore
Share & tools
lore
#0 lore raw

PATCH 6/6 CS5535: Drop the Geode-specific MFGPT/GPIO code

With generic modular drivers handling all of this stuff, the geode-specific code can go away. The cs5535-gpio, cs5535-mfgpt, and cs5535-clockevt drivers now handle this.

---
 arch/x86/Kconfig             |   10 -
 arch/x86/include/asm/geode.h |  117 ------------
 arch/x86/kernel/Makefile     |    1 -
 arch/x86/kernel/geode_32.c   |  174 ------------------
 arch/x86/kernel/mfgpt_32.c   |  410 ------------------------------------------
 drivers/gpio/Kconfig         |    2 +-
 drivers/misc/Kconfig         |    2 +-
 7 files changed, 2 insertions(+), 714 deletions(-)
 delete mode 100644 arch/x86/kernel/geode_32.c
 delete mode 100644 arch/x86/kernel/mfgpt_32.c
arch/x86/Kconfig +0 -10
index 37a4d80..629699e 100644
@@ -2011,16 +2011,6 @@ config SCx200HR_TIMER
 	  processor goes idle (as is done by the scheduler).  The
 	  other workaround is idle=poll boot option.
 
-config GEODE_MFGPT_TIMER
-	def_bool y
-	prompt "Geode Multi-Function General Purpose Timer (MFGPT) events"
-	depends on MGEODE_LX && GENERIC_TIME && GENERIC_CLOCKEVENTS
-	---help---
-	  This driver provides a clock event source based on the MFGPT
-	  timer(s) in the CS5535 and CS5536 companion chip for the geode.
-	  MFGPTs have a better resolution and max interval than the
-	  generic PIT, and are suitable for use as high-res timers.
-
 config OLPC
 	bool "One Laptop Per Child support"
 	select GPIOLIB
arch/x86/include/asm/geode.h +0 -117

127 lines not on this page · raw message

arch/x86/kernel/Makefile +0 -1
index d8e5d0c..b0dc053 100644
@@ -89,7 +89,6 @@ obj-$(CONFIG_EARLY_PRINTK)	+= early_printk.o
 obj-$(CONFIG_HPET_TIMER) 	+= hpet.o
 
 obj-$(CONFIG_K8_NB)		+= k8.o
-obj-$(CONFIG_MGEODE_LX)		+= geode_32.o mfgpt_32.o
 obj-$(CONFIG_DEBUG_RODATA_TEST)	+= test_rodata.o
 obj-$(CONFIG_DEBUG_NX_TEST)	+= test_nx.o
 
arch/x86/kernel/geode_32.c deleted +0 -174

174 lines not on this page · raw message

arch/x86/kernel/mfgpt_32.c deleted +0 -410

410 lines not on this page · raw message

drivers/gpio/Kconfig +1 -1
index df4b82d..57ca339 100644
@@ -176,7 +176,7 @@ comment "PCI GPIO expanders:"
 
 config GPIO_CS5535
 	tristate "AMD CS5535/CS5536 GPIO support"
-	depends on PCI && !CS5535_GPIO && !MGEODE_LX
+	depends on PCI && !CS5535_GPIO
 	help
 	  The AMD CS5535 and CS5536 southbridges support 28 GPIO pins that
 	  can be used for quite a number of things.  The CS5535/6 is found on
drivers/misc/Kconfig +1 -1
index e8cc9b2..9740cd8 100644
@@ -175,7 +175,7 @@ config SGI_XP
 
 config CS5535_MFGPT
 	tristate "CS5535/CS5536 Geode Multi-Function General Purpose Timer (MFGPT) support"
-	depends on PCI && !MGEODE_LX
+	depends on PCI
 	default n
 	help
 	  This driver provides access to MFGPT functionality for other
Signature · 1 line
1.5.6.5