Commit b6ee5ac1 authored by Hans Verkuil's avatar Hans Verkuil
Browse files

Merge tag 'tags/next-media-20240626' of... 

Merge tag 'tags/next-media-20240626' of git://git.kernel.org/pub/scm/linux/kernel/git/pinchartl/linux.git



- fix typo in v4l2-subdev.h
- imx-pxp bug fix
- media i2c Kconfig: add missing FW_UPLOAD select

Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
parents 113ac3e2 a047b66c

drivers/media/i2c/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -710,6 +710,7 @@ config VIDEO_THP7312 
	tristate "THine THP7312 support"

	depends on I2C

	select FW_LOADER

	select FW_UPLOAD

	select MEDIA_CONTROLLER

	select V4L2_CCI_I2C

	select V4L2_FWNODE

drivers/media/platform/nxp/imx-pxp.c

+3 −0
Original line number Diff line number Diff line
@@ -1805,6 +1805,9 @@ static int pxp_probe(struct platform_device *pdev) 
		return PTR_ERR(mmio);

	dev->regmap = devm_regmap_init_mmio(&pdev->dev, mmio,

					    &pxp_regmap_config);

	if (IS_ERR(dev->regmap))

		return dev_err_probe(&pdev->dev, PTR_ERR(dev->regmap),

				     "Failed to init regmap\n");



	irq = platform_get_irq(pdev, 0);

	if (irq < 0)

include/media/v4l2-subdev.h

+1 −1
Original line number Diff line number Diff line
@@ -690,7 +690,7 @@ struct v4l2_subdev_pad_config { 
 *

 * @pad: pad number

 * @stream: stream number

 * @enabled: has the stream been enabled with v4l2_subdev_enable_stream()

 * @enabled: has the stream been enabled with v4l2_subdev_enable_streams()

 * @fmt: &struct v4l2_mbus_framefmt

 * @crop: &struct v4l2_rect to be used for crop

 * @compose: &struct v4l2_rect to be used for compose