Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fd931f23 authored by Andrey Smirnov's avatar Andrey Smirnov Committed by Linus Walleij
Browse files

pinctrl-sx150x: Remove magic numbers from sx150x_irq_set_type 



Tested-by: default avatarNeil Armstrong <narmstrong@baylibre.com>
Acked-by: default avatarNeil Armstrong <narmstrong@baylibre.com>
Signed-off-by: default avatarAndrey Smirnov <andrew.smirnov@gmail.com>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent 080c489d

drivers/pinctrl/pinctrl-sx150x.c

+20 −4
Original line number Original line Diff line number Diff line
@@ -47,6 +47,8 @@ enum { 
enum {

enum {

	SX150X_789_REG_MISC_AUTOCLEAR_OFF = 1 << 0,

	SX150X_789_REG_MISC_AUTOCLEAR_OFF = 1 << 0,

	SX150X_MAX_REGISTER = 0xad,

	SX150X_MAX_REGISTER = 0xad,

	SX150X_IRQ_TYPE_EDGE_RISING = 0x1,

	SX150X_IRQ_TYPE_EDGE_FALLING = 0x2,

};

};





struct sx150x_123_pri {

struct sx150x_123_pri {
@@ -441,6 +443,21 @@ static void sx150x_irq_unmask(struct irq_data *d) 
	pctl->irq.masked &= ~BIT(n);

	pctl->irq.masked &= ~BIT(n);

}

}





static void sx150x_irq_set_sense(struct sx150x_pinctrl *pctl,

				 unsigned int line, unsigned int sense)

{

	/*

	 * Every interrupt line is represented by two bits shifted

	 * proportionally to the line number

	 */

	const unsigned int n = line * 2;

	const unsigned int mask = ~((SX150X_IRQ_TYPE_EDGE_RISING |

				     SX150X_IRQ_TYPE_EDGE_FALLING) << n);



	pctl->irq.sense &= mask;

	pctl->irq.sense |= sense << n;

}



static int sx150x_irq_set_type(struct irq_data *d, unsigned int flow_type)

static int sx150x_irq_set_type(struct irq_data *d, unsigned int flow_type)

{

{

	struct sx150x_pinctrl *pctl =

	struct sx150x_pinctrl *pctl =
@@ -453,12 +470,11 @@ static int sx150x_irq_set_type(struct irq_data *d, unsigned int flow_type) 
	n = d->hwirq;

	n = d->hwirq;





	if (flow_type & IRQ_TYPE_EDGE_RISING)

	if (flow_type & IRQ_TYPE_EDGE_RISING)

		val |= 0x1;

		val |= SX150X_IRQ_TYPE_EDGE_RISING;

	if (flow_type & IRQ_TYPE_EDGE_FALLING)

	if (flow_type & IRQ_TYPE_EDGE_FALLING)

		val |= 0x2;

		val |= SX150X_IRQ_TYPE_EDGE_FALLING;





	pctl->irq.sense &= ~(3UL << (n * 2));

	sx150x_irq_set_sense(pctl, n, val);

	pctl->irq.sense |= val << (n * 2);

	return 0;

	return 0;

}

}