Merge "leds: qpnp-wled: Do not configure DTEST for PMI8998 v2.0" (a6a4e0c8) · Commits · e / devices / android_kernel_fairphone_FP3

drivers/leds/leds-qpnp-wled.c

+9 −5

Original line number	Diff line number	Diff line
		/* Copyright (c) 2014-2017, The Linux Foundation. All rights reserved.
		/* Copyright (c) 2014-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
		@@ -2215,6 +2215,9 @@ static int qpnp_wled_config(struct qpnp_wled *wled)
		return rc;

		if (wled->en_ext_pfet_sc_pro) {
		if (!(wled->pmic_rev_id->pmic_subtype == PMI8998_SUBTYPE
		&& wled->pmic_rev_id->rev4 ==
		PMI8998_V2P0_REV4)) {
		reg = QPNP_WLED_EXT_FET_DTEST2;
		rc = qpnp_wled_sec_write_reg(wled,
		QPNP_WLED_TEST1_REG(wled->ctrl_base),
		@@ -2222,6 +2225,7 @@ static int qpnp_wled_config(struct qpnp_wled *wled)
		if (rc)
		return rc;
		}
		}
		} else {
		rc = qpnp_wled_read_reg(wled,
		QPNP_WLED_SC_PRO_REG(wled->ctrl_base), &reg);