瀏覽代碼

video: driver: update platform_get_resource to platform_get_irq

Use platform_get_irq api instead of platform_get_resource for Lanai

Change-Id: Ia06e7d5c890f6c7344b53a9f15c0b68b26bcc53e
Signed-off-by: Deepa Guthyappa Madivalara <[email protected]>
Deepa Guthyappa Madivalara 2 年之前
父節點
當前提交
a6337c1460
共有 2 個文件被更改,包括 7 次插入2 次删除
  1. 7 0
      driver/vidc/src/msm_vidc_dt.c
  2. 0 2
      video_kernel_board.mk

+ 7 - 0
driver/vidc/src/msm_vidc_dt.c

@@ -690,8 +690,15 @@ static int msm_vidc_read_resources_from_dt(struct platform_device *pdev)
 	d_vpr_h("%s: register base %pa, size %#x\n",
 		__func__, &dt->register_base, dt->register_size);
 
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5,16,0))
+	dt->irq = platform_get_irq(pdev, 0);
+#else
 	kres = platform_get_resource(pdev, IORESOURCE_IRQ, 0);
 	dt->irq = kres ? kres->start : -1;
+#endif
+	if (dt->irq < 0)
+		d_vpr_e("%s: get irq failed, %d\n", __func__, dt->irq);
+
 	d_vpr_h("%s: irq %d\n", __func__, dt->irq);
 
 	rc = msm_vidc_load_fw_name(core);

+ 0 - 2
video_kernel_board.mk

@@ -10,7 +10,6 @@ endif
 
 # Build video kernel driver
 ifeq ($(TARGET_VIDC_ENABLE),true)
-ifneq ($(TARGET_KERNEL_DLKM_DISABLE),true)
 ifneq ($(TARGET_BOARD_AUTO),true)
 ifeq ($(call is-board-platform-in-list,$(TARGET_BOARD_PLATFORM)),true)
 BOARD_VENDOR_KERNEL_MODULES += $(KERNEL_MODULES_OUT)/msm_video.ko
@@ -19,4 +18,3 @@ BUILD_VIDEO_TECHPACK_SOURCE := true
 endif
 endif
 endif
-endif