Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

[firefly-linux-kernel-4.4.55.git] / drivers / net / ieee802154 / at86rf230.c

diff --git a/drivers/net/ieee802154/at86rf230.c b/drivers/net/ieee802154/at86rf230.c
index fc315ddea61c251b0c8154e9c908faddc7fbebe1..6f10b496472662c2550d943db16dac9dcb6dda4d 100644 (file)
--- a/drivers/net/ieee802154/at86rf230.c
+++ b/drivers/net/ieee802154/at86rf230.c
@@ -51,7 +51,7 @@ struct at86rf230_local {
        struct ieee802154_dev *dev;
 
        spinlock_t lock;
-       bool irq_disabled;
+       bool irq_busy;
        bool is_tx;
 };
 
@@ -219,6 +219,9 @@ struct at86rf230_local {
 #define IRQ_PLL_UNL    (1 << 1)
 #define IRQ_PLL_LOCK   (1 << 0)
 
+#define IRQ_ACTIVE_HIGH        0
+#define IRQ_ACTIVE_LOW 1
+
 #define STATE_P_ON             0x00    /* BUSY */
 #define STATE_BUSY_RX          0x01
 #define STATE_BUSY_TX          0x02
@@ -544,7 +547,7 @@ at86rf230_xmit(struct ieee802154_dev *dev, struct sk_buff *skb)
        unsigned long flags;
 
        spin_lock(&lp->lock);
-       if  (lp->irq_disabled) {
+       if  (lp->irq_busy) {
                spin_unlock(&lp->lock);
                return -EBUSY;
        }
@@ -705,8 +708,16 @@ static void at86rf230_irqwork(struct work_struct *work)
        }
 
        spin_lock_irqsave(&lp->lock, flags);
-       lp->irq_disabled = 0;
+       lp->irq_busy = 0;
        spin_unlock_irqrestore(&lp->lock, flags);
+}
+
+static void at86rf230_irqwork_level(struct work_struct *work)
+{
+       struct at86rf230_local *lp =
+               container_of(work, struct at86rf230_local, irqwork);
+
+       at86rf230_irqwork(work);
 
        enable_irq(lp->spi->irq);
 }
@@ -715,10 +726,8 @@ static irqreturn_t at86rf230_isr(int irq, void *data)
 {
        struct at86rf230_local *lp = data;
 
-       disable_irq_nosync(irq);
-
        spin_lock(&lp->lock);
-       lp->irq_disabled = 1;
+       lp->irq_busy = 1;
        spin_unlock(&lp->lock);
 
        schedule_work(&lp->irqwork);
@@ -726,11 +735,23 @@ static irqreturn_t at86rf230_isr(int irq, void *data)
        return IRQ_HANDLED;
 }
 
+static irqreturn_t at86rf230_isr_level(int irq, void *data)
+{
+       disable_irq_nosync(irq);
+
+       return at86rf230_isr(irq, data);
+}
+
+static int at86rf230_irq_polarity(struct at86rf230_local *lp, int pol)
+{
+       return at86rf230_write_subreg(lp, SR_IRQ_POLARITY, pol);
+}
 
 static int at86rf230_hw_init(struct at86rf230_local *lp)
 {
+       struct at86rf230_platform_data *pdata = lp->spi->dev.platform_data;
+       int rc, irq_pol;
        u8 status;
-       int rc;
 
        rc = at86rf230_read_subreg(lp, SR_TRX_STATUS, &status);
        if (rc)
@@ -748,12 +769,17 @@ static int at86rf230_hw_init(struct at86rf230_local *lp)
                dev_info(&lp->spi->dev, "Status: %02x\n", status);
        }
 
-       rc = at86rf230_write_subreg(lp, SR_IRQ_MASK, 0xff); /* IRQ_TRX_UR |
-                                                            * IRQ_CCA_ED |
-                                                            * IRQ_TRX_END |
-                                                            * IRQ_PLL_UNL |
-                                                            * IRQ_PLL_LOCK
-                                                            */
+       /* configure irq polarity, defaults to high active */
+       if (pdata->irq_type & (IRQF_TRIGGER_FALLING | IRQF_TRIGGER_LOW))
+               irq_pol = IRQ_ACTIVE_LOW;
+       else
+               irq_pol = IRQ_ACTIVE_HIGH;
+
+       rc = at86rf230_irq_polarity(lp, irq_pol);
+       if (rc)
+               return rc;
+
+       rc = at86rf230_write_subreg(lp, SR_IRQ_MASK, IRQ_TRX_END);
        if (rc)
                return rc;
 
@@ -798,37 +824,38 @@ static int at86rf230_hw_init(struct at86rf230_local *lp)
        return 0;
 }
 
-static int at86rf230_fill_data(struct spi_device *spi)
+static void at86rf230_fill_data(struct spi_device *spi)
 {
        struct at86rf230_local *lp = spi_get_drvdata(spi);
        struct at86rf230_platform_data *pdata = spi->dev.platform_data;
 
-       if (!pdata) {
-               dev_err(&spi->dev, "no platform_data\n");
-               return -EINVAL;
-       }
-
        lp->rstn = pdata->rstn;
        lp->slp_tr = pdata->slp_tr;
        lp->dig2 = pdata->dig2;
-
-       return 0;
 }
 
 static int at86rf230_probe(struct spi_device *spi)
 {
+       struct at86rf230_platform_data *pdata;
        struct ieee802154_dev *dev;
        struct at86rf230_local *lp;
-       u8 man_id_0, man_id_1;
-       int rc;
+       u8 man_id_0, man_id_1, status;
+       irq_handler_t irq_handler;
+       work_func_t irq_worker;
+       int rc, supported = 0;
        const char *chip;
-       int supported = 0;
 
        if (!spi->irq) {
                dev_err(&spi->dev, "no IRQ specified\n");
                return -EINVAL;
        }
 
+       pdata = spi->dev.platform_data;
+       if (!pdata) {
+               dev_err(&spi->dev, "no platform_data\n");
+               return -EINVAL;
+       }
+
        dev = ieee802154_alloc_device(sizeof(*lp), &at86rf230_ops);
        if (!dev)
                return -ENOMEM;
@@ -844,16 +871,22 @@ static int at86rf230_probe(struct spi_device *spi)
        dev->phy->channels_supported[0] = 0x7FFF800;
        dev->flags = IEEE802154_HW_OMIT_CKSUM;
 
+       if (pdata->irq_type & (IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING)) {
+               irq_worker = at86rf230_irqwork;
+               irq_handler = at86rf230_isr;
+       } else {
+               irq_worker = at86rf230_irqwork_level;
+               irq_handler = at86rf230_isr_level;
+       }
+
        mutex_init(&lp->bmux);
-       INIT_WORK(&lp->irqwork, at86rf230_irqwork);
+       INIT_WORK(&lp->irqwork, irq_worker);
        spin_lock_init(&lp->lock);
        init_completion(&lp->tx_complete);
 
        spi_set_drvdata(spi, lp);
 
-       rc = at86rf230_fill_data(spi);
-       if (rc)
-               goto err_fill;
+       at86rf230_fill_data(spi);
 
        rc = gpio_request(lp->rstn, "rstn");
        if (rc)
@@ -928,11 +961,17 @@ static int at86rf230_probe(struct spi_device *spi)
        if (rc)
                goto err_gpio_dir;
 
-       rc = request_irq(spi->irq, at86rf230_isr, IRQF_SHARED,
+       rc = request_irq(spi->irq, irq_handler,
+                        IRQF_SHARED | pdata->irq_type,
                         dev_name(&spi->dev), lp);
        if (rc)
                goto err_gpio_dir;
 
+       /* Read irq status register to reset irq line */
+       rc = at86rf230_read_subreg(lp, RG_IRQ_STATUS, 0xff, 0, &status);
+       if (rc)
+               goto err_irq;
+
        rc = ieee802154_register_device(lp->dev);
        if (rc)
                goto err_irq;
@@ -948,7 +987,6 @@ err_gpio_dir:
 err_slp_tr:
        gpio_free(lp->rstn);
 err_rstn:
-err_fill:
        spi_set_drvdata(spi, NULL);
        mutex_destroy(&lp->bmux);
        ieee802154_free_device(lp->dev);