summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2016-11-20 00:35:09 +0300
committerLinus Torvalds <torvalds@linux-foundation.org>2016-11-20 00:35:09 +0300
commit50d438fb9e4229cb37ec89a22c066b626e30885c (patch)
tree30a68ca0fd190054f6c0b61b46c433ce161115d8 /Documentation
parentdce9ce3615ca03bd7adb09a182b5ee192684f17f (diff)
parentad092de60f865c1ad94221bd06d381ecea446cc8 (diff)
downloadlinux-50d438fb9e4229cb37ec89a22c066b626e30885c.tar.xz
Merge branch 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux
Pull i2c fixes from Wolfram Sang: "Some I2C driver bugfixes (and one documentation fix)" * 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux: i2c: i2c-mux-pca954x: fix deselect enabling for device-tree i2c: digicolor: use clk_disable_unprepare instead of clk_unprepare i2c: mux: fix up dependencies i2c: Documentation: i2c-topology: fix minor whitespace nit i2c: mux: demux-pinctrl: make drivers with no pinctrl work again
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/i2c/i2c-topology4
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/i2c/i2c-topology b/Documentation/i2c/i2c-topology
index e0aefeece551..1a014fede0b7 100644
--- a/Documentation/i2c/i2c-topology
+++ b/Documentation/i2c/i2c-topology
@@ -326,7 +326,7 @@ Two parent-locked sibling muxes
This is a good topology.
- .--------.
+ .--------.
.----------. .--| dev D1 |
| parent- |--' '--------'
.--| locked | .--------.
@@ -350,7 +350,7 @@ Mux-locked and parent-locked sibling muxes
This is a good topology.
- .--------.
+ .--------.
.----------. .--| dev D1 |
| mux- |--' '--------'
.--| locked | .--------.