This patch renames the at86rf230 driver to at86rf2xx. The at86rf230
supports several devices like at86rf231, at86rf233 and at86rf212. The
name at86rf2xx describes more that more kinds of the at86rf chips are
supported.
Signed-off-by: Alexander Aring <alex.ar...@gmail.com>
---
.../ieee802154/{at86rf230.txt => at86rf2xx.txt} | 0
drivers/net/ieee802154/Kconfig | 4 +-
drivers/net/ieee802154/Makefile | 2 +-
.../net/ieee802154/{at86rf230.c => at86rf2xx.c} | 286 ++++++++++-----------
include/linux/spi/{at86rf230.h => at86rf2xx.h} | 8 +-
5 files changed, 150 insertions(+), 150 deletions(-)
rename Documentation/devicetree/bindings/net/ieee802154/{at86rf230.txt =>
at86rf2xx.txt} (100%)
rename drivers/net/ieee802154/{at86rf230.c => at86rf2xx.c} (77%)
rename include/linux/spi/{at86rf230.h => at86rf2xx.h} (89%)
diff --git a/Documentation/devicetree/bindings/net/ieee802154/at86rf230.txt
b/Documentation/devicetree/bindings/net/ieee802154/at86rf2xx.txt
similarity index 100%
rename from Documentation/devicetree/bindings/net/ieee802154/at86rf230.txt
rename to Documentation/devicetree/bindings/net/ieee802154/at86rf2xx.txt
diff --git a/drivers/net/ieee802154/Kconfig b/drivers/net/ieee802154/Kconfig
index 3e89bea..cd6312d 100644
--- a/drivers/net/ieee802154/Kconfig
+++ b/drivers/net/ieee802154/Kconfig
@@ -30,7 +30,7 @@ config IEEE802154_FAKELB
This driver can also be built as a module. To do so say M here.
The module will be called 'fakelb'.
-config IEEE802154_AT86RF230
+config IEEE802154_AT86RF2XX
depends on IEEE802154_DRIVERS && MAC802154
tristate "AT86RF230/231/233/212 transceiver driver"
depends on SPI
@@ -39,7 +39,7 @@ config IEEE802154_AT86RF230
controller.
This driver can also be built as a module. To do so, say M here.
- the module will be called 'at86rf230'.
+ the module will be called 'at86rf2xx'.
config IEEE802154_MRF24J40
tristate "Microchip MRF24J40 transceiver driver"
diff --git a/drivers/net/ieee802154/Makefile b/drivers/net/ieee802154/Makefile
index abb0c08..141f680 100644
--- a/drivers/net/ieee802154/Makefile
+++ b/drivers/net/ieee802154/Makefile
@@ -1,4 +1,4 @@
obj-$(CONFIG_IEEE802154_FAKEHARD) += fakehard.o
obj-$(CONFIG_IEEE802154_FAKELB) += fakelb.o
-obj-$(CONFIG_IEEE802154_AT86RF230) += at86rf230.o
+obj-$(CONFIG_IEEE802154_AT86RF2XX) += at86rf2xx.o
obj-$(CONFIG_IEEE802154_MRF24J40) += mrf24j40.o
diff --git a/drivers/net/ieee802154/at86rf230.c
b/drivers/net/ieee802154/at86rf2xx.c
similarity index 77%
rename from drivers/net/ieee802154/at86rf230.c
rename to drivers/net/ieee802154/at86rf2xx.c
index 4517b14..07f649a 100644
--- a/drivers/net/ieee802154/at86rf230.c
+++ b/drivers/net/ieee802154/at86rf2xx.c
@@ -1,5 +1,5 @@
/*
- * AT86RF230/RF231 driver
+ * AT86RF2XX driver
*
* Copyright (C) 2009-2012 Siemens AG
*
@@ -30,14 +30,14 @@
#include <linux/workqueue.h>
#include <linux/spinlock.h>
#include <linux/spi/spi.h>
-#include <linux/spi/at86rf230.h>
+#include <linux/spi/at86rf2xx.h>
#include <linux/skbuff.h>
#include <linux/of_gpio.h>
#include <net/mac802154.h>
#include <net/wpan-phy.h>
-struct at86rf230_local {
+struct at86rf2xx_local {
struct spi_device *spi;
u8 part;
@@ -59,7 +59,7 @@ struct at86rf230_local {
int rssi_base_val;
};
-static bool is_rf212(struct at86rf230_local *local)
+static bool is_rf212(struct at86rf2xx_local *local)
{
return local->part == 7;
}
@@ -257,7 +257,7 @@ static bool is_rf212(struct at86rf230_local *local)
#define STATE_TRANSITION_IN_PROGRESS 0x1F
static int
-__at86rf230_detect_device(struct spi_device *spi, u16 *man_id, u8 *part,
+__at86rf2xx_detect_device(struct spi_device *spi, u16 *man_id, u8 *part,
u8 *version)
{
u8 data[4];
@@ -308,7 +308,7 @@ __at86rf230_detect_device(struct spi_device *spi, u16
*man_id, u8 *part,
}
static int
-__at86rf230_write(struct at86rf230_local *lp, u8 addr, u8 data)
+__at86rf2xx_write(struct at86rf2xx_local *lp, u8 addr, u8 data)
{
u8 *buf = lp->buf;
int status;
@@ -338,7 +338,7 @@ __at86rf230_write(struct at86rf230_local *lp, u8 addr, u8
data)
}
static int
-__at86rf230_read_subreg(struct at86rf230_local *lp,
+__at86rf2xx_read_subreg(struct at86rf2xx_local *lp,
u8 addr, u8 mask, int shift, u8 *data)
{
u8 *buf = lp->buf;
@@ -372,34 +372,34 @@ __at86rf230_read_subreg(struct at86rf230_local *lp,
}
static int
-at86rf230_read_subreg(struct at86rf230_local *lp,
+at86rf2xx_read_subreg(struct at86rf2xx_local *lp,
u8 addr, u8 mask, int shift, u8 *data)
{
int status;
mutex_lock(&lp->bmux);
- status = __at86rf230_read_subreg(lp, addr, mask, shift, data);
+ status = __at86rf2xx_read_subreg(lp, addr, mask, shift, data);
mutex_unlock(&lp->bmux);
return status;
}
static int
-at86rf230_write_subreg(struct at86rf230_local *lp,
+at86rf2xx_write_subreg(struct at86rf2xx_local *lp,
u8 addr, u8 mask, int shift, u8 data)
{
int status;
u8 val;
mutex_lock(&lp->bmux);
- status = __at86rf230_read_subreg(lp, addr, 0xff, 0, &val);
+ status = __at86rf2xx_read_subreg(lp, addr, 0xff, 0, &val);
if (status)
goto out;
val &= ~mask;
val |= (data << shift) & mask;
- status = __at86rf230_write(lp, addr, val);
+ status = __at86rf2xx_write(lp, addr, val);
out:
mutex_unlock(&lp->bmux);
@@ -407,7 +407,7 @@ out:
}
static int
-at86rf230_write_fbuf(struct at86rf230_local *lp, u8 *data, u8 len)
+at86rf2xx_write_fbuf(struct at86rf2xx_local *lp, u8 *data, u8 len)
{
u8 *buf = lp->buf;
int status;
@@ -447,7 +447,7 @@ at86rf230_write_fbuf(struct at86rf230_local *lp, u8 *data,
u8 len)
}
static int
-at86rf230_read_fbuf(struct at86rf230_local *lp, u8 *data, u8 *len, u8 *lqi)
+at86rf2xx_read_fbuf(struct at86rf2xx_local *lp, u8 *data, u8 *len, u8 *lqi)
{
u8 *buf = lp->buf;
int status;
@@ -507,7 +507,7 @@ at86rf230_read_fbuf(struct at86rf230_local *lp, u8 *data,
u8 *len, u8 *lqi)
}
static int
-at86rf230_ed(struct ieee802154_dev *dev, u8 *level)
+at86rf2xx_ed(struct ieee802154_dev *dev, u8 *level)
{
might_sleep();
BUG_ON(!level);
@@ -516,9 +516,9 @@ at86rf230_ed(struct ieee802154_dev *dev, u8 *level)
}
static int
-at86rf230_state(struct ieee802154_dev *dev, int state)
+at86rf2xx_state(struct ieee802154_dev *dev, int state)
{
- struct at86rf230_local *lp = dev->priv;
+ struct at86rf2xx_local *lp = dev->priv;
int rc;
u8 val;
u8 desired_status;
@@ -533,7 +533,7 @@ at86rf230_state(struct ieee802154_dev *dev, int state)
desired_status = state;
do {
- rc = at86rf230_read_subreg(lp, SR_TRX_STATUS, &val);
+ rc = at86rf2xx_read_subreg(lp, SR_TRX_STATUS, &val);
if (rc)
goto err;
} while (val == STATE_TRANSITION_IN_PROGRESS);
@@ -542,12 +542,12 @@ at86rf230_state(struct ieee802154_dev *dev, int state)
return 0;
/* state is equal to phy states */
- rc = at86rf230_write_subreg(lp, SR_TRX_CMD, state);
+ rc = at86rf2xx_write_subreg(lp, SR_TRX_CMD, state);
if (rc)
goto err;
do {
- rc = at86rf230_read_subreg(lp, SR_TRX_STATUS, &val);
+ rc = at86rf2xx_read_subreg(lp, SR_TRX_STATUS, &val);
if (rc)
goto err;
} while (val == STATE_TRANSITION_IN_PROGRESS);
@@ -567,65 +567,65 @@ err:
}
static int
-at86rf230_start(struct ieee802154_dev *dev)
+at86rf2xx_start(struct ieee802154_dev *dev)
{
- struct at86rf230_local *lp = dev->priv;
+ struct at86rf2xx_local *lp = dev->priv;
u8 rc;
- rc = at86rf230_write_subreg(lp, SR_RX_SAFE_MODE, 1);
+ rc = at86rf2xx_write_subreg(lp, SR_RX_SAFE_MODE, 1);
if (rc)
return rc;
- rc = at86rf230_state(dev, STATE_TX_ON);
+ rc = at86rf2xx_state(dev, STATE_TX_ON);
if (rc)
return rc;
- return at86rf230_state(dev, STATE_RX_AACK_ON);
+ return at86rf2xx_state(dev, STATE_RX_AACK_ON);
}
static void
-at86rf230_stop(struct ieee802154_dev *dev)
+at86rf2xx_stop(struct ieee802154_dev *dev)
{
- at86rf230_state(dev, STATE_FORCE_TRX_OFF);
+ at86rf2xx_state(dev, STATE_FORCE_TRX_OFF);
}
static int
-at86rf230_set_channel(struct at86rf230_local *lp, int page, int channel)
+at86rf23x_set_channel(struct at86rf2xx_local *lp, int page, int channel)
{
lp->rssi_base_val = -91;
- return at86rf230_write_subreg(lp, SR_CHANNEL, channel);
+ return at86rf2xx_write_subreg(lp, SR_CHANNEL, channel);
}
static int
-at86rf212_set_channel(struct at86rf230_local *lp, int page, int channel)
+at86rf212_set_channel(struct at86rf2xx_local *lp, int page, int channel)
{
int rc;
if (channel == 0)
- rc = at86rf230_write_subreg(lp, SR_SUB_MODE, 0);
+ rc = at86rf2xx_write_subreg(lp, SR_SUB_MODE, 0);
else
- rc = at86rf230_write_subreg(lp, SR_SUB_MODE, 1);
+ rc = at86rf2xx_write_subreg(lp, SR_SUB_MODE, 1);
if (rc < 0)
return rc;
if (page == 0) {
- rc = at86rf230_write_subreg(lp, SR_BPSK_QPSK, 0);
+ rc = at86rf2xx_write_subreg(lp, SR_BPSK_QPSK, 0);
lp->rssi_base_val = -100;
} else {
- rc = at86rf230_write_subreg(lp, SR_BPSK_QPSK, 1);
+ rc = at86rf2xx_write_subreg(lp, SR_BPSK_QPSK, 1);
lp->rssi_base_val = -98;
}
if (rc < 0)
return rc;
- return at86rf230_write_subreg(lp, SR_CHANNEL, channel);
+ return at86rf2xx_write_subreg(lp, SR_CHANNEL, channel);
}
static int
-at86rf230_channel(struct ieee802154_dev *dev, int page, int channel)
+at86rf2xx_channel(struct ieee802154_dev *dev, int page, int channel)
{
- struct at86rf230_local *lp = dev->priv;
+ struct at86rf2xx_local *lp = dev->priv;
int rc;
might_sleep();
@@ -639,7 +639,7 @@ at86rf230_channel(struct ieee802154_dev *dev, int page, int
channel)
if (is_rf212(lp))
rc = at86rf212_set_channel(lp, page, channel);
else
- rc = at86rf230_set_channel(lp, page, channel);
+ rc = at86rf23x_set_channel(lp, page, channel);
if (rc < 0)
return rc;
@@ -651,9 +651,9 @@ at86rf230_channel(struct ieee802154_dev *dev, int page, int
channel)
}
static int
-at86rf230_xmit(struct ieee802154_dev *dev, struct sk_buff *skb)
+at86rf2xx_xmit(struct ieee802154_dev *dev, struct sk_buff *skb)
{
- struct at86rf230_local *lp = dev->priv;
+ struct at86rf2xx_local *lp = dev->priv;
int rc;
unsigned long flags;
@@ -666,7 +666,7 @@ at86rf230_xmit(struct ieee802154_dev *dev, struct sk_buff
*skb)
might_sleep();
- rc = at86rf230_state(dev, STATE_FORCE_TX_ON);
+ rc = at86rf2xx_state(dev, STATE_FORCE_TX_ON);
if (rc)
goto err;
@@ -675,17 +675,17 @@ at86rf230_xmit(struct ieee802154_dev *dev, struct sk_buff
*skb)
reinit_completion(&lp->tx_complete);
spin_unlock_irqrestore(&lp->lock, flags);
- rc = at86rf230_write_fbuf(lp, skb->data, skb->len);
+ rc = at86rf2xx_write_fbuf(lp, skb->data, skb->len);
if (rc)
goto err_rx;
if (lp->tx_aret) {
- rc = at86rf230_write_subreg(lp, SR_TRX_CMD, STATE_TX_ARET_ON);
+ rc = at86rf2xx_write_subreg(lp, SR_TRX_CMD, STATE_TX_ARET_ON);
if (rc)
goto err_rx;
}
- rc = at86rf230_write_subreg(lp, SR_TRX_CMD, STATE_BUSY_TX);
+ rc = at86rf2xx_write_subreg(lp, SR_TRX_CMD, STATE_BUSY_TX);
if (rc)
goto err_rx;
@@ -693,9 +693,9 @@ at86rf230_xmit(struct ieee802154_dev *dev, struct sk_buff
*skb)
if (rc < 0)
goto err_rx;
- return at86rf230_start(dev);
+ return at86rf2xx_start(dev);
err_rx:
- at86rf230_start(dev);
+ at86rf2xx_start(dev);
err:
pr_err("error: %d\n", rc);
@@ -706,7 +706,7 @@ err:
return rc;
}
-static int at86rf230_rx(struct at86rf230_local *lp)
+static int at86rf2xx_rx(struct at86rf2xx_local *lp)
{
u8 len = 128, lqi = 0;
struct sk_buff *skb;
@@ -716,7 +716,7 @@ static int at86rf230_rx(struct at86rf230_local *lp)
if (!skb)
return -ENOMEM;
- if (at86rf230_read_fbuf(lp, skb_put(skb, len), &len, &lqi))
+ if (at86rf2xx_read_fbuf(lp, skb_put(skb, len), &len, &lqi))
goto err;
if (len < 2)
@@ -737,28 +737,28 @@ err:
}
static int
-at86rf230_set_hw_addr_filt(struct ieee802154_dev *dev,
+at86rf2xx_set_hw_addr_filt(struct ieee802154_dev *dev,
struct ieee802154_hw_addr_filt *filt,
unsigned long changed)
{
- struct at86rf230_local *lp = dev->priv;
+ struct at86rf2xx_local *lp = dev->priv;
if (changed & IEEE802515_AFILT_SADDR_CHANGED) {
u16 addr = le16_to_cpu(filt->short_addr);
dev_vdbg(&lp->spi->dev,
- "at86rf230_set_hw_addr_filt called for saddr\n");
- __at86rf230_write(lp, RG_SHORT_ADDR_0, addr);
- __at86rf230_write(lp, RG_SHORT_ADDR_1, addr >> 8);
+ "at86rf2xx_set_hw_addr_filt called for saddr\n");
+ __at86rf2xx_write(lp, RG_SHORT_ADDR_0, addr);
+ __at86rf2xx_write(lp, RG_SHORT_ADDR_1, addr >> 8);
}
if (changed & IEEE802515_AFILT_PANID_CHANGED) {
u16 pan = le16_to_cpu(filt->pan_id);
dev_vdbg(&lp->spi->dev,
- "at86rf230_set_hw_addr_filt called for pan id\n");
- __at86rf230_write(lp, RG_PAN_ID_0, pan);
- __at86rf230_write(lp, RG_PAN_ID_1, pan >> 8);
+ "at86rf2xx_set_hw_addr_filt called for pan id\n");
+ __at86rf2xx_write(lp, RG_PAN_ID_0, pan);
+ __at86rf2xx_write(lp, RG_PAN_ID_1, pan >> 8);
}
if (changed & IEEE802515_AFILT_IEEEADDR_CHANGED) {
@@ -766,18 +766,18 @@ at86rf230_set_hw_addr_filt(struct ieee802154_dev *dev,
memcpy(addr, &filt->ieee_addr, 8);
dev_vdbg(&lp->spi->dev,
- "at86rf230_set_hw_addr_filt called for IEEE addr\n");
+ "at86rf2xx_set_hw_addr_filt called for IEEE addr\n");
for (i = 0; i < 8; i++)
- __at86rf230_write(lp, RG_IEEE_ADDR_0 + i, addr[i]);
+ __at86rf2xx_write(lp, RG_IEEE_ADDR_0 + i, addr[i]);
}
if (changed & IEEE802515_AFILT_PANC_CHANGED) {
dev_vdbg(&lp->spi->dev,
- "at86rf230_set_hw_addr_filt called for panc change\n");
+ "at86rf2xx_set_hw_addr_filt called for panc change\n");
if (filt->pan_coord)
- at86rf230_write_subreg(lp, SR_AACK_I_AM_COORD, 1);
+ at86rf2xx_write_subreg(lp, SR_AACK_I_AM_COORD, 1);
else
- at86rf230_write_subreg(lp, SR_AACK_I_AM_COORD, 0);
+ at86rf2xx_write_subreg(lp, SR_AACK_I_AM_COORD, 0);
}
return 0;
@@ -786,7 +786,7 @@ at86rf230_set_hw_addr_filt(struct ieee802154_dev *dev,
static int
at86rf212_set_txpower(struct ieee802154_dev *dev, int db)
{
- struct at86rf230_local *lp = dev->priv;
+ struct at86rf2xx_local *lp = dev->priv;
/* typical maximum output is 5dBm with RG_PHY_TX_PWR 0x60, lower five
* bits decrease power in 1dB steps. 0x60 represents extra PA gain of
@@ -799,29 +799,29 @@ at86rf212_set_txpower(struct ieee802154_dev *dev, int db)
db = -(db - 5);
- return __at86rf230_write(lp, RG_PHY_TX_PWR, 0x60 | db);
+ return __at86rf2xx_write(lp, RG_PHY_TX_PWR, 0x60 | db);
}
static int
at86rf212_set_lbt(struct ieee802154_dev *dev, bool on)
{
- struct at86rf230_local *lp = dev->priv;
+ struct at86rf2xx_local *lp = dev->priv;
- return at86rf230_write_subreg(lp, SR_CSMA_LBT_MODE, on);
+ return at86rf2xx_write_subreg(lp, SR_CSMA_LBT_MODE, on);
}
static int
at86rf212_set_cca_mode(struct ieee802154_dev *dev, u8 mode)
{
- struct at86rf230_local *lp = dev->priv;
+ struct at86rf2xx_local *lp = dev->priv;
- return at86rf230_write_subreg(lp, SR_CCA_MODE, mode);
+ return at86rf2xx_write_subreg(lp, SR_CCA_MODE, mode);
}
static int
at86rf212_set_cca_ed_level(struct ieee802154_dev *dev, s32 level)
{
- struct at86rf230_local *lp = dev->priv;
+ struct at86rf2xx_local *lp = dev->priv;
int desens_steps;
if (level < lp->rssi_base_val || level > 30)
@@ -829,34 +829,34 @@ at86rf212_set_cca_ed_level(struct ieee802154_dev *dev,
s32 level)
desens_steps = (level - lp->rssi_base_val) * 100 / 207;
- return at86rf230_write_subreg(lp, SR_CCA_ED_THRES, desens_steps);
+ return at86rf2xx_write_subreg(lp, SR_CCA_ED_THRES, desens_steps);
}
static int
at86rf212_set_csma_params(struct ieee802154_dev *dev, u8 min_be, u8 max_be,
u8 retries)
{
- struct at86rf230_local *lp = dev->priv;
+ struct at86rf2xx_local *lp = dev->priv;
int rc;
if (min_be > max_be || max_be > 8 || retries > 5)
return -EINVAL;
- rc = at86rf230_write_subreg(lp, SR_MIN_BE, min_be);
+ rc = at86rf2xx_write_subreg(lp, SR_MIN_BE, min_be);
if (rc)
return rc;
- rc = at86rf230_write_subreg(lp, SR_MAX_BE, max_be);
+ rc = at86rf2xx_write_subreg(lp, SR_MAX_BE, max_be);
if (rc)
return rc;
- return at86rf230_write_subreg(lp, SR_MAX_CSMA_RETRIES, retries);
+ return at86rf2xx_write_subreg(lp, SR_MAX_CSMA_RETRIES, retries);
}
static int
at86rf212_set_frame_retries(struct ieee802154_dev *dev, s8 retries)
{
- struct at86rf230_local *lp = dev->priv;
+ struct at86rf2xx_local *lp = dev->priv;
int rc = 0;
if (retries < -1 || retries > 15)
@@ -865,29 +865,29 @@ at86rf212_set_frame_retries(struct ieee802154_dev *dev,
s8 retries)
lp->tx_aret = retries >= 0;
if (retries >= 0)
- rc = at86rf230_write_subreg(lp, SR_MAX_FRAME_RETRIES, retries);
+ rc = at86rf2xx_write_subreg(lp, SR_MAX_FRAME_RETRIES, retries);
return rc;
}
-static struct ieee802154_ops at86rf230_ops = {
+static struct ieee802154_ops at86rf2xx_ops = {
.owner = THIS_MODULE,
- .xmit = at86rf230_xmit,
- .ed = at86rf230_ed,
- .set_channel = at86rf230_channel,
- .start = at86rf230_start,
- .stop = at86rf230_stop,
- .set_hw_addr_filt = at86rf230_set_hw_addr_filt,
+ .xmit = at86rf2xx_xmit,
+ .ed = at86rf2xx_ed,
+ .set_channel = at86rf2xx_channel,
+ .start = at86rf2xx_start,
+ .stop = at86rf2xx_stop,
+ .set_hw_addr_filt = at86rf2xx_set_hw_addr_filt,
};
static struct ieee802154_ops at86rf212_ops = {
.owner = THIS_MODULE,
- .xmit = at86rf230_xmit,
- .ed = at86rf230_ed,
- .set_channel = at86rf230_channel,
- .start = at86rf230_start,
- .stop = at86rf230_stop,
- .set_hw_addr_filt = at86rf230_set_hw_addr_filt,
+ .xmit = at86rf2xx_xmit,
+ .ed = at86rf2xx_ed,
+ .set_channel = at86rf2xx_channel,
+ .start = at86rf2xx_start,
+ .stop = at86rf2xx_stop,
+ .set_hw_addr_filt = at86rf2xx_set_hw_addr_filt,
.set_txpower = at86rf212_set_txpower,
.set_lbt = at86rf212_set_lbt,
.set_cca_mode = at86rf212_set_cca_mode,
@@ -896,15 +896,15 @@ static struct ieee802154_ops at86rf212_ops = {
.set_frame_retries = at86rf212_set_frame_retries,
};
-static void at86rf230_irqwork(struct work_struct *work)
+static void at86rf2xx_irqwork(struct work_struct *work)
{
- struct at86rf230_local *lp =
- container_of(work, struct at86rf230_local, irqwork);
+ struct at86rf2xx_local *lp =
+ container_of(work, struct at86rf2xx_local, irqwork);
u8 status = 0, val;
int rc;
unsigned long flags;
- rc = at86rf230_read_subreg(lp, RG_IRQ_STATUS, 0xff, 0, &val);
+ rc = at86rf2xx_read_subreg(lp, RG_IRQ_STATUS, 0xff, 0, &val);
status |= val;
status &= ~IRQ_PLL_LOCK; /* ignore */
@@ -921,7 +921,7 @@ static void at86rf230_irqwork(struct work_struct *work)
complete(&lp->tx_complete);
} else {
spin_unlock_irqrestore(&lp->lock, flags);
- at86rf230_rx(lp);
+ at86rf2xx_rx(lp);
}
}
@@ -930,19 +930,19 @@ static void at86rf230_irqwork(struct work_struct *work)
spin_unlock_irqrestore(&lp->lock, flags);
}
-static void at86rf230_irqwork_level(struct work_struct *work)
+static void at86rf2xx_irqwork_level(struct work_struct *work)
{
- struct at86rf230_local *lp =
- container_of(work, struct at86rf230_local, irqwork);
+ struct at86rf2xx_local *lp =
+ container_of(work, struct at86rf2xx_local, irqwork);
- at86rf230_irqwork(work);
+ at86rf2xx_irqwork(work);
enable_irq(lp->spi->irq);
}
-static irqreturn_t at86rf230_isr(int irq, void *data)
+static irqreturn_t at86rf2xx_isr(int irq, void *data)
{
- struct at86rf230_local *lp = data;
+ struct at86rf2xx_local *lp = data;
unsigned long flags;
spin_lock_irqsave(&lp->lock, flags);
@@ -954,20 +954,20 @@ static irqreturn_t at86rf230_isr(int irq, void *data)
return IRQ_HANDLED;
}
-static irqreturn_t at86rf230_isr_level(int irq, void *data)
+static irqreturn_t at86rf2xx_isr_level(int irq, void *data)
{
disable_irq_nosync(irq);
- return at86rf230_isr(irq, data);
+ return at86rf2xx_isr(irq, data);
}
-static int at86rf230_hw_init(struct at86rf230_local *lp)
+static int at86rf2xx_hw_init(struct at86rf2xx_local *lp)
{
int rc, irq_pol, irq_type;
u8 dvdd;
u8 csma_seed[2];
- rc = at86rf230_write_subreg(lp, SR_TRX_CMD, STATE_FORCE_TRX_OFF);
+ rc = at86rf2xx_write_subreg(lp, SR_TRX_CMD, STATE_FORCE_TRX_OFF);
if (rc)
return rc;
@@ -978,35 +978,35 @@ static int at86rf230_hw_init(struct at86rf230_local *lp)
else
irq_pol = IRQ_ACTIVE_HIGH;
- rc = at86rf230_write_subreg(lp, SR_IRQ_POLARITY, irq_pol);
+ rc = at86rf2xx_write_subreg(lp, SR_IRQ_POLARITY, irq_pol);
if (rc)
return rc;
- rc = at86rf230_write_subreg(lp, SR_IRQ_MASK, IRQ_TRX_END);
+ rc = at86rf2xx_write_subreg(lp, SR_IRQ_MASK, IRQ_TRX_END);
if (rc)
return rc;
get_random_bytes(csma_seed, ARRAY_SIZE(csma_seed));
- rc = at86rf230_write_subreg(lp, SR_CSMA_SEED_0, csma_seed[0]);
+ rc = at86rf2xx_write_subreg(lp, SR_CSMA_SEED_0, csma_seed[0]);
if (rc)
return rc;
- rc = at86rf230_write_subreg(lp, SR_CSMA_SEED_1, csma_seed[1]);
+ rc = at86rf2xx_write_subreg(lp, SR_CSMA_SEED_1, csma_seed[1]);
if (rc)
return rc;
/* CLKM changes are applied immediately */
- rc = at86rf230_write_subreg(lp, SR_CLKM_SHA_SEL, 0x00);
+ rc = at86rf2xx_write_subreg(lp, SR_CLKM_SHA_SEL, 0x00);
if (rc)
return rc;
/* Turn CLKM Off */
- rc = at86rf230_write_subreg(lp, SR_CLKM_CTRL, 0x00);
+ rc = at86rf2xx_write_subreg(lp, SR_CLKM_CTRL, 0x00);
if (rc)
return rc;
/* Wait the next SLEEP cycle */
msleep(100);
- rc = at86rf230_read_subreg(lp, SR_DVDD_OK, &dvdd);
+ rc = at86rf2xx_read_subreg(lp, SR_DVDD_OK, &dvdd);
if (rc)
return rc;
if (!dvdd) {
@@ -1017,10 +1017,10 @@ static int at86rf230_hw_init(struct at86rf230_local *lp)
return 0;
}
-static struct at86rf230_platform_data *
-at86rf230_get_pdata(struct spi_device *spi)
+static struct at86rf2xx_platform_data *
+at86rf2xx_get_pdata(struct spi_device *spi)
{
- struct at86rf230_platform_data *pdata;
+ struct at86rf2xx_platform_data *pdata;
if (!IS_ENABLED(CONFIG_OF) || !spi->dev.of_node)
return spi->dev.platform_data;
@@ -1037,11 +1037,11 @@ done:
return pdata;
}
-static int at86rf230_probe(struct spi_device *spi)
+static int at86rf2xx_probe(struct spi_device *spi)
{
- struct at86rf230_platform_data *pdata;
+ struct at86rf2xx_platform_data *pdata;
struct ieee802154_dev *dev;
- struct at86rf230_local *lp;
+ struct at86rf2xx_local *lp;
u16 man_id = 0;
u8 part = 0, version = 0, status;
irq_handler_t irq_handler;
@@ -1055,7 +1055,7 @@ static int at86rf230_probe(struct spi_device *spi)
return -EINVAL;
}
- pdata = at86rf230_get_pdata(spi);
+ pdata = at86rf2xx_get_pdata(spi);
if (!pdata) {
dev_err(&spi->dev, "no platform_data\n");
return -EINVAL;
@@ -1084,7 +1084,7 @@ static int at86rf230_probe(struct spi_device *spi)
usleep_range(120, 240);
}
- rc = __at86rf230_detect_device(spi, &man_id, &part, &version);
+ rc = __at86rf2xx_detect_device(spi, &man_id, &part, &version);
if (rc < 0)
return rc;
@@ -1101,7 +1101,7 @@ static int at86rf230_probe(struct spi_device *spi)
break;
case 3:
chip = "at86rf231";
- ops = &at86rf230_ops;
+ ops = &at86rf2xx_ops;
break;
case 7:
chip = "at86rf212";
@@ -1110,7 +1110,7 @@ static int at86rf230_probe(struct spi_device *spi)
break;
case 11:
chip = "at86rf233";
- ops = &at86rf230_ops;
+ ops = &at86rf2xx_ops;
break;
default:
chip = "UNKNOWN";
@@ -1138,11 +1138,11 @@ static int at86rf230_probe(struct spi_device *spi)
irq_type = irq_get_trigger_type(spi->irq);
if (irq_type & (IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING)) {
- irq_worker = at86rf230_irqwork;
- irq_handler = at86rf230_isr;
+ irq_worker = at86rf2xx_irqwork;
+ irq_handler = at86rf2xx_isr;
} else {
- irq_worker = at86rf230_irqwork_level;
- irq_handler = at86rf230_isr_level;
+ irq_worker = at86rf2xx_irqwork_level;
+ irq_handler = at86rf2xx_isr_level;
}
mutex_init(&lp->bmux);
@@ -1159,12 +1159,12 @@ static int at86rf230_probe(struct spi_device *spi)
dev->phy->channels_supported[0] = 0x7FFF800;
}
- rc = at86rf230_hw_init(lp);
+ rc = at86rf2xx_hw_init(lp);
if (rc)
goto err_hw_init;
/* Read irq status register to reset irq line */
- rc = at86rf230_read_subreg(lp, RG_IRQ_STATUS, 0xff, 0, &status);
+ rc = at86rf2xx_read_subreg(lp, RG_IRQ_STATUS, 0xff, 0, &status);
if (rc)
goto err_hw_init;
@@ -1187,51 +1187,51 @@ err_hw_init:
return rc;
}
-static int at86rf230_remove(struct spi_device *spi)
+static int at86rf2xx_remove(struct spi_device *spi)
{
- struct at86rf230_local *lp = spi_get_drvdata(spi);
+ struct at86rf2xx_local *lp = spi_get_drvdata(spi);
- /* mask all at86rf230 irq's */
- at86rf230_write_subreg(lp, SR_IRQ_MASK, 0);
+ /* mask all at86rf2xx irq's */
+ at86rf2xx_write_subreg(lp, SR_IRQ_MASK, 0);
ieee802154_unregister_device(lp->dev);
flush_work(&lp->irqwork);
mutex_destroy(&lp->bmux);
ieee802154_free_device(lp->dev);
- dev_dbg(&spi->dev, "unregistered at86rf230\n");
+ dev_dbg(&spi->dev, "unregistered at86rf2xx\n");
return 0;
}
-static const struct of_device_id at86rf230_of_match[] = {
+static const struct of_device_id at86rf2xx_of_match[] = {
{ .compatible = "atmel,at86rf230", },
{ .compatible = "atmel,at86rf231", },
{ .compatible = "atmel,at86rf233", },
{ .compatible = "atmel,at86rf212", },
{ },
};
-MODULE_DEVICE_TABLE(of, at86rf230_of_match);
+MODULE_DEVICE_TABLE(of, at86rf2xx_of_match);
-static const struct spi_device_id at86rf230_device_id[] = {
+static const struct spi_device_id at86rf2xx_device_id[] = {
{ .name = "at86rf230", },
{ .name = "at86rf231", },
{ .name = "at86rf233", },
{ .name = "at86rf212", },
{ },
};
-MODULE_DEVICE_TABLE(spi, at86rf230_device_id);
+MODULE_DEVICE_TABLE(spi, at86rf2xx_device_id);
-static struct spi_driver at86rf230_driver = {
- .id_table = at86rf230_device_id,
+static struct spi_driver at86rf2xx_driver = {
+ .id_table = at86rf2xx_device_id,
.driver = {
- .of_match_table = of_match_ptr(at86rf230_of_match),
- .name = "at86rf230",
+ .of_match_table = of_match_ptr(at86rf2xx_of_match),
+ .name = "at86rf2xx",
.owner = THIS_MODULE,
},
- .probe = at86rf230_probe,
- .remove = at86rf230_remove,
+ .probe = at86rf2xx_probe,
+ .remove = at86rf2xx_remove,
};
-module_spi_driver(at86rf230_driver);
+module_spi_driver(at86rf2xx_driver);
-MODULE_DESCRIPTION("AT86RF230 Transceiver Driver");
+MODULE_DESCRIPTION("AT86RF2XX Transceiver Driver");
MODULE_LICENSE("GPL v2");
diff --git a/include/linux/spi/at86rf230.h b/include/linux/spi/at86rf2xx.h
similarity index 89%
rename from include/linux/spi/at86rf230.h
rename to include/linux/spi/at86rf2xx.h
index b2b1afb..deac16e 100644
--- a/include/linux/spi/at86rf230.h
+++ b/include/linux/spi/at86rf2xx.h
@@ -1,5 +1,5 @@
/*
- * AT86RF230/RF231 driver
+ * AT86RF2XX driver
*
* Copyright (C) 2009-2012 Siemens AG
*
@@ -19,10 +19,10 @@
* Written by:
* Dmitry Eremin-Solenikov <dmitry.barysh...@siemens.com>
*/
-#ifndef AT86RF230_H
-#define AT86RF230_H
+#ifndef AT86RF2XX_H
+#define AT86RF2XX_H
-struct at86rf230_platform_data {
+struct at86rf2xx_platform_data {
int rstn;
int slp_tr;
int dig2;
--
2.0.0
------------------------------------------------------------------------------
HPCC Systems Open Source Big Data Platform from LexisNexis Risk Solutions
Find What Matters Most in Your Big Data with HPCC Systems
Open Source. Fast. Scalable. Simple. Ideal for Dirty Data.
Leverages Graph Analysis for Fast Processing & Easy Data Exploration
http://p.sf.net/sfu/hpccsystems
_______________________________________________
Linux-zigbee-devel mailing list
Linux-zigbee-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/linux-zigbee-devel
