Skip to content

Commit

Permalink
Merge branch 'i2c/for-5.0' of git://git.kernel.org/pub/scm/linux/kern…
Browse files Browse the repository at this point in the history
…el/git/wsa/linux

Pull i2c updates from Wolfram Sang:
 "I2C has only driver updates for you this time.

  Mostly new IDs/DT compatibles, also SPDX conversions, small cleanups.
  STM32F7 got FastMode+ and PM support, Axxia some reliabilty
  improvements"

* 'i2c/for-5.0' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux: (26 commits)
  i2c: Add Actions Semiconductor Owl family S700 I2C support
  dt-bindings: i2c: Add S700 support for Actions Semi Soc's
  i2c: ismt: Add support for Intel Cedar Fork
  i2c: tegra: Switch to SPDX identifier
  i2c: tegra: Add missing kerneldoc for some fields
  i2c: tegra: Cleanup kerneldoc comments
  i2c: axxia: support sequence command mode
  dt-bindings: i2c: rcar: Add r8a774c0 support
  dt-bindings: i2c: sh_mobile: Add r8a774c0 support
  i2c: sh_mobile: Add support for r8a774c0 (RZ/G2E)
  i2c: i2c-cros-ec-tunnel: Switch to SPDX identifier.
  i2c: powermac: Use of_node_name_eq for node name comparisons
  i2c-axxia: check for error conditions first
  i2c-axxia: dedicated function to set client addr
  dt-bindings: i2c: Use correct vendor prefix for Atmel
  i2c: tegra: replace spin_lock_irqsave with spin_lock in ISR
  eeprom: at24: add support for 24c2048
  dt-bindings: eeprom: at24: add "atmel,24c2048" compatible string
  i2c: i2c-stm32f7: add PM Runtime support
  i2c: sh_mobile: add support for r8a77990 (R-Car E3)
  ...
  • Loading branch information
torvalds committed Jan 6, 2019
2 parents 926b02d + 81482d1 commit 7671c14
Show file tree
Hide file tree
Showing 22 changed files with 346 additions and 137 deletions.
1 change: 1 addition & 0 deletions Documentation/devicetree/bindings/eeprom/at24.txt
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ Required properties:
"atmel,24c256",
"atmel,24c512",
"atmel,24c1024",
"atmel,24c2048",

If <manufacturer> is not "atmel", then a fallback must be used
with the same <model> and "atmel" as manufacturer.
Expand Down
2 changes: 1 addition & 1 deletion Documentation/devicetree/bindings/i2c/i2c-at91.txt
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ i2c0: i2c@fff84000 {
clock-frequency = <400000>;

24c512@50 {
compatible = "24c512";
compatible = "atmel,24c512";
reg = <0x50>;
pagesize = <128>;
}
Expand Down
4 changes: 2 additions & 2 deletions Documentation/devicetree/bindings/i2c/i2c-mux-ltc4306.txt
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ Example:
reg = <0>;

eeprom@50 {
compatible = "at,24c02";
compatible = "atmel,24c02";
reg = <0x50>;
};
};
Expand All @@ -54,7 +54,7 @@ Example:
reg = <1>;

eeprom@50 {
compatible = "at,24c02";
compatible = "atmel,24c02";
reg = <0x50>;
};
};
Expand Down
2 changes: 1 addition & 1 deletion Documentation/devicetree/bindings/i2c/i2c-mux-pca954x.txt
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ Example:
reg = <2>;

eeprom@54 {
compatible = "at,24c08";
compatible = "atmel,24c08";
reg = <0x54>;
};
};
Expand Down
4 changes: 3 additions & 1 deletion Documentation/devicetree/bindings/i2c/i2c-owl.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,9 @@ Actions Semiconductor Owl I2C controller

Required properties:

- compatible : Should be "actions,s900-i2c".
- compatible : Should be one of the following:
- "actions,s700-i2c" for S700 SoC
- "actions,s900-i2c" for S900 SoC
- reg : Offset and length of the register set for the device.
- #address-cells : Should be 1.
- #size-cells : Should be 0.
Expand Down
1 change: 1 addition & 0 deletions Documentation/devicetree/bindings/i2c/i2c-rcar.txt
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ Required properties:
"renesas,i2c-r8a7745" if the device is a part of a R8A7745 SoC.
"renesas,i2c-r8a77470" if the device is a part of a R8A77470 SoC.
"renesas,i2c-r8a774a1" if the device is a part of a R8A774A1 SoC.
"renesas,i2c-r8a774c0" if the device is a part of a R8A774C0 SoC.
"renesas,i2c-r8a7778" if the device is a part of a R8A7778 SoC.
"renesas,i2c-r8a7779" if the device is a part of a R8A7779 SoC.
"renesas,i2c-r8a7790" if the device is a part of a R8A7790 SoC.
Expand Down
10 changes: 9 additions & 1 deletion Documentation/devicetree/bindings/i2c/i2c-sh_mobile.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ Required properties:
- "renesas,iic-r8a7744" (RZ/G1N)
- "renesas,iic-r8a7745" (RZ/G1E)
- "renesas,iic-r8a774a1" (RZ/G2M)
- "renesas,iic-r8a774c0" (RZ/G2E)
- "renesas,iic-r8a7790" (R-Car H2)
- "renesas,iic-r8a7791" (R-Car M2-W)
- "renesas,iic-r8a7792" (R-Car V2H)
Expand All @@ -16,6 +17,7 @@ Required properties:
- "renesas,iic-r8a7795" (R-Car H3)
- "renesas,iic-r8a7796" (R-Car M3-W)
- "renesas,iic-r8a77965" (R-Car M3-N)
- "renesas,iic-r8a77990" (R-Car E3)
- "renesas,iic-sh73a0" (SH-Mobile AG5)
- "renesas,rcar-gen2-iic" (generic R-Car Gen2 or RZ/G1
compatible device)
Expand All @@ -28,7 +30,13 @@ Required properties:
the platform first followed by the generic R-Car
version.

renesas,rmobile-iic must always follow.
When compatible with "renesas,rmobile-iic" it should
be the last compatibility string listed.

The r8a77990 (R-Car E3) and r8a774c0 (RZ/G2E)
controllers are not considered compatible with
"renesas,rcar-gen3-iic" or "renesas,rmobile-iic"
due to the absence of automatic transmission registers.

- reg : address start and address range size of device
- interrupts : interrupt of device
Expand Down
6 changes: 6 additions & 0 deletions Documentation/devicetree/bindings/i2c/i2c-stm32.txt
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,11 @@ Optional properties :
- i2c-scl-falling-time-ns : Only for STM32F7, I2C SCL Falling time for the board
(default: 10)
I2C Timings are derived from these 2 values
- st,syscfg-fmp: Only for STM32F7, use to set Fast Mode Plus bit within SYSCFG
whether Fast Mode Plus speed is selected by slave.
1st cell : phandle to syscfg
2nd cell : register offset within SYSCFG
3rd cell : register bitmask for FMP bit

Example :

Expand Down Expand Up @@ -53,4 +58,5 @@ Example :
clocks = <&rcc 1 CLK_I2C1>;
pinctrl-0 = <&i2c1_sda_pin>, <&i2c1_scl_pin>;
pinctrl-names = "default";
st,syscfg-fmp = <&syscfg 0x4 0x1>;
};
2 changes: 1 addition & 1 deletion Documentation/devicetree/bindings/i2c/nxp,pca9541.txt
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ Example:
#size-cells = <0>;

eeprom@54 {
compatible = "at,24c08";
compatible = "atmel,24c08";
reg = <0x54>;
};
};
Expand Down
Loading

0 comments on commit 7671c14

Please sign in to comment.