Commit 573e298c authored by Laurent Pinchart's avatar Laurent Pinchart Committed by Mauro Carvalho Chehab
Browse files

media: ti-vpe: cal: Split CAMERARX syscon regmap retrieval to a function 



Simplify the cal_probe() function by splitting the CAMERARX syscon
regmap retrieval to a separate function. A few local variables are
renamed in the process to shorten them (syscon_camerrx_*) or to make
them more accurate (parent isn't the parent OF node but the CAL device's
own OF node).

Signed-off-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: default avatarTomi Valkeinen <tomi.valkeinen@ti.com>
Reviewed-by: default avatarBenoit Parrot <bparrot@ti.com>
Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+huawei@kernel.org>
parent 4607c248

drivers/media/platform/ti-vpe/cal.c

+42 −31
Original line number Diff line number Diff line
@@ -991,6 +991,45 @@ static struct regmap *cal_get_camerarx_regmap(struct cal_dev *cal) 
	return regmap;

}



static int cal_camerarx_init_regmap(struct cal_dev *cal)

{

	struct device_node *np = cal->pdev->dev.of_node;

	struct regmap *syscon;

	u32 syscon_offset;

	int ret;



	syscon = syscon_regmap_lookup_by_phandle(np, "ti,camerrx-control");

	ret = of_property_read_u32_index(np, "ti,camerrx-control", 1,

					 &syscon_offset);

	if (IS_ERR(syscon))

		ret = PTR_ERR(syscon);

	if (ret) {

		dev_warn(&cal->pdev->dev,

			 "failed to get ti,camerrx-control: %d\n", ret);



		/*

		 * Backward DTS compatibility.

		 * If syscon entry is not present then check if the

		 * camerrx_control resource is present.

		 */

		syscon = cal_get_camerarx_regmap(cal);

		if (IS_ERR(syscon)) {

			dev_err(&cal->pdev->dev,

				"failed to get camerrx_control regmap\n");

			return PTR_ERR(syscon);

		}

		/* In this case the base already point to the direct

		 * CM register so no need for an offset

		 */

		syscon_offset = 0;

	}



	cal->syscon_camerrx = syscon;

	cal->syscon_camerrx_offset = syscon_offset;



	return 0;

}



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

 *	Context Management

 * ------------------------------------------------------------------
@@ -2270,9 +2309,6 @@ static int cal_probe(struct platform_device *pdev) 
{

	struct cal_dev *cal;

	struct cal_ctx *ctx;

	struct device_node *parent = pdev->dev.of_node;

	struct regmap *syscon_camerrx;

	u32 syscon_camerrx_offset;

	unsigned int i;

	int ret;

	int irq;
@@ -2296,34 +2332,9 @@ static int cal_probe(struct platform_device *pdev) 
		return PTR_ERR(cal->fclk);

	}



	syscon_camerrx = syscon_regmap_lookup_by_phandle(parent,

							 "ti,camerrx-control");

	ret = of_property_read_u32_index(parent, "ti,camerrx-control", 1,

					 &syscon_camerrx_offset);

	if (IS_ERR(syscon_camerrx))

		ret = PTR_ERR(syscon_camerrx);

	if (ret) {

		dev_warn(&pdev->dev, "failed to get ti,camerrx-control: %d\n",

			 ret);



		/*

		 * Backward DTS compatibility.

		 * If syscon entry is not present then check if the

		 * camerrx_control resource is present.

		 */

		syscon_camerrx = cal_get_camerarx_regmap(cal);

		if (IS_ERR(syscon_camerrx)) {

			dev_err(&pdev->dev, "failed to get camerrx_control regmap\n");

			return PTR_ERR(syscon_camerrx);

		}

		/* In this case the base already point to the direct

		 * CM register so no need for an offset

		 */

		syscon_camerrx_offset = 0;

	}



	cal->syscon_camerrx = syscon_camerrx;

	cal->syscon_camerrx_offset = syscon_camerrx_offset;

	ret = cal_camerarx_init_regmap(cal);

	if (ret < 0)

		return ret;



	cal->res = platform_get_resource_byname(pdev, IORESOURCE_MEM,

						"cal_top");

CRA Git | Maintained and supported by SUSTech CRA and CCSE