Merge "backlight: qcom-spmi-wled: Add low dimming workaround for WLED5" (32c06034) · Commits · e / devices / android_kernel_oneplus_sm8150

drivers/video/backlight/qcom-spmi-wled.c

+72 −0

Original line number	Diff line number	Diff line
		@@ -109,11 +109,17 @@ static const int version_table[] = {
		};

		/* WLED5 specific control registers */
		#define WLED5_CTRL_SH_FOR_SOFTSTART_REG 0x58
		#define WLED5_SOFTSTART_EN_SH_SS BIT(0)

		#define WLED5_CTRL_OVP_INT_CTL_REG 0x5f
		#define WLED5_OVP_INT_N_MASK GENMASK(6, 4)
		#define WLED5_OVP_INT_N_SHIFT 4
		#define WLED5_OVP_INT_TIMER_MASK GENMASK(2, 0)

		#define WLED5_CTRL_TEST4_REG 0xe5
		#define WLED5_TEST4_EN_SH_SS BIT(5)

		/* WLED5 specific sink registers */
		#define WLED5_SINK_MOD_A_EN_REG 0x50
		#define WLED5_SINK_MOD_B_EN_REG 0x60
		@@ -284,6 +290,54 @@ static int wled_sync_toggle(struct wled *wled)
		return rc;
		}

		static int wled5_sample_hold_control(struct wled *wled, u16 brightness,
		bool enable)
		{
		int rc;
		u16 offset, threshold;
		u8 val, mask;

		/*
		* Control S_H only when module was disabled and a lower brightness
		* of < 1% is set.
		*/
		if (wled->prev_state)
		return 0;

		/* If CABC is enabled, then don't do anything for now */
		if (!wled->cabc_disabled)
		return 0;

		/* 1 % threshold to enable the workaround */
		threshold = DIV_ROUND_UP(wled->max_brightness, 100);

		/* If brightness is > 1%, don't do anything */
		if (brightness > threshold)
		return 0;

		/* Wait for ~5ms before enabling S_H */
		if (enable)
		usleep_range(5000, 5010);

		/* Disable S_H if brightness is < 1% */
		if (wled->pmic_rev_id->rev4 == PM8150L_V3P0_REV4) {
		offset = WLED5_CTRL_SH_FOR_SOFTSTART_REG;
		val = enable ? WLED5_SOFTSTART_EN_SH_SS : 0;
		mask = WLED5_SOFTSTART_EN_SH_SS;
		} else {
		offset = WLED5_CTRL_TEST4_REG;
		val = enable ? WLED5_TEST4_EN_SH_SS : 0;
		mask = WLED5_TEST4_EN_SH_SS;
		}

		rc = regmap_update_bits(wled->regmap,
		wled->ctrl_addr + offset, mask, val);
		if (rc < 0)
		pr_err("Error in writing offset 0x%02X rc=%d\n", offset, rc);

		return rc;
		}

		static int wled5_set_brightness(struct wled *wled, u16 brightness)
		{
		int rc, offset;
		@@ -376,6 +430,15 @@ static int wled_update_status(struct backlight_device *bl)
		goto unlock_mutex;
		}

		if (is_wled5(wled)) {
		rc = wled5_sample_hold_control(wled, brightness, false);
		if (rc < 0) {
		pr_err("wled disabling sample and hold failed rc:%d\n",
		rc);
		goto unlock_mutex;
		}
		}

		if (!!brightness != wled->prev_state) {
		rc = wled_module_enable(wled, !!brightness);
		if (rc < 0) {
		@@ -383,6 +446,15 @@ static int wled_update_status(struct backlight_device *bl)
		goto unlock_mutex;
		}
		}

		if (is_wled5(wled)) {
		rc = wled5_sample_hold_control(wled, brightness, true);
		if (rc < 0) {
		pr_err("wled enabling sample and hold failed rc:%d\n",
		rc);
		goto unlock_mutex;
		}
		}
		} else {
		rc = wled_module_enable(wled, brightness);
		if (rc < 0) {

include/linux/qpnp/qpnp-revid.h

+10 −0

Original line number	Diff line number	Diff line
		@@ -245,6 +245,16 @@
		#define PM8150L_V1P0_REV3 0x00
		#define PM8150L_V1P0_REV4 0x01

		#define PM8150L_V2P0_REV1 0x00
		#define PM8150L_V2P0_REV2 0x00
		#define PM8150L_V2P0_REV3 0x00
		#define PM8150L_V2P0_REV4 0x02

		#define PM8150L_V3P0_REV1 0x00
		#define PM8150L_V3P0_REV2 0x00
		#define PM8150L_V3P0_REV3 0x00
		#define PM8150L_V3P0_REV4 0x03

		/* PMI8998 FAB_ID */
		#define PMI8998_FAB_ID_SMIC 0x11
		#define PMI8998_FAB_ID_GF 0x30