wbrawner/distribution
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Amlogic: fix patch

Browse source
This commit is contained in:
adamg 2024-02-02 04:15:14 +00:00
parent b4eefb3076
commit 8c5111e5b4
49 changed files with 82 additions and 80 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
projects/Amlogic/packages/linux/patches/S922X/0001-dt-bindings-clk-g12a-clkc-add-CTS_ENCL-clock-ids.patch
View file

@ -1,4 +1,4 @@
From 7f64c5713a47f3216f48048f69df6fa5d49eb9e7 Mon Sep 17 00:00:00 2001
From c1fe0ad8dd7141bf6a8a482506173e8842c7bdbe Mon Sep 17 00:00:00 2001
From: Neil Armstrong <neil.armstrong@linaro.org>
Date: Fri, 24 Nov 2023 09:41:12 +0100
Subject: [PATCH 01/49] dt-bindings: clk: g12a-clkc: add CTS_ENCL clock ids

2
projects/Amlogic/packages/linux/patches/S922X/0002-clk-meson-g12a-add-CTS_ENCL-CTS_ENCL_SEL-clocks.patch
View file

@ -1,4 +1,4 @@
From 25b893fa047b8a8af6cbf925f2126c84a146eb35 Mon Sep 17 00:00:00 2001
From 09b022b0874cf773fedc2d9d2af9bd74848f77fa Mon Sep 17 00:00:00 2001
From: Neil Armstrong <neil.armstrong@linaro.org>
Date: Fri, 24 Nov 2023 09:41:17 +0100
Subject: [PATCH 02/49] clk: meson: g12a: add CTS_ENCL & CTS_ENCL_SEL clocks

6
projects/Amlogic/packages/linux/patches/S922X/0003-clk-meson-add-vclk-driver.patch
View file

@ -1,4 +1,4 @@
From 700d570a2f5de05087be651a7732cab05cc7f76f Mon Sep 17 00:00:00 2001
From 25c21aa6e55cd82988375310ebbad0b9bc8ed0da Mon Sep 17 00:00:00 2001
From: Neil Armstrong <neil.armstrong@linaro.org>
Date: Fri, 24 Nov 2023 09:41:18 +0100
Subject: [PATCH 03/49] clk: meson: add vclk driver
@ -28,7 +28,7 @@ Signed-off-by: Neil Armstrong <neil.armstrong@linaro.org>
create mode 100644 drivers/clk/meson/vclk.h
diff --git a/drivers/clk/meson/Kconfig b/drivers/clk/meson/Kconfig
index 29ffd14d267b..59a40a49f8e1 100644
index 135da8f2d0b1..83f629515e96 100644
--- a/drivers/clk/meson/Kconfig
+++ b/drivers/clk/meson/Kconfig
@@ -30,6 +30,10 @@ config COMMON_CLK_MESON_VID_PLL_DIV
@ -51,7 +51,7 @@ index 29ffd14d267b..59a40a49f8e1 100644
help
Support for the clock controller on Amlogic S905D2, S905X2 and S905Y2
diff --git a/drivers/clk/meson/Makefile b/drivers/clk/meson/Makefile
index 9ee4b954c896..9ba43fe7a07a 100644
index cd961cc4f4db..6efeb8c7bd2a 100644
--- a/drivers/clk/meson/Makefile
+++ b/drivers/clk/meson/Makefile
@@ -12,6 +12,7 @@ obj-$(CONFIG_COMMON_CLK_MESON_PLL) += clk-pll.o

2
projects/Amlogic/packages/linux/patches/S922X/0004-clk-meson-g12a-make-VCLK2-and-ENCL-clock-path-config.patch
View file

@ -1,4 +1,4 @@
From 396ed35999fa1987d68643586b9c95052bb34496 Mon Sep 17 00:00:00 2001
From fcbfbcf79f5a5206aee38d3c69875565dd6d6431 Mon Sep 17 00:00:00 2001
From: Neil Armstrong <neil.armstrong@linaro.org>
Date: Fri, 24 Nov 2023 09:41:19 +0100
Subject: [PATCH 04/49] clk: meson: g12a: make VCLK2 and ENCL clock path

2
projects/Amlogic/packages/linux/patches/S922X/0005-drm-meson-gate-px_clk-when-setting-rate.patch
View file

@ -1,4 +1,4 @@
From 3ecfa3f37500eb0a37d5629fcea59953116c800e Mon Sep 17 00:00:00 2001
From 3649827ec3d7dff809938bdd03dd359e971c3cd4 Mon Sep 17 00:00:00 2001
From: Neil Armstrong <neil.armstrong@linaro.org>
Date: Fri, 24 Nov 2023 09:41:20 +0100
Subject: [PATCH 05/49] drm/meson: gate px_clk when setting rate

2
projects/Amlogic/packages/linux/patches/S922X/0006-arm64-meson-g12-common-add-the-MIPI-DSI-nodes.patch
View file

@ -1,4 +1,4 @@
From d8a953f276b7c6cd74f51b7c94cd9fb3edd941d7 Mon Sep 17 00:00:00 2001
From f580f795fd23c1cd49b0c46973f6eb699ae48f1e Mon Sep 17 00:00:00 2001
From: Neil Armstrong <neil.armstrong@linaro.org>
Date: Fri, 24 Nov 2023 09:41:21 +0100
Subject: [PATCH 06/49] arm64: meson: g12-common: add the MIPI DSI nodes

2
projects/Amlogic/packages/linux/patches/S922X/0007-dt-bindings-clock-g12a-clkc-add-MIPI-ISP-CSI-PHY-clo.patch
View file

@ -1,4 +1,4 @@
From 0e1d615c50e2014a36b734d27045f0ed1cae89ff Mon Sep 17 00:00:00 2001
From 520fe8137e67749a4388a2c0e15a6cee1cbb9bed Mon Sep 17 00:00:00 2001
From: Neil Armstrong <neil.armstrong@linaro.org>
Date: Tue, 14 Nov 2023 11:14:43 +0100
Subject: [PATCH 07/49] dt-bindings: clock: g12a-clkc: add MIPI ISP & CSI PHY

2
projects/Amlogic/packages/linux/patches/S922X/0008-clk-meson-g12a-add-MIPI-ISP-clocks.patch
View file

@ -1,4 +1,4 @@
From a348bd3e7dc25c847ca76acaa8014c30a401edfb Mon Sep 17 00:00:00 2001
From 794aa5b737ffb710a43b3dde5893c9320ce789a3 Mon Sep 17 00:00:00 2001
From: Neil Armstrong <neil.armstrong@linaro.org>
Date: Tue, 14 Nov 2023 11:14:44 +0100
Subject: [PATCH 08/49] clk: meson: g12a: add MIPI ISP clocks

2
projects/Amlogic/packages/linux/patches/S922X/0009-clk-meson-g12a-add-CSI-ISP-gates-clocks.patch
View file

@ -1,4 +1,4 @@
From 0ee184dfa040dc25a8d698e7b006752936471868 Mon Sep 17 00:00:00 2001
From b47a6aac842e16521f666615f802d1c32a244d9f Mon Sep 17 00:00:00 2001
From: Neil Armstrong <neil.armstrong@linaro.org>
Date: Tue, 14 Nov 2023 11:14:45 +0100
Subject: [PATCH 09/49] clk: meson: g12a: add CSI & ISP gates clocks

2
projects/Amlogic/packages/linux/patches/S922X/0010-drm-panel-st7701-add-odroid-go-ultra-panel-support.patch
View file

@ -1,4 +1,4 @@
From 7833886e61125266a6f391d96f5db14b5013a28a Mon Sep 17 00:00:00 2001
From a92e0edd59ffe9a5f8210ef99570165f8eae354d Mon Sep 17 00:00:00 2001
From: adamg <adamg88@users.noreply.github.com>
Date: Tue, 23 Jan 2024 23:28:55 +0000
Subject: [PATCH 10/49] drm: panel: st7701: add odroid-go-ultra panel support

2
projects/Amlogic/packages/linux/patches/S922X/0011-arm64-meson-odroid-go-ultra-add-DSI-panel.patch
View file

@ -1,4 +1,4 @@
From b98ce182b139c787137cc732877632a053d3d747 Mon Sep 17 00:00:00 2001
From b1ec05e594ac3efc54ee4efacdc6d33284d7a533 Mon Sep 17 00:00:00 2001
From: adamg <adamg88@users.noreply.github.com>
Date: Tue, 23 Jan 2024 23:41:40 +0000
Subject: [PATCH 11/49] arm64: meson: odroid-go-ultra: add DSI panel

2
projects/Amlogic/packages/linux/patches/S922X/0012-clk-meson-g12a-fix-mipi-display-output-for-odroid-go.patch
View file

@ -1,4 +1,4 @@
From dfad46b4d3834f1c36233f171943af7a0e9f34e6 Mon Sep 17 00:00:00 2001
From f67ff8d0a59222f943869c7d9d2e0bd4a68ebcda Mon Sep 17 00:00:00 2001
From: "Mauro (mdrjr) Ribeiro" <mauro.ribeiro@hardkernel.com>
Date: Tue, 23 Jan 2024 23:56:49 +0000
Subject: [PATCH 12/49] clk: meson: g12a: fix mipi display output for

2
projects/Amlogic/packages/linux/patches/S922X/0013-arm64-meson-odroid-go-ultra-correct-voltages.patch
View file

@ -1,4 +1,4 @@
From 6d1d09be179529c1a707f9ed83d23c167900c2c5 Mon Sep 17 00:00:00 2001
From 03ed1c5a21386b8128e4fb0a78e40ae33d2b476e Mon Sep 17 00:00:00 2001
From: "Mauro (mdrjr) Ribeiro" <mauro.ribeiro@hardkernel.com>
Date: Tue, 23 Jan 2024 23:53:24 +0000
Subject: [PATCH 13/49] arm64: meson: odroid-go-ultra: correct voltages

2
projects/Amlogic/packages/linux/patches/S922X/0014-arm64-meson-odroid-go-ultra-add-over-clocking-freque.patch
View file

@ -1,4 +1,4 @@
From b78534965f9800ec6bc29816b5fc4a518a55bc38 Mon Sep 17 00:00:00 2001
From 243cf585f8efd4e4b2cc391d34c3092b6010637e Mon Sep 17 00:00:00 2001
From: "Mauro (mdrjr) Ribeiro" <mauro.ribeiro@hardkernel.com>
Date: Wed, 24 Jan 2024 10:56:00 +0000
Subject: [PATCH 14/49] arm64: meson: odroid-go-ultra: add over-clocking

2
projects/Amlogic/packages/linux/patches/S922X/0015-arm64-meson-odroid-go-ultra-specify-overclocking-fre.patch
View file

@ -1,4 +1,4 @@
From 90a1c072c1d2312f485bd0d47b39ef594e0f65d3 Mon Sep 17 00:00:00 2001
From 699ae801205b23d1da08158922041aaaee26d4a6 Mon Sep 17 00:00:00 2001
From: adamg <adamg88@users.noreply.github.com>
Date: Wed, 24 Jan 2024 11:37:48 +0000
Subject: [PATCH 15/49] arm64: meson: odroid-go-ultra: specify overclocking

2
projects/Amlogic/packages/linux/patches/S922X/0016-arm64-meson-odroid-go-ultra-remove-adc-joystick.patch
View file

@ -1,4 +1,4 @@
From 63b0fc884bb654a7247f14b05cedb2c2f18c24d0 Mon Sep 17 00:00:00 2001
From 38fa893698684ad22da9e7c82c5b4edac57bb5d8 Mon Sep 17 00:00:00 2001
From: "Mauro (mdrjr) Ribeiro" <mauro.ribeiro@hardkernel.com>
Date: Wed, 24 Jan 2024 12:08:19 +0000
Subject: [PATCH 16/49] arm64: meson: odroid-go-ultra: remove adc joystick

2
projects/Amlogic/packages/linux/patches/S922X/0017-drm-meson-venc-HACK-panic-when-gamma-is-not-set-corr.patch
View file

@ -1,4 +1,4 @@
From fac13764b8819963ac934ff6ed56a4314e664973 Mon Sep 17 00:00:00 2001
From 6e06d0c825f9cad2fdaf97f37581d069103a3b0e Mon Sep 17 00:00:00 2001
From: brooksytech <1673861+brooksytech@users.noreply.github.com>
Date: Wed, 24 Jan 2024 16:18:45 +0000
Subject: [PATCH 17/49] drm: meson: venc: HACK: panic when gamma is not set

6
projects/Amlogic/packages/linux/patches/S922X/0018-gpiolib-of-revert-api-changes-needed-for-joypad-driv.patch
View file

@ -1,4 +1,4 @@
From 262f961e5600728f46041b70fc79e463bf6c22c7 Mon Sep 17 00:00:00 2001
From 8ba55ed10c13f40ac110e55db1619a1f63f89dff Mon Sep 17 00:00:00 2001
From: adamg <adamg88@users.noreply.github.com>
Date: Wed, 24 Jan 2024 22:12:01 +0000
Subject: [PATCH 18/49] gpiolib: of: revert api changes needed for joypad
@ -11,10 +11,10 @@ Subject: [PATCH 18/49] gpiolib: of: revert api changes needed for joypad
create mode 100644 include/linux/of_gpio_legacy.h
diff --git a/drivers/gpio/gpiolib-of.c b/drivers/gpio/gpiolib-of.c
index 402f7d99b0c1..c3b5a3aecfc7 100644
index d9525d95e818..6291ef324a06 100644
--- a/drivers/gpio/gpiolib-of.c
+++ b/drivers/gpio/gpiolib-of.c
@@ -408,6 +408,20 @@ static struct gpio_desc *of_get_named_gpiod_flags(const struct device_node *np,
@@ -398,6 +398,20 @@ static struct gpio_desc *of_get_named_gpiod_flags(const struct device_node *np,
return desc;
}

2
projects/Amlogic/packages/linux/patches/S922X/0019-input-add-input-polldev-driver.patch
View file

@ -1,4 +1,4 @@
From 86e95809b9184c287232cda8f29690826d832e86 Mon Sep 17 00:00:00 2001
From c8ebb2fd33117fa7474b6275e7d3989b9e1395ad Mon Sep 17 00:00:00 2001
From: adamg <adamg88@users.noreply.github.com>
Date: Wed, 24 Jan 2024 21:50:05 +0000
Subject: [PATCH 19/49] input: add input-polldev driver

2
projects/Amlogic/packages/linux/patches/S922X/0020-input-joystick-add-odroid-go-ultra-joypad-driver.patch
View file

@ -1,4 +1,4 @@
From e27840af97ac40407d190c221d1eb32737bb0172 Mon Sep 17 00:00:00 2001
From 3f4861aa9f49f4fc7681c5c4caaa2922586e61ca Mon Sep 17 00:00:00 2001
From: adamg <adamg88@users.noreply.github.com>
Date: Wed, 24 Jan 2024 21:55:38 +0000
Subject: [PATCH 20/49] input: joystick: add odroid-go ultra-joypad driver

2
projects/Amlogic/packages/linux/patches/S922X/0021-arm64-meson-odroid-go-ultra-add-joypad.patch
View file

@ -1,4 +1,4 @@
From c19ec625d944a7152c5697ea46dcc9a73752fc26 Mon Sep 17 00:00:00 2001
From 74abcbd59fda168ba65c6f106322012c84c151a0 Mon Sep 17 00:00:00 2001
From: adamg <adamg88@users.noreply.github.com>
Date: Wed, 24 Jan 2024 21:57:34 +0000
Subject: [PATCH 21/49] arm64: meson: odroid-go-ultra: add joypad

2
projects/Amlogic/packages/linux/patches/S922X/0022-arm64-meson-odroid-disable-heartbeat.patch
View file

@ -1,4 +1,4 @@
From ca5e6f5823e8fcfc58e7130390ada5cb3c422491 Mon Sep 17 00:00:00 2001
From 90520a4c074557ab1586773f805aa2de47a27009 Mon Sep 17 00:00:00 2001
From: adamg <adamg88@users.noreply.github.com>
Date: Wed, 24 Jan 2024 22:22:49 +0000
Subject: [PATCH 22/49] arm64: meson: odroid: disable heartbeat

2
projects/Amlogic/packages/linux/patches/S922X/0023-arm64-meson-g12-common-add-mali-to-dts.patch
View file

@ -1,4 +1,4 @@
From 2097bdaed54ed1185fedb5946354f0e724b27265 Mon Sep 17 00:00:00 2001
From 50b5516c38e61d9fa1435703d99f6ac87f37ad0f Mon Sep 17 00:00:00 2001
From: adamg <adamg88@users.noreply.github.com>
Date: Wed, 24 Jan 2024 23:56:58 +0000
Subject: [PATCH 23/49] arm64: meson: g12-common: add mali to dts

2
projects/Amlogic/packages/linux/patches/S922X/0024-arm64-meson-odroid-go-ultra-increase-vddcpu_a-voltag.patch
View file

@ -1,4 +1,4 @@
From 515c800b6c23502d25ccd971dcfdc6ca0dde7897 Mon Sep 17 00:00:00 2001
From 12c26f4f6e3ec2c9d7f2a0481fe0961854a463df Mon Sep 17 00:00:00 2001
From: adamg <adamg88@users.noreply.github.com>
Date: Thu, 25 Jan 2024 00:32:40 +0000
Subject: [PATCH 24/49] arm64: meson: odroid-go-ultra: increase vddcpu_a

2
projects/Amlogic/packages/linux/patches/S922X/0025-arm64-meson-add-dt-for-powkiddy-rgb10-max-3-pro.patch
View file

@ -1,4 +1,4 @@
From 2e182dc98e292ddcb126633aea6446ba4549e3f2 Mon Sep 17 00:00:00 2001
From 80932467ac1c501eb4f1c92847aaba55cd03d359 Mon Sep 17 00:00:00 2001
From: adamg <adamg88@users.noreply.github.com>
Date: Fri, 26 Jan 2024 17:55:02 +0000
Subject: [PATCH 25/49] arm64: meson: add dt for powkiddy-rgb10-max-3-pro

32
projects/Amlogic/packages/linux/patches/S922X/0026-power-supply-rk818-battery-Add-battery-driver-for-RK.patch
View file

@ -1,4 +1,4 @@
From 6229c1cbda5a197866a060c1d0519b6205dccc92 Mon Sep 17 00:00:00 2001
From 6bc5a3d8fb3c742f53afa6d8a0c39bfeb93c0835 Mon Sep 17 00:00:00 2001
From: Ondrej Jirman <megi@xff.cz>
Date: Sun, 11 Jun 2023 18:29:24 +0200
Subject: [PATCH 26/49] power: supply: rk818-battery: Add battery driver for
@ -12,18 +12,18 @@ This is forward ported driver from Rockchip BSP.
Signed-of-by: Kamil Trzciński <ayufan@ayufan.eu>
---
drivers/mfd/rk8xx-core.c | 6 +-
drivers/mfd/rk8xx-i2c.c | 38 +-
drivers/mfd/rk8xx-i2c.c | 40 +-
drivers/power/supply/Kconfig | 17 +
drivers/power/supply/Makefile | 1 +
drivers/power/supply/Makefile | 2 +
drivers/power/supply/rk818_battery.c | 3568 ++++++++++++++++++++++++++
drivers/power/supply/rk818_battery.h | 168 ++
include/linux/mfd/rk808.h | 81 +-
7 files changed, 3874 insertions(+), 5 deletions(-)
7 files changed, 3876 insertions(+), 6 deletions(-)
create mode 100644 drivers/power/supply/rk818_battery.c
create mode 100644 drivers/power/supply/rk818_battery.h
diff --git a/drivers/mfd/rk8xx-core.c b/drivers/mfd/rk8xx-core.c
index b1ffc3b9e2be..05175284079e 100644
index a577f950c632..301583865673 100644
--- a/drivers/mfd/rk8xx-core.c
+++ b/drivers/mfd/rk8xx-core.c
@@ -109,8 +109,10 @@ static const struct mfd_cell rk817s[] = {
@ -40,7 +40,7 @@ index b1ffc3b9e2be..05175284079e 100644
.name = "rk808-rtc",
.num_resources = ARRAY_SIZE(rtc_resources),
diff --git a/drivers/mfd/rk8xx-i2c.c b/drivers/mfd/rk8xx-i2c.c
index 75b5cf09d5a0..3d9632fb3554 100644
index 1a98feea97e2..fdb472b570cc 100644
--- a/drivers/mfd/rk8xx-i2c.c
+++ b/drivers/mfd/rk8xx-i2c.c
@@ -75,13 +75,47 @@ static bool rk817_is_volatile_reg(struct device *dev, unsigned int reg)
@ -86,20 +86,21 @@ index 75b5cf09d5a0..3d9632fb3554 100644
.reg_bits = 8,
.val_bits = 8,
- .max_register = RK818_USB_CTRL_REG,
+ .max_register = RK818_SAVE_DATA19,
.cache_type = REGCACHE_MAPLE,
- .cache_type = REGCACHE_RBTREE,
- .volatile_reg = rk808_is_volatile_reg,
+ .max_register = RK818_SAVE_DATA19,
+ .cache_type = REGCACHE_MAPLE,
+ .volatile_reg = rk818_is_volatile_reg,
};
static const struct regmap_config rk805_regmap_config = {
diff --git a/drivers/power/supply/Kconfig b/drivers/power/supply/Kconfig
index f21cb05815ec..1722fc1ee7ec 100644
index a61bb1283e19..2c0317b38ba5 100644
--- a/drivers/power/supply/Kconfig
+++ b/drivers/power/supply/Kconfig
@@ -984,4 +984,21 @@ config FUEL_GAUGE_MM8013
the state of charge, temperature, cycle count, actual and design
capacity, etc.
@@ -952,4 +952,21 @@ config CHARGER_QCOM_SMB2
adds support for the SMB2 switch mode battery charger found
in PMI8998 and related PMICs.
+config FUEL_GAUGE_MM8013
+ tristate "Mitsumi MM8013 fuel gauge driver"
@ -120,13 +121,14 @@ index f21cb05815ec..1722fc1ee7ec 100644
+
endif # POWER_SUPPLY
diff --git a/drivers/power/supply/Makefile b/drivers/power/supply/Makefile
index 58b567278034..aa3de47be2c5 100644
index a8a9fa6de1e9..8e1aba33e0a2 100644
--- a/drivers/power/supply/Makefile
+++ b/drivers/power/supply/Makefile
@@ -114,3 +114,4 @@ obj-$(CONFIG_CHARGER_SURFACE) += surface_charger.o
@@ -111,3 +111,5 @@ obj-$(CONFIG_BATTERY_SURFACE) += surface_battery.o
obj-$(CONFIG_CHARGER_SURFACE) += surface_charger.o
obj-$(CONFIG_BATTERY_UG3105) += ug3105_battery.o
obj-$(CONFIG_CHARGER_QCOM_SMB2) += qcom_pmi8998_charger.o
obj-$(CONFIG_FUEL_GAUGE_MM8013) += mm8013.o
+obj-$(CONFIG_FUEL_GAUGE_MM8013) += mm8013.o
+obj-$(CONFIG_BATTERY_RK818) += rk818_battery.o
diff --git a/drivers/power/supply/rk818_battery.c b/drivers/power/supply/rk818_battery.c
new file mode 100644

2
projects/Amlogic/packages/linux/patches/S922X/0027-power-supply-rk818-battery-Use-a-more-propper-compat.patch
View file

@ -1,4 +1,4 @@
From 6654f3a58925a1a84f0d98dfb1365eb006b57c3a Mon Sep 17 00:00:00 2001
From 6ffe99c17ad245020a2472d4b71d8aff1e19ceb1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Jirman?= <megi@xff.cz>
Date: Sun, 7 Nov 2021 19:30:07 +0100
Subject: [PATCH 27/49] power: supply: rk818-battery: Use a more propper

10
projects/Amlogic/packages/linux/patches/S922X/0028-power-supply-rk818-charger-Implement-charger-driver-.patch
View file

@ -1,4 +1,4 @@
From b6fb69c12d1362b3784b96bdb3b768bb306a57d2 Mon Sep 17 00:00:00 2001
From c5c7a79edd726f7408a3ef1ba118c8fe2869eda8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Jirman?= <megi@xff.cz>
Date: Sun, 7 Nov 2021 20:09:02 +0100
Subject: [PATCH 28/49] power: supply: rk818-charger: Implement charger driver
@ -17,10 +17,10 @@ Signed-off-by: Ondrej Jirman <megi@xff.cz>
create mode 100644 drivers/power/supply/rk818_charger.c
diff --git a/drivers/power/supply/Kconfig b/drivers/power/supply/Kconfig
index 1722fc1ee7ec..a8f03555188f 100644
index 2c0317b38ba5..69d1b897a771 100644
--- a/drivers/power/supply/Kconfig
+++ b/drivers/power/supply/Kconfig
@@ -1001,4 +1001,12 @@ config BATTERY_RK818
@@ -969,4 +969,12 @@ config BATTERY_RK818
If you say yes here you will get support for the battery of RK818 PMIC.
This driver can give support for Rk818 Battery Charge Interface.
@ -34,10 +34,10 @@ index 1722fc1ee7ec..a8f03555188f 100644
+
endif # POWER_SUPPLY
diff --git a/drivers/power/supply/Makefile b/drivers/power/supply/Makefile
index aa3de47be2c5..5a2480aca754 100644
index 8e1aba33e0a2..867ca396bc5a 100644
--- a/drivers/power/supply/Makefile
+++ b/drivers/power/supply/Makefile
@@ -115,3 +115,4 @@ obj-$(CONFIG_BATTERY_UG3105) += ug3105_battery.o
@@ -113,3 +113,4 @@ obj-$(CONFIG_BATTERY_UG3105) += ug3105_battery.o
obj-$(CONFIG_CHARGER_QCOM_SMB2) += qcom_pmi8998_charger.o
obj-$(CONFIG_FUEL_GAUGE_MM8013) += mm8013.o
obj-$(CONFIG_BATTERY_RK818) += rk818_battery.o

2
projects/Amlogic/packages/linux/patches/S922X/0029-power-supply-rk818-charger-Change-charger-type-to-MA.patch
View file

@ -1,4 +1,4 @@
From c141f790a38f9cc2a50642edb44bf71b3a50d78d Mon Sep 17 00:00:00 2001
From ed83c80a599b47ee346775b614139b9376606251 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Jirman?= <megi@xff.cz>
Date: Thu, 13 Jan 2022 13:53:03 +0100
Subject: [PATCH 29/49] power: supply: rk818-charger: Change charger type to

2
projects/Amlogic/packages/linux/patches/S922X/0030-power-supply-rk818-battery-Report-charging-status-ba.patch
View file

@ -1,4 +1,4 @@
From 76f8f9577608e114af43c00aa1e60aacaa11d2dc Mon Sep 17 00:00:00 2001
From f454620c20c314f78e62eedeeec329030f68eabf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Jirman?= <megi@xff.cz>
Date: Fri, 21 Jan 2022 11:38:00 +0100
Subject: [PATCH 30/49] power: supply: rk818-battery: Report charging status

2
projects/Amlogic/packages/linux/patches/S922X/0031-power-supply-rk818-battery-Drop-dependency-on-frameb.patch
View file

@ -1,4 +1,4 @@
From d7ab30b72c46d9d6ddfe72f567267dde1f06e447 Mon Sep 17 00:00:00 2001
From 6927a0e7b561f4ecf1991c565d8e14bbe862cb1d Mon Sep 17 00:00:00 2001
From: Ondrej Jirman <megi@xff.cz>
Date: Tue, 17 May 2022 23:30:46 +0200
Subject: [PATCH 31/49] power: supply: rk818-battery: Drop dependency on

10
projects/Amlogic/packages/linux/patches/S922X/0032-power-supply-rk818-charger-Unify-rk818-charger-and-r.patch
View file

@ -1,4 +1,4 @@
From e40e882849f5e9686c7c89db8e7a29b07a0e7875 Mon Sep 17 00:00:00 2001
From 2476f8cdccfd9e5429b3a1beef5825164619c65a Mon Sep 17 00:00:00 2001
From: Ondrej Jirman <megi@xff.cz>
Date: Sat, 4 Nov 2023 18:25:03 +0100
Subject: [PATCH 32/49] power: supply: rk818-charger: Unify rk818-charger and
@ -17,10 +17,10 @@ Signed-off-by: Ondrej Jirman <megi@xff.cz>
4 files changed, 95 insertions(+), 33 deletions(-)
diff --git a/drivers/power/supply/Kconfig b/drivers/power/supply/Kconfig
index a8f03555188f..b058d033fbf4 100644
index 69d1b897a771..04d6ab28b44f 100644
--- a/drivers/power/supply/Kconfig
+++ b/drivers/power/supply/Kconfig
@@ -993,14 +993,6 @@ config FUEL_GAUGE_MM8013
@@ -961,14 +961,6 @@ config FUEL_GAUGE_MM8013
the state of charge, temperature, cycle count, actual and design
capacity, etc.
@ -36,10 +36,10 @@ index a8f03555188f..b058d033fbf4 100644
bool "RK818 Charger driver"
depends on MFD_RK8XX
diff --git a/drivers/power/supply/Makefile b/drivers/power/supply/Makefile
index 5a2480aca754..873d0cc4cbeb 100644
index 867ca396bc5a..e25b09cca4ca 100644
--- a/drivers/power/supply/Makefile
+++ b/drivers/power/supply/Makefile
@@ -114,5 +114,4 @@ obj-$(CONFIG_CHARGER_SURFACE) += surface_charger.o
@@ -112,5 +112,4 @@ obj-$(CONFIG_CHARGER_SURFACE) += surface_charger.o
obj-$(CONFIG_BATTERY_UG3105) += ug3105_battery.o
obj-$(CONFIG_CHARGER_QCOM_SMB2) += qcom_pmi8998_charger.o
obj-$(CONFIG_FUEL_GAUGE_MM8013) += mm8013.o

2
projects/Amlogic/packages/linux/patches/S922X/0033-power-supply-rk818-battery-Speed-up-battery-current-.patch
View file

@ -1,4 +1,4 @@
From 5e4566a4d1aea04096d90b612475767167b8757c Mon Sep 17 00:00:00 2001
From 1a90054428401ec22afb359c05ff4c667b6de615 Mon Sep 17 00:00:00 2001
From: Ondrej Jirman <megi@xff.cz>
Date: Fri, 27 May 2022 03:07:54 +0200
Subject: [PATCH 33/49] power: supply: rk818-battery: Speed up battery current

2
projects/Amlogic/packages/linux/patches/S922X/0034-power-supply-rk818-charger-Delay-applying-input-curr.patch
View file

@ -1,4 +1,4 @@
From c35257b3f311f46a6ed4b15c5af433433486f8a1 Mon Sep 17 00:00:00 2001
From 11d91617a77b6fd25e96db709de9307067c66c0a Mon Sep 17 00:00:00 2001
From: Ondrej Jirman <megi@xff.cz>
Date: Tue, 2 Aug 2022 09:37:05 +0200
Subject: [PATCH 34/49] power: supply: rk818-charger: Delay applying input

2
projects/Amlogic/packages/linux/patches/S922X/0035-power-supply-rk818-battery-Don-t-auto-poweroff-the-P.patch
View file

@ -1,4 +1,4 @@
From 88271052cc0c74b7109ea781a53dc8e863eda764 Mon Sep 17 00:00:00 2001
From 54c654e254cded0d8162bd6e74787f06e292054b Mon Sep 17 00:00:00 2001
From: Ondrej Jirman <megi@xff.cz>
Date: Thu, 10 Nov 2022 20:03:47 +0100
Subject: [PATCH 35/49] power: supply: rk818-battery: Don't auto-poweroff the

2
projects/Amlogic/packages/linux/patches/S922X/0036-power-supply-rk818-charger-Add-support-for-POWER_SUP.patch
View file

@ -1,4 +1,4 @@
From 557a625ad061282bd321e9c96e5d0cf362e59706 Mon Sep 17 00:00:00 2001
From 935f57d7a30de02fbd8300cfc5804fc9cf9b3eef Mon Sep 17 00:00:00 2001
From: Ondrej Jirman <megi@xff.cz>
Date: Thu, 10 Nov 2022 20:05:16 +0100
Subject: [PATCH 36/49] power: supply: rk818-charger: Add support for

2
projects/Amlogic/packages/linux/patches/S922X/0037-power-supply-rk818-battery-Don-t-reset-dsoc-to-0-on-.patch
View file

@ -1,4 +1,4 @@
From 22446adc1a1745a578419bd8ce652ae1a02d9615 Mon Sep 17 00:00:00 2001
From f30d17b19e6ffcf86b833097d560030c80571d0f Mon Sep 17 00:00:00 2001
From: Ondrej Jirman <megi@xff.cz>
Date: Sun, 11 Dec 2022 10:39:22 +0100
Subject: [PATCH 37/49] power: supply: rk818-battery: Don't reset dsoc to 0 on

4
projects/Amlogic/packages/linux/patches/S922X/0038-supply-rk817-Fix-battery-capacity-sanity-check-calcu.patch
View file

@ -1,4 +1,4 @@
From 776d63cd8ab6e498ae405f05d20808f4a8dae920 Mon Sep 17 00:00:00 2001
From 6849172e1ff347e2fd5906ba2e14ee0b72851b54 Mon Sep 17 00:00:00 2001
From: Alexander Warnecke <awarnecke002@hotmail.com>
Date: Thu, 29 Jun 2023 19:52:42 +1000
Subject: [PATCH 38/49] supply: rk817: Fix battery capacity sanity check
@ -13,7 +13,7 @@ Signed-off-by: Alexander Warnecke <awarnecke002@hotmail.com>
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/power/supply/rk817_charger.c b/drivers/power/supply/rk817_charger.c
index 7ca91739c6cc..44af88045ac1 100644
index f64daf5a41d9..f0afc9daa855 100644
--- a/drivers/power/supply/rk817_charger.c
+++ b/drivers/power/supply/rk817_charger.c
@@ -715,7 +715,7 @@ static int rk817_read_battery_nvram_values(struct rk817_charger *charger)

4
projects/Amlogic/packages/linux/patches/S922X/0039-power-supply-rk817-charger-Add-input-current-limit-s.patch
View file

@ -1,4 +1,4 @@
From 559a8cdd09bf04bb96f5ac3e25e8eaa58873c8ee Mon Sep 17 00:00:00 2001
From 5b3b362b7844192e20a8decb30b3f55923065f21 Mon Sep 17 00:00:00 2001
From: Ondrej Jirman <megi@xff.cz>
Date: Sun, 6 Aug 2023 02:55:22 +0200
Subject: [PATCH 39/49] power: supply: rk817-charger: Add input current limit
@ -12,7 +12,7 @@ Signed-off-by: Ondrej Jirman <megi@xff.cz>
1 file changed, 99 insertions(+), 13 deletions(-)
diff --git a/drivers/power/supply/rk817_charger.c b/drivers/power/supply/rk817_charger.c
index 44af88045ac1..833b12cfcced 100644
index f0afc9daa855..c788554b1939 100644
--- a/drivers/power/supply/rk817_charger.c
+++ b/drivers/power/supply/rk817_charger.c
@@ -556,11 +556,72 @@ static int rk817_bat_get_prop(struct power_supply *ps,

4
projects/Amlogic/packages/linux/patches/S922X/0040-power-supply-rk817-charger-Take-input-current-limit-.patch
View file

@ -1,4 +1,4 @@
From ac6f709e7a805923b819d3e6cdee13108664b05e Mon Sep 17 00:00:00 2001
From 49919dbfb5f8a0ca15f6b0729eac338d2d57beac Mon Sep 17 00:00:00 2001
From: Ondrej Jirman <megi@xff.cz>
Date: Thu, 7 Sep 2023 17:37:59 +0200
Subject: [PATCH 40/49] power: supply: rk817-charger: Take input current limit
@ -12,7 +12,7 @@ Signed-off-by: Ondrej Jirman <megi@xff.cz>
1 file changed, 36 insertions(+)
diff --git a/drivers/power/supply/rk817_charger.c b/drivers/power/supply/rk817_charger.c
index 833b12cfcced..9de86fc8f3fa 100644
index c788554b1939..ee5c8419ac42 100644
--- a/drivers/power/supply/rk817_charger.c
+++ b/drivers/power/supply/rk817_charger.c
@@ -53,6 +53,7 @@ struct rk817_charger {

4
projects/Amlogic/packages/linux/patches/S922X/0041-power-supply-rk817-charger-Propagate-proper-errors.patch
View file

@ -1,4 +1,4 @@
From 5521dace8d11b1c2244393501bee9a1556c6b6a8 Mon Sep 17 00:00:00 2001
From 584e456bf9eeed588317bb073a8d326219fef8bd Mon Sep 17 00:00:00 2001
From: Ondrej Jirman <megi@xff.cz>
Date: Thu, 7 Sep 2023 17:43:00 +0200
Subject: [PATCH 41/49] power: supply: rk817-charger: Propagate proper errors
@ -11,7 +11,7 @@ Signed-off-by: Ondrej Jirman <megi@xff.cz>
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/power/supply/rk817_charger.c b/drivers/power/supply/rk817_charger.c
index 9de86fc8f3fa..241fff9bc2ab 100644
index ee5c8419ac42..1e0900e5b450 100644
--- a/drivers/power/supply/rk817_charger.c
+++ b/drivers/power/supply/rk817_charger.c
@@ -1250,13 +1250,13 @@ static int rk817_charger_probe(struct platform_device *pdev)

2
projects/Amlogic/packages/linux/patches/S922X/0042-power-supply-rk818-battery-charger-clear-unused-vari.patch
View file

@ -1,4 +1,4 @@
From 11eae05c4e291f33c230f3b30df8a50d562eaff3 Mon Sep 17 00:00:00 2001
From 3529aa1aaa05b20c217e5bf088bf6e097ad52310 Mon Sep 17 00:00:00 2001
From: "Mauro (mdrjr) Ribeiro" <mauro.ribeiro@hardkernel.com>
Date: Wed, 31 Jan 2024 11:59:50 -0300
Subject: [PATCH 42/49] power: supply: rk818-battery/charger: clear unused

2
projects/Amlogic/packages/linux/patches/S922X/0043-arm64-meson-odroid-go-ultra-add-battery-and-charger-.patch
View file

@ -1,4 +1,4 @@
From 6edab33d6aa48edb44d1ffa5598e0120916a7039 Mon Sep 17 00:00:00 2001
From 4fb0701649967cdeabd55fe7dfd05dba4d6c4cb6 Mon Sep 17 00:00:00 2001
From: "Mauro (mdrjr) Ribeiro" <mauro.ribeiro@hardkernel.com>
Date: Wed, 31 Jan 2024 18:36:49 +0000
Subject: [PATCH 43/49] arm64: meson: odroid-go-ultra: add battery and charger

4
projects/Amlogic/packages/linux/patches/S922X/0044-ASoC-meson-axg-card-limit-the-volume-to-prevent-clip.patch
View file

@ -1,4 +1,4 @@
From 006cb0b46e6348290abad15d346baf8e2c403c5f Mon Sep 17 00:00:00 2001
From 96b26c76769f6adf339b41926afe656fc30446d0 Mon Sep 17 00:00:00 2001
From: ckkim <changkon12@gmail.com>
Date: Thu, 20 Apr 2023 16:18:40 +0900
Subject: [PATCH 44/49] ASoC: meson: axg-card: limit the volume to prevent
@ -9,7 +9,7 @@ Subject: [PATCH 44/49] ASoC: meson: axg-card: limit the volume to prevent
1 file changed, 7 insertions(+)
diff --git a/sound/soc/meson/axg-card.c b/sound/soc/meson/axg-card.c
index 3180aa4d3a15..e17a9418bde4 100644
index f10c0c17863e..ba9bd1255075 100644
--- a/sound/soc/meson/axg-card.c
+++ b/sound/soc/meson/axg-card.c
@@ -59,6 +59,13 @@ static int axg_card_tdm_dai_init(struct snd_soc_pcm_runtime *rtd)

2
projects/Amlogic/packages/linux/patches/S922X/0045-power-supply-rk818_charger-change-syfs-node-name-so-.patch
View file

@ -1,4 +1,4 @@
From 4c3c07ba7f2cc507612a448066fd2b124b2ff236 Mon Sep 17 00:00:00 2001
From 9e83d12a03367d69e6aba5879c6f4db4ba301bda Mon Sep 17 00:00:00 2001
From: adamg <adamg88@users.noreply.github.com>
Date: Wed, 31 Jan 2024 20:18:22 +0000
Subject: [PATCH 45/49] power: supply: rk818_charger: change syfs node name so

2
projects/Amlogic/packages/linux/patches/S922X/0046-arm64-meson-odroid-go-ultra-add-headphone-detection.patch
View file

@ -1,4 +1,4 @@
From a56c03b64f3f335a3b5e813ba759e15571d23b88 Mon Sep 17 00:00:00 2001
From 88e015d1bc67b6f7a7883ae6de915aa03b35d588 Mon Sep 17 00:00:00 2001
From: "Mauro (mdrjr) Ribeiro" <mauro.ribeiro@hardkernel.com>
Date: Wed, 31 Jan 2024 20:56:40 +0000
Subject: [PATCH 46/49] arm64: meson: odroid-go-ultra: add headphone detection

2
projects/Amlogic/packages/linux/patches/S922X/0047-arm64-dts-amlogic-odroid-go-ultra-Improve-sound-outp.patch
View file

@ -1,4 +1,4 @@
From 680aed77a6796ff444e2d1e91eb2acd7e517ede4 Mon Sep 17 00:00:00 2001
From a34fda226977aaa2d4d5e775607756469c390536 Mon Sep 17 00:00:00 2001
From: ckkim <changkon12@gmail.com>
Date: Thu, 20 Apr 2023 16:21:09 +0900
Subject: [PATCH 47/49] arm64: dts: amlogic: odroid-go ultra: Improve sound

2
projects/Amlogic/packages/linux/patches/S922X/0048-arm64-meson-g12-common-remove-lower-freq-gpu-opps.patch
View file

@ -1,4 +1,4 @@
From cc3be99a18f59879a3476619e9274a4d3127dff4 Mon Sep 17 00:00:00 2001
From 701e7d3f1b7a3106ca5963d2a3257798fa558d01 Mon Sep 17 00:00:00 2001
From: adamg <adamg88@users.noreply.github.com>
Date: Thu, 1 Feb 2024 19:03:03 +0000
Subject: [PATCH 48/49] arm64: meson: g12-common: remove lower freq gpu opps

2
projects/Amlogic/packages/linux/patches/S922X/0049-LOCAL-ALSA-Assign-internal-PCM-chmap-ELD-IEC958-kctl.patch
View file

@ -1,4 +1,4 @@
From 67854f6e3476e8cbadff7e560f602dd539153f9c Mon Sep 17 00:00:00 2001
From d6230d301e49e23704a42ced4f5202761c06ed99 Mon Sep 17 00:00:00 2001
From: Anssi Hannula <anssi.hannula@iki.fi>
Date: Sun, 17 Apr 2022 04:37:48 +0000
Subject: [PATCH 49/49] LOCAL: ALSA: Assign internal PCM chmap/ELD/IEC958 kctls