Commit 2cabb7ad authored by Laurent Pinchart's avatar Laurent Pinchart Committed by Mauro Carvalho Chehab

media: ti-vpe: cal: Use syscon_regmap_lookup_by_phandle_args()

Use the syscon_regmap_lookup_by_phandle_args() function to replace
manual lookup of the syscon regmap offset. This simplifies the
cal_camerarx_init_regmap() implementation.
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 573e298c
...@@ -995,17 +995,14 @@ static int cal_camerarx_init_regmap(struct cal_dev *cal) ...@@ -995,17 +995,14 @@ static int cal_camerarx_init_regmap(struct cal_dev *cal)
{ {
struct device_node *np = cal->pdev->dev.of_node; struct device_node *np = cal->pdev->dev.of_node;
struct regmap *syscon; struct regmap *syscon;
u32 syscon_offset; unsigned int offset;
int ret;
syscon = syscon_regmap_lookup_by_phandle(np, "ti,camerrx-control"); syscon = syscon_regmap_lookup_by_phandle_args(np, "ti,camerrx-control",
ret = of_property_read_u32_index(np, "ti,camerrx-control", 1, 1, &offset);
&syscon_offset); if (IS_ERR(syscon)) {
if (IS_ERR(syscon))
ret = PTR_ERR(syscon);
if (ret) {
dev_warn(&cal->pdev->dev, dev_warn(&cal->pdev->dev,
"failed to get ti,camerrx-control: %d\n", ret); "failed to get ti,camerrx-control: %ld\n",
PTR_ERR(syscon));
/* /*
* Backward DTS compatibility. * Backward DTS compatibility.
...@@ -1021,11 +1018,11 @@ static int cal_camerarx_init_regmap(struct cal_dev *cal) ...@@ -1021,11 +1018,11 @@ static int cal_camerarx_init_regmap(struct cal_dev *cal)
/* In this case the base already point to the direct /* In this case the base already point to the direct
* CM register so no need for an offset * CM register so no need for an offset
*/ */
syscon_offset = 0; offset = 0;
} }
cal->syscon_camerrx = syscon; cal->syscon_camerrx = syscon;
cal->syscon_camerrx_offset = syscon_offset; cal->syscon_camerrx_offset = offset;
return 0; return 0;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment