Commit d095b18f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'media/v6.7-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media 

Pull media fixes from Mauro Carvalho Chehab.

* tag 'media/v6.7-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media:
  media: pci: mgb4: add COMMON_CLK dependency
  media: v4l2-subdev: Fix a 64bit bug
  media: mgb4: Added support for T200 card variant
  media: vsp1: Remove unbalanced .s_stream(0) calls
parents 2cc14f52 32138be3

drivers/media/pci/mgb4/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 
config VIDEO_MGB4

	tristate "Digiteq Automotive MGB4 support"

	depends on VIDEO_DEV && PCI && I2C && DMADEVICES && SPI && MTD && IIO

	depends on COMMON_CLK

	select VIDEOBUF2_DMA_SG

	select IIO_BUFFER

	select IIO_TRIGGERED_BUFFER

drivers/media/pci/mgb4/mgb4_core.c

+15 −5
Original line number Diff line number Diff line
@@ -42,6 +42,10 @@ 


#define MGB4_USER_IRQS 16



#define DIGITEQ_VID 0x1ed8

#define T100_DID    0x0101

#define T200_DID    0x0201



ATTRIBUTE_GROUPS(mgb4_pci);



static int flashid;
@@ -151,7 +155,7 @@ static struct spi_master *get_spi_adap(struct platform_device *pdev) 
	return dev ? container_of(dev, struct spi_master, dev) : NULL;

}



static int init_spi(struct mgb4_dev *mgbdev)

static int init_spi(struct mgb4_dev *mgbdev, u32 devid)

{

	struct resource spi_resources[] = {

		{
@@ -213,8 +217,13 @@ static int init_spi(struct mgb4_dev *mgbdev) 
	snprintf(mgbdev->fw_part_name, sizeof(mgbdev->fw_part_name),

		 "mgb4-fw.%d", flashid);

	mgbdev->partitions[0].name = mgbdev->fw_part_name;

	if (devid == T200_DID) {

		mgbdev->partitions[0].size = 0x950000;

		mgbdev->partitions[0].offset = 0x1000000;

	} else {

		mgbdev->partitions[0].size = 0x400000;

		mgbdev->partitions[0].offset = 0x400000;

	}

	mgbdev->partitions[0].mask_flags = 0;



	snprintf(mgbdev->data_part_name, sizeof(mgbdev->data_part_name),
@@ -551,7 +560,7 @@ static int mgb4_probe(struct pci_dev *pdev, const struct pci_device_id *id) 
		goto err_video_regs;



	/* SPI FLASH */

	rv = init_spi(mgbdev);

	rv = init_spi(mgbdev, id->device);

	if (rv < 0)

		goto err_cmt_regs;
@@ -666,7 +675,8 @@ static void mgb4_remove(struct pci_dev *pdev) 
}



static const struct pci_device_id mgb4_pci_ids[] = {

	{ PCI_DEVICE(0x1ed8, 0x0101), },

	{ PCI_DEVICE(DIGITEQ_VID, T100_DID), },

	{ PCI_DEVICE(DIGITEQ_VID, T200_DID), },

	{ 0, }

};

MODULE_DEVICE_TABLE(pci, mgb4_pci_ids);

drivers/media/platform/renesas/vsp1/vsp1_pipe.c

+1 −1
Original line number Diff line number Diff line
@@ -373,7 +373,7 @@ int vsp1_pipeline_stop(struct vsp1_pipeline *pipe) 
			   (7 << VI6_DPR_SMPPT_TGW_SHIFT) |

			   (VI6_DPR_NODE_UNUSED << VI6_DPR_SMPPT_PT_SHIFT));



	v4l2_subdev_call(&pipe->output->entity.subdev, video, s_stream, 0);

	vsp1_wpf_stop(pipe->output);



	return ret;

}

drivers/media/platform/renesas/vsp1/vsp1_rpf.c

+1 −9
Original line number Diff line number Diff line
@@ -43,14 +43,6 @@ static inline void vsp1_rpf_write(struct vsp1_rwpf *rpf, 
			       data);

}



/* -----------------------------------------------------------------------------

 * V4L2 Subdevice Operations

 */



static const struct v4l2_subdev_ops rpf_ops = {

	.pad    = &vsp1_rwpf_pad_ops,

};



/* -----------------------------------------------------------------------------

 * VSP1 Entity Operations

 */
@@ -411,7 +403,7 @@ struct vsp1_rwpf *vsp1_rpf_create(struct vsp1_device *vsp1, unsigned int index) 
	rpf->entity.index = index;



	sprintf(name, "rpf.%u", index);

	ret = vsp1_entity_init(vsp1, &rpf->entity, name, 2, &rpf_ops,

	ret = vsp1_entity_init(vsp1, &rpf->entity, name, 2, &vsp1_rwpf_subdev_ops,

			       MEDIA_ENT_F_PROC_VIDEO_PIXEL_FORMATTER);

	if (ret < 0)

		return ERR_PTR(ret);

drivers/media/platform/renesas/vsp1/vsp1_rwpf.c

+6 −2
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ struct v4l2_rect *vsp1_rwpf_get_crop(struct vsp1_rwpf *rwpf, 
}



/* -----------------------------------------------------------------------------

 * V4L2 Subdevice Pad Operations

 * V4L2 Subdevice Operations

 */



static int vsp1_rwpf_enum_mbus_code(struct v4l2_subdev *subdev,
@@ -243,7 +243,7 @@ static int vsp1_rwpf_set_selection(struct v4l2_subdev *subdev, 
	return ret;

}



const struct v4l2_subdev_pad_ops vsp1_rwpf_pad_ops = {

static const struct v4l2_subdev_pad_ops vsp1_rwpf_pad_ops = {

	.init_cfg = vsp1_entity_init_cfg,

	.enum_mbus_code = vsp1_rwpf_enum_mbus_code,

	.enum_frame_size = vsp1_rwpf_enum_frame_size,
@@ -253,6 +253,10 @@ const struct v4l2_subdev_pad_ops vsp1_rwpf_pad_ops = { 
	.set_selection = vsp1_rwpf_set_selection,

};



const struct v4l2_subdev_ops vsp1_rwpf_subdev_ops = {

	.pad    = &vsp1_rwpf_pad_ops,

};



/* -----------------------------------------------------------------------------

 * Controls

 */