Commit afdd6ae3 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'ieee802154-for-davem-2018-02-26' of... 

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: default avatarDavid S. Miller <davem@davemloft.net>
parents 23363b87 8c6ad9cc

Documentation/devicetree/bindings/net/ieee802154/mcr20a.txt

0 → 100644
+23 −0
Original line number Original line Diff line number Diff line 
* MCR20A IEEE 802.15.4 *



Required properties:

  - compatible:		should be "nxp,mcr20a"

  - spi-max-frequency:	maximal bus speed, should be set to a frequency

			lower than 9000000 depends sync or async operation mode

  - reg:		the chipselect index

  - interrupts:		the interrupt generated by the device. Non high-level

			can occur deadlocks while handling isr.



Optional properties:

  - rst_b-gpio:		GPIO spec for the RST_B pin



Example:



	mcr20a@0 {

		compatible = "nxp,mcr20a";

		spi-max-frequency = <9000000>;

		reg = <0>;

		interrupts = <17 2>;

		interrupt-parent = <&gpio>;

		rst_b-gpio = <&gpio 27 1>

	};

MAINTAINERS

+9 −0
Original line number Original line Diff line number Diff line
@@ -8592,6 +8592,15 @@ S: Maintained 
F:	Documentation/ABI/testing/sysfs-bus-iio-potentiometer-mcp4531

F:	Documentation/ABI/testing/sysfs-bus-iio-potentiometer-mcp4531

F:	drivers/iio/potentiometer/mcp4531.c

F:	drivers/iio/potentiometer/mcp4531.c





MCR20A IEEE-802.15.4 RADIO DRIVER

M:	Xue Liu <liuxuenetmail@gmail.com>

L:	linux-wpan@vger.kernel.org

W:	https://github.com/xueliu/mcr20a-linux

S:	Maintained

F:	drivers/net/ieee802154/mcr20a.c

F:	drivers/net/ieee802154/mcr20a.h

F:	Documentation/devicetree/bindings/net/ieee802154/mcr20a.txt



MEASUREMENT COMPUTING CIO-DAC IIO DRIVER

MEASUREMENT COMPUTING CIO-DAC IIO DRIVER

M:	William Breathitt Gray <vilhelm.gray@gmail.com>

M:	William Breathitt Gray <vilhelm.gray@gmail.com>

L:	linux-iio@vger.kernel.org

L:	linux-iio@vger.kernel.org

drivers/net/ieee802154/Kconfig

+11 −0
Original line number Original line Diff line number Diff line
@@ -104,3 +104,14 @@ config IEEE802154_CA8210_DEBUGFS 
	  exposes a debugfs node for each CA8210 instance which allows

	  exposes a debugfs node for each CA8210 instance which allows

	  direct use of the Cascoda API, exposing the 802.15.4 MAC

	  direct use of the Cascoda API, exposing the 802.15.4 MAC

	  management entities.

	  management entities.



config IEEE802154_MCR20A

       tristate "MCR20A transceiver driver"

       depends on IEEE802154_DRIVERS && MAC802154

       depends on SPI

	---help---

	  Say Y here to enable the MCR20A SPI 802.15.4 wireless

	  controller.



	  This driver can also be built as a module. To do so, say M here.

	  the module will be called 'mcr20a'.

drivers/net/ieee802154/Makefile

+1 −0
Original line number Original line Diff line number Diff line
@@ -6,3 +6,4 @@ obj-$(CONFIG_IEEE802154_CC2520) += cc2520.o 
obj-$(CONFIG_IEEE802154_ATUSB) += atusb.o

obj-$(CONFIG_IEEE802154_ATUSB) += atusb.o

obj-$(CONFIG_IEEE802154_ADF7242) += adf7242.o

obj-$(CONFIG_IEEE802154_ADF7242) += adf7242.o

obj-$(CONFIG_IEEE802154_CA8210) += ca8210.o

obj-$(CONFIG_IEEE802154_CA8210) += ca8210.o

obj-$(CONFIG_IEEE802154_MCR20A) += mcr20a.o

CRA Git | Maintained and supported by SUSTech CRA and CCSE