diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-01-11 15:40:43 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-01-11 15:40:43 -0800 |
| commit | 6327edceb62bc4c91195e2dc6d5574a53005cb5a (patch) | |
| tree | 9265680070e5bdaf81069de7bafa3d86dd0729a1 /Documentation | |
| parent | 606e9ad20094f6d500166881d301f31a51bc8aa7 (diff) | |
| parent | cf8ce8b80f8bf9669f6ec4e71e16668430febdac (diff) | |
| download | linux-6327edceb62bc4c91195e2dc6d5574a53005cb5a.tar.gz linux-6327edceb62bc4c91195e2dc6d5574a53005cb5a.tar.bz2 linux-6327edceb62bc4c91195e2dc6d5574a53005cb5a.zip | |
Merge branch 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux
Pull i2c fixes from Wolfram Sang:
"Two driver bugfixes, a documentation fix, and a removal of a spec
violation for the bus recovery algorithm in the core"
* 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux:
i2c: fix bus recovery stop mode timing
i2c: bcm2835: Store pointer to bus clock
dt-bindings: i2c: at91: fix i2c-sda-hold-time-ns documentation for sam9x60
i2c: at91: fix clk_offset for sam9x60
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/devicetree/bindings/i2c/i2c-at91.txt | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/Documentation/devicetree/bindings/i2c/i2c-at91.txt b/Documentation/devicetree/bindings/i2c/i2c-at91.txt index 2210f4359c45..8347b1e7c080 100644 --- a/Documentation/devicetree/bindings/i2c/i2c-at91.txt +++ b/Documentation/devicetree/bindings/i2c/i2c-at91.txt @@ -18,8 +18,10 @@ Optional properties: - dma-names: should contain "tx" and "rx". - atmel,fifo-size: maximum number of data the RX and TX FIFOs can store for FIFO capable I2C controllers. -- i2c-sda-hold-time-ns: TWD hold time, only available for "atmel,sama5d4-i2c" - and "atmel,sama5d2-i2c". +- i2c-sda-hold-time-ns: TWD hold time, only available for: + "atmel,sama5d4-i2c", + "atmel,sama5d2-i2c", + "microchip,sam9x60-i2c". - Child nodes conforming to i2c bus binding Examples : |