Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bd529cfb authored by Evgeniy Polyakov's avatar Evgeniy Polyakov Committed by Greg Kroah-Hartman
Browse files

[PATCH] W1: Move w1 bus master code into 'w1/masters' and move w1 slave code into 'w1/slaves' 



Signed-off-by: default avatarBen Gardner <bgardner@wabtec.com>
Signed-off-by: default avatarEvgeniy Polyakov <johnpol@2ka.mipt.ru>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent ccd69940

drivers/w1/Kconfig

+2 −58
Original line number Original line Diff line number Diff line
@@ -11,63 +11,7 @@ config W1 
	  This W1 support can also be built as a module.  If so, the module

	  This W1 support can also be built as a module.  If so, the module

	  will be called wire.ko.

	  will be called wire.ko.





config W1_MATROX

source drivers/w1/masters/Kconfig

	tristate "Matrox G400 transport layer for 1-wire"

source drivers/w1/slaves/Kconfig

	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.





endmenu
 
endmenu

drivers/w1/Makefile

+1 −9
Original line number Original line Diff line number Diff line
@@ -13,13 +13,5 @@ endif 
obj-$(CONFIG_W1)	+= wire.o

obj-$(CONFIG_W1)	+= wire.o

wire-objs		:= w1.o w1_int.o w1_family.o w1_netlink.o w1_io.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-y			+= masters/ slaves/

obj-$(CONFIG_W1_THERM)		+= w1_therm.o

obj-$(CONFIG_W1_SMEM)		+= w1_smem.o

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

drivers/w1/masters/Kconfig

0 → 100644
+38 −0
Original line number Original line Diff line number Diff line 
#

# 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

drivers/w1/masters/Makefile

0 → 100644
+11 −0
Original line number Original line Diff line number Diff line 
#

# 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

drivers/w1/ds_w1_bridge.c→drivers/w1/masters/ds_w1_bridge.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -22,8 +22,8 @@ 
#include <linux/module.h>

#include <linux/module.h>

#include <linux/types.h>

#include <linux/types.h>





#include "../w1/w1.h"

#include "../w1.h"

#include "../w1/w1_int.h"

#include "../w1_int.h"

#include "dscore.h"

#include "dscore.h"





static struct ds_device *ds_dev;

static struct ds_device *ds_dev;