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

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

[PATCH] w1_smem: support for new simple rom family [0x81 id]. 



Support for new simple rom family [0x81 id].
It is the same as existing 0x01 family,
which is used in ds9490* w1 adapters.
Patch is on top of new-thermal-sensor-families patch.

Signed-off-by: default avatarEvgeniy Polyakov <johnpol@2ka.mipt.ru>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 718a538f

drivers/w1/w1_family.h

+2 −1
Original line number Original line Diff line number Diff line
@@ -27,7 +27,8 @@ 
#include <asm/atomic.h>

#include <asm/atomic.h>





#define W1_FAMILY_DEFAULT	0

#define W1_FAMILY_DEFAULT	0

#define W1_FAMILY_SMEM		0x01

#define W1_FAMILY_SMEM_01	0x01

#define W1_FAMILY_SMEM_81	0x81

#define W1_THERM_DS18S20 	0x10

#define W1_THERM_DS18S20 	0x10

#define W1_THERM_DS1822  	0x22

#define W1_THERM_DS1822  	0x22

#define W1_THERM_DS18B20 	0x28

#define W1_THERM_DS18B20 	0x28

drivers/w1/w1_smem.c

+22 −4
Original line number Original line Diff line number Diff line
@@ -99,19 +99,37 @@ out_dec: 
	return count;

	return count;

}

}





static struct w1_family w1_smem_family = {

static struct w1_family w1_smem_family_01 = {

	.fid = W1_FAMILY_SMEM,

	.fid = W1_FAMILY_SMEM_01,

	.fops = &w1_smem_fops,

};



static struct w1_family w1_smem_family_81 = {

	.fid = W1_FAMILY_SMEM_81,

	.fops = &w1_smem_fops,

	.fops = &w1_smem_fops,

};

};





static int __init w1_smem_init(void)

static int __init w1_smem_init(void)

{

{

	return w1_register_family(&w1_smem_family);

	int err;



	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);

		return err;

	}



	return 0;

}

}





static void __exit w1_smem_fini(void)

static void __exit w1_smem_fini(void)

{

{

	w1_unregister_family(&w1_smem_family);

	w1_unregister_family(&w1_smem_family_01);

	w1_unregister_family(&w1_smem_family_81);

}

}





module_init(w1_smem_init);

module_init(w1_smem_init);