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

Commit c3a416a6 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:
 "Most notable:

   - introducing the i2c_quirk infrastructure.  Now, flaws of I2C
     controllers can be described and the core will check if the flaws
     collide with the messages to be sent

   - wait_for_completion return type cleanup series

   - new drivers for Digicolor, Netlogic XLP, Ingenic JZ4780

   - updates to the I2C slave framework which include API changes.  Its
     only user was updated, too.  Documentation was finally added

   - changed dynamic bus numbering for the DT case.  This could change
     bus numbers for users.  However, it fixes a collision where dynamic
     and static busses request the same id.

   - driver bugfixes, cleanups"

* 'i2c/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux: (52 commits)
  i2c: xlp9xx: Driver for Netlogic XLP9XX/5XX I2C controller
  of: Add vendor prefix 'netlogic'
  i2c: davinci: use ICPFUNC to toggle I2C as gpio for bus recovery
  i2c: davinci: use bus recovery infrastructure
  i2c: change input parameter to i2c_adapter for prepare/unprepare_recovery
  i2c: i2c-mux-gpio: remove error messages for probe deferrals
  i2c: jz4780: Add i2c bus controller driver for Ingenic JZ4780
  i2c: dln2: set the device tree node of the adapter
  i2c: davinci: fixup wait_for_completion_timeout handling
  i2c: mpc: Fix ISR return value
  i2c: slave-eeprom: add more info when to increase the pointer
  i2c: slave: add documentation for i2c-slave-eeprom
  Documentation: i2c: describe the new slave mode
  i2c: slave: rework the slave API
  i2c: add support for the Digicolor I2C controller
  i2c: busses with dynamic ids should start after fixed ids for DT
  of: base: add function to get highest id of an alias stem
  i2c: designware: Suppress error message if platform_get_irq() < 0
  i2c: mpc: assign the correct prescaler from SVR
  i2c: img-scb: fixup of wait_for_completion_timeout return handling
  ...
parents 8c194f3b 2bbd681b

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

+3 −0
Original line number Diff line number Diff line
@@ -10,6 +10,9 @@ Required properties: 
Recommended properties :

- interrupts : standard interrupt property.

- clock-frequency : desired I2C bus clock frequency in Hz.

- ti,has-pfunc: boolean; if defined, it indicates that SoC supports PFUNC

	registers. PFUNC registers allow to switch I2C pins to function as

	GPIOs, so they can by toggled manually.



Example (enbw_cmc board):

	i2c@1c22000 {

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

0 → 100644
+25 −0
Original line number Diff line number Diff line 
Conexant Digicolor I2C controller



Required properties:

 - compatible: must be "cnxt,cx92755-i2c"

 - reg: physical address and length of the device registers

 - interrupts: a single interrupt specifier

 - clocks: clock for the device

 - #address-cells: should be <1>

 - #size-cells: should be <0>



Optional properties:

- clock-frequency: the desired I2C bus clock frequency in Hz; in

  absence of this property the default value is used (100 kHz).



Example:



	i2c: i2c@f0000120 {

		compatible = "cnxt,cx92755-i2c";

		reg = <0xf0000120 0x10>;

		interrupts = <28>;

		clocks = <&main_clk>;

		clock-frequency = <100000>;

		#address-cells = <1>;

		#size-cells = <0>;

	};

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

0 → 100644
+35 −0
Original line number Diff line number Diff line 
* Ingenic JZ4780 I2C Bus controller



Required properties:

- compatible: should be "ingenic,jz4780-i2c"

- reg: Should contain the address & size of the I2C controller registers.

- interrupts: Should specify the interrupt provided by parent.

- clocks: Should contain a single clock specifier for the JZ4780 I2C clock.

- clock-frequency: desired I2C bus clock frequency in Hz.



Recommended properties:

- pinctrl-names: should be "default";

- pinctrl-0: phandle to pinctrl function



Optional properties:

- interrupt-parent: Should be the phandle of the interrupt controller that

  delivers interrupts to the I2C block.



Example



/ {

	i2c4: i2c4@0x10054000 {

		compatible = "ingenic,jz4780-i2c";

		reg = <0x10054000 0x1000>;



		interrupt-parent = <&intc>;

		interrupts = <56>;



		clocks = <&cgu JZ4780_CLK_SMB4>;

		clock-frequency = <100000>;

		pinctrl-names = "default";

		pinctrl-0 = <&pins_i2c4_data>;



	};

};

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

0 → 100644
+22 −0
Original line number Diff line number Diff line 
Device tree configuration for the I2C controller on the XLP9xx/5xx SoC



Required properties:

- compatible      : should be "netlogic,xlp980-i2c"

- reg             : bus address start and address range size of device

- interrupts      : interrupt number



Optional properties:

- clock-frequency : frequency of bus clock in Hz

                    Defaults to 100 KHz when the property is not specified



Example:



i2c0: i2c@113100 {

	compatible = "netlogic,xlp980-i2c";

	#address-cells = <1>;

	#size-cells = <0>;

	reg = <0 0x113100 0x100>;

	clock-frequency = <400000>;

	interrupts = <30>;

	interrupt-parent = <&pic>;

};

Documentation/devicetree/bindings/vendor-prefixes.txt

+1 −0
Original line number Diff line number Diff line
@@ -125,6 +125,7 @@ mxicy Macronix International Co., Ltd. 
national	National Semiconductor

neonode		Neonode Inc.

netgear	NETGEAR

netlogic	Broadcom Corporation (formerly NetLogic Microsystems)

newhaven	Newhaven Display International

nintendo	Nintendo

nokia	Nokia