Commit d55fc378 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull i2c updates from Wolfram Sang:

 - New drivers: UniPhier (with and without FIFO)

 - some drivers got some bigger rework: ismt, designware, img-scb (rcar
   had to be reverted because issues were showing up just lately)

 - ACPI: reworked the device scanning and added support for muxes

... and quite a lot of driver bugfixes and cleanups this time.  All
files touched outside of the i2c realm have proper acks.

* 'i2c/for-4.4' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux: (70 commits)
  i2c: rcar: Revert the latest refactoring series
  i2c: pnx: remove superfluous assignment
  MAINTAINERS: i2c: drop i2c-pnx maintainer
  MAINTAINERS: i2c: mark also subdirectories as maintained
  i2c: cadence: enable driver for ARM64
  i2c: i801: Document Intel DNV and Broxton
  i2c: at91: manage unexpected RXRDY flag when starting a transfer
  i2c: pnx: Use setup_timer instead of open coding it
  i2c: add ACPI support for I2C mux ports
  acpi: add acpi_preset_companion() stub
  i2c: pxa: Add support for pxa910/988 & new configuration features
  i2c: au1550: Convert to devm_kzalloc and devm_ioremap_resource
  i2c-dev: Fix I2C_SLAVE ioctl comment
  i2c-dev: Fix typo in ioctl name reference
  i2c: sirf: tune the divider to make i2c bus freq more accurate
  i2c: imx: Use -ENXIO as error in the NACK case
  i2c: i801: Add support for Intel Broxton
  i2c: i801: Add support for Intel DNV
  i2c: mediatek: add i2c resume support
  i2c: imx: implement bus recovery
  ...
parents 42d4ebb4 75ecc64e

Documentation/acpi/i2c-muxes.txt

0 → 100644
+58 −0
Original line number Diff line number Diff line 
ACPI I2C Muxes

--------------



Describing an I2C device hierarchy that includes I2C muxes requires an ACPI

Device () scope per mux channel.



Consider this topology:



+------+   +------+

| SMB1 |-->| MUX0 |--CH00--> i2c client A (0x50)

|      |   | 0x70 |--CH01--> i2c client B (0x50)

+------+   +------+



which corresponds to the following ASL:



Device (SMB1)

{

    Name (_HID, ...)

    Device (MUX0)

    {

        Name (_HID, ...)

        Name (_CRS, ResourceTemplate () {

            I2cSerialBus (0x70, ControllerInitiated, I2C_SPEED,

                          AddressingMode7Bit, "^SMB1", 0x00,

                          ResourceConsumer,,)

        }



        Device (CH00)

        {

            Name (_ADR, 0)



            Device (CLIA)

            {

                Name (_HID, ...)

                Name (_CRS, ResourceTemplate () {

                    I2cSerialBus (0x50, ControllerInitiated, I2C_SPEED,

                                  AddressingMode7Bit, "^CH00", 0x00,

                                  ResourceConsumer,,)

                }

            }

        }



        Device (CH01)

        {

            Name (_ADR, 1)



            Device (CLIB)

            {

                Name (_HID, ...)

                Name (_CRS, ResourceTemplate () {

                    I2cSerialBus (0x50, ControllerInitiated, I2C_SPEED,

                                  AddressingMode7Bit, "^CH01", 0x00,

                                  ResourceConsumer,,)

                }

            }

        }

    }

}

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

+3 −3
Original line number Diff line number Diff line 
* Texas Instruments Davinci I2C

* Texas Instruments Davinci/Keystone I2C



This file provides information, what the device node for the

davinci i2c interface contain.

davinci/keystone i2c interface contains.



Required properties:

- compatible: "ti,davinci-i2c";

- compatible: "ti,davinci-i2c" or "ti,keystone-i2c";

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



Recommended properties :

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

+9 −0
Original line number Diff line number Diff line
@@ -14,6 +14,10 @@ Optional properties: 
  The absence of the propoerty indicates the default frequency 100 kHz.

- dmas: A list of two dma specifiers, one for each entry in dma-names.

- dma-names: should contain "tx" and "rx".

- scl-gpios: specify the gpio related to SCL pin

- sda-gpios: specify the gpio related to SDA pin

- pinctrl: add extra pinctrl to configure i2c pins to gpio function for i2c

  bus recovery, call it "gpio" state



Examples:
@@ -37,4 +41,9 @@ i2c0: i2c@40066000 { /* i2c0 on vf610 */ 
	dmas = <&edma0 0 50>,

		<&edma0 0 51>;

	dma-names = "rx","tx";

	pinctrl-names = "default", "gpio";

	pinctrl-0 = <&pinctrl_i2c1>;

	pinctrl-1 = <&pinctrl_i2c1_gpio>;

	scl-gpios = <&gpio5 26 GPIO_ACTIVE_HIGH>;

	sda-gpios = <&gpio5 27 GPIO_ACTIVE_HIGH>;

};

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

+1 −0
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ Required properties: 
	"renesas,i2c-r8a7792"

	"renesas,i2c-r8a7793"

	"renesas,i2c-r8a7794"

	"renesas,i2c-r8a7795"

- reg: physical base address of the controller and length of memory mapped

  region.

- interrupts: interrupt specifier.

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

+1 −0
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ Required properties: 
			- "renesas,iic-r8a7792" (R-Car V2H)

			- "renesas,iic-r8a7793" (R-Car M2-N)

			- "renesas,iic-r8a7794" (R-Car E2)

			- "renesas,iic-r8a7795" (R-Car H3)

			- "renesas,iic-sh73a0" (SH-Mobile AG5)

- reg             : address start and address range size of device

- interrupts      : interrupt of device

CRA Git | Maintained and supported by SUSTech CRA and CCSE