On Sun, 06 Jan 2008 14:46:14 +0100
Philipp Zabel <[EMAIL PROTECTED]> wrote:
> 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 <[EMAIL PROTECTED]>
> ---
> drivers/w1/masters/ds1wm.c | 9 +++++----
> include/linux/ds1wm.h | 1 +
> 2 files changed, 6 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/w1/masters/ds1wm.c b/drivers/w1/masters/ds1wm.c
> index 5747997..688e435 100644
> --- a/drivers/w1/masters/ds1wm.c
> +++ b/drivers/w1/masters/ds1wm.c
> @@ -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);
> diff --git a/include/linux/ds1wm.h b/include/linux/ds1wm.h
> index 31f6e3c..d3c65e4 100644
> --- a/include/linux/ds1wm.h
> +++ b/include/linux/ds1wm.h
> @@ -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);
> };
But no drivers are converted to set ds1wm_platform_data.active_high. Won't
IORESOURCE_IRQ_HIGHEDGE devices be broken by this change?
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
