Commit f855fc2c authored by Philipp Zabel's avatar Philipp Zabel Committed by Mauro Carvalho Chehab
Browse files

media: hantro: add support for named register ranges 



Add support for multiple register ranges with SoC specific names.

Signed-off-by: default avatarPhilipp Zabel <p.zabel@pengutronix.de>
Reviewed-by: default avatarBoris Brezillon <boris.brezillon@collabora.com>
Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+samsung@kernel.org>
parent 4d20d087

drivers/staging/media/hantro/hantro.h

+6 −2
Original line number Diff line number Diff line
@@ -72,6 +72,8 @@ struct hantro_irq { 
 * @num_irqs:			number of irqs in the array

 * @clk_names:			array of clock names

 * @num_clocks:			number of clocks in the array

 * @reg_names:			array of register range names

 * @num_regs:			number of register range names in the array

 */

struct hantro_variant {

	unsigned int enc_offset;
@@ -88,6 +90,8 @@ struct hantro_variant { 
	int num_irqs;

	const char *clk_names[HANTRO_MAX_CLOCKS];

	int num_clocks;

	const char * const *reg_names;

	int num_regs;

};



/**
@@ -160,7 +164,7 @@ hantro_vdev_to_func(struct video_device *vdev) 
 * @dev:		Pointer to device for convenient logging using

 *			dev_ macros.

 * @clocks:		Array of clock handles.

 * @base:		Mapped address of VPU registers.

 * @reg_bases:		Mapped addresses of VPU registers.

 * @enc_base:		Mapped address of VPU encoder register for convenience.

 * @dec_base:		Mapped address of VPU decoder register for convenience.

 * @vpu_mutex:		Mutex to synchronize V4L2 calls.
@@ -178,7 +182,7 @@ struct hantro_dev { 
	struct platform_device *pdev;

	struct device *dev;

	struct clk_bulk_data clocks[HANTRO_MAX_CLOCKS];

	void __iomem *base;

	void __iomem **reg_bases;

	void __iomem *enc_base;

	void __iomem *dec_base;

drivers/staging/media/hantro/hantro_drv.c

+18 −6
Original line number Diff line number Diff line
@@ -670,6 +670,7 @@ static int hantro_probe(struct platform_device *pdev) 
	const struct of_device_id *match;

	struct hantro_dev *vpu;

	struct resource *res;

	int num_bases;

	int i, ret;



	vpu = devm_kzalloc(&pdev->dev, sizeof(*vpu), GFP_KERNEL);
@@ -693,12 +694,23 @@ static int hantro_probe(struct platform_device *pdev) 
	if (ret)

		return ret;



	res = platform_get_resource(vpu->pdev, IORESOURCE_MEM, 0);

	vpu->base = devm_ioremap_resource(vpu->dev, res);

	if (IS_ERR(vpu->base))

		return PTR_ERR(vpu->base);

	vpu->enc_base = vpu->base + vpu->variant->enc_offset;

	vpu->dec_base = vpu->base + vpu->variant->dec_offset;

	num_bases = vpu->variant->num_regs ?: 1;

	vpu->reg_bases = devm_kcalloc(&pdev->dev, num_bases,

				      sizeof(*vpu->reg_bases), GFP_KERNEL);

	if (!vpu->reg_bases)

		return -ENOMEM;



	for (i = 0; i < num_bases; i++) {

		res = vpu->variant->reg_names ?

		      platform_get_resource_byname(vpu->pdev, IORESOURCE_MEM,

						   vpu->variant->reg_names[i]) :

		      platform_get_resource(vpu->pdev, IORESOURCE_MEM, 0);

		vpu->reg_bases[i] = devm_ioremap_resource(vpu->dev, res);

		if (IS_ERR(vpu->reg_bases[i]))

			return PTR_ERR(vpu->reg_bases[i]);

	}

	vpu->enc_base = vpu->reg_bases[0] + vpu->variant->enc_offset;

	vpu->dec_base = vpu->reg_bases[0] + vpu->variant->dec_offset;



	ret = dma_set_coherent_mask(vpu->dev, DMA_BIT_MASK(32));

	if (ret) {