Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 6722feada7f6213ba06d510ef853e57ddcd59dae

Authored by Jean Delvare
Committed by Mark M. Hoffman
1 parent 7fce084a0b
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

hwmon: (lm78/w83781d) Probe fewer I2C addresses 

We've never seen any device supported by the lm78 or w83781d driver at
addresses 0x20-0x27, so let's stop probing these addresses. Extra probes cost
time, and have potential for confusing or misdetecting other I2C devices.

Signed-off-by: Jean Delvare <khali@linux-fr.org>
Signed-off-by: Mark M. Hoffman <mhoffman@lightlink.com>

Showing 4 changed files with 10 additions and 13 deletions Side-by-side Diff

Documentation/hwmon/lm78
Diff comments   View file @ 6722fea
... ... @@ -4,12 +4,12 @@
4 4 Supported chips:
5 5 * National Semiconductor LM78 / LM78-J
6 6 Prefix: 'lm78'
7   - Addresses scanned: I2C 0x20 - 0x2f, ISA 0x290 (8 I/O ports)
  7 + Addresses scanned: I2C 0x28 - 0x2f, ISA 0x290 (8 I/O ports)
8 8 Datasheet: Publicly available at the National Semiconductor website
9 9 http://www.national.com/
10 10 * National Semiconductor LM79
11 11 Prefix: 'lm79'
12   - Addresses scanned: I2C 0x20 - 0x2f, ISA 0x290 (8 I/O ports)
  12 + Addresses scanned: I2C 0x28 - 0x2f, ISA 0x290 (8 I/O ports)
13 13 Datasheet: Publicly available at the National Semiconductor website
14 14 http://www.national.com/
15 15  
Documentation/hwmon/w83781d
Diff comments   View file @ 6722fea
... ... @@ -4,11 +4,11 @@
4 4 Supported chips:
5 5 * Winbond W83781D
6 6 Prefix: 'w83781d'
7   - Addresses scanned: I2C 0x20 - 0x2f, ISA 0x290 (8 I/O ports)
  7 + Addresses scanned: I2C 0x28 - 0x2f, ISA 0x290 (8 I/O ports)
8 8 Datasheet: http://www.winbond-usa.com/products/winbond_products/pdfs/PCIC/w83781d.pdf
9 9 * Winbond W83782D
10 10 Prefix: 'w83782d'
11   - Addresses scanned: I2C 0x20 - 0x2f, ISA 0x290 (8 I/O ports)
  11 + Addresses scanned: I2C 0x28 - 0x2f, ISA 0x290 (8 I/O ports)
12 12 Datasheet: http://www.winbond.com/PDF/sheet/w83782d.pdf
13 13 * Winbond W83783S
14 14 Prefix: 'w83783s'
... ... @@ -16,7 +16,7 @@
16 16 Datasheet: http://www.winbond-usa.com/products/winbond_products/pdfs/PCIC/w83783s.pdf
17 17 * Winbond W83627HF
18 18 Prefix: 'w83627hf'
19   - Addresses scanned: I2C 0x20 - 0x2f, ISA 0x290 (8 I/O ports)
  19 + Addresses scanned: I2C 0x28 - 0x2f, ISA 0x290 (8 I/O ports)
20 20 Datasheet: http://www.winbond.com/PDF/sheet/w83627hf.pdf
21 21 * Asus AS99127F
22 22 Prefix: 'as99127f'
drivers/hwmon/lm78.c
Diff comments   View file @ 6722fea
... ... @@ -37,10 +37,8 @@
37 37 static struct platform_device *pdev;
38 38  
39 39 /* Addresses to scan */
40   -static unsigned short normal_i2c[] = { 0x20, 0x21, 0x22, 0x23, 0x24,
41   - 0x25, 0x26, 0x27, 0x28, 0x29,
42   - 0x2a, 0x2b, 0x2c, 0x2d, 0x2e,
43   - 0x2f, I2C_CLIENT_END };
  40 +static unsigned short normal_i2c[] = { 0x28, 0x29, 0x2a, 0x2b, 0x2c, 0x2d,
  41 + 0x2e, 0x2f, I2C_CLIENT_END };
44 42 static unsigned short isa_address = 0x290;
45 43  
46 44 /* Insmod parameters */
drivers/hwmon/w83781d.c
Diff comments   View file @ 6722fea
... ... @@ -54,9 +54,8 @@
54 54 static struct platform_device *pdev;
55 55  
56 56 /* Addresses to scan */
57   -static unsigned short normal_i2c[] = { 0x20, 0x21, 0x22, 0x23, 0x24, 0x25,
58   - 0x26, 0x27, 0x28, 0x29, 0x2a, 0x2b,
59   - 0x2c, 0x2d, 0x2e, 0x2f, I2C_CLIENT_END };
  57 +static unsigned short normal_i2c[] = { 0x28, 0x29, 0x2a, 0x2b, 0x2c, 0x2d,
  58 + 0x2e, 0x2f, I2C_CLIENT_END };
60 59 static unsigned short isa_address = 0x290;
61 60  
62 61 /* Insmod parameters */
... ... @@ -1270,7 +1269,7 @@
1270 1269 kind = w83783s;
1271 1270 else if (val1 == 0x21 && vendid == winbond)
1272 1271 kind = w83627hf;
1273   - else if (val1 == 0x31 && address >= 0x28)
  1272 + else if (val1 == 0x31)
1274 1273 kind = as99127f;
1275 1274 else {
1276 1275 if (kind == 0)