Skip to content

Commit afdd6ae

Browse files
committed
Merge branch 'ieee802154-for-davem-2018-02-26' of git://git.kernel.org/pub/scm/linux/kernel/git/sschmidt/wpan-next
Stefan Schmidt says: ==================== pull-request: ieee802154-next 2018-02-26 An update from ieee802154 for *net-next* Alexander corrected a setting which got lost during some 6lowpan rework a while back and Xue Liu provided us with a new driver for the MCR20A transceiver. If there are any issues let me know. If not, please pull. ==================== Signed-off-by: David S. Miller <[email protected]>
2 parents 23363b8 + 8c6ad9c commit afdd6ae

File tree

7 files changed

+1956
-0
lines changed

7 files changed

+1956
-0
lines changed
Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
* MCR20A IEEE 802.15.4 *
2+
3+
Required properties:
4+
- compatible: should be "nxp,mcr20a"
5+
- spi-max-frequency: maximal bus speed, should be set to a frequency
6+
lower than 9000000 depends sync or async operation mode
7+
- reg: the chipselect index
8+
- interrupts: the interrupt generated by the device. Non high-level
9+
can occur deadlocks while handling isr.
10+
11+
Optional properties:
12+
- rst_b-gpio: GPIO spec for the RST_B pin
13+
14+
Example:
15+
16+
mcr20a@0 {
17+
compatible = "nxp,mcr20a";
18+
spi-max-frequency = <9000000>;
19+
reg = <0>;
20+
interrupts = <17 2>;
21+
interrupt-parent = <&gpio>;
22+
rst_b-gpio = <&gpio 27 1>
23+
};

MAINTAINERS

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8592,6 +8592,15 @@ S: Maintained
85928592
F: Documentation/ABI/testing/sysfs-bus-iio-potentiometer-mcp4531
85938593
F: drivers/iio/potentiometer/mcp4531.c
85948594

8595+
MCR20A IEEE-802.15.4 RADIO DRIVER
8596+
M: Xue Liu <[email protected]>
8597+
8598+
W: https://github.com/xueliu/mcr20a-linux
8599+
S: Maintained
8600+
F: drivers/net/ieee802154/mcr20a.c
8601+
F: drivers/net/ieee802154/mcr20a.h
8602+
F: Documentation/devicetree/bindings/net/ieee802154/mcr20a.txt
8603+
85958604
MEASUREMENT COMPUTING CIO-DAC IIO DRIVER
85968605
M: William Breathitt Gray <[email protected]>
85978606

drivers/net/ieee802154/Kconfig

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,3 +104,14 @@ config IEEE802154_CA8210_DEBUGFS
104104
exposes a debugfs node for each CA8210 instance which allows
105105
direct use of the Cascoda API, exposing the 802.15.4 MAC
106106
management entities.
107+
108+
config IEEE802154_MCR20A
109+
tristate "MCR20A transceiver driver"
110+
depends on IEEE802154_DRIVERS && MAC802154
111+
depends on SPI
112+
---help---
113+
Say Y here to enable the MCR20A SPI 802.15.4 wireless
114+
controller.
115+
116+
This driver can also be built as a module. To do so, say M here.
117+
the module will be called 'mcr20a'.

drivers/net/ieee802154/Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,4 @@ obj-$(CONFIG_IEEE802154_CC2520) += cc2520.o
66
obj-$(CONFIG_IEEE802154_ATUSB) += atusb.o
77
obj-$(CONFIG_IEEE802154_ADF7242) += adf7242.o
88
obj-$(CONFIG_IEEE802154_CA8210) += ca8210.o
9+
obj-$(CONFIG_IEEE802154_MCR20A) += mcr20a.o

0 commit comments

Comments
 (0)