at86rf230: add irq type configuration option
authorSascha Herrmann <sascha@ps.nvbi.de>
Sun, 14 Apr 2013 22:33:28 +0000 (22:33 +0000)
committerDavid S. Miller <davem@davemloft.net>
Tue, 16 Apr 2013 20:34:07 +0000 (16:34 -0400)
Add option to at86rf230 platform data to configure the type of the
interrupt used by the driver. The irq polarity of the device will
be configured accordingly.

Signed-off-by: Sascha Herrmann <sascha@ps.nvbi.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ieee802154/at86rf230.c
include/linux/spi/at86rf230.h

index fc315ddea61c251b0c8154e9c908faddc7fbebe1..cf098889ba648c71e3e846b3193de53771fac101 100644 (file)
@@ -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
@@ -726,11 +729,16 @@ static irqreturn_t at86rf230_isr(int irq, void *data)
        return IRQ_HANDLED;
 }
 
+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,6 +756,16 @@ static int at86rf230_hw_init(struct at86rf230_local *lp)
                dev_info(&lp->spi->dev, "Status: %02x\n", status);
        }
 
+       /* 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, 0xff); /* IRQ_TRX_UR |
                                                             * IRQ_CCA_ED |
                                                             * IRQ_TRX_END |
@@ -798,37 +816,36 @@ 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;
+       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;
@@ -851,9 +868,7 @@ static int at86rf230_probe(struct spi_device *spi)
 
        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,7 +943,8 @@ 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, at86rf230_isr,
+                        IRQF_SHARED | pdata->irq_type,
                         dev_name(&spi->dev), lp);
        if (rc)
                goto err_gpio_dir;
@@ -948,7 +964,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);
index b2b1afbb32024ebbb80be196ea276a7ff53ae43e..aa327a8105ada0d2502d697c6f66699e8f8c516b 100644 (file)
@@ -26,6 +26,20 @@ struct at86rf230_platform_data {
        int rstn;
        int slp_tr;
        int dig2;
+
+       /* Setting the irq_type will configure the driver to request
+        * the platform irq trigger type according to the given value
+        * and configure the interrupt polarity of the device to the
+        * corresponding polarity.
+        *
+        * Allowed values are: IRQF_TRIGGER_RISING, IRQF_TRIGGER_FALLING,
+        *                     IRQF_TRIGGER_HIGH and IRQF_TRIGGER_LOW
+        *
+        * Setting it to 0, the driver does not touch the trigger type
+        * configuration of the interrupt and sets the interrupt polarity
+        * of the device to high active (the default value).
+        */
+       int irq_type;
 };
 
 #endif