Merge pull request #2799 from JustEnoughLinuxOS/dev

PR for release (fixes)

packages/emulators/standalone/mupen64plus-sa/mupen64plus-sa-core/config/RK3326/mupen64plus.cfg.xut

@@ -110,13 +110,13 @@ Kbd Mapping Frame Advance = 47
 # SDL keysym for pressing the game shark button
 Kbd Mapping Gameshark = 103
 # Joystick event string for stopping the emulator
-Joy Mapping Stop = "J0B12/B13"
+Joy Mapping Stop = "J0B16/B9"
 # Joystick event string for switching between fullscreen/windowed modes
 Joy Mapping Fullscreen = ""
 # Joystick event string for saving the emulator state
-Joy Mapping Save State = "J0B12/B5"
+Joy Mapping Save State = "J0B16/B5"
 # Joystick event string for loading the emulator state
-Joy Mapping Load State = "J0B12/B4"
+Joy Mapping Load State = "J0B16/B4"
 # Joystick event string for advancing the save state slot
 Joy Mapping Increment Slot = ""
 # Joystick event string for resetting the emulator
@@ -128,15 +128,15 @@ Joy Mapping Speed Up = ""
 # Joystick event string for taking a screenshot
 Joy Mapping Screenshot = ""
 # Joystick event string for pausing the emulator
-Joy Mapping Pause = "J0B12/B0"
+Joy Mapping Pause = "J0B16/B0"
 # Joystick event string for muting/unmuting the sound
 Joy Mapping Mute = ""
 # Joystick event string for increasing the volume
 Joy Mapping Increase Volume = ""
 # Joystick event string for decreasing the volume
 Joy Mapping Decrease Volume = ""
 # Joystick event string for fast-forward
-Joy Mapping Fast Forward = "J0B12/B14"
+Joy Mapping Fast Forward = "J0B16/B15"
 # Joystick event string for advancing by one frame when paused
 Joy Mapping Frame Advance = ""
 # Joystick event string for pressing the game shark button
@@ -196,8 +196,8 @@ DPad D = button(13)
 DPad U = button(12)
 Start = button(9)
 Z Trig = button(7)
-B Button = button(1)
-A Button = button(2)
+B Button = button(0)
+A Button = button(1)
 C Button R = axis(2+)
 C Button L = axis(2-)
 C Button D = axis(3+)
@@ -399,7 +399,7 @@ ScreenHeight = 320
 # Use fullscreen mode if True, or windowed mode if False
 Fullscreen = True
 # If true, activate the SDL_GL_SWAP_CONTROL attribute
-VerticalSync = True
+VerticalSync = False
 # Rotate screen contents: 0=0 degree, 1=90 degree, 2 = 180 degree, 3=270 degree
 Rotate = 0
 
@@ -605,9 +605,9 @@ ScreenUpdateSetting = 4
 # Force to use normal alpha blender
 NormalAlphaBlender = False
 # Use a faster algorithm to speed up texture loading and CRC computation
-FastTextureLoading = False
+FastTextureLoading = True
 # Use different texture coordinate clamping code
-AccurateTextureMapping = True
+AccurateTextureMapping = False
 # Force emulated frame buffers to be in N64 native resolution
 InN64Resolution = False
 # Try to reduce Video RAM usage (should never be used)
@@ -641,7 +641,7 @@ DumpTexturesToFiles = False
 # Display On-screen FPS
 ShowFPS = False
 # Use Mipmapping? 0=no, 1=nearest, 2=bilinear, 3=trilinear
-Mipmapping = 2
+Mipmapping = 0
 # Enable, Disable fog generation (0=Disable, 1=Enable)
 FogMethod = 1
 # Force to use texture filtering or not (0=auto: n64 choose, 1=force no filtering, 2=force filtering)

packages/emulators/standalone/mupen64plus-sa/mupen64plus-sa-input-sdl/config/RK3326/default.ini

@@ -135,8 +135,8 @@ DPad D = button(13)
 DPad U = button(12)
 Start = button(9)
 Z Trig = button(7)
-B Button = button(1)
-A Button = button(2)
+B Button = button(0)
+A Button = button(1)
 C Button R = axis(2+)
 C Button L = axis(2-)
 C Button D = axis(3+)

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

@@ -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 <[email protected]>
 Date: Fri, 24 Nov 2023 09:41:12 +0100
 Subject: [PATCH 01/49] dt-bindings: clk: g12a-clkc: add CTS_ENCL clock ids

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

@@ -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 <[email protected]>
 Date: Fri, 24 Nov 2023 09:41:17 +0100
 Subject: [PATCH 02/49] clk: meson: g12a: add CTS_ENCL & CTS_ENCL_SEL clocks

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

@@ -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 <[email protected]>
 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 <[email protected]>
  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

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

@@ -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 <[email protected]>
 Date: Fri, 24 Nov 2023 09:41:19 +0100
 Subject: [PATCH 04/49] clk: meson: g12a: make VCLK2 and ENCL clock path

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

@@ -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 <[email protected]>
 Date: Fri, 24 Nov 2023 09:41:20 +0100
 Subject: [PATCH 05/49] drm/meson: gate px_clk when setting rate

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

@@ -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 <[email protected]>
 Date: Fri, 24 Nov 2023 09:41:21 +0100
 Subject: [PATCH 06/49] arm64: meson: g12-common: add the MIPI DSI nodes

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

@@ -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 <[email protected]>
 Date: Tue, 14 Nov 2023 11:14:43 +0100
 Subject: [PATCH 07/49] dt-bindings: clock: g12a-clkc: add MIPI ISP & CSI PHY

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

@@ -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 <[email protected]>
 Date: Tue, 14 Nov 2023 11:14:44 +0100
 Subject: [PATCH 08/49] clk: meson: g12a: add MIPI ISP clocks

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

@@ -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 <[email protected]>
 Date: Tue, 14 Nov 2023 11:14:45 +0100
 Subject: [PATCH 09/49] clk: meson: g12a: add CSI & ISP gates clocks

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

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

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

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

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

@@ -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" <[email protected]>
 Date: Tue, 23 Jan 2024 23:56:49 +0000
 Subject: [PATCH 12/49] clk: meson: g12a: fix mipi display output for

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

@@ -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" <[email protected]>
 Date: Tue, 23 Jan 2024 23:53:24 +0000
 Subject: [PATCH 13/49] arm64: meson: odroid-go-ultra: correct voltages

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

@@ -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" <[email protected]>
 Date: Wed, 24 Jan 2024 10:56:00 +0000
 Subject: [PATCH 14/49] arm64: meson: odroid-go-ultra: add over-clocking

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

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

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

@@ -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" <[email protected]>
 Date: Wed, 24 Jan 2024 12:08:19 +0000
 Subject: [PATCH 16/49] arm64: meson: odroid-go-ultra: remove adc joystick

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

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

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

@@ -1,4 +1,4 @@
-From 262f961e5600728f46041b70fc79e463bf6c22c7 Mon Sep 17 00:00:00 2001
+From 8ba55ed10c13f40ac110e55db1619a1f63f89dff Mon Sep 17 00:00:00 2001
 From: adamg <[email protected]>
 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;
  }
 

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -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 <[email protected]>
 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 <[email protected]>
 ---
  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

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

@@ -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?= <[email protected]>
 Date: Sun, 7 Nov 2021 19:30:07 +0100
 Subject: [PATCH 27/49] power: supply: rk818-battery: Use a more propper

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

@@ -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?= <[email protected]>
 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 <[email protected]>
  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

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

@@ -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?= <[email protected]>
 Date: Thu, 13 Jan 2022 13:53:03 +0100
 Subject: [PATCH 29/49] power: supply: rk818-charger: Change charger type to