[1/2] Revert "media: rkisp1: Drop IRQF_SHARED"

Message ID 20231218-rkisp-shirq-fix-v1-1-173007628248@ideasonboard.com
State New
Headers
Series media: rkisp1: Fix shared interrupt handling |

Commit Message

Tomi Valkeinen Dec. 18, 2023, 7:54 a.m. UTC
  This reverts commit 85d2a31fe4d9be1555f621ead7a520d8791e0f74.

The rkisp1 does share interrupt lines on some platforms, after all. Thus
we need to revert this, and implement a fix for the rkisp1 shared irq
handling in a follow-up patch.

Reported-by: Mikhail Rudenko <mike.rudenko@gmail.com>
Closes: https://lore.kernel.org/all/87o7eo8vym.fsf@gmail.com/
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ideasonboard.com>
---
 drivers/media/platform/rockchip/rkisp1/rkisp1-dev.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
  

Comments

Laurent Pinchart Dec. 18, 2023, 9:16 a.m. UTC | #1
Hi Tomi,

Thank you for the patch.

On Mon, Dec 18, 2023 at 09:54:00AM +0200, Tomi Valkeinen wrote:
> This reverts commit 85d2a31fe4d9be1555f621ead7a520d8791e0f74.
> 
> The rkisp1 does share interrupt lines on some platforms, after all. Thus
> we need to revert this, and implement a fix for the rkisp1 shared irq
> handling in a follow-up patch.
> 
> Reported-by: Mikhail Rudenko <mike.rudenko@gmail.com>
> Closes: https://lore.kernel.org/all/87o7eo8vym.fsf@gmail.com/
> Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ideasonboard.com>

Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>

> ---
>  drivers/media/platform/rockchip/rkisp1/rkisp1-dev.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/media/platform/rockchip/rkisp1/rkisp1-dev.c b/drivers/media/platform/rockchip/rkisp1/rkisp1-dev.c
> index f96f821a7b50..acc559652d6e 100644
> --- a/drivers/media/platform/rockchip/rkisp1/rkisp1-dev.c
> +++ b/drivers/media/platform/rockchip/rkisp1/rkisp1-dev.c
> @@ -559,7 +559,7 @@ static int rkisp1_probe(struct platform_device *pdev)
>  				rkisp1->irqs[il] = irq;
>  		}
>  
> -		ret = devm_request_irq(dev, irq, info->isrs[i].isr, 0,
> +		ret = devm_request_irq(dev, irq, info->isrs[i].isr, IRQF_SHARED,
>  				       dev_driver_string(dev), dev);
>  		if (ret) {
>  			dev_err(dev, "request irq failed: %d\n", ret);
  

Patch

diff --git a/drivers/media/platform/rockchip/rkisp1/rkisp1-dev.c b/drivers/media/platform/rockchip/rkisp1/rkisp1-dev.c
index f96f821a7b50..acc559652d6e 100644
--- a/drivers/media/platform/rockchip/rkisp1/rkisp1-dev.c
+++ b/drivers/media/platform/rockchip/rkisp1/rkisp1-dev.c
@@ -559,7 +559,7 @@  static int rkisp1_probe(struct platform_device *pdev)
 				rkisp1->irqs[il] = irq;
 		}
 
-		ret = devm_request_irq(dev, irq, info->isrs[i].isr, 0,
+		ret = devm_request_irq(dev, irq, info->isrs[i].isr, IRQF_SHARED,
 				       dev_driver_string(dev), dev);
 		if (ret) {
 			dev_err(dev, "request irq failed: %d\n", ret);