Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 4aa323bd839604dd83aec56ed3a88df352c3339d

Authored by Philipp Zabel
Committed by Linus Torvalds
1 parent eccba06891
Exists in master and in 39 other branches 8mp-imx_5.4.70_2.3.0, 8qm-imx_5.4.70_2.3.0, emb_imx_lf-5.15.y, emb_lf-6.1.y, imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, imx_4.1.15_1.0.0_ga, pitx_8mp_lf-5.10.y, rt-smarc-imx_4.1.15_1.0.0_ga, rt_linux_5.15.71, smarc-8m-android-11.0.0_2.0.0, smarc-imx6_4.14.98_2.0.0_ga, smarc-imx6_4.9.88_2.0.0_ga, smarc-imx7_4.14.98_2.0.0_ga, smarc-imx7_4.9.11_1.0.0_ga, smarc-imx7_4.9.88_2.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-imx_4.1.15_1.0.0_ga, smarc-imx_4.9.11_1.0.0_ga, smarc-imx_4.9.51_imx8m_ga, smarc-imx_4.9.88_2.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_1.2.0_ga, smarc_8m_00d0_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.14.78_1.0.0_ga, smarc_8m_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.19.35_1.1.0, smarc_8mm_imx_4.14.78_1.0.0_ga, smarc_8mm_imx_4.14.98_2.0.0_ga, smarc_8mm_imx_4.19.35_1.1.0, smarc_8mm_imx_5.4.24_2.1.0, smarc_8mp_lf-5.10.y, smarc_8mq_imx_5.4.24_2.1.0, smarc_8mq_lf-5.10.y, smarc_imx_lf-5.15.y

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>

Showing 2 changed files with 6 additions and 4 deletions Side-by-side Diff

drivers/w1/masters/ds1wm.c
Diff comments   View file @ 4aa323b
... ... @@ -361,11 +361,12 @@
361 361 goto err1;
362 362 }
363 363 ds1wm_data->irq = res->start;
364   - ds1wm_data->active_high = (res->flags & IORESOURCE_IRQ_HIGHEDGE) ?
365   - 1 : 0;
  364 + ds1wm_data->active_high = plat->active_high;
366 365  
367   - set_irq_type(ds1wm_data->irq, ds1wm_data->active_high ?
368   - IRQ_TYPE_EDGE_RISING : IRQ_TYPE_EDGE_FALLING);
  366 + if (res->flags & IORESOURCE_IRQ_HIGHEDGE)
  367 + set_irq_type(ds1wm_data->irq, IRQ_TYPE_EDGE_RISING);
  368 + if (res->flags & IORESOURCE_IRQ_LOWEDGE)
  369 + set_irq_type(ds1wm_data->irq, IRQ_TYPE_EDGE_FALLING);
369 370  
370 371 ret = request_irq(ds1wm_data->irq, ds1wm_isr, IRQF_DISABLED,
371 372 "ds1wm", ds1wm_data);
include/linux/ds1wm.h
Diff comments   View file @ 4aa323b
... ... @@ -6,6 +6,7 @@
6 6 * e.g. on h5xxx and h2200 this is 2
7 7 * (registers aligned to 4-byte boundaries),
8 8 * while on hx4700 this is 1 */
  9 + int active_high;
9 10 void (*enable)(struct platform_device *pdev);
10 11 void (*disable)(struct platform_device *pdev);
11 12 };