Received: by 2002:a05:7412:31a9:b0:e2:908c:2ebd with SMTP id et41csp2582433rdb; Tue, 12 Sep 2023 06:27:39 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHrxR9wTWGAxTWJbBnBXfAhETLUBIucWdq468wgX4XF0lCopUT6CR/C69OekExuBqpnry+8 X-Received: by 2002:a17:90a:da03:b0:26d:689f:4261 with SMTP id e3-20020a17090ada0300b0026d689f4261mr10079419pjv.44.1694525259415; Tue, 12 Sep 2023 06:27:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1694525259; cv=none; d=google.com; s=arc-20160816; b=Y9gWbUO7nwBH56+raB3N9+D4SjcfC/qDkvcb6XWdgzWb3tvD0NfaWm4EoumouBW8EE cE/HFosEN25PFjcq1GmuyCy4Rggj79Z1ZNuHhTrEQpY9roYDu113biVcwaMBM4ZAR1RO F78Axa1B6B7UjhjKUCXA8iEy2qHE+lsmDjuyrkl+i9NjM2q+vtvAezU5ixub952tFlBD hKcuysvsx+huh7fUS+qprjpBOuHwAoF7rUjbIdGhF6PtalL3rWhN0HRvE3TUfkKhD5+d Rx/k3U0YrK8ZHhw0wQsr2f5cSzGqadcWKiXVcJDehgZdr+7CKD3XU0J95Czq0A58mRGB NxEA== 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 :message-id:date:subject:cc:to:from:dkim-signature; bh=iSfGC/hvNMM32XmmZXJJuUD0BPJLT11BtsOl0PNMRNc=; fh=mIx7IMye7T0RmPsR4YpAvoiPliDc9bjmkco1xAZMGDk=; b=WH0ekM2ypeD/14yYvVPLnFigDAp9vFIGA3vfHT2j2Zl6YQ60LzpSodB8Nmrd7v8WZE UpUKeD9MPNXLJbS5xmsSAkx9ovb2Ncim5w8Y27rqm8UvWQ+4xMcle6FVQzt16q3WxaIr EHtXO7TqYRIyPGLYtl4juKcqX2GKOkmhqMQ5S2zfD/53Qx3xYDfKGcmxufGQi31PC66m NwVb2s5s1As6jDdA3DFCsgzAGe6GkWZ1AlV5qz5g3ksoG39Z9YF/DX8N78IBk5W4RQ3v Gu24z8dFJxx2JKNx7zrxJZ/ZTY2Ft/CkeWScq6gZy24yU3oRNZSrsU9WQwBnID+joM31 J5kQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=K7RGvLx8; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from agentk.vger.email (agentk.vger.email. [2620:137:e000::3:2]) by mx.google.com with ESMTPS id gq4-20020a17090b104400b0026b2602b969si7909647pjb.43.2023.09.12.06.27.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Sep 2023 06:27:39 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 as permitted sender) client-ip=2620:137:e000::3:2; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=K7RGvLx8; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by agentk.vger.email (Postfix) with ESMTP id 36EB78024CCD; Tue, 12 Sep 2023 05:03:12 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at agentk.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234958AbjILMCn (ORCPT + 99 others); Tue, 12 Sep 2023 08:02:43 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37862 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235112AbjILMCW (ORCPT ); Tue, 12 Sep 2023 08:02:22 -0400 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5BA8E19B1; Tue, 12 Sep 2023 05:02:06 -0700 (PDT) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 2CC2FC433C7; Tue, 12 Sep 2023 12:02:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1694520126; bh=rcwDmaPFBJEQrSd2Ys0Lwa0Qjgtcef3du4K1fAV+R2E=; h=From:To:Cc:Subject:Date:From; b=K7RGvLx8tUw5F0N6NjsPSSVWspYDdRXf0mowtKDeVECaUhHqB6/nHxfzhLoitLQd0 8/OPIfDI+cE/LDoZ0G9T4tEWfu50KvqiqlASKG0dKZ9PinBK0OqBkWkueLLIl4GlhG W1JWRi8eo7DjIWMsdIs8Ht6R6WWaOVn/Mz/7AbTOhqbnAh/kRpWRivF328jYTwTV2D gKcH7jXOT/Wb3n/CbTMpfKOzWQEDkVaulXmhJarQLW+0bYlnNLTI6q6aF6DSFfLPwa 5kskiiHURKv9f28R2eRFwOOITdhXFh6bEBMM60ShyjhNI9U3NkdMaBgD5UhPWkuaVX qtTO4z7YF4vWw== From: Arnd Bergmann To: Mauro Carvalho Chehab , Hans Verkuil , Sakari Ailus , Laurent Pinchart , Hans de Goede Cc: Arnd Bergmann , linux-media@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] media: fix VIDEO_CAMERA_SENSOR dependencies Date: Tue, 12 Sep 2023 14:01:42 +0200 Message-Id: <20230912120159.4118842-1-arnd@kernel.org> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (agentk.vger.email [0.0.0.0]); Tue, 12 Sep 2023 05:03:13 -0700 (PDT) X-Spam-Status: No, score=-1.2 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on agentk.vger.email From: Arnd Bergmann The new Kconfig submenu now guards the visibility of camera sensor drivers, and any driver that selects one of them runs into a missing dependency warning if it's disabled: WARNING: unmet direct dependencies detected for VIDEO_OV2640 Depends on [n]: MEDIA_SUPPORT [=y] && VIDEO_DEV [=y] && VIDEO_CAMERA_SENSOR [=n] Selected by [y]: - VIDEO_EM28XX_V4L2 [=y] && USB [=y] && MEDIA_SUPPORT [=y] && MEDIA_USB_SUPPORT [=y] && (MEDIA_CAMERA_SUPPORT [=y] || MEDIA_ANALOG_TV_SUPPORT [=y] || MEDIA_DIGITAL_TV_SUPPORT [=y]) && VIDEO_EM28XX [=y] && MEDIA_SUBDRV_AUTOSELECT [=y] && MEDIA_CAMERA_SUPPORT [=y] - VIDEO_GO7007 [=y] && MEDIA_SUPPORT [=y] && MEDIA_USB_SUPPORT [=y] && MEDIA_ANALOG_TV_SUPPORT [=y] && VIDEO_DEV [=y] && I2C [=y] && SND [=y] && USB [=y] && MEDIA_SUBDRV_AUTOSELECT [=y] && MEDIA_CAMERA_SUPPORT [=y] WARNING: unmet direct dependencies detected for VIDEO_MT9V011 Depends on [n]: MEDIA_SUPPORT [=y] && VIDEO_DEV [=y] && VIDEO_CAMERA_SENSOR [=n] Selected by [y]: - VIDEO_EM28XX_V4L2 [=y] && USB [=y] && MEDIA_SUPPORT [=y] && MEDIA_USB_SUPPORT [=y] && (MEDIA_CAMERA_SUPPORT [=y] || MEDIA_ANALOG_TV_SUPPORT [=y] || MEDIA_DIGITAL_TV_SUPPORT [=y]) && VIDEO_EM28XX [=y] && MEDIA_SUBDRV_AUTOSELECT [=y] && MEDIA_CAMERA_SUPPORT [=y] WARNING: unmet direct dependencies detected for VIDEO_OV7670 Depends on [n]: MEDIA_SUPPORT [=y] && VIDEO_DEV [=y] && VIDEO_CAMERA_SENSOR [=n] Selected by [y]: - VIDEO_CAFE_CCIC [=y] && MEDIA_SUPPORT [=y] && MEDIA_PLATFORM_SUPPORT [=y] && MEDIA_PLATFORM_DRIVERS [=y] && V4L_PLATFORM_DRIVERS [=y] && PCI [=y] && I2C [=y] && VIDEO_DEV [=y] && COMMON_CLK [=y] - VIDEO_MMP_CAMERA [=y] && MEDIA_SUPPORT [=y] && MEDIA_PLATFORM_SUPPORT [=y] && MEDIA_PLATFORM_DRIVERS [=y] && V4L_PLATFORM_DRIVERS [=y] && I2C [=y] && VIDEO_DEV [=y] && (ARCH_MMP [=y] || COMPILE_TEST [=y]) && COMMON_CLK [=y] - VIDEO_VIA_CAMERA [=y] && MEDIA_SUPPORT [=y] && MEDIA_PLATFORM_SUPPORT [=y] && MEDIA_PLATFORM_DRIVERS [=y] && V4L_PLATFORM_DRIVERS [=y] && FB_VIA [=y] && VIDEO_DEV [=y] Some of these are guarded by 'if MEDIA_SUBDRV_AUTOSELECT && MEDIA_CAMERA_SUPPORT', which seems to be the right approach, so update those to use the new VIDEO_CAMERA_SENSOR symbol instead of MEDIA_CAMERA_SUPPORT and add the same condition to the ones that don't already have one. Fixes: 7d3c7d2a2914e ("media: i2c: Add a camera sensor top level menu") Signed-off-by: Arnd Bergmann --- drivers/media/platform/marvell/Kconfig | 4 ++-- drivers/media/platform/via/Kconfig | 2 +- drivers/media/usb/em28xx/Kconfig | 4 ++-- drivers/media/usb/go7007/Kconfig | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/media/platform/marvell/Kconfig b/drivers/media/platform/marvell/Kconfig index ec1a16734a280..d6499ffe30e8b 100644 --- a/drivers/media/platform/marvell/Kconfig +++ b/drivers/media/platform/marvell/Kconfig @@ -7,7 +7,7 @@ config VIDEO_CAFE_CCIC depends on V4L_PLATFORM_DRIVERS depends on PCI && I2C && VIDEO_DEV depends on COMMON_CLK - select VIDEO_OV7670 + select VIDEO_OV7670 if MEDIA_SUBDRV_AUTOSELECT && VIDEO_CAMERA_SENSOR select VIDEOBUF2_VMALLOC select VIDEOBUF2_DMA_CONTIG select VIDEOBUF2_DMA_SG @@ -22,7 +22,7 @@ config VIDEO_MMP_CAMERA depends on I2C && VIDEO_DEV depends on ARCH_MMP || COMPILE_TEST depends on COMMON_CLK - select VIDEO_OV7670 + select VIDEO_OV7670 if MEDIA_SUBDRV_AUTOSELECT && VIDEO_CAMERA_SENSOR select I2C_GPIO select VIDEOBUF2_VMALLOC select VIDEOBUF2_DMA_CONTIG diff --git a/drivers/media/platform/via/Kconfig b/drivers/media/platform/via/Kconfig index 8926eb0803b27..ea8dfc0a90756 100644 --- a/drivers/media/platform/via/Kconfig +++ b/drivers/media/platform/via/Kconfig @@ -7,7 +7,7 @@ config VIDEO_VIA_CAMERA depends on V4L_PLATFORM_DRIVERS depends on FB_VIA && VIDEO_DEV select VIDEOBUF2_DMA_SG - select VIDEO_OV7670 + select VIDEO_OV7670 if MEDIA_SUBDRV_AUTOSELECT && VIDEO_CAMERA_SENSOR help Driver support for the integrated camera controller in VIA Chrome9 chipsets. Currently only tested on OLPC xo-1.5 systems diff --git a/drivers/media/usb/em28xx/Kconfig b/drivers/media/usb/em28xx/Kconfig index b3c472b8c5a96..cb61fd6cc6c61 100644 --- a/drivers/media/usb/em28xx/Kconfig +++ b/drivers/media/usb/em28xx/Kconfig @@ -12,8 +12,8 @@ config VIDEO_EM28XX_V4L2 select VIDEO_SAA711X if MEDIA_SUBDRV_AUTOSELECT select VIDEO_TVP5150 if MEDIA_SUBDRV_AUTOSELECT select VIDEO_MSP3400 if MEDIA_SUBDRV_AUTOSELECT - select VIDEO_MT9V011 if MEDIA_SUBDRV_AUTOSELECT && MEDIA_CAMERA_SUPPORT - select VIDEO_OV2640 if MEDIA_SUBDRV_AUTOSELECT && MEDIA_CAMERA_SUPPORT + select VIDEO_MT9V011 if MEDIA_SUBDRV_AUTOSELECT && VIDEO_CAMERA_SENSOR + select VIDEO_OV2640 if MEDIA_SUBDRV_AUTOSELECT && VIDEO_CAMERA_SENSOR help This is a video4linux driver for Empia 28xx based TV cards. diff --git a/drivers/media/usb/go7007/Kconfig b/drivers/media/usb/go7007/Kconfig index 4ff79940ad8d4..478106b751267 100644 --- a/drivers/media/usb/go7007/Kconfig +++ b/drivers/media/usb/go7007/Kconfig @@ -12,7 +12,7 @@ config VIDEO_GO7007 select VIDEO_TW2804 if MEDIA_SUBDRV_AUTOSELECT select VIDEO_TW9903 if MEDIA_SUBDRV_AUTOSELECT select VIDEO_TW9906 if MEDIA_SUBDRV_AUTOSELECT - select VIDEO_OV7640 if MEDIA_SUBDRV_AUTOSELECT && MEDIA_CAMERA_SUPPORT + select VIDEO_OV7640 if MEDIA_SUBDRV_AUTOSELECT && VIDEO_CAMERA_SENSOR select VIDEO_UDA1342 if MEDIA_SUBDRV_AUTOSELECT help This is a video4linux driver for the WIS GO7007 MPEG -- 2.39.2