summaryrefslogtreecommitdiffstats
path: root/Documentation/devicetree/bindings/net/micrel-ks8851.txt
diff options
context:
space:
mode:
authorWolfram Sang <wsa@the-dreams.de>2014-06-17 14:36:41 +0200
committerWolfram Sang <wsa@the-dreams.de>2014-06-17 14:37:31 +0200
commitf0b1f6442b5090fed3529cb39f3acf8c91693d3d (patch)
treebc5f62b017a82161c9a7f892f464813f6efd5bf3 /Documentation/devicetree/bindings/net/micrel-ks8851.txt
parenti2c: sun6-p2wi: fix call to snprintf (diff)
parentLinux 3.16-rc1 (diff)
downloadlinux-f0b1f6442b5090fed3529cb39f3acf8c91693d3d.tar.xz
linux-f0b1f6442b5090fed3529cb39f3acf8c91693d3d.zip
Merge tag 'v3.16-rc1' into i2c/for-next
Merge a stable base (Linux 3.16-rc1) Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
Diffstat (limited to 'Documentation/devicetree/bindings/net/micrel-ks8851.txt')
-rw-r--r--Documentation/devicetree/bindings/net/micrel-ks8851.txt15
1 files changed, 12 insertions, 3 deletions
diff --git a/Documentation/devicetree/bindings/net/micrel-ks8851.txt b/Documentation/devicetree/bindings/net/micrel-ks8851.txt
index d54d0cc79487..bbdf9a7359a2 100644
--- a/Documentation/devicetree/bindings/net/micrel-ks8851.txt
+++ b/Documentation/devicetree/bindings/net/micrel-ks8851.txt
@@ -1,9 +1,18 @@
-Micrel KS8851 Ethernet mac
+Micrel KS8851 Ethernet mac (MLL)
Required properties:
-- compatible = "micrel,ks8851-ml" of parallel interface
+- compatible = "micrel,ks8851-mll" of parallel interface
- reg : 2 physical address and size of registers for data and command
- interrupts : interrupt connection
+Micrel KS8851 Ethernet mac (SPI)
+
+Required properties:
+- compatible = "micrel,ks8851" or the deprecated "ks8851"
+- reg : chip select number
+- interrupts : interrupt connection
+
Optional properties:
-- vdd-supply: supply for Ethernet mac
+- vdd-supply: analog 3.3V supply for Ethernet mac
+- vdd-io-supply: digital 1.8V IO supply for Ethernet mac
+- reset-gpios: reset_n input pin