forked from torvalds/linux
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'i2c/for-next' of git://git.kernel.org/pub/scm/linux/ker…
…nel/git/wsa/linux Pull i2c updates from Wolfram Sang: "Here is the pull request from the i2c subsystem. It got a little delayed because I needed to wait for a dependency to be included (commit b424080: "reset: Add optional resets and stubs"). Plus, I had some email problems. All done now, the highlights are: - drivers can now deprecate their use of i2c classes. That shouldn't be used on embedded platforms anyhow and was often blindly copy&pasted. This mechanism gives users time to switch away and ultimately boot faster once the use of classes for those drivers is gone for good. - new drivers for QUP, Cadence, efm32 - tracepoint support for I2C and SMBus - bigger cleanups for the mv64xxx, nomadik, and designware drivers And the usual bugfixes, cleanups, feature additions. Most stuff has been in linux-next for a while. Just some hot fixes and new drivers were added a bit more recently." * 'i2c/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux: (63 commits) i2c: cadence: fix Kconfig dependency i2c: Add driver for Cadence I2C controller i2c: cadence: Document device tree bindings Documentation: i2c: improve section about flags mangling the protocol i2c: qup: use proper type fro clk_freq i2c: qup: off by ones in qup_i2c_probe() i2c: efm32: fix binding doc MAINTAINERS: update I2C web resources i2c: qup: New bus driver for the Qualcomm QUP I2C controller i2c: qup: Add device tree bindings information i2c: i2c-xiic: deprecate class based instantiation i2c: i2c-sirf: deprecate class based instantiation i2c: i2c-mv64xxx: deprecate class based instantiation i2c: i2c-designware-platdrv: deprecate class based instantiation i2c: i2c-davinci: deprecate class based instantiation i2c: i2c-bcm2835: deprecate class based instantiation i2c: mv64xxx: Fix reset controller handling i2c: omap: fix usage of IS_ERR_VALUE with pm_runtime_get_sync i2c: efm32: new bus driver i2c: exynos5: remove unnecessary cast of void pointer ...
- v4.15
- v4.15-rc9
- v4.15-rc8
- v4.15-rc7
- v4.15-rc6
- v4.15-rc5
- v4.15-rc4
- v4.15-rc3
- v4.15-rc2
- v4.15-rc1
- v4.14
- v4.14-rc8
- v4.14-rc7
- v4.14-rc6
- v4.14-rc5
- v4.14-rc4
- v4.14-rc3
- v4.14-rc2
- v4.14-rc1
- v4.13
- v4.13-rc7
- v4.13-rc6
- v4.13-rc5
- v4.13-rc4
- v4.13-rc3
- v4.13-rc2
- v4.13-rc1
- v4.12
- v4.12-rc7
- v4.12-rc6
- v4.12-rc5
- v4.12-rc4
- v4.12-rc3
- v4.12-rc2
- v4.12-rc1
- v4.11
- v4.11-rc8
- v4.11-rc7
- v4.11-rc6
- v4.11-rc5
- v4.11-rc4
- v4.11-rc3
- v4.11-rc2
- v4.11-rc1
- v4.10
- v4.10-rc8
- v4.10-rc7
- v4.10-rc6
- v4.10-rc5
- v4.10-rc4
- v4.10-rc3
- v4.10-rc2
- v4.10-rc1
- v4.9
- v4.9-rc8
- v4.9-rc7
- v4.9-rc6
- v4.9-rc5
- v4.9-rc4
- v4.9-rc3
- v4.9-rc2
- v4.9-rc1
- v4.8
- v4.8-rc8
- v4.8-rc7
- v4.8-rc6
- v4.8-rc5
- v4.8-rc4
- v4.8-rc3
- v4.8-rc2
- v4.8-rc1
- v4.7
- v4.7-rc7
- v4.7-rc6
- v4.7-rc5
- v4.7-rc4
- v4.7-rc3
- v4.7-rc2
- v4.7-rc1
- v4.6
- v4.6-rc7
- v4.6-rc6
- v4.6-rc5
- v4.6-rc4
- v4.6-rc3
- v4.6-rc2
- v4.6-rc1
- v4.5
- v4.5-rc7
- v4.5-rc6
- v4.5-rc5
- v4.5-rc4
- v4.5-rc3
- v4.5-rc2
- v4.5-rc1
- v4.4
- v4.4-rc8
- v4.4-rc7
- v4.4-rc6
- v4.4-rc5
- v4.4-rc4
- v4.4-rc3
- v4.4-rc2
- v4.4-rc1
- v4.3
- v4.3-rc7
- v4.3-rc6
- v4.3-rc5
- v4.3-rc4
- v4.3-rc3
- v4.3-rc2
- v4.3-rc1
- v4.2
- v4.2-rc8
- v4.2-rc7
- v4.2-rc6
- v4.2-rc5
- v4.2-rc4
- v4.2-rc3
- v4.2-rc2
- v4.2-rc1
- v4.1
- v4.1-rc8
- v4.1-rc7
- v4.1-rc6
- v4.1-rc5
- v4.1-rc4
- v4.1-rc3
- v4.1-rc2
- v4.1-rc1
- v4.0
- v4.0-rc7
- v4.0-rc6
- v4.0-rc5
- v4.0-rc4
- v4.0-rc3
- v4.0-rc2
- v4.0-rc1
- v3.19
- v3.19-rc7
- v3.19-rc6
- v3.19-rc5
- v3.19-rc4
- v3.19-rc3
- v3.19-rc2
- v3.19-rc1
- v3.18
- v3.18-rc7
- v3.18-rc6
- v3.18-rc5
- v3.18-rc4
- v3.18-rc3
- v3.18-rc2
- v3.18-rc1
- v3.17
- v3.17-rc7
- v3.17-rc6
- v3.17-rc5
- v3.17-rc4
- v3.17-rc3
- v3.17-rc2
- v3.17-rc1
- v3.16
- v3.16-rc7
- v3.16-rc6
- v3.16-rc5
- v3.16-rc4
- v3.16-rc3
- v3.16-rc2
- v3.16-rc1
- v3.15
- v3.15-rc8
- v3.15-rc7
- v3.15-rc6
- v3.15-rc5
- v3.15-rc4
- v3.15-rc3
- v3.15-rc2
- v3.15-rc1
Showing
64 changed files
with
3,292 additions
and
501 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,24 @@ | ||
Binding for the Cadence I2C controller | ||
|
||
Required properties: | ||
- reg: Physical base address and size of the controller's register area. | ||
- compatible: Compatibility string. Must be 'cdns,i2c-r1p10'. | ||
- clocks: Input clock specifier. Refer to common clock bindings. | ||
- interrupts: Interrupt specifier. Refer to interrupt bindings. | ||
- #address-cells: Should be 1. | ||
- #size-cells: Should be 0. | ||
|
||
Optional properties: | ||
- clock-frequency: Desired operating frequency, in Hz, of the bus. | ||
- clock-names: Input clock name, should be 'pclk'. | ||
|
||
Example: | ||
i2c@e0004000 { | ||
compatible = "cdns,i2c-r1p10"; | ||
clocks = <&clkc 38>; | ||
interrupts = <GIC_SPI 25 IRQ_TYPE_LEVEL_HIGH>; | ||
reg = <0xe0004000 0x1000>; | ||
clock-frequency = <400000>; | ||
#address-cells = <1>; | ||
#size-cells = <0>; | ||
}; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,34 @@ | ||
* Energymicro efm32 i2c controller | ||
|
||
Required properties : | ||
|
||
- reg : Offset and length of the register set for the device | ||
- compatible : should be "energymicro,efm32-i2c" | ||
- interrupts : the interrupt number | ||
- clocks : reference to the module clock | ||
|
||
Recommended properties : | ||
|
||
- clock-frequency : maximal I2C bus clock frequency in Hz. | ||
- efm32,location : Decides the location of the USART I/O pins. | ||
Allowed range : [0 .. 6] | ||
|
||
Example: | ||
i2c0: i2c@4000a000 { | ||
#address-cells = <1>; | ||
#size-cells = <0>; | ||
compatible = "energymicro,efm32-i2c"; | ||
reg = <0x4000a000 0x400>; | ||
interrupts = <9>; | ||
clocks = <&cmu clk_HFPERCLKI2C0>; | ||
clock-frequency = <100000>; | ||
status = "ok"; | ||
efm32,location = <3>; | ||
|
||
eeprom@50 { | ||
compatible = "microchip,24c02"; | ||
reg = <0x50>; | ||
pagesize = <16>; | ||
}; | ||
}; | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,40 @@ | ||
Qualcomm Universal Peripheral (QUP) I2C controller | ||
|
||
Required properties: | ||
- compatible: Should be: | ||
* "qcom,i2c-qup-v1.1.1" for 8660, 8960 and 8064. | ||
* "qcom,i2c-qup-v2.1.1" for 8974 v1. | ||
* "qcom,i2c-qup-v2.2.1" for 8974 v2 and later. | ||
- reg: Should contain QUP register address and length. | ||
- interrupts: Should contain I2C interrupt. | ||
|
||
- clocks: A list of phandles + clock-specifiers, one for each entry in | ||
clock-names. | ||
- clock-names: Should contain: | ||
* "core" for the core clock | ||
* "iface" for the AHB clock | ||
|
||
- #address-cells: Should be <1> Address cells for i2c device address | ||
- #size-cells: Should be <0> as i2c addresses have no size component | ||
|
||
Optional properties: | ||
- clock-frequency: Should specify the desired i2c bus clock frequency in Hz, | ||
defaults to 100kHz if omitted. | ||
|
||
Child nodes should conform to i2c bus binding. | ||
|
||
Example: | ||
|
||
i2c@f9924000 { | ||
compatible = "qcom,i2c-qup-v2.2.1"; | ||
reg = <0xf9924000 0x1000>; | ||
interrupts = <0 96 0>; | ||
|
||
clocks = <&gcc GCC_BLSP1_QUP2_I2C_APPS_CLK>, <&gcc GCC_BLSP1_AHB_CLK>; | ||
clock-names = "core", "iface"; | ||
|
||
clock-frequency = <355000>; | ||
|
||
#address-cells = <1>; | ||
#size-cells = <0>; | ||
}; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -1427,6 +1427,7 @@ F: drivers/cpuidle/cpuidle-zynq.c | |
N: zynq | ||
N: xilinx | ||
F: drivers/clocksource/cadence_ttc_timer.c | ||
F: drivers/i2c/busses/i2c-cadence.c | ||
F: drivers/mmc/host/sdhci-of-arasan.c | ||
|
||
ARM SMMU DRIVER | ||
|
@@ -4308,7 +4309,8 @@ F: drivers/i2c/i2c-stub.c | |
I2C SUBSYSTEM | ||
M: Wolfram Sang <[email protected]> | ||
L: [email protected] | ||
W: http://i2c.wiki.kernel.org/ | ||
W: https://i2c.wiki.kernel.org/ | ||
Q: https://patchwork.ozlabs.org/project/linux-i2c/list/ | ||
T: git git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux.git | ||
S: Maintained | ||
F: Documentation/i2c/ | ||
|
Oops, something went wrong.