refresh gcc-4.2.3 patches

[openwrt.git] / package / kernel / modules / other.mk

diff --git a/package/kernel/modules/other.mk b/package/kernel/modules/other.mk
index 921cebf..d7d078d 100644 (file)
--- a/package/kernel/modules/other.mk
+++ b/package/kernel/modules/other.mk
@@ -133,7 +133,7 @@ define KernelPackage/pcmcia-serial
   DEPENDS:=kmod-pcmcia-core
   KCONFIG:= \
        CONFIG_PCMCIA_SERIAL_CS \
-       CONFIG_SERIAL_8250_CS
+       CONFIG_SERIAL_8250_CS
   AUTOLOAD:=$(call AutoLoad,45,serial_cs)
 endef
 
@@ -158,7 +158,7 @@ $(eval $(call KernelPackage,pcmcia-serial))
 define KernelPackage/bluetooth
   SUBMENU:=$(OTHER_MENU)
   TITLE:=Bluetooth support
-  DEPENDS:=@USB_SUPPORT @!TARGET_atheros @!TARGET_uml
+  DEPENDS:=@USB_SUPPORT @!TARGET_uml
   KCONFIG:= \
        CONFIG_BLUEZ \
        CONFIG_BLUEZ_L2CAP \
@@ -235,6 +235,7 @@ define KernelPackage/mmc
        CONFIG_MMC_BLOCK_BOUNCE=y \
        CONFIG_MMC_SDHCI=n \
        CONFIG_MMC_TIFM_SD=n \
+       CONFIG_MMC_WBSD=n \
        CONFIG_SDIO_UART=n
   FILES:= \
        $(LINUX_DIR)/drivers/mmc/core/mmc_core.$(LINUX_KMOD_SUFFIX) \
@@ -269,11 +270,27 @@ $(eval $(call KernelPackage,mmc-at91))
 ifeq ($(KERNEL),2.4)
   WATCHDOG_DIR=char
 endif
-ifeq ($(KERNEL_PATCHVER),2.6.24)
+ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,2.6.24)),1)
   WATCHDOG_DIR=watchdog
 endif
 WATCHDOG_DIR?=char/watchdog
 
+define KernelPackage/atmel-wdt
+  SUBMENU:=$(OTHER_MENU)
+  TITLE:=AT32AP700x watchdog
+  DEPENDS:=@TARGET_avr32
+  KCONFIG:=CONFIG_AT32AP700X_WDT
+  FILES:=$(LINUX_DIR)/drivers/$(WATCHDOG_DIR)/at32ap700x_wdt.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,50,at32ap700x_wdt)
+endef
+
+define KernelPackage/atmel-wdt/description
+ AT32AP700x watchdog
+endef
+
+$(eval $(call KernelPackage,atmel-wdt))
+
+
 define KernelPackage/softdog
   SUBMENU:=$(OTHER_MENU)
   TITLE:=Software watchdog driver
@@ -293,7 +310,7 @@ $(eval $(call KernelPackage,softdog))
 define KernelPackage/leds-gpio
   SUBMENU:=$(OTHER_MENU)
   TITLE:=GPIO LED support
-  DEPENDS:=@TARGET_adm5120
+  DEPENDS:= @GPIO_SUPPORT
   KCONFIG:=CONFIG_LEDS_GPIO
   FILES:=$(LINUX_DIR)/drivers/leds/leds-gpio.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,60,leds-gpio)
@@ -497,6 +514,22 @@ endef
 $(eval $(call KernelPackage,input-evdev))
 
 
+define KernelPackage/hid
+  SUBMENU:=$(OTHER_MENU)
+  TITLE:=Input even device
+  DEPENDS:=+kmod-input-core +kmod-input-evdev
+  KCONFIG:=CONFIG_HID
+  FILES:=$(LINUX_DIR)/drivers/hid/hid.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,61,hid)
+endef
+
+define KernelPackage/hid/description
+ Kernel modules for HID devices
+endef
+
+$(eval $(call KernelPackage,hid))
+
+
 define KernelPackage/input-polldev
   SUBMENU:=$(OTHER_MENU)
   TITLE:=Polled Input device support
@@ -516,7 +549,7 @@ $(eval $(call KernelPackage,input-polldev))
 define KernelPackage/input-gpio-buttons
   SUBMENU:=$(OTHER_MENU)
   TITLE:=Polled GPIO buttons input device
-  DEPENDS:=+kmod-input-polldev @LINUX_2_6
+  DEPENDS:=@GPIO_SUPPORT +kmod-input-polldev
   KCONFIG:= \
        CONFIG_INPUT_GPIO_BUTTONS \
        CONFIG_INPUT_MISC=y
@@ -534,7 +567,7 @@ $(eval $(call KernelPackage,input-gpio-buttons))
 define KernelPackage/mmc-spi
   SUBMENU:=$(OTHER_MENU)
   TITLE:=MMC/SD over SPI Support
-  DEPENDS:=@LINUX_2_6
+  DEPENDS:=@LINUX_2_6 +kmod-mmc +kmod-spi +kmod-crc-itu-t +kmod-crc7
   KCONFIG:=CONFIG_MMC_SPI
   FILES:=$(LINUX_DIR)/drivers/mmc/host/mmc_spi.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,90,mmc_spi)
@@ -563,32 +596,22 @@ $(eval $(call KernelPackage,mmc-atmelmci))
 
 define KernelPackage/spi
   SUBMENU:=$(OTHER_MENU)
-  TITLE:=Serial Peripheral Interface
-  DEPENDS:=@LINUX_2_6 +kmod-crc-itu-t +kmod-crc7
-  KCONFIG:=CONFIG_SPI=y \
-       CONFIG_MTD_DATAFLASH \
-       CONFIG_MTD_M25P80 \
-       CONFIG_SPI_AT25 \
-       CONFIG_SPI_SPIDEV \
-       CONFIG_SPI_TLE62X0
-  FILES:= \
-       $(LINUX_DIR)/drivers/spi/at25.$(LINUX_KMOD_SUFFIX) \
-       $(LINUX_DIR)/drivers/spi/spidev.$(LINUX_KMOD_SUFFIX) \
-       $(LINUX_DIR)/drivers/spi/tle62x0.$(LINUX_KMOD_SUFFIX) \
-       $(LINUX_DIR)/drivers/mtd/devices/m25p80.$(LINUX_KMOD_SUFFIX) \
-       $(LINUX_DIR)/drivers/mtd/devices/mtd_dataflash.$(LINUX_KMOD_SUFFIX)
-  AUTOLOAD:=$(call AutoLoad,90,spi)
+  TITLE:=Serial Peripheral Interface support
+  DEPENDS:=@LINUX_2_6
+  KCONFIG:=\
+       CONFIG_SPI=y \
+       CONFIG_SPI_MASTER=y
 endef
 
 define KernelPackage/spi/description
- This package contains the Serial Peripheral Interface driver
+ This package contains the Serial Peripheral Interface Master driver
 endef
 
 $(eval $(call KernelPackage,spi))
 
 define KernelPackage/spi-bitbang
   SUBMENU:=$(OTHER_MENU)
-  TITLE:=Serial Peripheral Interface bitbanging
+  TITLE:=Serial Peripheral Interface bitbanging library
   DEPENDS:=@LINUX_2_6 +kmod-spi
   KCONFIG:=CONFIG_SPI_BITBANG
   FILES:=$(LINUX_DIR)/drivers/spi/spi_bitbang.$(LINUX_KMOD_SUFFIX)
@@ -596,7 +619,38 @@ define KernelPackage/spi-bitbang
 endef
 
 define KernelPackage/spi-bitbang/description
- This package contains the Serial Peripheral Interface bitbanging library
+ This package contains the SPI bitbanging library
 endef
 
 $(eval $(call KernelPackage,spi-bitbang))
+
+define KernelPackage/spi-gpio
+  SUBMENU:=$(OTHER_MENU)
+  TITLE:=GPIO based bitbanging SPI controller
+  DEPENDS:=@GPIO_SUPPORT +kmod-spi-bitbang
+  KCONFIG:=CONFIG_SPI_GPIO
+  FILES:=$(LINUX_DIR)/drivers/spi/spi_gpio.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,92,spi_gpio)
+endef
+
+define KernelPackage/spi-gpio/description
+ This package contains the GPIO based bitbanging SPI controller driver
+endef
+
+$(eval $(call KernelPackage,spi-gpio))
+
+define KernelPackage/spi-dev
+  SUBMENU:=$(OTHER_MENU)
+  TITLE:=User mode SPI device driver
+  DEPENDS:=@LINUX_2_6 +kmod-spi
+  KCONFIG:=CONFIG_SPI_SPIDEV
+  FILES:=$(LINUX_DIR)/drivers/spi/spidev.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,91,spidev)
+endef
+
+define KernelPackage/spi-dev/description
+ This package contains the user mode SPI device driver
+endef
+
+$(eval $(call KernelPackage,spi-dev))
+