DS1WM: decouple host IRQ and INTR active state settings (4aa323bd) · Commits · 戴 / test

The DS1WM driver incorrectly infers the IAS bit (1-wire interrupt active high) from IRQ settings. There are devices that have IAS=0 but still need the IRQ to trigger on a rising edge. With this patch, machines with DS1WM that need IAS=1 have to set .active_high=1 in the ds1wm_platform_data. Signed-off-by:

Philipp Zabel <philipp.zabel@gmail.com> Acked-by:

Evgeniy Polyakov <johnpol@2ka.mipt.ru> Acked-by:

Matt Reimer <mreimer@vpop.net> Signed-off-by:

Andrew Morton <akpm@linux-foundation.org> Signed-off-by:

Linus Torvalds <torvalds@linux-foundation.org>

drivers/w1/masters/ds1wm.c

+5 −4

Original line number	Diff line number	Diff line
		@@ -361,11 +361,12 @@ static int ds1wm_probe(struct platform_device *pdev)
		goto err1;
		}
		ds1wm_data->irq = res->start;
		ds1wm_data->active_high = (res->flags & IORESOURCE_IRQ_HIGHEDGE) ?
		1 : 0;
		ds1wm_data->active_high = plat->active_high;

		set_irq_type(ds1wm_data->irq, ds1wm_data->active_high ?
		IRQ_TYPE_EDGE_RISING : IRQ_TYPE_EDGE_FALLING);
		if (res->flags & IORESOURCE_IRQ_HIGHEDGE)
		set_irq_type(ds1wm_data->irq, IRQ_TYPE_EDGE_RISING);
		if (res->flags & IORESOURCE_IRQ_LOWEDGE)
		set_irq_type(ds1wm_data->irq, IRQ_TYPE_EDGE_FALLING);

		ret = request_irq(ds1wm_data->irq, ds1wm_isr, IRQF_DISABLED,
		"ds1wm", ds1wm_data);

include/linux/ds1wm.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -6,6 +6,7 @@ struct ds1wm_platform_data {
		* e.g. on h5xxx and h2200 this is 2
		* (registers aligned to 4-byte boundaries),
		* while on hx4700 this is 1 */
		int active_high;
		void (enable)(struct platform_device pdev);
		void (disable)(struct platform_device pdev);
		};

Admin message