Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7a60743f authored by Nikhil Devshatwar's avatar Nikhil Devshatwar Committed by Mauro Carvalho Chehab
Browse files

[media] v4l: of: Correct pclk-sample for BT656 bus 



Current v4l2_of_parse_parallel_bus function attempts to parse the
DT properties for the parallel bus as well as BT656 bus.
If the pclk-sample property is defined for the BT656 bus, it is still
marked as a parallel bus.
Fix this by parsing the pclk after the bus_type is selected.
Only when hsync or vsync properties are specified, the bus_type should
be set to V4L2_MBUS_PARALLEL.

Signed-off-by: default avatarNikhil Devshatwar <nikhil.nd@ti.com>
Acked-by: default avatarSylwester Nawrocki <s.nawrocki@samsung.com>
Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@osg.samsung.com>
parent 49b7cb5d

drivers/media/v4l2-core/v4l2-of.c

+4 −4
Original line number Diff line number Diff line
@@ -93,10 +93,6 @@ static void v4l2_of_parse_parallel_bus(const struct device_node *node, 
		flags |= v ? V4L2_MBUS_VSYNC_ACTIVE_HIGH :

			V4L2_MBUS_VSYNC_ACTIVE_LOW;



	if (!of_property_read_u32(node, "pclk-sample", &v))

		flags |= v ? V4L2_MBUS_PCLK_SAMPLE_RISING :

			V4L2_MBUS_PCLK_SAMPLE_FALLING;



	if (!of_property_read_u32(node, "field-even-active", &v))

		flags |= v ? V4L2_MBUS_FIELD_EVEN_HIGH :

			V4L2_MBUS_FIELD_EVEN_LOW;
@@ -105,6 +101,10 @@ static void v4l2_of_parse_parallel_bus(const struct device_node *node, 
	else

		endpoint->bus_type = V4L2_MBUS_BT656;



	if (!of_property_read_u32(node, "pclk-sample", &v))

		flags |= v ? V4L2_MBUS_PCLK_SAMPLE_RISING :

			V4L2_MBUS_PCLK_SAMPLE_FALLING;



	if (!of_property_read_u32(node, "data-active", &v))

		flags |= v ? V4L2_MBUS_DATA_ACTIVE_HIGH :

			V4L2_MBUS_DATA_ACTIVE_LOW;