From a6337c1460d78537a7187e507045d81c711436c6 Mon Sep 17 00:00:00 2001 From: Deepa Guthyappa Madivalara Date: Mon, 19 Sep 2022 16:30:43 -0700 Subject: [PATCH] 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 --- driver/vidc/src/msm_vidc_dt.c | 7 +++++++ video_kernel_board.mk | 2 -- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/driver/vidc/src/msm_vidc_dt.c b/driver/vidc/src/msm_vidc_dt.c index ea23ea9e9a..8ba8aa2f30 100644 --- a/driver/vidc/src/msm_vidc_dt.c +++ b/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); diff --git a/video_kernel_board.mk b/video_kernel_board.mk index 5f5b05b124..bdb6475ebd 100644 --- a/video_kernel_board.mk +++ b/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