X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=package%2Fkernel%2Flinux%2Fmodules%2Fw1.mk;h=196fe675dc295eab585ccd1adfa799fb43028a54;hb=4a5bab78a246189f080976d4c39fa500b02a505c;hp=90932168313bbac83fb1f2758a0eea6bcd05b131;hpb=4ebf19b48fafc8d94e14e4ba779969613b241a6a;p=lede.git

diff --git a/package/kernel/linux/modules/w1.mk b/package/kernel/linux/modules/w1.mk
index 9093216831..196fe675dc 100644
--- a/package/kernel/linux/modules/w1.mk
+++ b/package/kernel/linux/modules/w1.mk
@@ -14,11 +14,10 @@ define KernelPackage/w1
   TITLE:=Dallas's 1-wire support
   KCONFIG:=CONFIG_W1
   FILES:=$(LINUX_DIR)/drivers/w1/wire.ko
-  AUTOLOAD:=$(call AutoLoad,50,wire)
 endef
 
 define KernelPackage/w1/description
-  Kernel module for Dallas's 1-wire support
+ Kernel module for Dallas's 1-wire support
 endef
 
 $(eval $(call KernelPackage,w1))
@@ -38,12 +37,12 @@ define KernelPackage/w1-master-gpio
   DEPENDS:=@GPIO_SUPPORT
   KCONFIG:=CONFIG_W1_MASTER_GPIO
   FILES:=$(W1_MASTERS_DIR)/w1-gpio.ko
-  AUTOLOAD:=$(call AutoLoad,60,w1-gpio)
+  AUTOLOAD:=$(call AutoProbe,w1-gpio)
   $(call AddDepends/w1)
 endef
 
 define KernelPackage/w1-master-gpio/description
-  Kernel module for the GPIO 1-wire bus master driver
+ Kernel module for the GPIO 1-wire bus master driver
 endef
 
 $(eval $(call KernelPackage,w1-master-gpio))
@@ -52,14 +51,14 @@ define KernelPackage/w1-master-ds2482
   TITLE:=DS2482 1-wire i2c bus master driver
   KCONFIG:=CONFIG_W1_MASTER_DS2482
   FILES:=$(W1_MASTERS_DIR)/ds2482.ko
-  AUTOLOAD:=$(call AutoLoad,60,ds2482)
+  AUTOLOAD:=$(call AutoProbe,ds2482)
   $(call AddDepends/w1,+kmod-i2c-core)
 endef
 
 define KernelPackage/w1-master-ds2482/description
-  Kernel module for the DS2482 i2c 1-wire bus master driver
-  NOTE: Init with: echo ds2482 0x18 > /sys/bus/i2c/devices/i2c-0/new_device
-  or use owfs
+ Kernel module for the DS2482 i2c 1-wire bus master driver
+ NOTE: Init with: echo ds2482 0x18 > /sys/bus/i2c/devices/i2c-0/new_device
+ or use owfs
 endef
 
 $(eval $(call KernelPackage,w1-master-ds2482))
@@ -70,16 +69,33 @@ define KernelPackage/w1-master-ds2490
   DEPENDS:=@USB_SUPPORT +kmod-usb-core
   KCONFIG:=CONFIG_W1_MASTER_DS2490
   FILES:=$(W1_MASTERS_DIR)/ds2490.ko
-  AUTOLOAD:=$(call AutoLoad,60,ds2490)
+  AUTOLOAD:=$(call AutoProbe,ds2490)
   $(call AddDepends/w1)
 endef
 
 define KernelPackage/w1-master-ds2490/description
-  Kernel module for the DS2490 usb 1-wire bus master driver
+ Kernel module for the DS2490 usb 1-wire bus master driver
 endef
 
 $(eval $(call KernelPackage,w1-master-ds2490))
 
+
+define KernelPackage/w1-master-mxc
+  TITLE:=Freescale MXC 1-wire busmaster
+  DEPENDS:=@(TARGET_mxs||TARGET_imx6)
+  KCONFIG:=CONFIG_W1_MASTER_MXC
+  FILES:=$(W1_MASTERS_DIR)/mxc_w1.ko
+  AUTOLOAD:=$(call AutoProbe,mxc_w1)
+  $(call AddDepends/w1)
+endef
+
+define KernelPackage/w1-master-mxc/description
+ Kernel module for 1-wire Freescale MXC 1-wire busmaster
+endef
+
+$(eval $(call KernelPackage,w1-master-mxc))
+
+
 #
 # 1-wire slaves
 #
@@ -87,12 +103,12 @@ define KernelPackage/w1-slave-therm
   TITLE:=Thermal family implementation
   KCONFIG:=CONFIG_W1_SLAVE_THERM
   FILES:=$(W1_SLAVES_DIR)/w1_therm.ko
-  AUTOLOAD:=$(call AutoLoad,70,w1_therm)
+  AUTOLOAD:=$(call AutoProbe,w1_therm)
   $(call AddDepends/w1)
 endef
 
 define KernelPackage/w1-slave-therm/description
-  Kernel module for 1-wire thermal sensors
+ Kernel module for 1-wire thermal sensors
 endef
 
 $(eval $(call KernelPackage,w1-slave-therm))
@@ -102,12 +118,12 @@ define KernelPackage/w1-slave-smem
   TITLE:=Simple 64bit memory family implementation
   KCONFIG:=CONFIG_W1_SLAVE_SMEM
   FILES:=$(W1_SLAVES_DIR)/w1_smem.ko
-  AUTOLOAD:=$(call AutoLoad,70,w1_smem)
+  AUTOLOAD:=$(call AutoProbe,w1_smem)
   $(call AddDepends/w1)
 endef
 
 define KernelPackage/w1-slave-smem/description
-  Kernel module for 1-wire simple 64bit memory rom(ds2401/ds2411/ds1990*)
+ Kernel module for 1-wire simple 64bit memory rom(ds2401/ds2411/ds1990*)
 endef
 
 $(eval $(call KernelPackage,w1-slave-smem))
@@ -116,12 +132,12 @@ define KernelPackage/w1-slave-ds2431
   TITLE:=DS2431 1kb EEPROM driver
   KCONFIG:= CONFIG_W1_SLAVE_DS2431
   FILES:=$(W1_SLAVES_DIR)/w1_ds2431.ko
-  AUTOLOAD:=$(call AutoLoad,70,w1_ds2431)
+  AUTOLOAD:=$(call AutoProbe,w1_ds2431)
   $(call AddDepends/w1)
 endef
 
 define KernelPackage/w1-slave-ds2431/description
-  Kernel module for 1-wire 1kb EEPROM (DS2431)
+ Kernel module for 1-wire 1kb EEPROM (DS2431)
 endef
 
 $(eval $(call KernelPackage,w1-slave-ds2431))
@@ -132,12 +148,12 @@ define KernelPackage/w1-slave-ds2433
 	CONFIG_W1_SLAVE_DS2433 \
 	CONFIG_W1_SLAVE_DS2433_CRC=n
   FILES:=$(W1_SLAVES_DIR)/w1_ds2433.ko
-  AUTOLOAD:=$(call AutoLoad,70,w1_ds2433)
+  AUTOLOAD:=$(call AutoProbe,w1_ds2433)
   $(call AddDepends/w1)
 endef
 
 define KernelPackage/w1-slave-ds2433/description
-  Kernel module for 1-wire 4kb EEPROM (DS2433)
+ Kernel module for 1-wire 4kb EEPROM (DS2433)
 endef
 
 $(eval $(call KernelPackage,w1-slave-ds2433))
@@ -149,12 +165,28 @@ define KernelPackage/w1-slave-ds2760
 	CONFIG_W1_SLAVE_DS2760 \
 	CONFIG_W1_SLAVE_DS2433_CRC=n
   FILES:=$(W1_SLAVES_DIR)/w1_ds2760.ko
-  AUTOLOAD:=$(call AutoLoad,70,w1_ds2760)
+  AUTOLOAD:=$(call AutoProbe,w1_ds2760)
   $(call AddDepends/w1)
 endef
 
 define KernelPackage/w1-slave-ds2760/description
-  Kernel module for 1-wire DS2760 battery monitor chip support
+ Kernel module for 1-wire DS2760 battery monitor chip support
 endef
 
 $(eval $(call KernelPackage,w1-slave-ds2760))
+
+
+define KernelPackage/w1-slave-ds2413
+  TITLE:=DS2413 2 Ch. Addressable Switch
+  KCONFIG:= \
+	CONFIG_W1_SLAVE_DS2413
+  FILES:=$(W1_SLAVES_DIR)/w1_ds2413.ko
+  AUTOLOAD:=$(call AutoProbe,w1_ds2413)
+  $(call AddDepends/w1)
+endef
+
+define KernelPackage/w1-slave-ds2413/description
+ Kernel module for 1-wire DS2413 Dual Channel Addressable Switch support
+endef
+
+$(eval $(call KernelPackage,w1-slave-ds2413))