Commit 7b215de3 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 into next 

Pull i2c updates from Wolfram Sang:
 "I2C has the following updates for 3.16:

   - major cleanups to the rcar and sh_mobile drivers
   - removal of nuc900 driver which had a compile error for years
   - usual bunch of driver updates, bugfixes and cleanups"

* 'i2c/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux: (44 commits)
  i2c: pca954x: Fix compilation without CONFIG_GPIOLIB
  i2c: mux: pca954x: Use the descriptor-based GPIO API
  i2c: mpc: insert DR read in i2c_fixup()
  i2c: bfin: turn to Resource-managed API in probe function
  i2c: Make of_device_id array const
  i2c: remove unnecessary OOM messages
  i2c: designware-pci: Add Haswell PCI IDs
  i2c: designware: Add runtime PM hooks
  i2c: designware: Disable device on system suspend
  i2c: nuc900: remove driver
  i2c: imx: update i2c clock divider for each transaction
  i2c: imx: fix the i2c bus hang issue when do repeat restart
  i2c: rcar: update copyright and license information
  i2c: rcar: janitorial cleanup after refactoring
  i2c: rcar: reuse status bits as enable bits
  i2c: rcar: remove spinlock
  i2c: rcar: refactor status bit handling
  i2c: rcar: refactor setting up msg
  i2c: rcar: check bus free before first message
  i2c: rcar: refactor irq state machine
  ...
parents 1fe9eb18 642653d1

Documentation/devicetree/bindings/i2c/i2c-arb-gpio-challenge.txt

+6 −0
Original line number Diff line number Diff line
@@ -8,6 +8,12 @@ the standard I2C multi-master rules. Using GPIOs is generally useful in 
the case where there is a device on the bus that has errata and/or bugs

that makes standard multimaster mode not feasible.



Note that this scheme works well enough but has some downsides:

* It is nonstandard (not using standard I2C multimaster)

* Having two masters on a bus in general makes it relatively hard to debug

  problems (hard to tell if i2c issues were caused by one master, another, or

  some device on the bus).





Algorithm:

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

+9 −2
Original line number Diff line number Diff line
@@ -5,7 +5,14 @@ at various speeds ranging from 100khz to 3.4Mhz. 


Required properties:

  - compatible: value should be.

      -> "samsung,exynos5-hsi2c", for i2c compatible with exynos5 hsi2c.

	-> "samsung,exynos5-hsi2c", (DEPRECATED)

				for i2c compatible with HSI2C available

				on Exynos5250 and Exynos5420 SoCs.

	-> "samsung,exynos5250-hsi2c", for i2c compatible with HSI2C available

				on Exynos5250 and Exynos5420 SoCs.

	-> "samsung,exynos5260-hsi2c", for i2c compatible with HSI2C available

				on Exynos5260 SoCs.



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

    region.

  - interrupts: interrupt number to the cpu.
@@ -26,7 +33,7 @@ Optional properties: 
Example:



hsi2c@12ca0000 {

	compatible = "samsung,exynos5-hsi2c";

	compatible = "samsung,exynos5250-hsi2c";

	reg = <0x12ca0000 0x100>;

	interrupts = <56>;

	clock-frequency = <100000>;

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

+1 −1
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ Required properties : 


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

 - compatible      : Should be either:

                     - "allwinner,sun4i-i2c"

                     - "allwinner,sun4i-a10-i2c"

                     - "allwinner,sun6i-a31-i2c"

                     - "marvell,mv64xxx-i2c"

                     - "marvell,mv78230-i2c"

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

+3 −0
Original line number Diff line number Diff line
@@ -7,6 +7,9 @@ Required properties: 
	"renesas,i2c-r8a7779"

	"renesas,i2c-r8a7790"

	"renesas,i2c-r8a7791"

	"renesas,i2c-r8a7792"

	"renesas,i2c-r8a7793"

	"renesas,i2c-r8a7794"

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

  region.

- interrupts: interrupt specifier.

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

0 → 100644
+26 −0
Original line number Diff line number Diff line 
Device tree configuration for Renesas IIC (sh_mobile) driver



Required properties:

- compatible      : "renesas,iic-<soctype>". "renesas,rmobile-iic" as fallback

- reg             : address start and address range size of device

- interrupts      : interrupt of device

- clocks          : clock for device

- #address-cells  : should be <1>

- #size-cells     : should be <0>



Optional properties:

- clock-frequency : frequency of bus clock in Hz. Default 100kHz if unset.



Pinctrl properties might be needed, too. See there.



Example:



	iic0: i2c@e6500000 {

		compatible = "renesas,iic-r8a7790", "renesas,rmobile-iic";

		reg = <0 0xe6500000 0 0x425>;

		interrupts = <0 174 IRQ_TYPE_LEVEL_HIGH>;

		clocks = <&mstp3_clks R8A7790_CLK_IIC0>;

		clock-frequency = <400000>;

		#address-cells = <1>;

		#size-cells = <0>;

	};

CRA Git | Maintained and supported by SUSTech CRA and CCSE