summaryrefslogtreecommitdiffstats
path: root/drivers/w1/w1_family.h
diff options
context:
space:
mode:
authorNeilBrown <neilb@suse.de>2014-11-19 04:04:20 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-11-27 04:09:02 +0100
commit4b7e4f8289c1ca60accb6c1baf31984f69bc2771 (patch)
treecb5debd8a6f879a77a6481eba8b211d396276da5 /drivers/w1/w1_family.h
parentw1: avoid potential u16 overflow (diff)
downloadlinux-4b7e4f8289c1ca60accb6c1baf31984f69bc2771.tar.xz
linux-4b7e4f8289c1ca60accb6c1baf31984f69bc2771.zip
w1: support auto-load of w1_bq27000 module.
1/ change request_module call to zero-pad single digit family numbers. This appears to be the intention of the code, but not what it actually does. This means that the alias created for W1_FAMILY_SMEM_01 might actually be useful. 2/ Define a family name for the BQ27000 battery charge monitor. Unfortunately this is the same number as W1_FAMILY_SMEM_01 so if both a compiled on a system, one module might need to be blacklisted. 3/ Add a MODULE_ALIAS for the bq27000. Acked-by: Evgeniy Polyakov <zbr@ioremap.net> Signed-off-by: NeilBrown <neilb@suse.de> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/w1/w1_family.h')
-rw-r--r--drivers/w1/w1_family.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/w1/w1_family.h b/drivers/w1/w1_family.h
index 0d18365b61ad..ed5dcb80a1f7 100644
--- a/drivers/w1/w1_family.h
+++ b/drivers/w1/w1_family.h
@@ -27,6 +27,7 @@
#include <linux/atomic.h>
#define W1_FAMILY_DEFAULT 0
+#define W1_FAMILY_BQ27000 0x01
#define W1_FAMILY_SMEM_01 0x01
#define W1_FAMILY_SMEM_81 0x81
#define W1_THERM_DS18S20 0x10