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

Commit 663cc813 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging 

* 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging:
  macintosh: Don't assume i2c device probing always succeeds
  i2c: Hide probe errors caused by ACPI resource conflicts
  i2c: Minor documentation update
  mfd: AB3100 drop unused module parameters
  Staging: IIO: tsl2561: Drop unused module parameters
  leds: leds-pca9532 - Drop unused module parameters
  ltc4215/ltc4245: Discard obsolete detect methods
  ds2482: Discard obsolete detect method
  max6875: Discard obsolete detect method
  i2c: Move misc devices documentation
parents 58e57fbd 6f6b35e1

Documentation/hwmon/ltc4215

+4 −3
Original line number Diff line number Diff line
@@ -22,12 +22,13 @@ Usage Notes 
-----------



This driver does not probe for LTC4215 devices, due to the fact that some

of the possible addresses are unfriendly to probing. You will need to use

the "force" parameter to tell the driver where to find the device.

of the possible addresses are unfriendly to probing. You will have to

instantiate the devices explicitly.



Example: the following will load the driver for an LTC4215 at address 0x44

on I2C bus #0:

$ modprobe ltc4215 force=0,0x44

$ modprobe ltc4215

$ echo ltc4215 0x44 > /sys/bus/i2c/devices/i2c-0/new_device





Sysfs entries

Documentation/hwmon/ltc4245

+4 −3
Original line number Diff line number Diff line
@@ -23,12 +23,13 @@ Usage Notes 
-----------



This driver does not probe for LTC4245 devices, due to the fact that some

of the possible addresses are unfriendly to probing. You will need to use

the "force" parameter to tell the driver where to find the device.

of the possible addresses are unfriendly to probing. You will have to

instantiate the devices explicitly.



Example: the following will load the driver for an LTC4245 at address 0x23

on I2C bus #1:

$ modprobe ltc4245 force=1,0x23

$ modprobe ltc4245

$ echo ltc4245 0x23 > /sys/bus/i2c/devices/i2c-1/new_device





Sysfs entries

Documentation/i2c/instantiating-devices

+1 −1
Original line number Diff line number Diff line
@@ -188,7 +188,7 @@ segment, the address is sufficient to uniquely identify the device to be 
deleted.



Example:

# echo eeprom 0x50 > /sys/class/i2c-adapter/i2c-3/new_device

# echo eeprom 0x50 > /sys/bus/i2c/devices/i2c-3/new_device



While this interface should only be used when in-kernel device declaration

can't be done, there is a variety of cases where it can be helpful:

Documentation/i2c/chips/max6875→Documentation/misc-devices/max6875

+4 −2
Original line number Diff line number Diff line
@@ -42,10 +42,12 @@ General Remarks 


Valid addresses for the MAX6875 are 0x50 and 0x52.

Valid addresses for the MAX6874 are 0x50, 0x52, 0x54 and 0x56.

The driver does not probe any address, so you must force the address.

The driver does not probe any address, so you explicitly instantiate the

devices.



Example:

$ modprobe max6875 force=0,0x50

$ modprobe max6875

$ echo max6875 0x50 > /sys/bus/i2c/devices/i2c-0/new_device



The MAX6874/MAX6875 ignores address bit 0, so this driver attaches to multiple

addresses.  For example, for address 0x50, it also reserves 0x51.