diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-03-23 17:12:04 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-03-23 17:12:04 -0400 |
commit | fc2bb8d1cde1296d210a0f1ff9ee979a447d0a34 (patch) | |
tree | 725696adebdc70e1b4e0ce8537da25eb5f2bf564 /Documentation | |
parent | 475c77edf826333aa61625f49d6a2bec26ecb5a6 (diff) | |
parent | bbceeee82ef55c11db0161f4078edd79290e3bcf (diff) |
Merge branch 'i2c-embedded/for-3.4' of git://git.pengutronix.de/git/wsa/linux
Pull i2c embedded updates from Wolfram Sang:
"Nothing special from i2c-embedded for this merge window. Two new
drivers, minor feature additions, bugfixes, cleanups.
All patches have been in linux-next for some time, too."
* 'i2c-embedded/for-3.4' of git://git.pengutronix.de/git/wsa/linux:
i2c-eg20t: Remove write-only variables
i2c-eg20t: Rework pch_i2c_wait_for_bus_idle to reduce wait time
i2c-s3c2410: Add stub runtime power management
i2c-s3c2410: Convert to devm_kzalloc()
i2c: add CSR SiRFprimaII on-chip I2C controllers driver
i2c: tegra: Remove unnecessary write to INT_STATUS
i2c: imx: fix imx driver to work though signal is pending
i2c: designware: dw_i2c_init_driver as subsys initcall
misc: at24: describe platform_data with kernel_doc
i2c: Move I2C_EG20T option to the right place.
i2c: Support for Netlogic XLR/XLS I2C controller.
i2c: mpc: Add support for SMBUS_READ_BLOCK_DATA
i2c: versatile: Add Device Tree support
Diffstat (limited to 'Documentation')
-rw-r--r-- | Documentation/devicetree/bindings/i2c/sirf-i2c.txt | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/i2c/sirf-i2c.txt b/Documentation/devicetree/bindings/i2c/sirf-i2c.txt new file mode 100644 index 000000000000..7baf9e133fa8 --- /dev/null +++ b/Documentation/devicetree/bindings/i2c/sirf-i2c.txt | |||
@@ -0,0 +1,19 @@ | |||
1 | I2C for SiRFprimaII platforms | ||
2 | |||
3 | Required properties : | ||
4 | - compatible : Must be "sirf,prima2-i2c" | ||
5 | - reg: physical base address of the controller and length of memory mapped | ||
6 | region. | ||
7 | - interrupts: interrupt number to the cpu. | ||
8 | |||
9 | Optional properties: | ||
10 | - clock-frequency : Constains desired I2C/HS-I2C bus clock frequency in Hz. | ||
11 | The absence of the propoerty indicates the default frequency 100 kHz. | ||
12 | |||
13 | Examples : | ||
14 | |||
15 | i2c0: i2c@b00e0000 { | ||
16 | compatible = "sirf,prima2-i2c"; | ||
17 | reg = <0xb00e0000 0x10000>; | ||
18 | interrupts = <24>; | ||
19 | }; | ||