[package] switch to newer CS5535 GPIO driver, patch from Philip Prindeville

SVN-Revision: 25631

diff --git a/package/kernel/modules/other.mk b/package/kernel/modules/other.mk
index 56cda45f701cd3d9ffa46f1d8be58bf3e77091c3..60a534c86d96037a0862a249389c442b82e8f14a 100644 (file)
--- a/package/kernel/modules/other.mk
+++ b/package/kernel/modules/other.mk
@@ -167,15 +167,9 @@ define KernelPackage/gpio-cs5535
   SUBMENU:=$(OTHER_MENU)
   TITLE:=AMD CS5535/CS5536 GPIO driver
   DEPENDS:=@TARGET_x86
   SUBMENU:=$(OTHER_MENU)
   TITLE:=AMD CS5535/CS5536 GPIO driver
   DEPENDS:=@TARGET_x86

-  KCONFIG:=CONFIG_CS5535_GPIO \
-          CONFIG_GPIO_CS5535
-ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,2.6.32)),1) 
+  KCONFIG:=CONFIG_CS5535_GPIO

   FILES:=$(LINUX_DIR)/drivers/char/cs5535_gpio.ko
   AUTOLOAD:=$(call AutoLoad,50,cs5535_gpio)
   FILES:=$(LINUX_DIR)/drivers/char/cs5535_gpio.ko
   AUTOLOAD:=$(call AutoLoad,50,cs5535_gpio)

-else
-  FILES:=$(LINUX_DIR)/drivers/gpio/cs5535-gpio.ko
-  AUTOLOAD:=$(call AutoLoad,50,cs5535-gpio)
-endif

 endef
 
 define KernelPackage/gpio-cs5535/description
 endef
 
 define KernelPackage/gpio-cs5535/description


@@ -185,6 +179,24 @@ endef
 $(eval $(call KernelPackage,gpio-cs5535))
 
 
 $(eval $(call KernelPackage,gpio-cs5535))
 
 

+define KernelPackage/gpio-cs5535-new
+  SUBMENU:=$(OTHER_MENU)
+  TITLE:=AMD CS5535/CS5536 GPIO driver with improved sysfs support
+  DEPENDS:=@TARGET_x86
+ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,2.6.33)),1) 
+  KCONFIG:=CONFIG_GPIO_CS5535 CONFIG_PCI CONFIG_GPIOLIB
+  FILES:=$(LINUX_DIR)/drivers/gpio/cs5535-gpio.ko
+  AUTOLOAD:=$(call AutoLoad,50,cs5535-gpio)
+endif
+endef
+
+define KernelPackage/gpio-cs5535-new/description
+ This package contains the new AMD CS5535/CS5536 GPIO driver
+endef
+
+$(eval $(call KernelPackage,gpio-cs5535-new))
+
+

 define KernelPackage/gpio-dev
   SUBMENU:=$(OTHER_MENU)
   TITLE:=Generic GPIO char device support
 define KernelPackage/gpio-dev
   SUBMENU:=$(OTHER_MENU)
   TITLE:=Generic GPIO char device support

diff --git a/target/linux/x86/config-default b/target/linux/x86/config-default
index e59cb74f633c7d626bf905c8067ca28dd191f8ab..326e46b9fef21f9a82f28d41182946b511e12ee6 100644 (file)
--- a/target/linux/x86/config-default
+++ b/target/linux/x86/config-default
@@ -72,6 +72,7 @@ CONFIG_CPU_IDLE_GOV_LADDER=y
 # CONFIG_CPU_SUP_TRANSMETA_32 is not set
 # CONFIG_CPU_SUP_UMC_32 is not set
 # CONFIG_CS5535_GPIO is not set
 # CONFIG_CPU_SUP_TRANSMETA_32 is not set
 # CONFIG_CPU_SUP_UMC_32 is not set
 # CONFIG_CS5535_GPIO is not set

+# CONFIG_GPIO_CS5535 is not set

 # CONFIG_CS89x0 is not set
 # CONFIG_DCDBAS is not set
 # CONFIG_DEBUG_BOOT_PARAMS is not set
 # CONFIG_CS89x0 is not set
 # CONFIG_DCDBAS is not set
 # CONFIG_DEBUG_BOOT_PARAMS is not set

diff --git a/target/linux/x86/geos/config-default b/target/linux/x86/geos/config-default
index 071f754906bbb1e6a79f7cfe6fc9ca44a5987fa9..156093259f3270af3fd412ace91ad8265a9b16be 100644 (file)
--- a/target/linux/x86/geos/config-default
+++ b/target/linux/x86/geos/config-default
@@ -26,3 +26,4 @@ CONFIG_X86_L1_CACHE_SHIFT=5
 CONFIG_X86_TSC=y
 CONFIG_X86_USE_3DNOW=y
 CONFIG_X86_USE_PPRO_CHECKSUM=y
 CONFIG_X86_TSC=y
 CONFIG_X86_USE_3DNOW=y
 CONFIG_X86_USE_PPRO_CHECKSUM=y

+CONFIG_GPIOLIB=y