mbox series

[0/2] Media Kconfig fixes

Message ID 20230816133526.3859456-1-sakari.ailus@linux.intel.com
Headers show
Series Media Kconfig fixes | expand

Message

Sakari Ailus Aug. 16, 2023, 1:35 p.m. UTC
Hi Randy, others,

These should address the Kconfig-derived build issues you found yesterday.

Sakari Ailus (2):
  media: v4l: usb: Use correct dependency for camera sensor drivers
  media: ivsc: Add ACPI dependency

 drivers/media/pci/intel/ivsc/Kconfig | 2 +-
 drivers/media/usb/em28xx/Kconfig     | 4 ++--
 drivers/media/usb/go7007/Kconfig     | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

Comments

Randy Dunlap Aug. 16, 2023, 7:21 p.m. UTC | #1
On 8/16/23 06:35, Sakari Ailus wrote:
> The IVSC driver only works in ACPI systems so make it depend on ACPI.
> 
> Compiling it elsewhere has little if any value.
> 
> Reported-by: Randy Dunlap <rdunlap@infradead.org>
> Fixes: 29006e196a56 ("media: pci: intel: ivsc: Add CSI submodule")
> Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>

Reviewed-by: Randy Dunlap <rdunlap@infradead.org>
Tested-by: Randy Dunlap <rdunlap@infradead.org> # build-tested

Thanks.

> ---
>  drivers/media/pci/intel/ivsc/Kconfig | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/media/pci/intel/ivsc/Kconfig b/drivers/media/pci/intel/ivsc/Kconfig
> index ec4ade92f583..413053175df7 100644
> --- a/drivers/media/pci/intel/ivsc/Kconfig
> +++ b/drivers/media/pci/intel/ivsc/Kconfig
> @@ -3,7 +3,7 @@
>  
>  config INTEL_VSC
>  	tristate "Intel Visual Sensing Controller"
> -	depends on INTEL_MEI
> +	depends on INTEL_MEI && ACPI
>  	help
>  	  This adds support for Intel Visual Sensing Controller (IVSC).
>
Randy Dunlap Aug. 16, 2023, 7:21 p.m. UTC | #2
Hi Sakari,

On 8/16/23 06:35, Sakari Ailus wrote:
> The Kconfig option that enables compiling camera sensor drivers is
> VIDEO_CAMERA_SENSOR rather than MEDIA_CAMERA_SUPPORT as it was previously.
> Fix this.
> 
> Reported-by: Randy Dunlap <rdunlap@infradead.org>
> Fixes: 7d3c7d2a2914 ("media: i2c: Add a camera sensor top level menu")
> Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
> ---
>  drivers/media/usb/em28xx/Kconfig | 4 ++--
>  drivers/media/usb/go7007/Kconfig | 2 +-
>  2 files changed, 3 insertions(+), 3 deletions(-)
> 

This patch reduces the number of kconfig warnings from 4 to 2. I still see these
(and these appear to be duplicates, so only one):

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_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 || COMPILE_TEST [=y]) && COMMON_CLK [=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_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 || COMPILE_TEST [=y]) && COMMON_CLK [=y]

Thanks.

> diff --git a/drivers/media/usb/em28xx/Kconfig b/drivers/media/usb/em28xx/Kconfig
> index b3c472b8c5a9..cb61fd6cc6c6 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 4ff79940ad8d..b2a15d9fb1f3 100644
> --- a/drivers/media/usb/go7007/Kconfig
> +++ b/drivers/media/usb/go7007/Kconfig
> @@ -12,8 +12,8 @@ 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_UDA1342 if MEDIA_SUBDRV_AUTOSELECT
> +	select VIDEO_OV7640 if MEDIA_SUBDRV_AUTOSELECT && VIDEO_CAMERA_SENSOR
>  	help
>  	  This is a video4linux driver for the WIS GO7007 MPEG
>  	  encoder chip.
Sakari Ailus Aug. 18, 2023, 9:47 a.m. UTC | #3
Hi Randy,

On Wed, Aug 16, 2023 at 12:21:31PM -0700, Randy Dunlap wrote:
> Hi Sakari,
> 
> On 8/16/23 06:35, Sakari Ailus wrote:
> > The Kconfig option that enables compiling camera sensor drivers is
> > VIDEO_CAMERA_SENSOR rather than MEDIA_CAMERA_SUPPORT as it was previously.
> > Fix this.
> > 
> > Reported-by: Randy Dunlap <rdunlap@infradead.org>
> > Fixes: 7d3c7d2a2914 ("media: i2c: Add a camera sensor top level menu")
> > Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
> > ---
> >  drivers/media/usb/em28xx/Kconfig | 4 ++--
> >  drivers/media/usb/go7007/Kconfig | 2 +-
> >  2 files changed, 3 insertions(+), 3 deletions(-)
> > 
> 
> This patch reduces the number of kconfig warnings from 4 to 2. I still see these
> (and these appear to be duplicates, so only one):
> 
> 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_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 || COMPILE_TEST [=y]) && COMMON_CLK [=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_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 || COMPILE_TEST [=y]) && COMMON_CLK [=y]

Oops. I missed this bit.

Hans has taken the ivsc Kconfig patch already so I'll send v2 for this one
only.