diff options
| author |   David S. Miller <davem@davemloft.net> | 2019-04-05 14:14:19 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-04-05 14:14:19 -0700 |
| commit | f83f7151950dd9e0f6b4a1a405bf5e55c5294e4d (patch) | |
| tree | f8d9d8ee821fcc9f0a8e1a8679bc622219c70e3b /Documentation/devicetree/bindings/hwmon/adc128d818.txt | |
| parent | Merge branch 'tipc-improve-TIPC-unicast-link-throughput' (diff) | |
| parent | Merge tag 'mm-compaction-5.1-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/mel/linux (diff) | |
| download | linux-dev-f83f7151950dd9e0f6b4a1a405bf5e55c5294e4d.tar.xz linux-dev-f83f7151950dd9e0f6b4a1a405bf5e55c5294e4d.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Minor comment merge conflict in mlx5.
Staging driver has a fixup due to the skb->xmit_more changes
in 'net-next', but was removed in 'net'.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'Documentation/devicetree/bindings/hwmon/adc128d818.txt')
| -rw-r--r-- | Documentation/devicetree/bindings/hwmon/adc128d818.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/devicetree/bindings/hwmon/adc128d818.txt b/Documentation/devicetree/bindings/hwmon/adc128d818.txt index 08bab0e94d25..d0ae46d7bac3 100644 --- a/Documentation/devicetree/bindings/hwmon/adc128d818.txt +++ b/Documentation/devicetree/bindings/hwmon/adc128d818.txt @@ -26,7 +26,7 @@ Required node properties: Optional node properties: - - ti,mode: Operation mode (see above). + - ti,mode: Operation mode (u8) (see above). Example (operation mode 2): @@ -34,5 +34,5 @@ Example (operation mode 2): adc128d818@1d { compatible = "ti,adc128d818"; reg = <0x1d>; - ti,mode = <2>; + ti,mode = /bits/ 8 <2>; }; |