Skip to contentSkip to conversation

Convert drivers to new irq trigger modes

PATCH In review Dirk Behme 3 participants 7 messages Feb 7, 2006 – Feb 13, 2006

Subsystems (2)
lore
Share & tools
lore

Dirk Behme

author
#0 lore raw

PATCH 1/1 Convert drivers to new irq trigger modes

ARM: OMAP: Convert drivers to new irq trigger modes.

New way to handle irq trigger mode is to pass it as flag to request_irq() instead of using special ARM function set_irq_mode().

Signed-off-by Dirk Behme <dirk.behme_at_gmail.com>
drivers/i2c/chips/isp1301_omap.c renamed from drivers/i2c/chips/isp1301_omap.c_orig +5 -3
@@ -60,6 +60,7 @@ struct isp1301 {
 	void			(*i2c_release)(struct device *dev);
 
 	int			irq;
+	int			irq_type;
 
 	u32			last_otg_ctrl;
 	unsigned		working:1;
@@ -1526,6 +1527,7 @@ static int isp1301_probe(struct i2c_adap
 	isp->timer.data = (unsigned long) isp;
 
 	isp->irq = -1;
+	isp->irq_type = SA_SAMPLE_RANDOM;
 	isp->client.addr = address;
 	i2c_set_clientdata(&isp->client, isp);
 	isp->client.adapter = bus;
@@ -1602,7 +1604,7 @@ fail1:
 		isp->irq = OMAP_GPIO_IRQ(2);
 		omap_request_gpio(2);
 		omap_set_gpio_direction(2, 1);
-		set_irq_type(isp->irq, IRQT_FALLING);
+		isp->irq_type = SA_TRIGGER_FALLING;
 	}
 
 	if (machine_is_omap_h3()) {
@@ -1611,11 +1613,11 @@ fail1:
 		isp->irq = OMAP_GPIO_IRQ(14);
 		omap_request_gpio(14);
 		omap_set_gpio_direction(14, 1);
-		set_irq_type(isp->irq, IRQT_FALLING);
+		isp->irq_type = SA_TRIGGER_FALLING;
 	}
 
 	status = request_irq(isp->irq, isp1301_irq,
-			SA_SAMPLE_RANDOM, DRIVER_NAME, isp);
+			isp->irq_type, DRIVER_NAME, isp);
 	if (status < 0) {
 		dev_dbg(&i2c->dev, "can't get IRQ %d, err %d\n",
 				isp->irq, status);
drivers/i2c/chips/tps65010.c renamed from drivers/i2c/chips/tps65010.c_orig +6 -6
@@ -87,6 +87,7 @@ struct tps65010 {
 	struct i2c_client	client;
 	struct semaphore	lock;
 	int			irq;
+	int			irq_type;
 	struct work_struct	work;
 	struct dentry		*file;
 	unsigned		charging:1;
@@ -526,6 +527,8 @@ fail1:
 		return 0;
 	}
 
+	tps->irq_type = SA_SAMPLE_RANDOM;
+
 #ifdef	CONFIG_ARM
 	if (machine_is_omap_h2()) {
 		tps->model = TPS65010;
@@ -533,7 +536,7 @@ fail1:
 		tps->irq = OMAP_GPIO_IRQ(58);
 		omap_request_gpio(58);
 		omap_set_gpio_direction(58, 1);
-		set_irq_type(tps->irq, IRQT_FALLING);
+		tps->irq_type = SA_TRIGGER_FALLING;
 	}
 	if (machine_is_omap_osk()) {
 		tps->model = TPS65010;
@@ -541,21 +544,18 @@ fail1:
 		tps->irq = OMAP_GPIO_IRQ(OMAP_MPUIO(1));
 		omap_request_gpio(OMAP_MPUIO(1));
 		omap_set_gpio_direction(OMAP_MPUIO(1), 1);
-		set_irq_type(tps->irq, IRQT_FALLING);
+		tps->irq_type = SA_TRIGGER_FALLING;
 	}
 	if (machine_is_omap_h3()) {
 		tps->model = TPS65013;
 
 		// FIXME set up this board's IRQ ...
 	}
-#else
-#define set_irq_type(num,trigger)	do{}while(0)
 #endif
 
 	if (tps->irq > 0) {
-		set_irq_type(tps->irq, IRQT_LOW);
 		status = request_irq(tps->irq, tps65010_irq,
-			SA_SAMPLE_RANDOM, DRIVER_NAME, tps);
+			 tps->irq_type, DRIVER_NAME, tps);
 		if (status < 0) {
 			dev_dbg(&tps->client.dev, "can't get IRQ %d, err %d\n",
 					tps->irq, status);
drivers/mmc/omap.c renamed from drivers/mmc/omap.c_orig +1 -2
@@ -1262,9 +1262,8 @@ static int __init mmc_omap_probe(struct 
 		}
 
 		omap_set_gpio_direction(host->switch_pin, 1);
-		set_irq_type(OMAP_GPIO_IRQ(host->switch_pin), IRQT_RISING);
 		ret = request_irq(OMAP_GPIO_IRQ(host->switch_pin),
-				  mmc_omap_switch_irq, 0, DRIVER_NAME, host);
+				  mmc_omap_switch_irq, SA_TRIGGER_RISING, DRIVER_NAME, host);
 		if (ret) {
 			printk(KERN_WARNING "MMC%d: Unable to get IRQ for MMC cover switch\n",
 			       host->id);
drivers/input/touchscreen/omap/omap_ts.c renamed from drivers/input/touchscreen/omap/omap_ts.c_orig +1 -1
@@ -162,7 +162,7 @@ static int __init omap_ts_probe(struct p
 
 	/* request irq */
 	if (ts_omap.irq != -1) {
-		if (request_irq(ts_omap.irq, omap_ts_handler, 0,
+		if (request_irq(ts_omap.irq, omap_ts_handler, ts_omap.irq_type,
 				OMAP_TS_NAME, &ts_omap)) {
 			printk(KERN_ERR
 	  "omap_ts.c: Could not allocate touchscreen IRQ!\n");
drivers/input/touchscreen/omap/omap_ts.h renamed from drivers/input/touchscreen/omap/omap_ts.h_orig +1 -0
@@ -46,6 +46,7 @@ struct omap_ts_t{
 	struct timer_list ts_timer;      // Timer for triggering acquisitions
 	int touched;
 	int irq;
+	int irq_type;
 	int irq_enabled;
 	struct ts_device *dev;
 	spinlock_t lock;
drivers/input/touchscreen/omap/ts_hx.c renamed from drivers/input/touchscreen/omap/ts_hx.c_orig +1 -1
@@ -98,7 +98,7 @@ static int __init hx_ts_probe(struct oma
 	};
 
 	omap_set_gpio_direction(gpio, 1);
-	set_irq_type(ts->irq, IRQT_FALLING);
+	ts->irq_type = SA_TRIGGER_FALLING;
 	return 0;
 }
 
drivers/input/touchscreen/omap/ts_osk.c renamed from drivers/input/touchscreen/omap/ts_osk.c_orig +1 -1
@@ -91,7 +91,7 @@ static int  __init osk_ts_probe(struct o
         omap_cfg_reg(P20_1610_GPIO4);
 	omap_request_gpio(4);
 	omap_set_gpio_direction(4, 1);
-	set_irq_type(OMAP_GPIO_IRQ(4), IRQT_FALLING);
+	ts->irq_type = SA_TRIGGER_FALLING;
 
 	ts->irq = PEN_IRQ;
 
drivers/input/touchscreen/omap/ts_inn1510.c renamed from drivers/input/touchscreen/omap/ts_inn1510.c_orig +1 -0
@@ -176,6 +176,7 @@ static int __init inn1510_ts_probe(struc
 		return -ENODEV;
 
 	ts->irq = OMAP1510_INT_FPGA_TS;
+	ts->irq_type = SA_SAMPLE_RANDOM;
 	
 	return 0;
 }
drivers/input/keyboard/omap-keypad.c renamed from drivers/input/keyboard/omap-keypad.c_orig +2 -3
@@ -365,10 +365,9 @@ static int __init omap_kp_probe(struct p
 		omap_writew(0, OMAP_MPUIO_BASE + OMAP_MPUIO_KBD_MASKIT);
 	} else {
 		for (i = 0; i < omap_kp->rows; i++) {
-			if (request_irq(OMAP_GPIO_IRQ(row_gpios[i]), omap_kp_interrupt, 0,
-						"omap-keypad", omap_kp) < 0)
+			if (request_irq(OMAP_GPIO_IRQ(row_gpios[i]), omap_kp_interrupt, 
+					SA_TRIGGER_FALLING, "omap-keypad", omap_kp) < 0)
 				return -EINVAL;
-			set_irq_type(OMAP_GPIO_IRQ(row_gpios[i]), IRQT_FALLING);
 		}
 	}
 
#1 lore raw
Quoted 6 lines · Dirk Behme

ARM: OMAP: Convert drivers to new irq trigger modes.

New way to handle irq trigger mode is to pass it as flag to request_irq() instead of using special ARM function set_irq_mode().

Thanks, pushing today. I've also pushed a related patch for gpio.c.

Tony

#2 lore raw
In reply to Dirk Behme

Hi Dirk,

Review

Quoted 2 lines · ext Dirk Behme
(quoted diff) +1 -0
 	int			irq;
+	int			irq_type;

This doesn't seem to be used anywhere.

drivers/i2c/chips/isp1301_omap.c fail1: · line 1607

Quoted 10 lines
drivers/i2c/chips/isp1301_omap.c renamed from drivers/i2c/chips/isp1301_omap.c_orig +2 -1
+	isp->irq_type = SA_SAMPLE_RANDOM;
 	isp->client.addr = address;
 	i2c_set_clientdata(&isp->client, isp);
 	isp->client.adapter = bus;
@@ -1602,7 +1604,7 @@ fail1:
 		isp->irq = OMAP_GPIO_IRQ(2);
 		omap_request_gpio(2);
 		omap_set_gpio_direction(2, 1);
-		set_irq_type(isp->irq, IRQT_FALLING);
+		isp->irq_type = SA_TRIGGER_FALLING;

You should be ORring here. Otherwise you lose the SA_SAMPLE_RANDOM flag.

Cheers,
Juha

author
#3 lore raw

Hello Juha,

Quoted 8 lines · Juha Yrjölä

Hi Dirk,

Review

Quoted 2 lines · ext Dirk Behme
(quoted diff) +1 -0
 	int			irq;
+	int			irq_type;

This doesn't seem to be used anywhere.

To which file do you refer here? isp1301_omap.c, tps65010.c or omap_ts.h? I use irq_type in all of them.

I thought I use irq_type in all three files: isp->irq_type,
tps->irq_type and ts->irq_type?

Quoted 4 lines
Quoted 4 lines
drivers/i2c/chips/isp1301_omap.c renamed from drivers/i2c/chips/isp1301_omap.c_orig +1 -0
+	isp->irq_type = SA_SAMPLE_RANDOM;
 	isp->client.addr = address;
 	i2c_set_clientdata(&isp->client, isp);
 	isp->client.adapter = bus;
Quoted 8 lines

drivers/i2c/chips/isp1301_omap.c fail1: · line 1607

Quoted 6 lines
drivers/i2c/chips/isp1301_omap.c renamed from drivers/i2c/chips/isp1301_omap.c_orig +1 -1
@@ -1602,7 +1604,7 @@ fail1:
 		isp->irq = OMAP_GPIO_IRQ(2);
 		omap_request_gpio(2);
 		omap_set_gpio_direction(2, 1);
-		set_irq_type(isp->irq, IRQT_FALLING);
+		isp->irq_type = SA_TRIGGER_FALLING;

You should be ORring here. Otherwise you lose the SA_SAMPLE_RANDOM flag.

It is intended to lose SA_SAMPLE_RANDOM here. SA_SAMPLE_RANDOM is the default and shall be used by request_irq() on boards which don't need special trigger setting. But on boards which need special trigger level setting this shall be overridden by the correct setting.

Best regards

Dirk

#4 lore raw
Quoted 7 lines · Dirk Behme
Quoted 4 lines

Review

Quoted 2 lines
	int			irq;
(quoted diff) +1 -0
+	int			irq_type;

This doesn't seem to be used anywhere.

To which file do you refer here? isp1301_omap.c, tps65010.c or omap_ts.h? I use irq_type in all of them.

Sorry, that part of the patch was obviously correct. I don't know what I was smoking at the time. =)

Quoted 7 lines
Quoted 1 line

You should be ORring here. Otherwise you lose the SA_SAMPLE_RANDOM flag.

It is intended to lose SA_SAMPLE_RANDOM here. SA_SAMPLE_RANDOM is the default and shall be used by request_irq() on boards which don't need special trigger setting. But on boards which need special trigger level setting this shall be overridden by the correct setting.

SA_SAMPLE_RANDOM doesn't have anything to do with triggering. It's used to indicate whether an IRQ source can be used to feed the kernel entropy pools. If the IRQ in question cannot be considered to happen at random intervals, the flag must not be set.

Cheers,
Juha

author
#5 lore raw
Quoted 3 lines · Juha Yrjölä

SA_SAMPLE_RANDOM doesn't have anything to do with triggering. It's used to
indicate whether an IRQ source can be used to feed the kernel entropy pools. If the IRQ in question cannot be considered to happen at random intervals, the flag must not be set.

Okay. What's about this?

Add ORing the SA_TRIGGER_FALLING and don't use SA_SAMPLE_RANDOM as default value in ts_inn1510.c.

drivers/i2c/chips/isp1301_omap.c renamed from drivers/i2c/chips/isp1301_omap.c_orig +2 -2
@@ -1604,7 +1604,7 @@ fail1:
 		isp->irq = OMAP_GPIO_IRQ(2);
 		omap_request_gpio(2);
 		omap_set_gpio_direction(2, 1);
-		isp->irq_type = SA_TRIGGER_FALLING;
+		isp->irq_type |=  SA_TRIGGER_FALLING;
 	}
 
 	if (machine_is_omap_h3()) {
@@ -1613,7 +1613,7 @@ fail1:
 		isp->irq = OMAP_GPIO_IRQ(14);
 		omap_request_gpio(14);
 		omap_set_gpio_direction(14, 1);
-		isp->irq_type = SA_TRIGGER_FALLING;
+		isp->irq_type |= SA_TRIGGER_FALLING;
 	}
 
 	status = request_irq(isp->irq, isp1301_irq,
drivers/i2c/chips/tps65010.c renamed from drivers/i2c/chips/tps65010.c_orig +2 -2
@@ -536,7 +536,7 @@ fail1:
 		tps->irq = OMAP_GPIO_IRQ(58);
 		omap_request_gpio(58);
 		omap_set_gpio_direction(58, 1);
-		tps->irq_type = SA_TRIGGER_FALLING;
+		tps->irq_type |= SA_TRIGGER_FALLING;
 	}
 	if (machine_is_omap_osk()) {
 		tps->model = TPS65010;
@@ -544,7 +544,7 @@ fail1:
 		tps->irq = OMAP_GPIO_IRQ(OMAP_MPUIO(1));
 		omap_request_gpio(OMAP_MPUIO(1));
 		omap_set_gpio_direction(OMAP_MPUIO(1), 1);
-		tps->irq_type = SA_TRIGGER_FALLING;
+		tps->irq_type |= SA_TRIGGER_FALLING;
 	}
 	if (machine_is_omap_h3()) {
 		tps->model = TPS65013;
drivers/input/touchscreen/omap/ts_inn1510.c renamed from drivers/input/touchscreen/omap/ts_inn1510.c_orig +1 -1
@@ -176,7 +176,7 @@ static int __init inn1510_ts_probe(struc
 		return -ENODEV;
 
 	ts->irq = OMAP1510_INT_FPGA_TS;
-	ts->irq_type = SA_SAMPLE_RANDOM;
+	ts->irq_type = 0;
 	
 	return 0;
 }
#6 lore raw
Quoted 9 lines · ext Dirk Behme
Quoted 4 lines

SA_SAMPLE_RANDOM doesn't have anything to do with triggering. It's used to indicate whether an IRQ source can be used to feed the kernel entropy pools. If the IRQ in question cannot be considered to happen at random intervals, the flag must not be set.

Okay. What's about this?

Add ORing the SA_TRIGGER_FALLING and don't use SA_SAMPLE_RANDOM as default value in ts_inn1510.c.

Exactly the other way around. =) The touchscreen IRQ practically occurs randomly, so there the flag should be set. For the power chips, the IRQ arrival can sort of be predicted, so the default value should be zero.

Cheers,
Juha