Merge "power: qpnp-qnovo5: Update ok_to_qnovo based on JEITA" (b3583cea) · Commits · e / devices / android_kernel_oneplus_sm7250

arch/arm64/boot/dts/qcom/kona-pmic-overlay.dtsi

+28 −0

Original line number	Diff line number	Diff line
		@@ -58,6 +58,34 @@
		};
		};

		&pm8150b_gpios {
		qnovo_fet_ctrl {
		qnovo_fet_ctrl_state1: qnovo_fet_ctrl_state1 {
		pins = "gpio8";
		function = "normal";
		input-enable;
		output-disable;
		bias-disable;
		power-source = <0>;
		};

		qnovo_fet_ctrl_state2: qnovo_fet_ctrl_state2 {
		pins = "gpio8";
		function = "normal";
		input-enable;
		output-disable;
		bias-pull-down;
		power-source = <0>;
		};
		};
		};

		&pm8150b_qnovo {
		pinctrl-names = "q_state1", "q_state2";
		pinctrl-0 = <&qnovo_fet_ctrl_state1>;
		pinctrl-1 = <&qnovo_fet_ctrl_state2>;
		};

		&pm8150b_charger {
		smb5_vconn: qcom,smb5-vconn {
		regulator-name = "smb5-vconn";

drivers/power/supply/qcom/qpnp-qnovo5.c

+35 −2

Original line number	Diff line number	Diff line
		@@ -3,6 +3,8 @@
		* Copyright (c) 2016-2019 The Linux Foundation. All rights reserved.
		*/

		#define pr_fmt(fmt) "Qnovo: %s: " fmt, __func__

		#include <linux/device.h>
		#include <linux/module.h>
		#include <linux/platform_device.h>
		@@ -73,6 +75,7 @@
		#define USER_VOTER "user_voter"
		#define SHUTDOWN_VOTER "user_voter"
		#define OK_TO_QNOVO_VOTER "ok_to_qnovo_voter"
		#define HW_OK_TO_QNOVO_VOTER "HW_OK_TO_QNOVO_VOTER"

		#define QNOVO_VOTER "qnovo_voter"
		#define QNOVO_OVERALL_VOTER "QNOVO_OVERALL_VOTER"
		@@ -1126,8 +1129,8 @@ static void status_change_work(struct work_struct *work)
		struct qnovo *chip = container_of(work,
		struct qnovo, status_change_work);
		union power_supply_propval pval;
		bool usb_present = false;
		int rc;
		bool usb_present = false, hw_ok_to_qnovo = false;
		int rc, battery_health, charge_status;

		if (is_usb_available(chip)) {
		rc = power_supply_get_property(chip->usb_psy,
		@@ -1159,6 +1162,36 @@ static void status_change_work(struct work_struct *work)
		schedule_delayed_work(&chip->usb_debounce_work,
		msecs_to_jiffies(DEBOUNCE_MS));
		}

		if (!is_batt_available(chip))
		return;

		rc = power_supply_get_property(chip->batt_psy, POWER_SUPPLY_PROP_HEALTH,
		&pval);
		if (rc < 0) {
		pr_err("Error in getting battery health, rc=%d\n", rc);
		return;
		}
		battery_health = pval.intval;

		rc = power_supply_get_property(chip->batt_psy, POWER_SUPPLY_PROP_STATUS,
		&pval);
		if (rc < 0) {
		pr_err("Error in getting charging status, rc=%d\n", rc);
		return;
		}
		charge_status = pval.intval;

		pr_debug("USB present: %d health:%d charge_status: %d\n",
		chip->usb_present, battery_health, charge_status);

		if (chip->usb_present) {
		hw_ok_to_qnovo =
		(battery_health == POWER_SUPPLY_HEALTH_GOOD) &&
		(charge_status == POWER_SUPPLY_STATUS_CHARGING);
		vote(chip->not_ok_to_qnovo_votable, HW_OK_TO_QNOVO_VOTER,
		!hw_ok_to_qnovo, 0);
		}
		}

		static int qnovo_notifier_call(struct notifier_block *nb,