13 files changed, 126 insertions, 91 deletions

diff --git a/drivers/w1/Kconfig b/drivers/w1/Kconfig
index 4baf61a22327..5e61ed59a41e 100644
--- a/drivers/w1/Kconfig
+++ b/drivers/w1/Kconfig
@@ -11,63 +11,7 @@ config W1
           This W1 support can also be built as a module.  If so, the module
           will be called wire.ko.
 
-config W1_MATROX
-        tristate "Matrox G400 transport layer for 1-wire"
-        depends on W1 && PCI
-        help
-          Say Y here if you want to communicate with your 1-wire devices
-          using Matrox's G400 GPIO pins.
-
-          This support is also available as a module.  If so, the module
-          will be called matrox_w1.ko.
-
-config W1_DS9490
-        tristate "DS9490R transport layer driver"
-        depends on W1 && USB
-        help
-          Say Y here if you want to have a driver for DS9490R UWB <-> W1 bridge.
-
-          This support is also available as a module.  If so, the module
-          will be called ds9490r.ko.
-
-config W1_DS9490_BRIDGE
-        tristate "DS9490R USB <-> W1 transport layer for 1-wire"
-        depends on W1_DS9490
-        help
-          Say Y here if you want to communicate with your 1-wire devices
-          using DS9490R USB bridge.
-
-          This support is also available as a module.  If so, the module
-          will be called ds_w1_bridge.ko.
-
-config W1_THERM
-        tristate "Thermal family implementation"
-        depends on W1
-        help
-          Say Y here if you want to connect 1-wire thermal sensors to you
-          wire.
-
-config W1_SMEM
-        tristate "Simple 64bit memory family implementation"
-        depends on W1
-        help
-          Say Y here if you want to connect 1-wire
-          simple 64bit memory rom(ds2401/ds2411/ds1990*) to you wire.
-
-config W1_DS2433
-        tristate "4kb EEPROM family support (DS2433)"
-        depends on W1
-        help
-          Say Y here if you want to use a 1-wire
-          4kb EEPROM family device (DS2433).
-
-config W1_DS2433_CRC
-        bool "Protect DS2433 data with a CRC16"
-        depends on W1_DS2433
-        select CRC16
-        help
-          Say Y here to protect DS2433 data with a CRC16.
-          Each block has 30 bytes of data and a two byte CRC16.
-          Full block writes are only allowed if the CRC is valid.
+source drivers/w1/masters/Kconfig
+source drivers/w1/slaves/Kconfig
 
 endmenu
diff --git a/drivers/w1/Makefile b/drivers/w1/Makefile
index 01fb54391470..0c2aa22d8c04 100644
--- a/drivers/w1/Makefile
+++ b/drivers/w1/Makefile
@@ -13,13 +13,5 @@ endif
 obj-$(CONFIG_W1)        += wire.o
 wire-objs               := w1.o w1_int.o w1_family.o w1_netlink.o w1_io.o
 
-obj-$(CONFIG_W1_MATROX)         += matrox_w1.o
-obj-$(CONFIG_W1_THERM)          += w1_therm.o
-obj-$(CONFIG_W1_SMEM)           += w1_smem.o
+obj-y                   += masters/ slaves/
 
-obj-$(CONFIG_W1_DS9490)         += ds9490r.o
-ds9490r-objs    := dscore.o
-
-obj-$(CONFIG_W1_DS9490_BRIDGE)  += ds_w1_bridge.o
-
-obj-$(CONFIG_W1_DS2433)         += w1_ds2433.o
diff --git a/drivers/w1/masters/Kconfig b/drivers/w1/masters/Kconfig
new file mode 100644
index 000000000000..51bd64d0e54d
--- /dev/null
+++ b/drivers/w1/masters/Kconfig
@@ -0,0 +1,38 @@
+#
+# 1-wire bus master configuration
+#
+
+menu "1-wire Bus Masters"
+        depends on W1
+
+config W1_MASTER_MATROX
+        tristate "Matrox G400 transport layer for 1-wire"
+        depends on W1 && PCI
+        help
+          Say Y here if you want to communicate with your 1-wire devices
+          using Matrox's G400 GPIO pins.
+
+          This support is also available as a module.  If so, the module
+          will be called matrox_w1.ko.
+
+config W1_MASTER_DS9490
+        tristate "DS9490R transport layer driver"
+        depends on W1 && USB
+        help
+          Say Y here if you want to have a driver for DS9490R UWB <-> W1 bridge.
+
+          This support is also available as a module.  If so, the module
+          will be called ds9490r.ko.
+
+config W1_MASTER_DS9490_BRIDGE
+        tristate "DS9490R USB <-> W1 transport layer for 1-wire"
+        depends on W1_DS9490
+        help
+          Say Y here if you want to communicate with your 1-wire devices
+          using DS9490R USB bridge.
+
+          This support is also available as a module.  If so, the module
+          will be called ds_w1_bridge.ko.
+
+endmenu
+
diff --git a/drivers/w1/masters/Makefile b/drivers/w1/masters/Makefile
new file mode 100644
index 000000000000..d9b84e522d6c
--- /dev/null
+++ b/drivers/w1/masters/Makefile
@@ -0,0 +1,11 @@
+#
+# Makefile for 1-wire bus master drivers.
+#
+
+obj-$(CONFIG_W1_MASTER_MATROX)          += matrox_w1.o
+
+obj-$(CONFIG_W1_MASTER_DS9490)          += ds9490r.o
+ds9490r-objs    := dscore.o
+
+obj-$(CONFIG_W1_MASTER_DS9490_BRIDGE)   += ds_w1_bridge.o
+
diff --git a/drivers/w1/ds_w1_bridge.c b/drivers/w1/masters/ds_w1_bridge.c
index 29e01d57c6be..5d30783a3eb6 100644
--- a/drivers/w1/ds_w1_bridge.c
+++ b/drivers/w1/masters/ds_w1_bridge.c
@@ -22,8 +22,8 @@
 #include <linux/module.h>
 #include <linux/types.h>
 
-#include "../w1/w1.h"
-#include "../w1/w1_int.h"
+#include "../w1.h"
+#include "../w1_int.h"
 #include "dscore.h"
 
 static struct ds_device *ds_dev;
diff --git a/drivers/w1/dscore.c b/drivers/w1/masters/dscore.c
index b9146306df49..2cf7776a7080 100644
--- a/drivers/w1/dscore.c
+++ b/drivers/w1/masters/dscore.c
@@ -340,7 +340,7 @@ int ds_reset(struct ds_device *dev, struct ds_status *st)
                 return -EIO;
         }
 #endif
-        
+
         return 0;
 }
 
@@ -348,7 +348,7 @@ int ds_reset(struct ds_device *dev, struct ds_status *st)
 int ds_set_speed(struct ds_device *dev, int speed)
 {
         int err;
-        
+
         if (speed != SPEED_NORMAL && speed != SPEED_FLEXIBLE && speed != SPEED_OVERDRIVE)
                 return -EINVAL;
 
diff --git a/drivers/w1/dscore.h b/drivers/w1/masters/dscore.h
index 6cf5671d6ebe..6cf5671d6ebe 100644
--- a/drivers/w1/dscore.h
+++ b/drivers/w1/masters/dscore.h
diff --git a/drivers/w1/matrox_w1.c b/drivers/w1/masters/matrox_w1.c
index 750a1aacf6f5..591809cbbb97 100644
--- a/drivers/w1/matrox_w1.c
+++ b/drivers/w1/masters/matrox_w1.c
@@ -19,8 +19,8 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
-#include <asm/atomic.h>
 #include <asm/types.h>
+#include <asm/atomic.h>
 #include <asm/io.h>
 
 #include <linux/delay.h>
@@ -35,9 +35,9 @@
 #include <linux/pci.h>
 #include <linux/timer.h>
 
-#include "w1.h"
-#include "w1_int.h"
-#include "w1_log.h"
+#include "../w1.h"
+#include "../w1_int.h"
+#include "../w1_log.h"
 
 MODULE_LICENSE("GPL");
 MODULE_AUTHOR("Evgeniy Polyakov <johnpol@2ka.mipt.ru>");
diff --git a/drivers/w1/slaves/Kconfig b/drivers/w1/slaves/Kconfig
new file mode 100644
index 000000000000..f9d4c91fc533
--- /dev/null
+++ b/drivers/w1/slaves/Kconfig
@@ -0,0 +1,38 @@
+#
+# 1-wire slaves configuration
+#
+
+menu "1-wire Slaves"
+        depends on W1
+
+config W1_SLAVE_THERM
+        tristate "Thermal family implementation"
+        depends on W1
+        help
+          Say Y here if you want to connect 1-wire thermal sensors to you
+          wire.
+
+config W1_SLAVE_SMEM
+        tristate "Simple 64bit memory family implementation"
+        depends on W1
+        help
+          Say Y here if you want to connect 1-wire
+          simple 64bit memory rom(ds2401/ds2411/ds1990*) to you wire.
+
+config W1_SLAVE_DS2433
+        tristate "4kb EEPROM family support (DS2433)"
+        depends on W1
+        help
+          Say Y here if you want to use a 1-wire
+          4kb EEPROM family device (DS2433).
+
+config W1_SLAVE_DS2433_CRC
+        bool "Protect DS2433 data with a CRC16"
+        depends on W1_DS2433
+        select CRC16
+        help
+          Say Y here to protect DS2433 data with a CRC16.
+          Each block has 30 bytes of data and a two byte CRC16.
+          Full block writes are only allowed if the CRC is valid.
+
+endmenu
diff --git a/drivers/w1/slaves/Makefile b/drivers/w1/slaves/Makefile
new file mode 100644
index 000000000000..70e21e2d70c3
--- /dev/null
+++ b/drivers/w1/slaves/Makefile
@@ -0,0 +1,12 @@
+#
+# Makefile for the Dallas's 1-wire slaves.
+#
+
+ifeq ($(CONFIG_W1_SLAVE_DS2433_CRC), y)
+EXTRA_CFLAGS += -DCONFIG_W1_F23_CRC
+endif
+
+obj-$(CONFIG_W1_SLAVE_THERM)    += w1_therm.o
+obj-$(CONFIG_W1_SLAVE_SMEM)     += w1_smem.o
+obj-$(CONFIG_W1_SLAVE_DS2433)   += w1_ds2433.o
+
diff --git a/drivers/w1/w1_ds2433.c b/drivers/w1/slaves/w1_ds2433.c
index 1e3d98aac12d..fb118be789ea 100644
--- a/drivers/w1/w1_ds2433.c
+++ b/drivers/w1/slaves/w1_ds2433.c
@@ -21,10 +21,10 @@
 
 #endif
 
-#include "w1.h"
-#include "w1_io.h"
-#include "w1_int.h"
-#include "w1_family.h"
+#include "../w1.h"
+#include "../w1_io.h"
+#include "../w1_int.h"
+#include "../w1_family.h"
 
 MODULE_LICENSE("GPL");
 MODULE_AUTHOR("Ben Gardner <bgardner@wabtec.com>");
diff --git a/drivers/w1/w1_smem.c b/drivers/w1/slaves/w1_smem.c
index e3209d0aca9b..c6d3be54f94c 100644
--- a/drivers/w1/w1_smem.c
+++ b/drivers/w1/slaves/w1_smem.c
@@ -27,10 +27,10 @@
 #include <linux/device.h>
 #include <linux/types.h>
 
-#include "w1.h"
-#include "w1_io.h"
-#include "w1_int.h"
-#include "w1_family.h"
+#include "../w1.h"
+#include "../w1_io.h"
+#include "../w1_int.h"
+#include "../w1_family.h"
 
 MODULE_LICENSE("GPL");
 MODULE_AUTHOR("Evgeniy Polyakov <johnpol@2ka.mipt.ru>");
@@ -51,7 +51,7 @@ static int __init w1_smem_init(void)
         err = w1_register_family(&w1_smem_family_01);
         if (err)
                 return err;
-        
+
         err = w1_register_family(&w1_smem_family_81);
         if (err) {
                 w1_unregister_family(&w1_smem_family_01);
diff --git a/drivers/w1/w1_therm.c b/drivers/w1/slaves/w1_therm.c
index 4577df3cfc48..536d16d78de7 100644
--- a/drivers/w1/w1_therm.c
+++ b/drivers/w1/slaves/w1_therm.c
@@ -28,10 +28,10 @@
 #include <linux/types.h>
 #include <linux/delay.h>
 
-#include "w1.h"
-#include "w1_io.h"
-#include "w1_int.h"
-#include "w1_family.h"
+#include "../w1.h"
+#include "../w1_io.h"
+#include "../w1_int.h"
+#include "../w1_family.h"
 
 MODULE_LICENSE("GPL");
 MODULE_AUTHOR("Evgeniy Polyakov <johnpol@2ka.mipt.ru>");
@@ -123,12 +123,12 @@ static inline int w1_DS18S20_convert_temp(u8 rom[9])
 
         if (!rom[7])
                 return 0;
-        
+
         if (rom[1] == 0)
                 t = ((s32)rom[0] >> 1)*1000;
         else
                 t = 1000*(-1*(s32)(0x100-rom[0]) >> 1);
-        
+
         t -= 250;
         h = 1000*((s32)rom[7] - (s32)rom[6]);
         h /= (s32)rom[7];
@@ -231,7 +231,7 @@ static ssize_t w1_therm_read_bin(struct kobject *kobj, char *buf, loff_t off, si
 
         for (i = 0; i < 9; ++i)
                 count += sprintf(buf + count, "%02x ", sl->rom[i]);
-        
+
         count += sprintf(buf + count, "t=%d\n", w1_convert_temp(rom, sl->family->fid));
 out:
         up(&dev->mutex);