From ed323cbda6da7bfaa3483f6dd2449f8e8afae682 Mon Sep 17 00:00:00 2001
From: The-going <48602507+The-going@users.noreply.github.com>
Date: Tue, 8 Oct 2024 15:57:45 +0300
Subject: [PATCH] sunxi-6.11: Re-extract the megous patches

---
 ...y-axp20x-battery-Add-support-for-POWER_SUPPLY_PROP_E.patch | 4 ++--
 ...y-axp20x-battery-Support-POWER_SUPPLY_PROP_CHARGE_BE.patch | 4 ++--
 ...-supply-axp20x_battery-Add-support-for-reporting-OCV.patch | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/patch/kernel/archive/sunxi-6.11/patches.megous/power-supply-axp20x-battery-Add-support-for-POWER_SUPPLY_PROP_E.patch b/patch/kernel/archive/sunxi-6.11/patches.megous/power-supply-axp20x-battery-Add-support-for-POWER_SUPPLY_PROP_E.patch
index 93b1132d2d..ab0caf6840 100644
--- a/patch/kernel/archive/sunxi-6.11/patches.megous/power-supply-axp20x-battery-Add-support-for-POWER_SUPPLY_PROP_E.patch
+++ b/patch/kernel/archive/sunxi-6.11/patches.megous/power-supply-axp20x-battery-Add-support-for-POWER_SUPPLY_PROP_E.patch
@@ -41,8 +41,8 @@ index 210be590691c..19b5f332fa75 100644
  		return -EINVAL;
  	}
 @@ -563,6 +574,8 @@ static enum power_supply_property axp20x_battery_props[] = {
- 	POWER_SUPPLY_PROP_VOLTAGE_MAX_DESIGN,
- 	POWER_SUPPLY_PROP_VOLTAGE_MIN_DESIGN,
+ 	POWER_SUPPLY_PROP_VOLTAGE_MAX,
+ 	POWER_SUPPLY_PROP_VOLTAGE_MIN,
  	POWER_SUPPLY_PROP_CAPACITY,
 +	POWER_SUPPLY_PROP_ENERGY_FULL_DESIGN,
 +	POWER_SUPPLY_PROP_ENERGY_EMPTY_DESIGN,
diff --git a/patch/kernel/archive/sunxi-6.11/patches.megous/power-supply-axp20x-battery-Support-POWER_SUPPLY_PROP_CHARGE_BE.patch b/patch/kernel/archive/sunxi-6.11/patches.megous/power-supply-axp20x-battery-Support-POWER_SUPPLY_PROP_CHARGE_BE.patch
index 13018f08d4..758787efe6 100644
--- a/patch/kernel/archive/sunxi-6.11/patches.megous/power-supply-axp20x-battery-Support-POWER_SUPPLY_PROP_CHARGE_BE.patch
+++ b/patch/kernel/archive/sunxi-6.11/patches.megous/power-supply-axp20x-battery-Support-POWER_SUPPLY_PROP_CHARGE_BE.patch
@@ -70,8 +70,8 @@ index b7b3e6b945dd..4e084b83e7cf 100644
  {
  	return psp == POWER_SUPPLY_PROP_STATUS ||
 +	       psp == POWER_SUPPLY_PROP_CHARGE_BEHAVIOUR ||
- 	       psp == POWER_SUPPLY_PROP_VOLTAGE_MIN_DESIGN ||
- 	       psp == POWER_SUPPLY_PROP_VOLTAGE_MAX_DESIGN ||
+ 	       psp == POWER_SUPPLY_PROP_VOLTAGE_MIN ||
+ 	       psp == POWER_SUPPLY_PROP_VOLTAGE_MAX ||
  	       psp == POWER_SUPPLY_PROP_CONSTANT_CHARGE_CURRENT ||
 @@ -554,6 +584,7 @@ static const struct power_supply_desc axp20x_batt_ps_desc = {
  	.property_is_writeable = axp20x_battery_prop_writeable,
diff --git a/patch/kernel/archive/sunxi-6.11/patches.megous/power-supply-axp20x_battery-Add-support-for-reporting-OCV.patch b/patch/kernel/archive/sunxi-6.11/patches.megous/power-supply-axp20x_battery-Add-support-for-reporting-OCV.patch
index 03a781b749..2a0095a031 100644
--- a/patch/kernel/archive/sunxi-6.11/patches.megous/power-supply-axp20x_battery-Add-support-for-reporting-OCV.patch
+++ b/patch/kernel/archive/sunxi-6.11/patches.megous/power-supply-axp20x_battery-Add-support-for-reporting-OCV.patch
@@ -55,8 +55,8 @@ index f24520719a74..bad981c349ff 100644
  	POWER_SUPPLY_PROP_CONSTANT_CHARGE_CURRENT_MAX,
  	POWER_SUPPLY_PROP_HEALTH,
 +	POWER_SUPPLY_PROP_VOLTAGE_OCV,
- 	POWER_SUPPLY_PROP_VOLTAGE_MAX_DESIGN,
- 	POWER_SUPPLY_PROP_VOLTAGE_MIN_DESIGN,
+ 	POWER_SUPPLY_PROP_VOLTAGE_MAX,
+ 	POWER_SUPPLY_PROP_VOLTAGE_MIN,
  	POWER_SUPPLY_PROP_CAPACITY,
 -- 
 2.35.3