Merge "pwm: qpnp: Read dtest configuration before checking mode" (e0449bcc) · Commits · e / devices / android_kernel_sony_msm8994

drivers/pwm/pwm-qpnp.c

+14 −14

Original line number	Diff line number	Diff line
		@@ -1885,6 +1885,20 @@ static int qpnp_parse_dt_config(struct spmi_device *spmi,
		}
		}

		rc = of_property_read_u32(of_node, "qcom,lpg-dtest-line",
		&chip->dtest_line);
		if (rc) {
		chip->in_test_mode = 0;
		} else {
		chip->in_test_mode = 1;
		rc = of_property_read_u32(of_node, "qcom,dtest-output",
		&chip->dtest_output);
		if (rc) {
		pr_err("Missing DTEST output configuration\n");
		chip->dtest_output = 0;
		}
		}

		for_each_child_of_node(of_node, node) {
		rc = of_property_read_string(node, "label", &lable);
		if (rc) {
		@@ -1920,20 +1934,6 @@ static int qpnp_parse_dt_config(struct spmi_device *spmi,
		goto out;
		}

		rc = of_property_read_u32(of_node, "qcom,lpg-dtest-line",
		&chip->dtest_line);
		if (rc) {
		chip->in_test_mode = 0;
		} else {
		chip->in_test_mode = 1;
		rc = of_property_read_u32(of_node, "qcom,dtest-output",
		&chip->dtest_output);
		if (rc) {
		pr_err("Missing DTEST output configuration\n");
		chip->dtest_output = 0;
		}
		}

		_pwm_change_mode(chip, enable);
		_pwm_enable(chip);