Skip to content

L
linux
Commit b61e056b authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files
Options

I2C: moved from all sensor drivers from normal_i2c_range to normal_i2c 

Signed-off-by: default avatarGreg Kroah-Hartman <greg@kroah.com>
parent bf01bbad
Hide whitespace changes
Inline Side-by-side
Showing with 42 additions and 53 deletions
drivers/i2c/chips/adm1021.c
View file @ b61e056b
...@@ -40,10 +40,10 @@ ...@@ -40,10 +40,10 @@
#define ADM1021_ALARM_RTEMP_NA 0x04 #define ADM1021_ALARM_RTEMP_NA 0x04
/* Addresses to scan */ /* Addresses to scan */
static unsigned short normal_i2c[] = { I2C_CLIENT_END }; static unsigned short normal_i2c[] = { 0x18, 0x19, 0x1a,
static unsigned short normal_i2c_range[] = { 0x18, 0x1a, 0x29, 0x2b, 0x29, 0x2a, 0x2b,
0x4c, 0x4e, I2C_CLIENT_END 0x4c, 0x4d, 0x4e,
}; I2C_CLIENT_END };
static unsigned int normal_isa[] = { I2C_CLIENT_ISA_END }; static unsigned int normal_isa[] = { I2C_CLIENT_ISA_END };
/* Insmod parameters */ /* Insmod parameters */
......
drivers/i2c/chips/adm1025.c
View file @ b61e056b
...@@ -59,8 +59,7 @@ ...@@ -59,8 +59,7 @@
* NE1619 has two possible addresses: 0x2c and 0x2d. * NE1619 has two possible addresses: 0x2c and 0x2d.
*/ */
static unsigned short normal_i2c[] = { I2C_CLIENT_END }; static unsigned short normal_i2c[] = { 0x2c, 0x2d, 0x2e, I2C_CLIENT_END };
static unsigned short normal_i2c_range[] = { 0x2c, 0x2e, I2C_CLIENT_END };
static unsigned int normal_isa[] = { I2C_CLIENT_ISA_END }; static unsigned int normal_isa[] = { I2C_CLIENT_ISA_END };
/* /*
......
drivers/i2c/chips/adm1031.c
View file @ b61e056b
...@@ -57,8 +57,7 @@ ...@@ -57,8 +57,7 @@
#define ADM1031_CONF2_TEMP_ENABLE(chan) (0x10 << (chan)) #define ADM1031_CONF2_TEMP_ENABLE(chan) (0x10 << (chan))
/* Addresses to scan */ /* Addresses to scan */
static unsigned short normal_i2c[] = { I2C_CLIENT_END }; static unsigned short normal_i2c[] = { 0x2c, 0x2d, 0x2e, I2C_CLIENT_END };
static unsigned short normal_i2c_range[] = { 0x2c, 0x2e, I2C_CLIENT_END };
static unsigned int normal_isa[] = { I2C_CLIENT_ISA_END }; static unsigned int normal_isa[] = { I2C_CLIENT_ISA_END };
/* Insmod parameters */ /* Insmod parameters */
......
drivers/i2c/chips/asb100.c
View file @ b61e056b
...@@ -56,8 +56,8 @@ ...@@ -56,8 +56,8 @@
#define ASB100_VERSION "1.0.0" #define ASB100_VERSION "1.0.0"
/* I2C addresses to scan */ /* I2C addresses to scan */
static unsigned short normal_i2c[] = { I2C_CLIENT_END }; static unsigned short normal_i2c[] = { 0x28, 0x29, 0x2a, 0x2b, 0x2c, 0x2d,
static unsigned short normal_i2c_range[] = { 0x28, 0x2f, I2C_CLIENT_END }; 0x2e, 0x2f, I2C_CLIENT_END };
/* ISA addresses to scan (none) */ /* ISA addresses to scan (none) */
static unsigned int normal_isa[] = { I2C_CLIENT_ISA_END }; static unsigned int normal_isa[] = { I2C_CLIENT_ISA_END };
......
drivers/i2c/chips/ds1621.c
View file @ b61e056b
...@@ -29,8 +29,8 @@ ...@@ -29,8 +29,8 @@
#include "lm75.h" #include "lm75.h"
/* Addresses to scan */ /* Addresses to scan */
static unsigned short normal_i2c[] = { I2C_CLIENT_END }; static unsigned short normal_i2c[] = { 0x48, 0x49, 0x4a, 0x4b, 0x4c,
static unsigned short normal_i2c_range[] = { 0x48, 0x4f, I2C_CLIENT_END }; 0x4d, 0x4e, 0x4f, I2C_CLIENT_END };
static unsigned int normal_isa[] = { I2C_CLIENT_ISA_END }; static unsigned int normal_isa[] = { I2C_CLIENT_ISA_END };
/* Insmod parameters */ /* Insmod parameters */
......
drivers/i2c/chips/eeprom.c
View file @ b61e056b
...@@ -36,8 +36,8 @@ ...@@ -36,8 +36,8 @@
#include <linux/i2c-sensor.h> #include <linux/i2c-sensor.h>
/* Addresses to scan */ /* Addresses to scan */
static unsigned short normal_i2c[] = { I2C_CLIENT_END }; static unsigned short normal_i2c[] = { 0x50, 0x51, 0x52, 0x53, 0x54,
static unsigned short normal_i2c_range[] = { 0x50, 0x57, I2C_CLIENT_END }; 0x55, 0x56, 0x57, I2C_CLIENT_END };
static unsigned int normal_isa[] = { I2C_CLIENT_ISA_END }; static unsigned int normal_isa[] = { I2C_CLIENT_ISA_END };
/* Insmod parameters */ /* Insmod parameters */
......
drivers/i2c/chips/fscher.c
View file @ b61e056b
...@@ -38,7 +38,6 @@ ...@@ -38,7 +38,6 @@
*/ */
static unsigned short normal_i2c[] = { 0x73, I2C_CLIENT_END }; static unsigned short normal_i2c[] = { 0x73, I2C_CLIENT_END };
static unsigned short normal_i2c_range[] = { I2C_CLIENT_END };
static unsigned int normal_isa[] = { I2C_CLIENT_ISA_END }; static unsigned int normal_isa[] = { I2C_CLIENT_ISA_END };
/* /*
......
drivers/i2c/chips/gl518sm.c
View file @ b61e056b
...@@ -45,7 +45,6 @@ ...@@ -45,7 +45,6 @@
/* Addresses to scan */ /* Addresses to scan */
static unsigned short normal_i2c[] = { 0x2c, 0x2d, I2C_CLIENT_END }; static unsigned short normal_i2c[] = { 0x2c, 0x2d, I2C_CLIENT_END };
static unsigned short normal_i2c_range[] = { I2C_CLIENT_END };
static unsigned int normal_isa[] = { I2C_CLIENT_ISA_END }; static unsigned int normal_isa[] = { I2C_CLIENT_ISA_END };
/* Insmod parameters */ /* Insmod parameters */
......
drivers/i2c/chips/it87.c
View file @ b61e056b
...@@ -42,8 +42,10 @@ ...@@ -42,8 +42,10 @@
/* Addresses to scan */ /* Addresses to scan */
static unsigned short normal_i2c[] = { I2C_CLIENT_END }; static unsigned short normal_i2c[] = { 0x20, 0x21, 0x22, 0x23, 0x24,
static unsigned short normal_i2c_range[] = { 0x20, 0x2f, I2C_CLIENT_END }; 0x25, 0x26, 0x27, 0x28, 0x29,
0x2a, 0x2b, 0x2c, 0x2d, 0x2e,
0x2f, I2C_CLIENT_END };
static unsigned int normal_isa[] = { 0x0290, I2C_CLIENT_ISA_END }; static unsigned int normal_isa[] = { 0x0290, I2C_CLIENT_ISA_END };
/* Insmod parameters */ /* Insmod parameters */
......
drivers/i2c/chips/lm63.c
View file @ b61e056b
...@@ -50,7 +50,6 @@ ...@@ -50,7 +50,6 @@
*/ */
static unsigned short normal_i2c[] = { 0x4c, I2C_CLIENT_END }; static unsigned short normal_i2c[] = { 0x4c, I2C_CLIENT_END };
static unsigned short normal_i2c_range[] = { I2C_CLIENT_END };
static unsigned int normal_isa[] = { I2C_CLIENT_ISA_END }; static unsigned int normal_isa[] = { I2C_CLIENT_ISA_END };
/* /*
......
drivers/i2c/chips/lm75.c
View file @ b61e056b
...@@ -28,8 +28,8 @@ ...@@ -28,8 +28,8 @@
/* Addresses to scan */ /* Addresses to scan */
static unsigned short normal_i2c[] = { I2C_CLIENT_END }; static unsigned short normal_i2c[] = { 0x48, 0x49, 0x4a, 0x4b, 0x4c,
static unsigned short normal_i2c_range[] = { 0x48, 0x4f, I2C_CLIENT_END }; 0x4d, 0x4e, 0x4f, I2C_CLIENT_END };
static unsigned int normal_isa[] = { I2C_CLIENT_ISA_END }; static unsigned int normal_isa[] = { I2C_CLIENT_ISA_END };
/* Insmod parameters */ /* Insmod parameters */
......
drivers/i2c/chips/lm77.c
View file @ b61e056b
...@@ -34,8 +34,7 @@ ...@@ -34,8 +34,7 @@
/* Addresses to scan */ /* Addresses to scan */
static unsigned short normal_i2c[] = { I2C_CLIENT_END }; static unsigned short normal_i2c[] = { 0x48, 0x49, 0x4a, 0x4b, I2C_CLIENT_END };
static unsigned short normal_i2c_range[] = { 0x48, 0x4b, I2C_CLIENT_END };
static unsigned int normal_isa[] = { I2C_CLIENT_ISA_END }; static unsigned int normal_isa[] = { I2C_CLIENT_ISA_END };
/* Insmod parameters */ /* Insmod parameters */
......
drivers/i2c/chips/lm78.c
View file @ b61e056b
...@@ -27,8 +27,10 @@ ...@@ -27,8 +27,10 @@
#include <asm/io.h> #include <asm/io.h>
/* Addresses to scan */ /* Addresses to scan */
static unsigned short normal_i2c[] = { I2C_CLIENT_END }; static unsigned short normal_i2c[] = { 0x20, 0x21, 0x22, 0x23, 0x24,
static unsigned short normal_i2c_range[] = { 0x20, 0x2f, I2C_CLIENT_END }; 0x25, 0x26, 0x27, 0x28, 0x29,
0x2a, 0x2b, 0x2c, 0x2d, 0x2e,
0x2f, I2C_CLIENT_END };
static unsigned int normal_isa[] = { 0x0290, I2C_CLIENT_ISA_END }; static unsigned int normal_isa[] = { 0x0290, I2C_CLIENT_ISA_END };
/* Insmod parameters */ /* Insmod parameters */
......
drivers/i2c/chips/lm80.c
View file @ b61e056b
...@@ -29,8 +29,8 @@ ...@@ -29,8 +29,8 @@
#include <linux/i2c-sensor.h> #include <linux/i2c-sensor.h>
/* Addresses to scan */ /* Addresses to scan */
static unsigned short normal_i2c[] = { I2C_CLIENT_END }; static unsigned short normal_i2c[] = { 0x28, 0x29, 0x2a, 0x2b, 0x2c,
static unsigned short normal_i2c_range[] = { 0x28, 0x2f, I2C_CLIENT_END }; 0x2d, 0x2e, 0x2f, I2C_CLIENT_END };
static unsigned int normal_isa[] = { I2C_CLIENT_ISA_END }; static unsigned int normal_isa[] = { I2C_CLIENT_ISA_END };
/* Insmod parameters */ /* Insmod parameters */
......
drivers/i2c/chips/lm83.c
View file @ b61e056b
...@@ -40,9 +40,10 @@ ...@@ -40,9 +40,10 @@
* addresses. * addresses.
*/ */
static unsigned short normal_i2c[] = { I2C_CLIENT_END }; static unsigned short normal_i2c[] = { 0x18, 0x19, 0x1a,
static unsigned short normal_i2c_range[] = { 0x18, 0x1a, 0x29, 0x2b, 0x29, 0x2a, 0x2b,
0x4c, 0x4e, I2C_CLIENT_END }; 0x4c, 0x4d, 0x4e,
I2C_CLIENT_END };
static unsigned int normal_isa[] = { I2C_CLIENT_ISA_END }; static unsigned int normal_isa[] = { I2C_CLIENT_ISA_END };
/* /*
......
drivers/i2c/chips/lm85.c
View file @ b61e056b
...@@ -33,7 +33,6 @@ ...@@ -33,7 +33,6 @@
/* Addresses to scan */ /* Addresses to scan */
static unsigned short normal_i2c[] = { 0x2c, 0x2d, 0x2e, I2C_CLIENT_END }; static unsigned short normal_i2c[] = { 0x2c, 0x2d, 0x2e, I2C_CLIENT_END };
static unsigned short normal_i2c_range[] = { I2C_CLIENT_END };
static unsigned int normal_isa[] = { I2C_CLIENT_ISA_END }; static unsigned int normal_isa[] = { I2C_CLIENT_ISA_END };
/* Insmod parameters */ /* Insmod parameters */
......
drivers/i2c/chips/lm87.c
View file @ b61e056b
...@@ -65,8 +65,7 @@ ...@@ -65,8 +65,7 @@
* LM87 has three possible addresses: 0x2c, 0x2d and 0x2e. * LM87 has three possible addresses: 0x2c, 0x2d and 0x2e.
*/ */
static unsigned short normal_i2c[] = { I2C_CLIENT_END }; static unsigned short normal_i2c[] = { 0x2c, 0x2d, 0x2e, I2C_CLIENT_END };
static unsigned short normal_i2c_range[] = { 0x2c, 0x2e, I2C_CLIENT_END };
static unsigned int normal_isa[] = { I2C_CLIENT_ISA_END }; static unsigned int normal_isa[] = { I2C_CLIENT_ISA_END };
/* /*
......
drivers/i2c/chips/lm90.c
View file @ b61e056b
...@@ -76,7 +76,6 @@ ...@@ -76,7 +76,6 @@
*/ */
static unsigned short normal_i2c[] = { 0x4c, 0x4d, I2C_CLIENT_END }; static unsigned short normal_i2c[] = { 0x4c, 0x4d, I2C_CLIENT_END };
static unsigned short normal_i2c_range[] = { I2C_CLIENT_END };
static unsigned int normal_isa[] = { I2C_CLIENT_ISA_END }; static unsigned int normal_isa[] = { I2C_CLIENT_ISA_END };
/* /*
......
drivers/i2c/chips/max1619.c
View file @ b61e056b
...@@ -34,9 +34,10 @@ ...@@ -34,9 +34,10 @@
#include <linux/i2c-sensor.h> #include <linux/i2c-sensor.h>
static unsigned short normal_i2c[] = { I2C_CLIENT_END }; static unsigned short normal_i2c[] = { 0x18, 0x19, 0x1a,
static unsigned short normal_i2c_range[] = { 0x18, 0x1a, 0x29, 0x2b, 0x29, 0x2a, 0x2b,
0x4c, 0x4e, I2C_CLIENT_END }; 0x4c, 0x4d, 0x4e,
I2C_CLIENT_END };
static unsigned int normal_isa[] = { I2C_CLIENT_ISA_END }; static unsigned int normal_isa[] = { I2C_CLIENT_ISA_END };
/* /*
......
drivers/i2c/chips/pc87360.c
View file @ b61e056b
...@@ -43,7 +43,6 @@ ...@@ -43,7 +43,6 @@
#include <asm/io.h> #include <asm/io.h>
static unsigned short normal_i2c[] = { I2C_CLIENT_END }; static unsigned short normal_i2c[] = { I2C_CLIENT_END };
static unsigned short normal_i2c_range[] = { I2C_CLIENT_END };
static unsigned int normal_isa[] = { 0, I2C_CLIENT_ISA_END }; static unsigned int normal_isa[] = { 0, I2C_CLIENT_ISA_END };
static struct i2c_force_data forces[] = {{ NULL }}; static struct i2c_force_data forces[] = {{ NULL }};
static u8 devid; static u8 devid;
...@@ -53,7 +52,6 @@ static u8 confreg[4]; ...@@ -53,7 +52,6 @@ static u8 confreg[4];
enum chips { any_chip, pc87360, pc87363, pc87364, pc87365, pc87366 }; enum chips { any_chip, pc87360, pc87363, pc87364, pc87365, pc87366 };
static struct i2c_address_data addr_data = { static struct i2c_address_data addr_data = {
.normal_i2c = normal_i2c, .normal_i2c = normal_i2c,
.normal_i2c_range = normal_i2c_range,
.normal_isa = normal_isa, .normal_isa = normal_isa,
.forces = forces, .forces = forces,
}; };
......
drivers/i2c/chips/pcf8574.c
View file @ b61e056b
...@@ -42,8 +42,9 @@ ...@@ -42,8 +42,9 @@
#include <linux/i2c-sensor.h> #include <linux/i2c-sensor.h>
/* Addresses to scan */ /* Addresses to scan */
static unsigned short normal_i2c[] = { I2C_CLIENT_END }; static unsigned short normal_i2c[] = { 0x20, 0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27,
static unsigned short normal_i2c_range[] = { 0x20, 0x27, 0x38, 0x3f, I2C_CLIENT_END }; 0x38, 0x39, 0x3a, 0x3b, 0x3c, 0x3d, 0x3e, 0x3f,
I2C_CLIENT_END };
static unsigned int normal_isa[] = { I2C_CLIENT_ISA_END }; static unsigned int normal_isa[] = { I2C_CLIENT_ISA_END };
/* Insmod parameters */ /* Insmod parameters */
......
drivers/i2c/chips/pcf8591.c
View file @ b61e056b
...@@ -27,8 +27,8 @@ ...@@ -27,8 +27,8 @@
#include <linux/i2c-sensor.h> #include <linux/i2c-sensor.h>
/* Addresses to scan */ /* Addresses to scan */
static unsigned short normal_i2c[] = { I2C_CLIENT_END }; static unsigned short normal_i2c[] = { 0x48, 0x49, 0x4a, 0x4b, 0x4c,
static unsigned short normal_i2c_range[] = { 0x48, 0x4f, I2C_CLIENT_END }; 0x4d, 0x4e, 0x4f, I2C_CLIENT_END };
static unsigned int normal_isa[] = { I2C_CLIENT_ISA_END }; static unsigned int normal_isa[] = { I2C_CLIENT_ISA_END };
/* Insmod parameters */ /* Insmod parameters */
......
drivers/i2c/chips/rtc8564.c
View file @ b61e056b
...@@ -66,11 +66,8 @@ static unsigned short normal_addr[] = { 0x51, I2C_CLIENT_END }; ...@@ -66,11 +66,8 @@ static unsigned short normal_addr[] = { 0x51, I2C_CLIENT_END };
static struct i2c_client_address_data addr_data = { static struct i2c_client_address_data addr_data = {
.normal_i2c = normal_addr, .normal_i2c = normal_addr,
.normal_i2c_range = ignore,
.probe = ignore, .probe = ignore,
.probe_range = ignore,
.ignore = ignore, .ignore = ignore,
.ignore_range = ignore,
.force = ignore, .force = ignore,
}; };
......
drivers/i2c/chips/smsc47m1.c
View file @ b61e056b
...@@ -34,7 +34,6 @@ ...@@ -34,7 +34,6 @@
#include <asm/io.h> #include <asm/io.h>
static unsigned short normal_i2c[] = { I2C_CLIENT_END }; static unsigned short normal_i2c[] = { I2C_CLIENT_END };
static unsigned short normal_i2c_range[] = { I2C_CLIENT_END };
/* Address is autodetected, there is no default value */ /* Address is autodetected, there is no default value */
static unsigned int normal_isa[] = { 0x0000, I2C_CLIENT_ISA_END }; static unsigned int normal_isa[] = { 0x0000, I2C_CLIENT_ISA_END };
static struct i2c_force_data forces[] = {{NULL}}; static struct i2c_force_data forces[] = {{NULL}};
...@@ -42,7 +41,6 @@ static struct i2c_force_data forces[] = {{NULL}}; ...@@ -42,7 +41,6 @@ static struct i2c_force_data forces[] = {{NULL}};
enum chips { any_chip, smsc47m1 }; enum chips { any_chip, smsc47m1 };
static struct i2c_address_data addr_data = { static struct i2c_address_data addr_data = {
.normal_i2c = normal_i2c, .normal_i2c = normal_i2c,
.normal_i2c_range = normal_i2c_range,
.normal_isa = normal_isa, .normal_isa = normal_isa,
.forces = forces, .forces = forces,
}; };
......
drivers/i2c/chips/via686a.c
View file @ b61e056b
...@@ -52,7 +52,6 @@ MODULE_PARM_DESC(force_addr, ...@@ -52,7 +52,6 @@ MODULE_PARM_DESC(force_addr,
Note that we can't determine the ISA address until we have initialized Note that we can't determine the ISA address until we have initialized
our module */ our module */
static unsigned short normal_i2c[] = { I2C_CLIENT_END }; static unsigned short normal_i2c[] = { I2C_CLIENT_END };
static unsigned short normal_i2c_range[] = { I2C_CLIENT_END };
static unsigned int normal_isa[] = { 0x0000, I2C_CLIENT_ISA_END }; static unsigned int normal_isa[] = { 0x0000, I2C_CLIENT_ISA_END };
/* Insmod parameters */ /* Insmod parameters */
......
drivers/i2c/chips/w83627hf.c
View file @ b61e056b
...@@ -57,7 +57,6 @@ MODULE_PARM_DESC(force_i2c, ...@@ -57,7 +57,6 @@ MODULE_PARM_DESC(force_i2c,
/* Addresses to scan */ /* Addresses to scan */
static unsigned short normal_i2c[] = { I2C_CLIENT_END }; static unsigned short normal_i2c[] = { I2C_CLIENT_END };
static unsigned short normal_i2c_range[] = { I2C_CLIENT_END };
static unsigned int normal_isa[] = { 0, I2C_CLIENT_ISA_END }; static unsigned int normal_isa[] = { 0, I2C_CLIENT_ISA_END };
/* Insmod parameters */ /* Insmod parameters */
......
drivers/i2c/chips/w83781d.c
View file @ b61e056b
...@@ -49,8 +49,9 @@ ...@@ -49,8 +49,9 @@
#define W83781D_RT 1 #define W83781D_RT 1
/* Addresses to scan */ /* Addresses to scan */
static unsigned short normal_i2c[] = { I2C_CLIENT_END }; static unsigned short normal_i2c[] = { 0x20, 0x21, 0x22, 0x23, 0x24, 0x25,
static unsigned short normal_i2c_range[] = { 0x20, 0x2f, I2C_CLIENT_END }; 0x26, 0x27, 0x28, 0x29, 0x2a, 0x2b,
0x2c, 0x2d, 0x2e, 0x2f, I2C_CLIENT_END };
static unsigned int normal_isa[] = { 0x0290, I2C_CLIENT_ISA_END }; static unsigned int normal_isa[] = { 0x0290, I2C_CLIENT_ISA_END };
/* Insmod parameters */ /* Insmod parameters */
......
drivers/i2c/chips/w83l785ts.c
View file @ b61e056b
...@@ -47,7 +47,6 @@ ...@@ -47,7 +47,6 @@
*/ */
static unsigned short normal_i2c[] = { 0x2e, I2C_CLIENT_END }; static unsigned short normal_i2c[] = { 0x2e, I2C_CLIENT_END };
static unsigned short normal_i2c_range[] = { I2C_CLIENT_END };
static unsigned int normal_isa[] = { I2C_CLIENT_ISA_END }; static unsigned int normal_isa[] = { I2C_CLIENT_ISA_END };
/* /*
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7