3 files changed, 30 insertions, 0 deletions

diff --git a/Documentation/devicetree/bindings/net/ieee802154/mrf24j40.txt b/Documentation/devicetree/bindings/net/ieee802154/mrf24j40.txt
new file mode 100644
index 000000000000..a4ed2efb5b73
--- /dev/null
+++ b/Documentation/devicetree/bindings/net/ieee802154/mrf24j40.txt
@@ -0,0 +1,20 @@
+* MRF24J40 IEEE 802.15.4 *
+
+Required properties:
+  - compatible:         should be "microchip,mrf24j40", "microchip,mrf24j40ma",
+                        or "microchip,mrf24j40mc" depends on your transceiver
+                        board
+  - spi-max-frequency:  maximal bus speed, should be set something under or equal
+                        10000000
+  - reg:                the chipselect index
+  - interrupts:         the interrupt generated by the device.
+
+Example:
+
+        mrf24j40ma@0 {
+                compatible = "microchip,mrf24j40ma";
+                spi-max-frequency = <8500000>;
+                reg = <0>;
+                interrupts = <19 8>;
+                interrupt-parent = <&gpio3>;
+        };
diff --git a/MAINTAINERS b/MAINTAINERS
index 310da4295c70..6790ecc65e6b 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -6958,6 +6958,7 @@ M:	Alan Ott <alan@signal11.us>
 L:      linux-wpan@vger.kernel.org
 S:      Maintained
 F:      drivers/net/ieee802154/mrf24j40.c
+F:      Documentation/devicetree/bindings/net/ieee802154/mrf24j40.txt
 
 MSI LAPTOP SUPPORT
 M:      "Lee, Chun-Yi" <jlee@suse.com>
diff --git a/drivers/net/ieee802154/mrf24j40.c b/drivers/net/ieee802154/mrf24j40.c
index 41d9f5770148..89150bd43ab2 100644
--- a/drivers/net/ieee802154/mrf24j40.c
+++ b/drivers/net/ieee802154/mrf24j40.c
@@ -799,6 +799,14 @@ static int mrf24j40_remove(struct spi_device *spi)
         return 0;
 }
 
+static const struct of_device_id mrf24j40_of_match[] = {
+        { .compatible = "microchip,mrf24j40", .data = (void *)MRF24J40 },
+        { .compatible = "microchip,mrf24j40ma", .data = (void *)MRF24J40MA },
+        { .compatible = "microchip,mrf24j40mc", .data = (void *)MRF24J40MC },
+        { },
+};
+MODULE_DEVICE_TABLE(of, mrf24j40_of_match);
+
 static const struct spi_device_id mrf24j40_ids[] = {
         { "mrf24j40", MRF24J40 },
         { "mrf24j40ma", MRF24J40MA },
@@ -809,6 +817,7 @@ MODULE_DEVICE_TABLE(spi, mrf24j40_ids);
 
 static struct spi_driver mrf24j40_driver = {
         .driver = {
+                .of_match_table = of_match_ptr(mrf24j40_of_match),
                 .name = "mrf24j40",
                 .owner = THIS_MODULE,
         },