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

Commit 00341b53 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'i2c/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux 

Pull i2c updates from Wolfram Sang:
 "Highlights:

   - OF and ACPI helpers are now included in the core, and not in
     external files anymore.  This removes dependency problems for
     modules and is cleaner, in general.
   - mv64xxx-driver gains fifo usage to support mv78230
   - imx-driver overhaul to support VF610
   - various cleanups, most notably related to devm_* and CONFIG_PM
     usage
   - driver bugfixes and smaller feature additions"

* 'i2c/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux: (51 commits)
  i2c: rcar: add rcar-H2 support
  i2c: sirf: retry 3 times as sometimes we get random noack and timeout
  i2c: sirf: support reverse direction of address
  i2c: sirf: fix the typo for setting bitrate to less than 100k
  i2c: sirf: we need to wait I2C_RESET status in resume
  i2c: sirf: reset i2c controller early after we get a noack
  i2c: designware: get SDA hold time, HCNT and LCNT configuration from ACPI
  i2c: designware: make HCNT/LCNT values configurable
  i2c: mpc: cleanup clock API use
  i2c: pnx: fix error return code in i2c_pnx_probe()
  i2c: ismt: add error return code in probe()
  i2c: mv64xxx: fix typo in binding documentation
  i2c: imx: use exact SoC revision to document binding
  i2c: move ACPI helpers into the core
  i2c: move OF helpers into the core
  i2c: mv64xxx: Fix timing issue on Armada XP (errata FE-8471889)
  i2c: mv64xxx: Add I2C Transaction Generator support
  i2c: powermac: fix return path on error
  Documentation: i2c: Fix example in instantiating-devices
  i2c: tiny-usb: do not use stack as URB transfer_buffer
  ...
parents 45d9a222 b720423a

Documentation/acpi/enumeration.txt

+3 −13
Original line number Diff line number Diff line
@@ -228,19 +228,9 @@ ACPI handle like: 
I2C serial bus support

~~~~~~~~~~~~~~~~~~~~~~

The slaves behind I2C bus controller only need to add the ACPI IDs like

with the platform and SPI drivers. However the I2C bus controller driver

needs to call acpi_i2c_register_devices() after it has added the adapter.



An I2C bus (controller) driver does:



	...

	ret = i2c_add_numbered_adapter(adapter);

	if (ret)

		/* handle error */



	of_i2c_register_devices(adapter);

	/* Enumerate the slave devices behind this bus via ACPI */

	acpi_i2c_register_devices(adapter);

with the platform and SPI drivers. The I2C core automatically enumerates

any slave devices behind the controller device once the adapter is

registered.



Below is an example of how to add ACPI support to the existing mpu3050

input driver:

Documentation/devicetree/bindings/i2c/i2c-imx.txt

+4 −1
Original line number Diff line number Diff line 
* Freescale Inter IC (I2C) and High Speed Inter IC (HS-I2C) for i.MX



Required properties:

- compatible : Should be "fsl,<chip>-i2c"

- compatible :

  - "fsl,imx1-i2c" for I2C compatible with the one integrated on i.MX1 SoC

  - "fsl,imx21-i2c" for I2C compatible with the one integrated on i.MX21 SoC

  - "fsl,vf610-i2c" for I2C compatible with the one integrated on Vybrid vf610 SoC

- reg : Should contain I2C/HS-I2C registers location and length

- interrupts : Should contain I2C/HS-I2C interrupt

Documentation/devicetree/bindings/i2c/i2c-mv64xxx.txt

+10 −0
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ Required properties : 


 - reg             : Offset and length of the register set for the device

 - compatible      : Should be "marvell,mv64xxx-i2c" or "allwinner,sun4i-i2c"

                     or "marvell,mv78230-i2c"

 - interrupts      : The interrupt number



Optional properties :
@@ -20,3 +21,12 @@ Examples: 
		interrupts = <29>;

		clock-frequency = <100000>;

	};



For the Armada XP:



	i2c@11000 {

		compatible = "marvell,mv78230-i2c", "marvell,mv64xxx-i2c";

		reg = <0x11000 0x100>;

		interrupts = <29>;

		clock-frequency = <100000>;

	};

Documentation/i2c/busses/i2c-piix4

+4 −3
Original line number Diff line number Diff line
@@ -73,9 +73,10 @@ this driver on those mainboards. 
The ServerWorks Southbridges, the Intel 440MX, and the Victory66 are

identical to the PIIX4 in I2C/SMBus support.



The AMD SB700 and SP5100 chipsets implement two PIIX4-compatible SMBus

controllers. If your BIOS initializes the secondary controller, it will

be detected by this driver as an "Auxiliary SMBus Host Controller".

The AMD SB700, SB800, SP5100 and Hudson-2 chipsets implement two

PIIX4-compatible SMBus controllers. If your BIOS initializes the

secondary controller, it will be detected by this driver as

an "Auxiliary SMBus Host Controller".



If you own Force CPCI735 motherboard or other OSB4 based systems you may need

to change the SMBus Interrupt Select register so the SMBus controller uses

Documentation/i2c/instantiating-devices

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ i2c_board_info which is registered by calling i2c_register_board_info(). 


Example (from omap2 h4):



static struct i2c_board_info __initdata h4_i2c_board_info[] = {

static struct i2c_board_info h4_i2c_board_info[] __initdata = {

	{

		I2C_BOARD_INFO("isp1301_omap", 0x2d),

		.irq		= OMAP_GPIO_IRQ(125),