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

Commit bd56b374 authored by Camera Software Integration's avatar Camera Software Integration Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: camera: sensor: Rename the dtsi entry to avoid the predefined... 

Merge "msm: camera: sensor: Rename the dtsi entry to avoid the predefined string" into camera-kernel.lnx.4.0
parents a7a72f3f d2639c26

drivers/cam_sensor_module/cam_res_mgr/cam_res_mgr.c

+4 −4
Original line number Diff line number Diff line
@@ -760,7 +760,7 @@ static int cam_res_mgr_parse_dt_shared_gpio( 


	of_node = dev->of_node;

	dt->num_shared_gpio = of_property_count_u32_elems(of_node,

		"shared-gpios");

		"gpios-shared");



	if (dt->num_shared_gpio <= 0) {

		CAM_DBG(CAM_RES,
@@ -776,7 +776,7 @@ static int cam_res_mgr_parse_dt_shared_gpio( 
		return -EINVAL;

	}



	rc = of_property_read_u32_array(of_node, "shared-gpios",

	rc = of_property_read_u32_array(of_node, "gpios-shared",

		dt->shared_gpio, dt->num_shared_gpio);

	if (rc) {

		CAM_ERR(CAM_RES, "Get shared gpio array failed.");
@@ -796,7 +796,7 @@ static int cam_res_mgr_parse_dt_shared_pinctrl_gpio( 


	of_node = dev->of_node;

	dt->num_shared_pctrl_gpio = of_property_count_u32_elems(of_node,

		"shared-pinctrl-gpios");

		"gpios-shared-pinctrl");



	if (dt->num_shared_pctrl_gpio <= 0) {

		CAM_DBG(CAM_RES,
@@ -825,7 +825,7 @@ static int cam_res_mgr_parse_dt_shared_pinctrl_gpio( 
	CAM_INFO(CAM_RES,

		"number of pctrl_gpio: %d", dt->num_shared_pctrl_gpio);



	rc = of_property_read_u32_array(of_node, "shared-pinctrl-gpios",

	rc = of_property_read_u32_array(of_node, "gpios-shared-pinctrl",

		dt->shared_pctrl_gpio, dt->num_shared_pctrl_gpio);

	if (rc) {

		CAM_ERR(CAM_RES, "Get shared pinctrl gpio array failed.");