hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

DS1WM: decouple host IRQ and INTR active state settings 

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>
This commit is contained in:
Philipp Zabel 2008-02-07 00:13:22 -08:00 committed by Linus Torvalds
parent eccba06891
commit 4aa323bd83
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/w1/masters/ds1wm.c
View File

@ -361,11 +361,12 @@ static int ds1wm_probe(struct platform_device *pdev)
goto err1; goto err1;
} }
ds1wm_data->irq = res->start; ds1wm_data->irq = res->start;
ds1wm_data->active_high = (res->flags & IORESOURCE_IRQ_HIGHEDGE) ? ds1wm_data->active_high = plat->active_high;
1 : 0;
set_irq_type(ds1wm_data->irq, ds1wm_data->active_high ? if (res->flags & IORESOURCE_IRQ_HIGHEDGE)
IRQ_TYPE_EDGE_RISING : IRQ_TYPE_EDGE_FALLING); 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, ret = request_irq(ds1wm_data->irq, ds1wm_isr, IRQF_DISABLED,
"ds1wm", ds1wm_data); "ds1wm", ds1wm_data);

1
include/linux/ds1wm.h
View File

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