qiurui
/
armbian-build
mirror of https://github.com/armbian/build.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

sunxi-6.12: re-export megous patches to v6.12.19

This commit is contained in:
The-going 2025-03-20 13:45:20 +03:00 committed by Igor
parent 8d08098c2e
commit cc7df28a64
9 changed files with 58 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
patch/kernel/archive/sunxi-6.12/patches.megous/power-axp20x_battery-Allow-to-set-target-voltage-to-4.35V.patch
View File

@ -1,4 +1,4 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From d1b96830bd932d8079add0d9d85f66038f6838ed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Jirman?= <megi@xff.cz>
Date: Thu, 27 Feb 2020 00:53:17 +0100
Subject: power: axp20x_battery: Allow to set target voltage to 4.35V
@ -11,10 +11,10 @@ Signed-off-by: Ondrej Jirman <megi@xff.cz>
1 file changed, 5 insertions(+)
diff --git a/drivers/power/supply/axp20x_battery.c b/drivers/power/supply/axp20x_battery.c
index 111111111111..222222222222 100644
index 57eba1ddb17b..1c3bcb5c72d8 100644
--- a/drivers/power/supply/axp20x_battery.c
+++ b/drivers/power/supply/axp20x_battery.c
@@ -629,6 +629,11 @@ static int axp20x_battery_set_max_voltage(struct axp20x_batt_ps *axp20x_batt,
@@ -628,6 +628,11 @@ static int axp20x_battery_set_max_voltage(struct axp20x_batt_ps *axp20x_batt,
val = AXP20X_CHRG_CTRL1_TGT_4_2V;
break;
@ -27,5 +27,5 @@ index 111111111111..222222222222 100644
/*
* AXP20x max voltage can be set to 4.36V and AXP22X max voltage
--
Armbian
2.35.3

10
patch/kernel/archive/sunxi-6.12/patches.megous/power-axp803-Add-interrupts-for-low-battery-power-condition.patch
View File

@ -1,4 +1,4 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From f84d23c69812443ff65701565b5bde1e72114987 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Jirman?= <megi@xff.cz>
Date: Sun, 14 Mar 2021 15:49:34 +0100
Subject: power: axp803: Add interrupts for low battery power condition
@ -13,7 +13,7 @@ Signed-off-by: Ondrej Jirman <megi@xff.cz>
2 files changed, 4 insertions(+)
diff --git a/drivers/mfd/axp20x.c b/drivers/mfd/axp20x.c
index 111111111111..222222222222 100644
index 2bbeda7dc6ed..8c199871621b 100644
--- a/drivers/mfd/axp20x.c
+++ b/drivers/mfd/axp20x.c
@@ -383,6 +383,8 @@ static const struct resource axp803_battery_resources[] = {
@ -26,10 +26,10 @@ index 111111111111..222222222222 100644
static const struct resource axp803_pek_resources[] = {
diff --git a/drivers/power/supply/axp20x_battery.c b/drivers/power/supply/axp20x_battery.c
index 111111111111..222222222222 100644
index 2d47a63bcc4f..a92212fdba91 100644
--- a/drivers/power/supply/axp20x_battery.c
+++ b/drivers/power/supply/axp20x_battery.c
@@ -1098,6 +1098,8 @@ static const struct axp_irq_data axp813_irqs[] = {
@@ -1097,6 +1097,8 @@ static const struct axp_irq_data axp813_irqs[] = {
{ "BATT_HEALTH_GOOD", axp20x_battery_changed_irq },
{ "BATT_CHARGING", axp20x_battery_changed_irq },
{ "BATT_CHARGING_DONE", axp20x_battery_changed_irq },
@ -39,5 +39,5 @@ index 111111111111..222222222222 100644
{ "BATT_CHG_TEMP_HIGH_END", axp20x_battery_temp_normal_irq },
{ "BATT_CHG_TEMP_LOW", axp20x_battery_temp_cold_irq },
--
Armbian
2.35.3

14
patch/kernel/archive/sunxi-6.12/patches.megous/power-supply-axp20x-battery-Add-support-for-POWER_SUPPLY_PROP_E.patch
View File

@ -1,4 +1,4 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From 4e06f31c98a47df4e29b9b2fa28b071833d5e2d9 Mon Sep 17 00:00:00 2001
From: Ondrej Jirman <megi@xff.cz>
Date: Thu, 10 Nov 2022 20:05:58 +0100
Subject: power: supply: axp20x-battery: Add support for
@ -8,11 +8,11 @@ Report total battery capacity.
Signed-off-by: Ondrej Jirman <megi@xff.cz>
---
drivers/power/supply/axp20x_battery.c | 30 ++++++++--
drivers/power/supply/axp20x_battery.c | 30 +++++++++++++++++++++++----
1 file changed, 26 insertions(+), 4 deletions(-)
diff --git a/drivers/power/supply/axp20x_battery.c b/drivers/power/supply/axp20x_battery.c
index 111111111111..222222222222 100644
index 67e35b27382c..950490fc9740 100644
--- a/drivers/power/supply/axp20x_battery.c
+++ b/drivers/power/supply/axp20x_battery.c
@@ -127,6 +127,7 @@ struct axp20x_batt_ps {
@ -40,7 +40,7 @@ index 111111111111..222222222222 100644
default:
return -EINVAL;
}
@@ -914,6 +925,8 @@ static enum power_supply_property axp20x_battery_props[] = {
@@ -913,6 +924,8 @@ static enum power_supply_property axp20x_battery_props[] = {
POWER_SUPPLY_PROP_VOLTAGE_MIN,
POWER_SUPPLY_PROP_VOLTAGE_OCV,
POWER_SUPPLY_PROP_CAPACITY,
@ -49,7 +49,7 @@ index 111111111111..222222222222 100644
};
static enum power_supply_property axp717_battery_props[] = {
@@ -1213,12 +1226,18 @@ static const struct of_device_id axp20x_battery_ps_id[] = {
@@ -1212,12 +1225,18 @@ static const struct of_device_id axp20x_battery_ps_id[] = {
};
MODULE_DEVICE_TABLE(of, axp20x_battery_ps_id);
@ -69,7 +69,7 @@ index 111111111111..222222222222 100644
struct device *dev = &pdev->dev;
const struct axp_irq_data *irq_data;
int irq, ret;
@@ -1256,9 +1275,12 @@ static int axp20x_power_probe(struct platform_device *pdev)
@@ -1255,9 +1274,12 @@ static int axp20x_power_probe(struct platform_device *pdev)
axp20x_batt->health = POWER_SUPPLY_HEALTH_GOOD;
@ -86,5 +86,5 @@ index 111111111111..222222222222 100644
/* Request irqs after registering, as irqs may trigger immediately */
--
Armbian
2.35.3

8
patch/kernel/archive/sunxi-6.12/patches.megous/power-supply-axp20x-battery-Enable-poweron-by-RTC-alarm.patch
View File

@ -1,4 +1,4 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From babceaf2d1819ccd28f846d4c0c6fe7ce1efd9b9 Mon Sep 17 00:00:00 2001
From: Ondrej Jirman <megi@xff.cz>
Date: Sat, 27 Aug 2022 20:50:43 +0200
Subject: power: supply: axp20x-battery: Enable poweron by RTC alarm
@ -15,10 +15,10 @@ Signed-off-by: Ondrej Jirman <megi@xff.cz>
1 file changed, 5 insertions(+)
diff --git a/drivers/power/supply/axp20x_battery.c b/drivers/power/supply/axp20x_battery.c
index 111111111111..222222222222 100644
index 8fd71a73ec11..67e35b27382c 100644
--- a/drivers/power/supply/axp20x_battery.c
+++ b/drivers/power/supply/axp20x_battery.c
@@ -1333,6 +1333,11 @@ static int axp20x_power_probe(struct platform_device *pdev)
@@ -1332,6 +1332,11 @@ static int axp20x_power_probe(struct platform_device *pdev)
ret = regmap_update_bits(axp20x_batt->regmap, 0x84, 0x37, 0x31);
if (ret)
goto warn_bat;
@ -31,5 +31,5 @@ index 111111111111..222222222222 100644
return 0;
--
Armbian
2.35.3

16
patch/kernel/archive/sunxi-6.12/patches.megous/power-supply-axp20x-battery-Support-POWER_SUPPLY_PROP_CHARGE_BE.patch
View File

@ -1,4 +1,4 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From 60faf4cddffdc43e7b150685c3c29d464407db12 Mon Sep 17 00:00:00 2001
From: Ondrej Jirman <megi@xff.cz>
Date: Sat, 2 Apr 2022 02:50:14 +0200
Subject: power: supply: axp20x-battery: Support
@ -8,11 +8,11 @@ Support force disabling the charger in a more standardized way.
Signed-off-by: Ondrej Jirman <megi@xff.cz>
---
drivers/power/supply/axp20x_battery.c | 31 ++++++++++
drivers/power/supply/axp20x_battery.c | 31 +++++++++++++++++++++++++++
1 file changed, 31 insertions(+)
diff --git a/drivers/power/supply/axp20x_battery.c b/drivers/power/supply/axp20x_battery.c
index 111111111111..222222222222 100644
index a92212fdba91..8fd71a73ec11 100644
--- a/drivers/power/supply/axp20x_battery.c
+++ b/drivers/power/supply/axp20x_battery.c
@@ -317,6 +317,19 @@ static int axp20x_battery_get_prop(struct power_supply *psy,
@ -35,7 +35,7 @@ index 111111111111..222222222222 100644
case POWER_SUPPLY_PROP_STATUS:
ret = regmap_read(axp20x_batt->regmap, AXP20X_PWR_OP_MODE,
&reg);
@@ -819,6 +832,21 @@ static int axp20x_battery_set_prop(struct power_supply *psy,
@@ -818,6 +831,21 @@ static int axp20x_battery_set_prop(struct power_supply *psy,
case POWER_SUPPLY_PROP_CONSTANT_CHARGE_CURRENT_MAX:
return axp20x_set_max_constant_charge_current(axp20x_batt,
val->intval);
@ -57,7 +57,7 @@ index 111111111111..222222222222 100644
case POWER_SUPPLY_PROP_STATUS:
switch (val->intval) {
case POWER_SUPPLY_STATUS_CHARGING:
@@ -876,6 +904,7 @@ static enum power_supply_property axp20x_battery_props[] = {
@@ -875,6 +903,7 @@ static enum power_supply_property axp20x_battery_props[] = {
POWER_SUPPLY_PROP_PRESENT,
POWER_SUPPLY_PROP_ONLINE,
POWER_SUPPLY_PROP_STATUS,
@ -65,7 +65,7 @@ index 111111111111..222222222222 100644
POWER_SUPPLY_PROP_VOLTAGE_NOW,
POWER_SUPPLY_PROP_CURRENT_NOW,
POWER_SUPPLY_PROP_CONSTANT_CHARGE_CURRENT,
@@ -907,6 +936,7 @@ static int axp20x_battery_prop_writeable(struct power_supply *psy,
@@ -906,6 +935,7 @@ static int axp20x_battery_prop_writeable(struct power_supply *psy,
return psp == POWER_SUPPLY_PROP_STATUS ||
psp == POWER_SUPPLY_PROP_VOLTAGE_MIN ||
psp == POWER_SUPPLY_PROP_VOLTAGE_MAX ||
@ -73,7 +73,7 @@ index 111111111111..222222222222 100644
psp == POWER_SUPPLY_PROP_CONSTANT_CHARGE_CURRENT ||
psp == POWER_SUPPLY_PROP_CONSTANT_CHARGE_CURRENT_MAX;
}
@@ -928,6 +958,7 @@ static const struct power_supply_desc axp209_batt_ps_desc = {
@@ -927,6 +957,7 @@ static const struct power_supply_desc axp209_batt_ps_desc = {
.property_is_writeable = axp20x_battery_prop_writeable,
.get_property = axp20x_battery_get_prop,
.set_property = axp20x_battery_set_prop,
@ -82,5 +82,5 @@ index 111111111111..222222222222 100644
static const struct power_supply_desc axp717_batt_ps_desc = {
--
Armbian
2.35.3

10
patch/kernel/archive/sunxi-6.12/patches.megous/power-supply-axp20x_battery-Add-support-for-reporting-OCV.patch
View File

@ -1,4 +1,4 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From 8bc2a96603c358901e4e51ef3033747cfd08539b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Jirman?= <megi@xff.cz>
Date: Fri, 28 Feb 2020 19:16:46 +0100
Subject: power: supply: axp20x_battery: Add support for reporting OCV
@ -7,11 +7,11 @@ Export OCV reported by PMIC via sysfs.
Signed-off-by: Ondrej Jirman <megi@xff.cz>
---
drivers/power/supply/axp20x_battery.c | 23 ++++++++++
drivers/power/supply/axp20x_battery.c | 23 +++++++++++++++++++++++
1 file changed, 23 insertions(+)
diff --git a/drivers/power/supply/axp20x_battery.c b/drivers/power/supply/axp20x_battery.c
index 111111111111..222222222222 100644
index 1c3bcb5c72d8..5745e91519a2 100644
--- a/drivers/power/supply/axp20x_battery.c
+++ b/drivers/power/supply/axp20x_battery.c
@@ -270,6 +270,25 @@ static int axp717_get_constant_charge_current(struct axp20x_batt_ps *axp,
@ -50,7 +50,7 @@ index 111111111111..222222222222 100644
case POWER_SUPPLY_PROP_CAPACITY:
/* When no battery is present, return capacity is 100% */
ret = regmap_read(axp20x_batt->regmap, AXP20X_PWR_OP_MODE,
@@ -851,6 +873,7 @@ static enum power_supply_property axp20x_battery_props[] = {
@@ -850,6 +872,7 @@ static enum power_supply_property axp20x_battery_props[] = {
POWER_SUPPLY_PROP_HEALTH,
POWER_SUPPLY_PROP_VOLTAGE_MAX,
POWER_SUPPLY_PROP_VOLTAGE_MIN,
@ -59,5 +59,5 @@ index 111111111111..222222222222 100644
};
--
Armbian
2.35.3

16
patch/kernel/archive/sunxi-6.12/patches.megous/power-supply-axp20x_battery-Monitor-battery-health.patch
View File

@ -1,15 +1,15 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From e89ebf0b08d42c4c0931818d4b1b5929872fcfa3 Mon Sep 17 00:00:00 2001
From: Samuel Holland <samuel@sholland.org>
Date: Sat, 29 Feb 2020 01:04:33 -0600
Subject: power: supply: axp20x_battery: Monitor battery health
Signed-off-by: Samuel Holland <samuel@sholland.org>
---
drivers/power/supply/axp20x_battery.c | 58 +++++++++-
drivers/power/supply/axp20x_battery.c | 58 ++++++++++++++++++++++++++-
1 file changed, 56 insertions(+), 2 deletions(-)
diff --git a/drivers/power/supply/axp20x_battery.c b/drivers/power/supply/axp20x_battery.c
index 111111111111..222222222222 100644
index 4c15cd10f1cc..2d47a63bcc4f 100644
--- a/drivers/power/supply/axp20x_battery.c
+++ b/drivers/power/supply/axp20x_battery.c
@@ -123,6 +123,7 @@ struct axp20x_batt_ps {
@ -29,7 +29,7 @@ index 111111111111..222222222222 100644
break;
case POWER_SUPPLY_PROP_CONSTANT_CHARGE_CURRENT:
@@ -1047,6 +1048,39 @@ static irqreturn_t axp20x_battery_changed_irq(int irq, void *devid)
@@ -1046,6 +1047,39 @@ static irqreturn_t axp20x_battery_changed_irq(int irq, void *devid)
return IRQ_HANDLED;
}
@ -69,7 +69,7 @@ index 111111111111..222222222222 100644
static const struct axp_irq_data axp20x_irqs[] = {
{ "BATT_PLUGIN", axp20x_battery_changed_irq },
{ "BATT_REMOVAL", axp20x_battery_changed_irq },
@@ -1057,6 +1091,24 @@ static const struct axp_irq_data axp20x_irqs[] = {
@@ -1056,6 +1090,24 @@ static const struct axp_irq_data axp20x_irqs[] = {
{}
};
@ -94,7 +94,7 @@ index 111111111111..222222222222 100644
static const struct axp_data axp209_data = {
.ccc_scale = 100000,
.ccc_offset = 300000,
@@ -1108,7 +1160,7 @@ static const struct axp_data axp813_data = {
@@ -1107,7 +1159,7 @@ static const struct axp_data axp813_data = {
.set_max_voltage = axp20x_battery_set_max_voltage,
.cfg_iio_chan = axp209_bat_cfg_iio_channels,
.set_bat_info = axp209_set_battery_info,
@ -103,7 +103,7 @@ index 111111111111..222222222222 100644
};
static const struct of_device_id axp20x_battery_ps_id[] = {
@@ -1169,6 +1221,8 @@ static int axp20x_power_probe(struct platform_device *pdev)
@@ -1168,6 +1220,8 @@ static int axp20x_power_probe(struct platform_device *pdev)
return PTR_ERR(axp20x_batt->batt);
}
@ -113,5 +113,5 @@ index 111111111111..222222222222 100644
axp20x_batt->data->set_bat_info(pdev, axp20x_batt, info);
power_supply_put_battery_info(axp20x_batt->batt, info);
--
Armbian
2.35.3

24
patch/kernel/archive/sunxi-6.12/patches.megous/power-supply-axp20x_battery-Send-uevents-for-status-changes.patch
View File

@ -1,15 +1,15 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From da98be26271438752568686f2f8801256deb743b Mon Sep 17 00:00:00 2001
From: Samuel Holland <samuel@sholland.org>
Date: Sat, 29 Feb 2020 01:04:17 -0600
Subject: power: supply: axp20x_battery: Send uevents for status changes
Signed-off-by: Samuel Holland <samuel@sholland.org>
---
drivers/power/supply/axp20x_battery.c | 56 +++++++++-
drivers/power/supply/axp20x_battery.c | 56 ++++++++++++++++++++++++++-
1 file changed, 54 insertions(+), 2 deletions(-)
diff --git a/drivers/power/supply/axp20x_battery.c b/drivers/power/supply/axp20x_battery.c
index 111111111111..222222222222 100644
index 87a7f06ebb37..4c15cd10f1cc 100644
--- a/drivers/power/supply/axp20x_battery.c
+++ b/drivers/power/supply/axp20x_battery.c
@@ -90,8 +90,15 @@
@ -36,7 +36,7 @@ index 111111111111..222222222222 100644
};
struct axp20x_batt_ps {
@@ -1030,6 +1038,25 @@ static void axp717_set_battery_info(struct platform_device *pdev,
@@ -1029,6 +1037,25 @@ static void axp717_set_battery_info(struct platform_device *pdev,
}
}
@ -62,7 +62,7 @@ index 111111111111..222222222222 100644
static const struct axp_data axp209_data = {
.ccc_scale = 100000,
.ccc_offset = 300000,
@@ -1040,6 +1067,7 @@ static const struct axp_data axp209_data = {
@@ -1039,6 +1066,7 @@ static const struct axp_data axp209_data = {
.set_max_voltage = axp20x_battery_set_max_voltage,
.cfg_iio_chan = axp209_bat_cfg_iio_channels,
.set_bat_info = axp209_set_battery_info,
@ -70,7 +70,7 @@ index 111111111111..222222222222 100644
};
static const struct axp_data axp221_data = {
@@ -1053,6 +1081,7 @@ static const struct axp_data axp221_data = {
@@ -1052,6 +1080,7 @@ static const struct axp_data axp221_data = {
.set_max_voltage = axp22x_battery_set_max_voltage,
.cfg_iio_chan = axp209_bat_cfg_iio_channels,
.set_bat_info = axp209_set_battery_info,
@ -78,7 +78,7 @@ index 111111111111..222222222222 100644
};
static const struct axp_data axp717_data = {
@@ -1065,6 +1094,7 @@ static const struct axp_data axp717_data = {
@@ -1064,6 +1093,7 @@ static const struct axp_data axp717_data = {
.set_max_voltage = axp717_battery_set_max_voltage,
.cfg_iio_chan = axp717_bat_cfg_iio_channels,
.set_bat_info = axp717_set_battery_info,
@ -86,7 +86,7 @@ index 111111111111..222222222222 100644
};
static const struct axp_data axp813_data = {
@@ -1078,6 +1108,7 @@ static const struct axp_data axp813_data = {
@@ -1077,6 +1107,7 @@ static const struct axp_data axp813_data = {
.set_max_voltage = axp20x_battery_set_max_voltage,
.cfg_iio_chan = axp209_bat_cfg_iio_channels,
.set_bat_info = axp209_set_battery_info,
@ -94,7 +94,7 @@ index 111111111111..222222222222 100644
};
static const struct of_device_id axp20x_battery_ps_id[] = {
@@ -1099,11 +1130,13 @@ MODULE_DEVICE_TABLE(of, axp20x_battery_ps_id);
@@ -1098,11 +1129,13 @@ MODULE_DEVICE_TABLE(of, axp20x_battery_ps_id);
static int axp20x_power_probe(struct platform_device *pdev)
{
@ -109,7 +109,7 @@ index 111111111111..222222222222 100644
if (!of_device_is_available(pdev->dev.of_node))
return -ENODEV;
@@ -1141,6 +1174,25 @@ static int axp20x_power_probe(struct platform_device *pdev)
@@ -1140,6 +1173,25 @@ static int axp20x_power_probe(struct platform_device *pdev)
power_supply_put_battery_info(axp20x_batt->batt, info);
}
@ -135,7 +135,7 @@ index 111111111111..222222222222 100644
/*
* Update max CCC to a valid value if battery info is present or set it
* to current register value by default.
@@ -1206,7 +1258,7 @@ static int axp20x_power_probe(struct platform_device *pdev)
@@ -1205,7 +1257,7 @@ static int axp20x_power_probe(struct platform_device *pdev)
static struct platform_driver axp20x_batt_driver = {
.probe = axp20x_power_probe,
.driver = {
@ -145,5 +145,5 @@ index 111111111111..222222222222 100644
},
};
--
Armbian
2.35.3

10
patch/kernel/archive/sunxi-6.12/patches.megous/power-supply-axp20x_battery-Setup-thermal-regulation-experiment.patch
View File

@ -1,4 +1,4 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From 33cf6c8dccf18c224fd4a0d9ae49fff4f3d7db10 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Jirman?= <megi@xff.cz>
Date: Wed, 23 Sep 2020 14:59:41 +0200
Subject: power: supply: axp20x_battery: Setup thermal regulation
@ -10,14 +10,14 @@ None of this is tested to actually work.
Signed-off-by: Ondrej Jirman <megi@xff.cz>
---
drivers/power/supply/axp20x_battery.c | 53 ++++++++++
drivers/power/supply/axp20x_battery.c | 53 +++++++++++++++++++++++++++
1 file changed, 53 insertions(+)
diff --git a/drivers/power/supply/axp20x_battery.c b/drivers/power/supply/axp20x_battery.c
index 111111111111..222222222222 100644
index 5745e91519a2..9c4252f1b7e1 100644
--- a/drivers/power/supply/axp20x_battery.c
+++ b/drivers/power/supply/axp20x_battery.c
@@ -1146,6 +1146,59 @@ static int axp20x_power_probe(struct platform_device *pdev)
@@ -1145,6 +1145,59 @@ static int axp20x_power_probe(struct platform_device *pdev)
*/
axp20x_get_constant_charge_current(axp20x_batt, &axp20x_batt->max_ccc);
@ -78,5 +78,5 @@ index 111111111111..222222222222 100644
}
--
Armbian
2.35.3