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

Commit 7797446e authored by qctecmdr Service's avatar qctecmdr Service Committed by Gerrit - the friendly Code Review server
Browse files

Merge "leds: qpnp-flash: Add support to query maximum current"

parents c952b4d6 2946916d

drivers/leds/leds-qpnp-flash-v2.c

+1 −1
Original line number Diff line number Diff line
@@ -1336,7 +1336,7 @@ int qpnp_flash_led_prepare(struct led_trigger *trig, int options, 
		}

	}



	if (options & QUERY_MAX_CURRENT) {

	if (options & QUERY_MAX_AVAIL_CURRENT) {

		rc = qpnp_flash_led_get_max_avail_current(led, max_current);

		if (rc < 0) {

			pr_err("query max current failed, rc=%d\n", rc);

drivers/media/platform/msm/camera/cam_sensor_module/cam_flash/cam_flash_core.c

+1 −1
Original line number Diff line number Diff line
@@ -719,7 +719,7 @@ int cam_flash_parser(struct cam_flash_ctrl *fctrl, void *arg) 
				(struct cam_flash_query_curr *)cmd_buf;



			rc = qpnp_flash_led_prepare(fctrl->switch_trigger,

				QUERY_MAX_CURRENT, &query_curr_ma);

				QUERY_MAX_AVAIL_CURRENT, &query_curr_ma);

			CAM_DBG(CAM_FLASH, "query_curr_ma = %d",

				query_curr_ma);

			if (rc) {

include/linux/leds-qpnp-flash.h

+5 −4
Original line number Diff line number Diff line 
/* Copyright (c) 2016-2017, The Linux Foundation. All rights reserved.

/* Copyright (c) 2016-2018, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -17,7 +17,8 @@ 


#define ENABLE_REGULATOR		BIT(0)

#define DISABLE_REGULATOR		BIT(1)

#define QUERY_MAX_CURRENT	BIT(2)

#define QUERY_MAX_AVAIL_CURRENT		BIT(2)

#define QUERY_MAX_CURRENT		BIT(3)



#define FLASH_LED_PREPARE_OPTIONS_MASK	GENMASK(3, 0)