]> git.karo-electronics.de Git - linux-beck.git/blobdiff - drivers/net/ieee802154/mrf24j40.c
Merge tag 'tty-4.4-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty
[linux-beck.git] / drivers / net / ieee802154 / mrf24j40.c
index 0cb251efdc0e0a2f85307031a6387ca6d9e4dcc4..aca0fb3cccbf5f294e689daae6722638356badab 100644 (file)
 #include <linux/module.h>
 #include <linux/regmap.h>
 #include <linux/ieee802154.h>
+#include <linux/irq.h>
 #include <net/cfg802154.h>
 #include <net/mac802154.h>
 
 /* MRF24J40 Short Address Registers */
 #define REG_RXMCR      0x00  /* Receive MAC control */
+#define BIT_PROMI      BIT(0)
+#define BIT_ERRPKT     BIT(1)
+#define BIT_NOACKRSP   BIT(5)
+#define BIT_PANCOORD   BIT(3)
+
 #define REG_PANIDL     0x01  /* PAN ID (low) */
 #define REG_PANIDH     0x02  /* PAN ID (high) */
 #define REG_SADRL      0x03  /* Short address (low) */
 #define REG_RXFLUSH    0x0D
 #define REG_ORDER      0x10
 #define REG_TXMCR      0x11  /* Transmit MAC control */
+#define TXMCR_MIN_BE_SHIFT             3
+#define TXMCR_MIN_BE_MASK              0x18
+#define TXMCR_CSMA_RETRIES_SHIFT       0
+#define TXMCR_CSMA_RETRIES_MASK                0x07
+
 #define REG_ACKTMOUT   0x12
 #define REG_ESLOTG1    0x13
 #define REG_SYMTICKL   0x14
@@ -49,6 +60,9 @@
 #define REG_PACON2     0x18  /* Power Amplifier Control */
 #define REG_TXBCON0    0x1A
 #define REG_TXNCON     0x1B  /* Transmit Normal FIFO Control */
+#define BIT_TXNTRIG    BIT(0)
+#define BIT_TXNACKREQ  BIT(2)
+
 #define REG_TXG1CON    0x1C
 #define REG_TXG2CON    0x1D
 #define REG_ESLOTG23   0x1E
 #define REG_TXSTBL     0x2E  /* TX Stabilization */
 #define REG_RXSR       0x30
 #define REG_INTSTAT    0x31  /* Interrupt Status */
+#define BIT_TXNIF      BIT(0)
+#define BIT_RXIF       BIT(3)
+
 #define REG_INTCON     0x32  /* Interrupt Control */
+#define BIT_TXNIE      BIT(0)
+#define BIT_RXIE       BIT(3)
+
 #define REG_GPIO       0x33  /* GPIO */
 #define REG_TRISGPIO   0x34  /* GPIO direction */
 #define REG_SLPACK     0x35
 #define REG_RFCTL      0x36  /* RF Control Mode Register */
+#define BIT_RFRST      BIT(2)
+
 #define REG_SECCR2     0x37
 #define REG_BBREG0     0x38
 #define REG_BBREG1     0x39  /* Baseband Registers */
+#define BIT_RXDECINV   BIT(2)
+
 #define REG_BBREG2     0x3A  /* */
+#define BBREG2_CCA_MODE_SHIFT  6
+#define BBREG2_CCA_MODE_MASK   0xc0
+
 #define REG_BBREG3     0x3B
 #define REG_BBREG4     0x3C
 #define REG_BBREG6     0x3E  /* */
 
 /* MRF24J40 Long Address Registers */
 #define REG_RFCON0     0x200  /* RF Control Registers */
+#define RFCON0_CH_SHIFT        4
+#define RFCON0_CH_MASK 0xf0
+#define RFOPT_RECOMMEND        3
+
 #define REG_RFCON1     0x201
 #define REG_RFCON2     0x202
 #define REG_RFCON3     0x203
+
+#define TXPWRL_MASK    0xc0
+#define TXPWRL_SHIFT   6
+#define TXPWRL_30      0x3
+#define TXPWRL_20      0x2
+#define TXPWRL_10      0x1
+#define TXPWRL_0       0x0
+
+#define TXPWRS_MASK    0x38
+#define TXPWRS_SHIFT   3
+#define TXPWRS_6_3     0x7
+#define TXPWRS_4_9     0x6
+#define TXPWRS_3_7     0x5
+#define TXPWRS_2_8     0x4
+#define TXPWRS_1_9     0x3
+#define TXPWRS_1_2     0x2
+#define TXPWRS_0_5     0x1
+#define TXPWRS_0       0x0
+
 #define REG_RFCON5     0x205
 #define REG_RFCON6     0x206
 #define REG_RFCON7     0x207
 #define REG_RFSTATE    0x20F
 #define REG_RSSI       0x210
 #define REG_SLPCON0    0x211  /* Sleep Clock Control Registers */
+#define BIT_INTEDGE    BIT(1)
+
 #define REG_SLPCON1    0x220
 #define REG_WAKETIMEL  0x222  /* Wake-up Time Match Value Low */
 #define REG_WAKETIMEH  0x223  /* Wake-up Time Match Value High */
@@ -181,8 +233,10 @@ struct mrf24j40 {
        u8 rx_fifo_buf[RX_FIFO_SIZE];
        struct spi_transfer rx_fifo_buf_trx;
 
-       struct mutex buffer_mutex; /* only used to protect buf */
-       u8 *buf; /* 3 bytes. Used for SPI single-register transfers. */
+       /* isr handling for reading intstat */
+       struct spi_message irq_msg;
+       u8 irq_buf[2];
+       struct spi_transfer irq_trx;
 };
 
 /* regmap information for short address register access */
@@ -486,43 +540,15 @@ static const struct regmap_bus mrf24j40_long_regmap_bus = {
        .val_format_endian_default = REGMAP_ENDIAN_BIG,
 };
 
-static int read_short_reg(struct mrf24j40 *devrec, u8 reg, u8 *val)
-{
-       int ret = -1;
-       struct spi_message msg;
-       struct spi_transfer xfer = {
-               .len = 2,
-               .tx_buf = devrec->buf,
-               .rx_buf = devrec->buf,
-       };
-
-       spi_message_init(&msg);
-       spi_message_add_tail(&xfer, &msg);
-
-       mutex_lock(&devrec->buffer_mutex);
-       devrec->buf[0] = MRF24J40_READSHORT(reg);
-       devrec->buf[1] = 0;
-
-       ret = spi_sync(devrec->spi, &msg);
-       if (ret)
-               dev_err(printdev(devrec),
-                       "SPI read Failed for short register 0x%hhx\n", reg);
-       else
-               *val = devrec->buf[1];
-
-       mutex_unlock(&devrec->buffer_mutex);
-       return ret;
-}
-
 static void write_tx_buf_complete(void *context)
 {
        struct mrf24j40 *devrec = context;
        __le16 fc = ieee802154_get_fc_from_skb(devrec->tx_skb);
-       u8 val = 0x01;
+       u8 val = BIT_TXNTRIG;
        int ret;
 
        if (ieee802154_is_ackreq(fc))
-               val |= 0x04;
+               val |= BIT_TXNACKREQ;
 
        devrec->tx_post_msg.complete = NULL;
        devrec->tx_post_buf[0] = MRF24J40_WRITESHORT(REG_TXNCON);
@@ -589,7 +615,7 @@ static int mrf24j40_start(struct ieee802154_hw *hw)
 
        /* Clear TXNIE and RXIE. Enable interrupts */
        return regmap_update_bits(devrec->regmap_short, REG_INTCON,
-                                 0x01 | 0x08, 0x00);
+                                 BIT_TXNIE | BIT_RXIE, 0);
 }
 
 static void mrf24j40_stop(struct ieee802154_hw *hw)
@@ -599,8 +625,8 @@ static void mrf24j40_stop(struct ieee802154_hw *hw)
        dev_dbg(printdev(devrec), "stop\n");
 
        /* Set TXNIE and RXIE. Disable Interrupts */
-       regmap_update_bits(devrec->regmap_short, REG_INTCON, 0x01 | 0x08,
-                          0x01 | 0x08);
+       regmap_update_bits(devrec->regmap_short, REG_INTCON,
+                          BIT_TXNIE | BIT_TXNIE, BIT_TXNIE | BIT_TXNIE);
 }
 
 static int mrf24j40_set_channel(struct ieee802154_hw *hw, u8 page, u8 channel)
@@ -616,17 +642,19 @@ static int mrf24j40_set_channel(struct ieee802154_hw *hw, u8 page, u8 channel)
        WARN_ON(channel > MRF24J40_CHAN_MAX);
 
        /* Set Channel TODO */
-       val = (channel-11) << 4 | 0x03;
-       ret = regmap_update_bits(devrec->regmap_long, REG_RFCON0, 0xf0, val);
+       val = (channel - 11) << RFCON0_CH_SHIFT | RFOPT_RECOMMEND;
+       ret = regmap_update_bits(devrec->regmap_long, REG_RFCON0,
+                                RFCON0_CH_MASK, val);
        if (ret)
                return ret;
 
        /* RF Reset */
-       ret = regmap_update_bits(devrec->regmap_short, REG_RFCTL, 0x04, 0x04);
+       ret = regmap_update_bits(devrec->regmap_short, REG_RFCTL, BIT_RFRST,
+                                BIT_RFRST);
        if (ret)
                return ret;
 
-       ret = regmap_update_bits(devrec->regmap_short, REG_RFCTL, 0x04, 0x00);
+       ret = regmap_update_bits(devrec->regmap_short, REG_RFCTL, BIT_RFRST, 0);
        if (!ret)
                udelay(SET_CHANNEL_DELAY_US); /* per datasheet */
 
@@ -689,11 +717,11 @@ static int mrf24j40_filter(struct ieee802154_hw *hw,
                int ret;
 
                if (filt->pan_coord)
-                       val = 0x8;
+                       val = BIT_PANCOORD;
                else
-                       val = 0x0;
-               ret = regmap_update_bits(devrec->regmap_short, REG_RXMCR, 0x8,
-                                        val);
+                       val = 0;
+               ret = regmap_update_bits(devrec->regmap_short, REG_RXMCR,
+                                        BIT_PANCOORD, val);
                if (ret)
                        return ret;
 
@@ -797,11 +825,183 @@ static int mrf24j40_handle_rx(struct mrf24j40 *devrec)
        devrec->rx_msg.complete = mrf24j40_handle_rx_read_len;
        devrec->rx_trx.len = 2;
        devrec->rx_buf[0] = MRF24J40_WRITESHORT(REG_BBREG1);
-       devrec->rx_buf[1] = 0x04; /* SET RXDECINV */
+       devrec->rx_buf[1] = BIT_RXDECINV; /* SET RXDECINV */
 
        return spi_async(devrec->spi, &devrec->rx_msg);
 }
 
+static int
+mrf24j40_csma_params(struct ieee802154_hw *hw, u8 min_be, u8 max_be,
+                    u8 retries)
+{
+       struct mrf24j40 *devrec = hw->priv;
+       u8 val;
+
+       /* min_be */
+       val = min_be << TXMCR_MIN_BE_SHIFT;
+       /* csma backoffs */
+       val |= retries << TXMCR_CSMA_RETRIES_SHIFT;
+
+       return regmap_update_bits(devrec->regmap_short, REG_TXMCR,
+                                 TXMCR_MIN_BE_MASK | TXMCR_CSMA_RETRIES_MASK,
+                                 val);
+}
+
+static int mrf24j40_set_cca_mode(struct ieee802154_hw *hw,
+                                const struct wpan_phy_cca *cca)
+{
+       struct mrf24j40 *devrec = hw->priv;
+       u8 val;
+
+       /* mapping 802.15.4 to driver spec */
+       switch (cca->mode) {
+       case NL802154_CCA_ENERGY:
+               val = 2;
+               break;
+       case NL802154_CCA_CARRIER:
+               val = 1;
+               break;
+       case NL802154_CCA_ENERGY_CARRIER:
+               switch (cca->opt) {
+               case NL802154_CCA_OPT_ENERGY_CARRIER_AND:
+                       val = 3;
+                       break;
+               default:
+                       return -EINVAL;
+               }
+               break;
+       default:
+               return -EINVAL;
+       }
+
+       return regmap_update_bits(devrec->regmap_short, REG_BBREG2,
+                                 BBREG2_CCA_MODE_MASK,
+                                 val << BBREG2_CCA_MODE_SHIFT);
+}
+
+/* array for representing ed levels */
+static const s32 mrf24j40_ed_levels[] = {
+       -9000, -8900, -8800, -8700, -8600, -8500, -8400, -8300, -8200, -8100,
+       -8000, -7900, -7800, -7700, -7600, -7500, -7400, -7300, -7200, -7100,
+       -7000, -6900, -6800, -6700, -6600, -6500, -6400, -6300, -6200, -6100,
+       -6000, -5900, -5800, -5700, -5600, -5500, -5400, -5300, -5200, -5100,
+       -5000, -4900, -4800, -4700, -4600, -4500, -4400, -4300, -4200, -4100,
+       -4000, -3900, -3800, -3700, -3600, -3500
+};
+
+/* map ed levels to register value */
+static const s32 mrf24j40_ed_levels_map[][2] = {
+       { -9000, 0 }, { -8900, 1 }, { -8800, 2 }, { -8700, 5 }, { -8600, 9 },
+       { -8500, 13 }, { -8400, 18 }, { -8300, 23 }, { -8200, 27 },
+       { -8100, 32 }, { -8000, 37 }, { -7900, 43 }, { -7800, 48 },
+       { -7700, 53 }, { -7600, 58 }, { -7500, 63 }, { -7400, 68 },
+       { -7300, 73 }, { -7200, 78 }, { -7100, 83 }, { -7000, 89 },
+       { -6900, 95 }, { -6800, 100 }, { -6700, 107 }, { -6600, 111 },
+       { -6500, 117 }, { -6400, 121 }, { -6300, 125 }, { -6200, 129 },
+       { -6100, 133 }, { -6000, 138 }, { -5900, 143 }, { -5800, 148 },
+       { -5700, 153 }, { -5600, 159 }, { -5500, 165 }, { -5400, 170 },
+       { -5300, 176 }, { -5200, 183 }, { -5100, 188 }, { -5000, 193 },
+       { -4900, 198 }, { -4800, 203 }, { -4700, 207 }, { -4600, 212 },
+       { -4500, 216 }, { -4400, 221 }, { -4300, 225 }, { -4200, 228 },
+       { -4100, 233 }, { -4000, 239 }, { -3900, 245 }, { -3800, 250 },
+       { -3700, 253 }, { -3600, 254 }, { -3500, 255 },
+};
+
+static int mrf24j40_set_cca_ed_level(struct ieee802154_hw *hw, s32 mbm)
+{
+       struct mrf24j40 *devrec = hw->priv;
+       int i;
+
+       for (i = 0; i < ARRAY_SIZE(mrf24j40_ed_levels_map); i++) {
+               if (mrf24j40_ed_levels_map[i][0] == mbm)
+                       return regmap_write(devrec->regmap_short, REG_CCAEDTH,
+                                           mrf24j40_ed_levels_map[i][1]);
+       }
+
+       return -EINVAL;
+}
+
+static const s32 mrf24j40ma_powers[] = {
+       0, -50, -120, -190, -280, -370, -490, -630, -1000, -1050, -1120, -1190,
+       -1280, -1370, -1490, -1630, -2000, -2050, -2120, -2190, -2280, -2370,
+       -2490, -2630, -3000, -3050, -3120, -3190, -3280, -3370, -3490, -3630,
+};
+
+static int mrf24j40_set_txpower(struct ieee802154_hw *hw, s32 mbm)
+{
+       struct mrf24j40 *devrec = hw->priv;
+       s32 small_scale;
+       u8 val;
+
+       if (0 >= mbm && mbm > -1000) {
+               val = TXPWRL_0 << TXPWRL_SHIFT;
+               small_scale = mbm;
+       } else if (-1000 >= mbm && mbm > -2000) {
+               val = TXPWRL_10 << TXPWRL_SHIFT;
+               small_scale = mbm + 1000;
+       } else if (-2000 >= mbm && mbm > -3000) {
+               val = TXPWRL_20 << TXPWRL_SHIFT;
+               small_scale = mbm + 2000;
+       } else if (-3000 >= mbm && mbm > -4000) {
+               val = TXPWRL_30 << TXPWRL_SHIFT;
+               small_scale = mbm + 3000;
+       } else {
+               return -EINVAL;
+       }
+
+       switch (small_scale) {
+       case 0:
+               val |= (TXPWRS_0 << TXPWRS_SHIFT);
+               break;
+       case -50:
+               val |= (TXPWRS_0_5 << TXPWRS_SHIFT);
+               break;
+       case -120:
+               val |= (TXPWRS_1_2 << TXPWRS_SHIFT);
+               break;
+       case -190:
+               val |= (TXPWRS_1_9 << TXPWRS_SHIFT);
+               break;
+       case -280:
+               val |= (TXPWRS_2_8 << TXPWRS_SHIFT);
+               break;
+       case -370:
+               val |= (TXPWRS_3_7 << TXPWRS_SHIFT);
+               break;
+       case -490:
+               val |= (TXPWRS_4_9 << TXPWRS_SHIFT);
+               break;
+       case -630:
+               val |= (TXPWRS_6_3 << TXPWRS_SHIFT);
+               break;
+       default:
+               return -EINVAL;
+       }
+
+       return regmap_update_bits(devrec->regmap_long, REG_RFCON3,
+                                 TXPWRL_MASK | TXPWRS_MASK, val);
+}
+
+static int mrf24j40_set_promiscuous_mode(struct ieee802154_hw *hw, bool on)
+{
+       struct mrf24j40 *devrec = hw->priv;
+       int ret;
+
+       if (on) {
+               /* set PROMI, ERRPKT and NOACKRSP */
+               ret = regmap_update_bits(devrec->regmap_short, REG_RXMCR,
+                                        BIT_PROMI | BIT_ERRPKT | BIT_NOACKRSP,
+                                        BIT_PROMI | BIT_ERRPKT | BIT_NOACKRSP);
+       } else {
+               /* clear PROMI, ERRPKT and NOACKRSP */
+               ret = regmap_update_bits(devrec->regmap_short, REG_RXMCR,
+                                        BIT_PROMI | BIT_ERRPKT | BIT_NOACKRSP,
+                                        0);
+       }
+
+       return ret;
+}
+
 static const struct ieee802154_ops mrf24j40_ops = {
        .owner = THIS_MODULE,
        .xmit_async = mrf24j40_tx,
@@ -810,33 +1010,50 @@ static const struct ieee802154_ops mrf24j40_ops = {
        .stop = mrf24j40_stop,
        .set_channel = mrf24j40_set_channel,
        .set_hw_addr_filt = mrf24j40_filter,
+       .set_csma_params = mrf24j40_csma_params,
+       .set_cca_mode = mrf24j40_set_cca_mode,
+       .set_cca_ed_level = mrf24j40_set_cca_ed_level,
+       .set_txpower = mrf24j40_set_txpower,
+       .set_promiscuous_mode = mrf24j40_set_promiscuous_mode,
 };
 
-static irqreturn_t mrf24j40_isr(int irq, void *data)
+static void mrf24j40_intstat_complete(void *context)
 {
-       struct mrf24j40 *devrec = data;
-       u8 intstat;
-       int ret;
+       struct mrf24j40 *devrec = context;
+       u8 intstat = devrec->irq_buf[1];
 
-       /* Read the interrupt status */
-       ret = read_short_reg(devrec, REG_INTSTAT, &intstat);
-       if (ret)
-               goto out;
+       enable_irq(devrec->spi->irq);
 
        /* Check for TX complete */
-       if (intstat & 0x1)
+       if (intstat & BIT_TXNIF)
                ieee802154_xmit_complete(devrec->hw, devrec->tx_skb, false);
 
        /* Check for Rx */
-       if (intstat & 0x8)
+       if (intstat & BIT_RXIF)
                mrf24j40_handle_rx(devrec);
+}
+
+static irqreturn_t mrf24j40_isr(int irq, void *data)
+{
+       struct mrf24j40 *devrec = data;
+       int ret;
+
+       disable_irq_nosync(irq);
+
+       devrec->irq_buf[0] = MRF24J40_READSHORT(REG_INTSTAT);
+       /* Read the interrupt status */
+       ret = spi_async(devrec->spi, &devrec->irq_msg);
+       if (ret) {
+               enable_irq(irq);
+               return IRQ_NONE;
+       }
 
-out:
        return IRQ_HANDLED;
 }
 
 static int mrf24j40_hw_init(struct mrf24j40 *devrec)
 {
+       u32 irq_type;
        int ret;
 
        /* Initialize the device.
@@ -928,6 +1145,25 @@ static int mrf24j40_hw_init(struct mrf24j40 *devrec)
                regmap_write(devrec->regmap_long, REG_RFCON3, 0x28);
        }
 
+       irq_type = irq_get_trigger_type(devrec->spi->irq);
+       if (irq_type == IRQ_TYPE_EDGE_RISING ||
+           irq_type == IRQ_TYPE_EDGE_FALLING)
+               dev_warn(&devrec->spi->dev,
+                        "Using edge triggered irq's are not recommended, because it can cause races and result in a non-functional driver!\n");
+       switch (irq_type) {
+       case IRQ_TYPE_EDGE_RISING:
+       case IRQ_TYPE_LEVEL_HIGH:
+               /* set interrupt polarity to rising */
+               ret = regmap_update_bits(devrec->regmap_long, REG_SLPCON0,
+                                        BIT_INTEDGE, BIT_INTEDGE);
+               if (ret)
+                       goto err_ret;
+               break;
+       default:
+               /* default is falling edge */
+               break;
+       }
+
        return 0;
 
 err_ret:
@@ -978,15 +1214,56 @@ mrf24j40_setup_rx_spi_messages(struct mrf24j40 *devrec)
        spi_message_add_tail(&devrec->rx_lqi_trx, &devrec->rx_buf_msg);
 }
 
+static void
+mrf24j40_setup_irq_spi_messages(struct mrf24j40 *devrec)
+{
+       spi_message_init(&devrec->irq_msg);
+       devrec->irq_msg.context = devrec;
+       devrec->irq_msg.complete = mrf24j40_intstat_complete;
+       devrec->irq_trx.len = 2;
+       devrec->irq_trx.tx_buf = devrec->irq_buf;
+       devrec->irq_trx.rx_buf = devrec->irq_buf;
+       spi_message_add_tail(&devrec->irq_trx, &devrec->irq_msg);
+}
+
 static void  mrf24j40_phy_setup(struct mrf24j40 *devrec)
 {
        ieee802154_random_extended_addr(&devrec->hw->phy->perm_extended_addr);
        devrec->hw->phy->current_channel = 11;
+
+       /* mrf24j40 supports max_minbe 0 - 3 */
+       devrec->hw->phy->supported.max_minbe = 3;
+       /* datasheet doesn't say anything about max_be, but we have min_be
+        * So we assume the max_be default.
+        */
+       devrec->hw->phy->supported.min_maxbe = 5;
+       devrec->hw->phy->supported.max_maxbe = 5;
+
+       devrec->hw->phy->cca.mode = NL802154_CCA_CARRIER;
+       devrec->hw->phy->supported.cca_modes = BIT(NL802154_CCA_ENERGY) |
+                                              BIT(NL802154_CCA_CARRIER) |
+                                              BIT(NL802154_CCA_ENERGY_CARRIER);
+       devrec->hw->phy->supported.cca_opts = BIT(NL802154_CCA_OPT_ENERGY_CARRIER_AND);
+
+       devrec->hw->phy->cca_ed_level = -6900;
+       devrec->hw->phy->supported.cca_ed_levels = mrf24j40_ed_levels;
+       devrec->hw->phy->supported.cca_ed_levels_size = ARRAY_SIZE(mrf24j40_ed_levels);
+
+       switch (spi_get_device_id(devrec->spi)->driver_data) {
+       case MRF24J40:
+       case MRF24J40MA:
+               devrec->hw->phy->supported.tx_powers = mrf24j40ma_powers;
+               devrec->hw->phy->supported.tx_powers_size = ARRAY_SIZE(mrf24j40ma_powers);
+               devrec->hw->phy->flags |= WPAN_PHY_FLAG_TXPOWER;
+               break;
+       default:
+               break;
+       }
 }
 
 static int mrf24j40_probe(struct spi_device *spi)
 {
-       int ret = -ENOMEM;
+       int ret = -ENOMEM, irq_type;
        struct ieee802154_hw *hw;
        struct mrf24j40 *devrec;
 
@@ -1004,10 +1281,16 @@ static int mrf24j40_probe(struct spi_device *spi)
        devrec->hw = hw;
        devrec->hw->parent = &spi->dev;
        devrec->hw->phy->supported.channels[0] = CHANNEL_MASK;
-       devrec->hw->flags = IEEE802154_HW_TX_OMIT_CKSUM | IEEE802154_HW_AFILT;
+       devrec->hw->flags = IEEE802154_HW_TX_OMIT_CKSUM | IEEE802154_HW_AFILT |
+                           IEEE802154_HW_CSMA_PARAMS |
+                           IEEE802154_HW_PROMISCUOUS;
+
+       devrec->hw->phy->flags = WPAN_PHY_FLAG_CCA_MODE |
+                                WPAN_PHY_FLAG_CCA_ED_LEVEL;
 
        mrf24j40_setup_tx_spi_messages(devrec);
        mrf24j40_setup_rx_spi_messages(devrec);
+       mrf24j40_setup_irq_spi_messages(devrec);
 
        devrec->regmap_short = devm_regmap_init_spi(spi,
                                                    &mrf24j40_short_regmap);
@@ -1028,32 +1311,25 @@ static int mrf24j40_probe(struct spi_device *spi)
                goto err_register_device;
        }
 
-       devrec->buf = devm_kzalloc(&spi->dev, 3, GFP_KERNEL);
-       if (!devrec->buf)
-               goto err_register_device;
-
        if (spi->max_speed_hz > MAX_SPI_SPEED_HZ) {
                dev_warn(&spi->dev, "spi clock above possible maximum: %d",
                         MAX_SPI_SPEED_HZ);
                return -EINVAL;
        }
 
-       mutex_init(&devrec->buffer_mutex);
-
        ret = mrf24j40_hw_init(devrec);
        if (ret)
                goto err_register_device;
 
        mrf24j40_phy_setup(devrec);
 
-       ret = devm_request_threaded_irq(&spi->dev,
-                                       spi->irq,
-                                       NULL,
-                                       mrf24j40_isr,
-                                       IRQF_TRIGGER_LOW|IRQF_ONESHOT,
-                                       dev_name(&spi->dev),
-                                       devrec);
+       /* request IRQF_TRIGGER_LOW as fallback default */
+       irq_type = irq_get_trigger_type(spi->irq);
+       if (!irq_type)
+               irq_type = IRQF_TRIGGER_LOW;
 
+       ret = devm_request_irq(&spi->dev, spi->irq, mrf24j40_isr,
+                              irq_type, dev_name(&spi->dev), devrec);
        if (ret) {
                dev_err(printdev(devrec), "Unable to get IRQ");
                goto err_register_device;