iio: humidity: hts221: support active-low interrupts

Add support for active low interrupts (IRQF_TRIGGER_LOW and
IRQF_TRIGGER_FALLING). Configure the device as active high or low
according to the requested irq line.

Signed-off-by: Lorenzo Bianconi <lorenzo.bianconi@st.com>
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>

diff --git a/drivers/iio/humidity/hts221.h b/drivers/iio/humidity/hts221.h
index 69dfa5c63ec299fe373fdd883425da8b9e077f07..c3de6e494f8c870b4bb2d88ddbb00c59c31e0392 100644 (file)
--- a/drivers/iio/humidity/hts221.h
+++ b/drivers/iio/humidity/hts221.h
@@ -61,6 +61,7 @@ struct hts221_hw {
 extern const struct dev_pm_ops hts221_pm_ops;
 
 int hts221_config_drdy(struct hts221_hw *hw, bool enable);
+int hts221_write_with_mask(struct hts221_hw *hw, u8 addr, u8 mask, u8 val);
 int hts221_probe(struct iio_dev *iio_dev);
 int hts221_set_enable(struct hts221_hw *hw, bool enable);
 int hts221_allocate_buffers(struct hts221_hw *hw);

diff --git a/drivers/iio/humidity/hts221_buffer.c b/drivers/iio/humidity/hts221_buffer.c
index c4ed153ad3974f9c292f8d91d3a329a186df0d70..ad5222295b2ce9b0c70be47e467a38b39766b018 100644 (file)
--- a/drivers/iio/humidity/hts221_buffer.c
+++ b/drivers/iio/humidity/hts221_buffer.c
@@ -22,6 +22,8 @@
 
 #include "hts221.h"
 
+#define HTS221_REG_DRDY_HL_ADDR                0x22
+#define HTS221_REG_DRDY_HL_MASK                BIT(7)
 #define HTS221_REG_STATUS_ADDR         0x27
 #define HTS221_RH_DRDY_MASK            BIT(1)
 #define HTS221_TEMP_DRDY_MASK          BIT(0)
@@ -67,6 +69,7 @@ static irqreturn_t hts221_trigger_handler_thread(int irq, void *private)
 int hts221_allocate_trigger(struct hts221_hw *hw)
 {
        struct iio_dev *iio_dev = iio_priv_to_dev(hw);
+       bool irq_active_low = false;
        unsigned long irq_type;
        int err;
 
@@ -76,6 +79,10 @@ int hts221_allocate_trigger(struct hts221_hw *hw)
        case IRQF_TRIGGER_HIGH:
        case IRQF_TRIGGER_RISING:
                break;
+       case IRQF_TRIGGER_LOW:
+       case IRQF_TRIGGER_FALLING:
+               irq_active_low = true;
+               break;
        default:
                dev_info(hw->dev,
                         "mode %lx unsupported, using IRQF_TRIGGER_RISING\n",
@@ -84,6 +91,10 @@ int hts221_allocate_trigger(struct hts221_hw *hw)
                break;
        }
 
+       err = hts221_write_with_mask(hw, HTS221_REG_DRDY_HL_ADDR,
+                                    HTS221_REG_DRDY_HL_MASK, irq_active_low);
+       if (err < 0)
+               return err;
        err = devm_request_threaded_irq(hw->dev, hw->irq, NULL,
                                        hts221_trigger_handler_thread,
                                        irq_type | IRQF_ONESHOT,

diff --git a/drivers/iio/humidity/hts221_core.c b/drivers/iio/humidity/hts221_core.c
index dc55d9fbc702a9806838204ce1b54cbd228bd70c..25fcb99939983a0296504bdfc7700497a1059a20 100644 (file)
--- a/drivers/iio/humidity/hts221_core.c
+++ b/drivers/iio/humidity/hts221_core.c
@@ -135,8 +135,7 @@ static const struct iio_chan_spec hts221_channels[] = {
        IIO_CHAN_SOFT_TIMESTAMP(2),
 };
 
-static int hts221_write_with_mask(struct hts221_hw *hw, u8 addr, u8 mask,
-                                 u8 val)
+int hts221_write_with_mask(struct hts221_hw *hw, u8 addr, u8 mask, u8 val)
 {
        u8 data;
        int err;