Input: iqs7222 - set all ULP entry masks by default

Some devices expose an ultra-low-power (ULP) mode entry mask for
each channel. If the mask is set, the device cannot enter ULP so
long as the corresponding channel remains in an active state.

The vendor has advised setting the mask for any disabled channel.
To accommodate this suggestion, initially set all masks and then
clear them only if specified in the device tree.

Fixes: a8b0abcc88cc ("Input: add support for Azoteq IQS7222A/B/C")
Signed-off-by: Jeff LaBundy <jeff@labundy.com>
Link: https://lore.kernel.org/r/20220908131548.48120-8-jeff@labundy.com
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>

diff --git a/drivers/input/misc/iqs7222.c b/drivers/input/misc/iqs7222.c
index b8749c3f94b454926dc3e5f9c47700c485f93483..ddb863bf63eec22682058868e98be75938c075bb 100644 (file)
--- a/drivers/input/misc/iqs7222.c
+++ b/drivers/input/misc/iqs7222.c
@@ -1771,11 +1771,9 @@ static int iqs7222_parse_chan(struct iqs7222_private *iqs7222, int chan_index)
        if (!chan_node)
                return 0;
 
-       if (dev_desc->allow_offset) {
-               sys_setup[dev_desc->allow_offset] |= BIT(chan_index);
-               if (fwnode_property_present(chan_node, "azoteq,ulp-allow"))
-                       sys_setup[dev_desc->allow_offset] &= ~BIT(chan_index);
-       }
+       if (dev_desc->allow_offset &&
+           fwnode_property_present(chan_node, "azoteq,ulp-allow"))
+               sys_setup[dev_desc->allow_offset] &= ~BIT(chan_index);
 
        chan_setup[0] |= IQS7222_CHAN_SETUP_0_CHAN_EN;
 
@@ -2206,6 +2204,9 @@ static int iqs7222_parse_all(struct iqs7222_private *iqs7222)
        u16 *sys_setup = iqs7222->sys_setup;
        int error, i;
 
+       if (dev_desc->allow_offset)
+               sys_setup[dev_desc->allow_offset] = U16_MAX;
+
        if (dev_desc->event_offset)
                sys_setup[dev_desc->event_offset] = IQS7222_EVENT_MASK_ATI;