From patchwork Wed May 12 14:46:36 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 435667 Delivered-To: patch@linaro.org Received: by 2002:a02:c901:0:0:0:0:0 with SMTP id t1csp5138743jao; Wed, 12 May 2021 12:57:47 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxXoMz5G6CYRGjV3meLvPRpPG9ioOiQY533PGme2V/i45QcMCNHVpJibG6QwFrBMZtSQfd+ X-Received: by 2002:a92:c50c:: with SMTP id r12mr32478231ilg.281.1620849467102; Wed, 12 May 2021 12:57:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1620849467; cv=none; d=google.com; s=arc-20160816; b=tmaKp+wvlzGFSKarvh5BgMjAFaQq0uZyX5xXzViqKZtNwlIBBHm18ScZeMC5ISQDgY y9KlGuVp2R60eGd9R9KtuiI8DtLynYXQUd9VywO6oIZ+xsQWMk9XYTg38OPmk+TjKsfO lILpODSwwkSwcUn+Aa0rmGxPzM7mX+4es56z1/2OcxbsaOWcWxKwXMV3af0KdWP0Dm+k +QPSGLGNH/3qWPFSBYbqbp7RCDfdva/XRNnJ+dVbjbYBjzru10YDgJvM+oo5MHLs4nCu GbDm+BvNPG9WFJySynVHNW8jH0yEwVzk/VWql9k4XL7HyjbUa4t1BAZdUcbNg10xnR0P tB8A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=BUPPjOQSH0iHsuWyOCNqE5ulxbC/R3zCzKW3CNqA7/0=; b=tTlvhZiFZ2TTpwxn4ASNVc6AIzMvRzrbuB9M1n4RUotSCZPim56uWxPUxeybgM19Vl yEZB8GKyNC5u9dLErBM9JwN20CkN4iyT0ZPAfF+FCovn+m6FkgzYVGXx0GXz1cMLv5ul of48pCy/LRwHeP8kClDSKAcicu9e5UhrA0jMRqFCUhg0B3suLHLvl/UxAosO/1L3srSE PO757AHWagk6/Qe99XcJmZDrNCSHh4QXdugDEiLiro8RqvCPYmcH4DNcn4TxFtEAnpB5 2U3pRqJwxXyqrWeDP1KIvtEAkuqxQNci4C36DEjcrNPm776wMICoA5u5NU8s9qBIBWn5 6KiQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=bU1VbbUY; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id q8si330223ior.12.2021.05.12.12.57.43; Wed, 12 May 2021 12:57:47 -0700 (PDT) Received-SPF: pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=bU1VbbUY; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232756AbhELQqv (ORCPT + 12 others); Wed, 12 May 2021 12:46:51 -0400 Received: from mail.kernel.org ([198.145.29.99]:35790 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S243433AbhELQlL (ORCPT ); Wed, 12 May 2021 12:41:11 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 2042D61E41; Wed, 12 May 2021 16:04:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1620835449; bh=vqip+Pu3og34Bc/t1ROJP4nKVxKwNkevrLoEQllWJXU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=bU1VbbUY+x4MdB/7HuwgfhtByg8pySY90twVVd75SAACPPi2wRuWN/8TV1zljTtGq ZYJLPUWPhhI0Ws+sNFIUvVV/gCjdsqE+w3JI38eXreFByBasOzzneDRE4H7RwRyOqt MS5vygeHqHa8fXePfxVQGRCZ5FcbRdd36HoJ8aEM= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Arnd Bergmann , Hans Verkuil , Mauro Carvalho Chehab , Sasha Levin Subject: [PATCH 5.12 350/677] media: mtk: fix mtk-smi dependency Date: Wed, 12 May 2021 16:46:36 +0200 Message-Id: <20210512144848.942248080@linuxfoundation.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210512144837.204217980@linuxfoundation.org> References: <20210512144837.204217980@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Arnd Bergmann [ Upstream commit 4fade8329ab2be2b902fce8db3625fd12234b873 ] The mtk-smi driver can now be built as a loadable module, but this leads to a build time regression when the drivers that depend on it are built-in: aarch64-linux-ld: drivers/media/platform/mtk-mdp/mtk_mdp_comp.o: in function `mtk_mdp_comp_clock_on': mtk_mdp_comp.c:(.text.mtk_mdp_comp_clock_on+0x54): undefined reference to `mtk_smi_larb_get' aarch64-linux-ld: drivers/media/platform/mtk-mdp/mtk_mdp_comp.o: in function `mtk_mdp_comp_clock_off': mtk_mdp_comp.c:(.text.mtk_mdp_comp_clock_off+0x12c): undefined reference to `mtk_smi_larb_put' Add a dependency on the interface, but keep allowing compile-testing without that driver, as it was originally intended. Fixes: 50fc8d9232cd ("memory: mtk-smi: Allow building as module") Signed-off-by: Arnd Bergmann Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Sasha Levin --- drivers/media/platform/Kconfig | 3 +++ 1 file changed, 3 insertions(+) -- 2.30.2 diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig index fd1831e97b22..1ddb5d6354cf 100644 --- a/drivers/media/platform/Kconfig +++ b/drivers/media/platform/Kconfig @@ -244,6 +244,7 @@ config VIDEO_MEDIATEK_JPEG depends on MTK_IOMMU_V1 || MTK_IOMMU || COMPILE_TEST depends on VIDEO_DEV && VIDEO_V4L2 depends on ARCH_MEDIATEK || COMPILE_TEST + depends on MTK_SMI || (COMPILE_TEST && MTK_SMI=n) select VIDEOBUF2_DMA_CONTIG select V4L2_MEM2MEM_DEV help @@ -271,6 +272,7 @@ config VIDEO_MEDIATEK_MDP depends on MTK_IOMMU || COMPILE_TEST depends on VIDEO_DEV && VIDEO_V4L2 depends on ARCH_MEDIATEK || COMPILE_TEST + depends on MTK_SMI || (COMPILE_TEST && MTK_SMI=n) select VIDEOBUF2_DMA_CONTIG select V4L2_MEM2MEM_DEV select VIDEO_MEDIATEK_VPU @@ -291,6 +293,7 @@ config VIDEO_MEDIATEK_VCODEC # our dependencies, to avoid missing symbols during link. depends on VIDEO_MEDIATEK_VPU || !VIDEO_MEDIATEK_VPU depends on MTK_SCP || !MTK_SCP + depends on MTK_SMI || (COMPILE_TEST && MTK_SMI=n) select VIDEOBUF2_DMA_CONTIG select V4L2_MEM2MEM_DEV select VIDEO_MEDIATEK_VCODEC_VPU if VIDEO_MEDIATEK_VPU