Message ID | 1511873595-29238-1-git-send-email-michael.hennerich@analog.com (mailing list archive) |
---|---|
State | Accepted |
Headers | show |
Hello. On 11/28/2017 01:53 PM, michael.hennerich@analog.com wrote: > From: Michael Hennerich <michael.hennerich@analog.com> > > This adds support for ADF7241 Low Power IEEE 802.15.4 > Zero-IF 2.4 GHz Transceivers > > Signed-off-by: Michael Hennerich <michael.hennerich@analog.com> > --- > Documentation/devicetree/bindings/net/ieee802154/adf7242.txt | 2 +- > drivers/net/ieee802154/adf7242.c | 4 +++- > 2 files changed, 4 insertions(+), 2 deletions(-) > > diff --git a/Documentation/devicetree/bindings/net/ieee802154/adf7242.txt b/Documentation/devicetree/bindings/net/ieee802154/adf7242.txt > index dea5124..d24172c 100644 > --- a/Documentation/devicetree/bindings/net/ieee802154/adf7242.txt > +++ b/Documentation/devicetree/bindings/net/ieee802154/adf7242.txt > @@ -1,7 +1,7 @@ > * ADF7242 IEEE 802.15.4 * > > Required properties: > - - compatible: should be "adi,adf7242" > + - compatible: should be "adi,adf7242", "adi,adf7241" > - spi-max-frequency: maximal bus speed (12.5 MHz) > - reg: the chipselect index > - interrupts: the interrupt generated by the device via pin IRQ1. > diff --git a/drivers/net/ieee802154/adf7242.c b/drivers/net/ieee802154/adf7242.c > index 400fdbd..56f4ca8 100644 > --- a/drivers/net/ieee802154/adf7242.c > +++ b/drivers/net/ieee802154/adf7242.c > @@ -1,7 +1,7 @@ > /* > * Analog Devices ADF7242 Low-Power IEEE 802.15.4 Transceiver > * > - * Copyright 2009-2015 Analog Devices Inc. > + * Copyright 2009-2017 Analog Devices Inc. > * > * Licensed under the GPL-2 or later. > * > @@ -1257,12 +1257,14 @@ static int adf7242_remove(struct spi_device *spi) > > static const struct of_device_id adf7242_of_match[] = { > { .compatible = "adi,adf7242", }, > + { .compatible = "adi,adf7241", }, > { }, > }; > MODULE_DEVICE_TABLE(of, adf7242_of_match); > > static const struct spi_device_id adf7242_device_id[] = { > { .name = "adf7242", }, > + { .name = "adf7241", }, > { }, > }; > MODULE_DEVICE_TABLE(spi, adf7242_device_id); All 5 patches have been applied to the wpan-next tree and will be part of the next pull request to net-next. Thanks! regards Stefan Schmidt -- To unsubscribe from this list: send the line "unsubscribe linux-wpan" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/Documentation/devicetree/bindings/net/ieee802154/adf7242.txt b/Documentation/devicetree/bindings/net/ieee802154/adf7242.txt index dea5124..d24172c 100644 --- a/Documentation/devicetree/bindings/net/ieee802154/adf7242.txt +++ b/Documentation/devicetree/bindings/net/ieee802154/adf7242.txt @@ -1,7 +1,7 @@ * ADF7242 IEEE 802.15.4 * Required properties: - - compatible: should be "adi,adf7242" + - compatible: should be "adi,adf7242", "adi,adf7241" - spi-max-frequency: maximal bus speed (12.5 MHz) - reg: the chipselect index - interrupts: the interrupt generated by the device via pin IRQ1. diff --git a/drivers/net/ieee802154/adf7242.c b/drivers/net/ieee802154/adf7242.c index 400fdbd..56f4ca8 100644 --- a/drivers/net/ieee802154/adf7242.c +++ b/drivers/net/ieee802154/adf7242.c @@ -1,7 +1,7 @@ /* * Analog Devices ADF7242 Low-Power IEEE 802.15.4 Transceiver * - * Copyright 2009-2015 Analog Devices Inc. + * Copyright 2009-2017 Analog Devices Inc. * * Licensed under the GPL-2 or later. * @@ -1257,12 +1257,14 @@ static int adf7242_remove(struct spi_device *spi) static const struct of_device_id adf7242_of_match[] = { { .compatible = "adi,adf7242", }, + { .compatible = "adi,adf7241", }, { }, }; MODULE_DEVICE_TABLE(of, adf7242_of_match); static const struct spi_device_id adf7242_device_id[] = { { .name = "adf7242", }, + { .name = "adf7241", }, { }, }; MODULE_DEVICE_TABLE(spi, adf7242_device_id);