leds: leds-qpnp-flash: update flash LED register setting (b1f9fa23) · Commits · e / devices / android_kernel_sony_msm8994

Documentation/devicetree/bindings/leds/leds-qpnp-flash.txt

+8 −2

Original line number	Original line	Diff line number	Diff line
	@@ -26,8 +26,8 @@ Optional properties:
	should be 80, 90, 100, 110, 120, 130 in C.		should be 80, 90, 100, 110, 120, 130 in C.
	- qcom,thermal-derate-rate : derate rate when module temperature		- qcom,thermal-derate-rate : derate rate when module temperature
	reaches threshold. Values should be		reaches threshold. Values should be
	"2_PERCENT", "2P5_PERCENT", "4_PERCENT",		"1_PERCENT", "1P25_PERCENT", "2_PERCENT",
	"5_PERCENT" in string.		"2P5_PERCENT", "5_PERCENT" in string.
	- qcom,current-ramp-enabled : boolean type. stepped current ramp enablement		- qcom,current-ramp-enabled : boolean type. stepped current ramp enablement
	- qcom,ramp-up-step : current ramp up rate. Values should be		- qcom,ramp-up-step : current ramp up rate. Values should be
	"0P2US", "0P4US", "0P8US", "1P6US", "3P3US",		"0P2US", "0P4US", "0P8US", "1P6US", "3P3US",
	@@ -45,6 +45,10 @@ Optional properties:
	in us.		in us.
	- qcom,pmic-charger-support : Boolean type. This tells if flash utilizes charger boost		- qcom,pmic-charger-support : Boolean type. This tells if flash utilizes charger boost
	support		support
			- qcom,headroom-sense-ch0-enabled: Boolean type. This configures headroom sensing enablement
			for LED channel 0
			- qcom,headroom-sense-ch1-enabled: Boolean type. This configures headroom sensing enablement
			for LED channel 1

	Required properties inside child node. Chile node contains settings for each individual LED:		Required properties inside child node. Chile node contains settings for each individual LED:
	- label : type of led that will be used, either "flash" or "torch".		- label : type of led that will be used, either "flash" or "torch".
	@@ -87,6 +91,8 @@ Example:
	qcom,vph-pwr-droop-enabled;		qcom,vph-pwr-droop-enabled;
	qcom,vph-pwr-droop-threshold = <3200>;		qcom,vph-pwr-droop-threshold = <3200>;
	qcom,vph-pwr-droop-debounce-time = <10>;		qcom,vph-pwr-droop-debounce-time = <10>;
			qcom,headroom-sense-ch0-enabled;
			qcom,headroom-sense-ch1-enabled;

	pm8226_flash0: qcom,flash_0 {		pm8226_flash0: qcom,flash_0 {
	label = "flash";		label = "flash";

drivers/leds/leds-qpnp-flash.c

+50 −8

Original line number	Original line	Diff line number	Diff line
	@@ -41,6 +41,8 @@
	#define FLASH_THERMAL_DRATE(base) (base + 0x52)		#define FLASH_THERMAL_DRATE(base) (base + 0x52)
	#define FLASH_CURRENT_RAMP(base) (base + 0x54)		#define FLASH_CURRENT_RAMP(base) (base + 0x54)
	#define FLASH_VPH_PWR_DROOP(base) (base + 0x5A)		#define FLASH_VPH_PWR_DROOP(base) (base + 0x5A)
			#define FLASH_HDRM_SNS_ENABLE_CTRL0(base) (base + 0x5C)
			#define FLASH_HDRM_SNS_ENABLE_CTRL1(base) (base + 0x5D)
	#define FLASH_LED_UNLOCK_SECURE(base) (base + 0xD0)		#define FLASH_LED_UNLOCK_SECURE(base) (base + 0xD0)
	#define FLASH_TORCH(base) (base + 0xE4)		#define FLASH_TORCH(base) (base + 0xE4)

	@@ -59,6 +61,7 @@
	#define FLASH_STROBE_MASK 0xC0		#define FLASH_STROBE_MASK 0xC0
	#define FLASH_CURRENT_RAMP_MASK 0xBF		#define FLASH_CURRENT_RAMP_MASK 0xBF
	#define FLASH_VPH_PWR_DROOP_MASK 0xF3		#define FLASH_VPH_PWR_DROOP_MASK 0xF3
			#define FLASH_LED_HDRM_SNS_ENABLE_MASK 0x81

	#define FLASH_LED_TRIGGER_DEFAULT "none"		#define FLASH_LED_TRIGGER_DEFAULT "none"
	#define FLASH_LED_HEADROOM_DEFAULT_MV 500		#define FLASH_LED_HEADROOM_DEFAULT_MV 500
	@@ -86,6 +89,7 @@
	#define FLASH_LED_THERMAL_DEVIDER 10		#define FLASH_LED_THERMAL_DEVIDER 10
	#define FLASH_LED_VPH_DROOP_THRESHOLD_MIN_MV 2500		#define FLASH_LED_VPH_DROOP_THRESHOLD_MIN_MV 2500
	#define FLASH_LED_VPH_DROOP_THRESHOLD_DIVIDER 100		#define FLASH_LED_VPH_DROOP_THRESHOLD_DIVIDER 100
			#define FLASH_LED_HDRM_SNS_ENABLE 0x81

	#define FLASH_UNLOCK_SECURE 0xA5		#define FLASH_UNLOCK_SECURE 0xA5
	#define FLASH_LED_TORCH_ENABLE 0x00		#define FLASH_LED_TORCH_ENABLE 0x00
	@@ -114,9 +118,10 @@ enum flash_led_type {
	};		};

	enum thermal_derate_rate {		enum thermal_derate_rate {
	RATE_2_PERCENT = 0,		RATE_1_PERCENT = 0,
			RATE_1P25_PERCENT,
			RATE_2_PERCENT,
	RATE_2P5_PERCENT,		RATE_2P5_PERCENT,
	RATE_4_PERCENT,
	RATE_5_PERCENT,		RATE_5_PERCENT,
	};		};

	@@ -170,6 +175,8 @@ struct flash_led_platform_data {
	bool thermal_derate_en;		bool thermal_derate_en;
	bool current_ramp_en;		bool current_ramp_en;
	bool vph_pwr_droop_en;		bool vph_pwr_droop_en;
			bool hdrm_sns_ch0_en;
			bool hdrm_sns_ch1_en;
	};		};

	/*		/*
	@@ -285,17 +292,21 @@ qpnp_led_masked_write(struct spmi_device *spmi_dev, u16 addr, u8 mask, u8 val)
	static int qpnp_flash_led_get_thermal_derate_rate(const char *rate)		static int qpnp_flash_led_get_thermal_derate_rate(const char *rate)
	{		{
	/*		/*
	* return 4% derate as default value if user specifies		* return 5% derate as default value if user specifies
	* a value un-supported		* a value un-supported
	*/		*/
	if (strcmp(rate, "2_PERCENT") == 0)		if (strcmp(rate, "1_PERCENT") == 0)
			return RATE_1_PERCENT;
			else if (strcmp(rate, "1P25_PERCENT") == 0)
			return RATE_1P25_PERCENT;
			else if (strcmp(rate, "2_PERCENT") == 0)
	return RATE_2_PERCENT;		return RATE_2_PERCENT;
	else if (strcmp(rate, "2P5_PERCENT") == 0)		else if (strcmp(rate, "2P5_PERCENT") == 0)
	return RATE_2P5_PERCENT;		return RATE_2P5_PERCENT;
	else if (strcmp(rate, "5_PERCENT") == 0)		else if (strcmp(rate, "5_PERCENT") == 0)
	return RATE_5_PERCENT;		return RATE_5_PERCENT;
	else		else
	return RATE_4_PERCENT;		return RATE_5_PERCENT;
	}		}

	static int qpnp_flash_led_get_ramp_step(const char *step)		static int qpnp_flash_led_get_ramp_step(const char *step)
	@@ -803,6 +814,31 @@ static int qpnp_flash_led_init_settings(struct qpnp_flash_led *led)
	dev_err(&led->spmi_dev->dev, "VPH PWR droop reg write failed\n");		dev_err(&led->spmi_dev->dev, "VPH PWR droop reg write failed\n");
	return rc;		return rc;
	}		}

			if (led->pdata->hdrm_sns_ch0_en) {
			rc = qpnp_led_masked_write(led->spmi_dev,
			FLASH_HDRM_SNS_ENABLE_CTRL0(led->base),
			FLASH_LED_HDRM_SNS_ENABLE_MASK,
			FLASH_LED_HDRM_SNS_ENABLE);
			if (rc) {
			dev_err(&led->spmi_dev->dev,
			"Headroom sense enable failed\n");
			return rc;
			}
			}

			if (led->pdata->hdrm_sns_ch1_en) {
			rc = qpnp_led_masked_write(led->spmi_dev,
			FLASH_HDRM_SNS_ENABLE_CTRL1(led->base),
			FLASH_LED_HDRM_SNS_ENABLE_MASK,
			FLASH_LED_HDRM_SNS_ENABLE);
			if (rc) {
			dev_err(&led->spmi_dev->dev,
			"Headroom sense enable failed\n");
			return rc;
			}
			}

	return 0;		return 0;
	}		}

	@@ -1023,7 +1059,7 @@ static int qpnp_flash_led_parse_common_dt(
	of_property_read_bool(node,		of_property_read_bool(node,
	"qcom,current-ramp-enabled");		"qcom,current-ramp-enabled");
	if (led->pdata->current_ramp_en) {		if (led->pdata->current_ramp_en) {
	led->pdata->ramp_up_step = FLASH_LED_RAMP_DN_STEP_DEFAULT_US;		led->pdata->ramp_up_step = FLASH_LED_RAMP_UP_STEP_DEFAULT_US;
	rc = of_property_read_string(node, "qcom,ramp_up_step", &temp);		rc = of_property_read_string(node, "qcom,ramp_up_step", &temp);
	if (!rc) {		if (!rc) {
	temp_val = qpnp_flash_led_get_ramp_step(temp);		temp_val = qpnp_flash_led_get_ramp_step(temp);
	@@ -1063,9 +1099,9 @@ static int qpnp_flash_led_parse_common_dt(
	FLASH_LED_VPH_PWR_DROOP_THRESHOLD_DEFAULT_MV;		FLASH_LED_VPH_PWR_DROOP_THRESHOLD_DEFAULT_MV;
	rc = of_property_read_u32(node,		rc = of_property_read_u32(node,
	"qcom,vph-pwr-droop-threshold", &val);		"qcom,vph-pwr-droop-threshold", &val);
	if (!rc)		if (!rc) {
	led->pdata->vph_pwr_droop_threshold = (u16)val;		led->pdata->vph_pwr_droop_threshold = (u16)val;
	else if (rc != -EINVAL) {		} else if (rc != -EINVAL) {
	dev_err(&led->spmi_dev->dev,		dev_err(&led->spmi_dev->dev,
	"Unable to read VPH PWR droop threshold\n");		"Unable to read VPH PWR droop threshold\n");
	return rc;		return rc;
	@@ -1084,6 +1120,12 @@ static int qpnp_flash_led_parse_common_dt(
	}		}
	}		}

			led->pdata->hdrm_sns_ch0_en = of_property_read_bool(node,
			"qcom,headroom-sense-ch0-enabled");

			led->pdata->hdrm_sns_ch1_en = of_property_read_bool(node,
			"qcom,headroom-sense-ch1-enabled");

	return 0;		return 0;
	}		}