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

Merge pull request #1950 from brooksytech/dev

Browse source 
Bump linux to 6.1.46, merge 351v wip
This commit is contained in:
Brooksytech 2023-08-21 06:45:45 -07:00 committed by GitHub
commit 68de0f6c36
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 84 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
projects/Amlogic/packages/linux/package.mk
View file

@ -19,7 +19,7 @@ PKG_PATCH_DIRS+="${DEVICE}"
case ${DEVICE} in
S922X*)
PKG_VERSION="6.1.45"
PKG_VERSION="6.1.46"
PKG_URL="https://www.kernel.org/pub/linux/kernel/v6.x/${PKG_NAME}-${PKG_VERSION}.tar.xz"
;;
esac

2
projects/Rockchip/packages/linux/package.mk
View file

@ -37,7 +37,7 @@ case ${DEVICE} in
PKG_GIT_CLONE_BRANCH="main"
;;
RK33*)
PKG_VERSION="6.1.45"
PKG_VERSION="6.1.46"
PKG_URL="https://www.kernel.org/pub/linux/kernel/v6.x/${PKG_NAME}-${PKG_VERSION}.tar.xz"
;;
esac

125
projects/Rockchip/packages/linux/patches/RK3326/000-rk3326-devices.patch
View file

@ -1,6 +1,6 @@
diff -rupN linux.orig/arch/arm64/boot/dts/rockchip/Makefile linux/arch/arm64/boot/dts/rockchip/Makefile
--- linux.orig/arch/arm64/boot/dts/rockchip/Makefile 2023-08-03 08:24:19.000000000 +0000
+++ linux/arch/arm64/boot/dts/rockchip/Makefile 2023-08-04 16:55:20.877879413 +0000
--- linux.orig/arch/arm64/boot/dts/rockchip/Makefile 2023-08-16 16:27:31.000000000 +0000
+++ linux/arch/arm64/boot/dts/rockchip/Makefile 2023-08-18 14:48:04.144844425 +0000
@@ -7,7 +7,11 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3308-ev
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3308-roc-cc.dtb
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3308-rock-pi-s.dtb
@ -14,8 +14,8 @@ diff -rupN linux.orig/arch/arm64/boot/dts/rockchip/Makefile linux/arch/arm64/boo
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-evb.dtb
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-nanopi-r2s.dtb
diff -rupN linux.orig/arch/arm64/boot/dts/rockchip/px30.dtsi linux/arch/arm64/boot/dts/rockchip/px30.dtsi
--- linux.orig/arch/arm64/boot/dts/rockchip/px30.dtsi 2023-08-03 08:24:19.000000000 +0000
+++ linux/arch/arm64/boot/dts/rockchip/px30.dtsi 2023-08-04 16:55:20.877879413 +0000
--- linux.orig/arch/arm64/boot/dts/rockchip/px30.dtsi 2023-08-16 16:27:31.000000000 +0000
+++ linux/arch/arm64/boot/dts/rockchip/px30.dtsi 2023-08-18 14:48:04.144844425 +0000
@@ -114,12 +114,6 @@
compatible = "operating-points-v2";
opp-shared;
@ -173,7 +173,7 @@ diff -rupN linux.orig/arch/arm64/boot/dts/rockchip/px30.dtsi linux/arch/arm64/bo
diff -rupN linux.orig/arch/arm64/boot/dts/rockchip/rk3326-anbernic-rg351m.dts linux/arch/arm64/boot/dts/rockchip/rk3326-anbernic-rg351m.dts
--- linux.orig/arch/arm64/boot/dts/rockchip/rk3326-anbernic-rg351m.dts 1970-01-01 00:00:00.000000000 +0000
+++ linux/arch/arm64/boot/dts/rockchip/rk3326-anbernic-rg351m.dts 2023-08-04 18:50:02.589594754 +0000
+++ linux/arch/arm64/boot/dts/rockchip/rk3326-anbernic-rg351m.dts 2023-08-18 14:48:04.144844425 +0000
@@ -0,0 +1,58 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+/*
@ -235,7 +235,7 @@ diff -rupN linux.orig/arch/arm64/boot/dts/rockchip/rk3326-anbernic-rg351m.dts li
+};
diff -rupN linux.orig/arch/arm64/boot/dts/rockchip/rk3326-anbernic-rg351p.dts linux/arch/arm64/boot/dts/rockchip/rk3326-anbernic-rg351p.dts
--- linux.orig/arch/arm64/boot/dts/rockchip/rk3326-anbernic-rg351p.dts 1970-01-01 00:00:00.000000000 +0000
+++ linux/arch/arm64/boot/dts/rockchip/rk3326-anbernic-rg351p.dts 2023-08-04 18:29:32.912721771 +0000
+++ linux/arch/arm64/boot/dts/rockchip/rk3326-anbernic-rg351p.dts 2023-08-18 14:48:04.144844425 +0000
@@ -0,0 +1,57 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+/*
@ -296,8 +296,8 @@ diff -rupN linux.orig/arch/arm64/boot/dts/rockchip/rk3326-anbernic-rg351p.dts li
+};
diff -rupN linux.orig/arch/arm64/boot/dts/rockchip/rk3326-anbernic-rg351v.dts linux/arch/arm64/boot/dts/rockchip/rk3326-anbernic-rg351v.dts
--- linux.orig/arch/arm64/boot/dts/rockchip/rk3326-anbernic-rg351v.dts 1970-01-01 00:00:00.000000000 +0000
+++ linux/arch/arm64/boot/dts/rockchip/rk3326-anbernic-rg351v.dts 2023-08-04 19:10:59.622486606 +0000
@@ -0,0 +1,85 @@
+++ linux/arch/arm64/boot/dts/rockchip/rk3326-anbernic-rg351v.dts 2023-08-18 15:53:35.369329928 +0000
@@ -0,0 +1,124 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+/*
+ * Copyright (c) 2019 Hardkernel Co., Ltd
@ -312,6 +312,11 @@ diff -rupN linux.orig/arch/arm64/boot/dts/rockchip/rk3326-anbernic-rg351v.dts li
+ model = "Anbernic RG351V";
+ compatible = "anbernic,rg351v", "rockchip,rk3326";
+
+ aliases {
+ mmc0 = &sdio;
+ mmc1 = &sdmmc;
+ };
+
+ gpio-keys-vol {
+ compatible = "gpio-keys";
+ autorepeat;
@ -357,7 +362,11 @@ diff -rupN linux.orig/arch/arm64/boot/dts/rockchip/rk3326-anbernic-rg351v.dts li
+ };
+};
+
+/delete-node/ &vcc_host; /* conflicts with pwm vibration motor */
+/* conflicts with pwm vibration motor */
+/delete-node/ &vcc_host;
+
+/* Device only has 1 LED compared to Odroid Go Advance */
+/delete-node/ &gpio_led;
+
+&internal_display {
+ compatible = "anbernic,rg351v-panel", "newvision,nv3051d";
@ -365,16 +374,46 @@ diff -rupN linux.orig/arch/arm64/boot/dts/rockchip/rk3326-anbernic-rg351v.dts li
+ vdd-supply = <&vcc_lcd>;
+};
+
+&io_domains {
+ vccio1-supply = <&vccio_sd>;
+};
+
+/delete-node/ &pwm_led;
+
+&pwm0 {
+ status = "okay";
+};
+
+/delete-node/ &pwm3;
+
+&rk817_charger {
+ /* This device does not have a current sense resistor */
+ rockchip,resistor-sense-micro-ohms = <0>;
+ monitored-battery = <&battery>;
+};
+
+&sdio {
+ cap-sd-highspeed;
+ card-detect-delay = <200>;
+ cd-gpios = <&gpio3 RK_PB4 GPIO_ACTIVE_LOW>; /*[> CD GPIO <]*/
+ sd-uhs-sdr12;
+ sd-uhs-sdr25;
+ sd-uhs-sdr50;
+ sd-uhs-sdr104;
+ vmmc-supply = <&vcc_sd>;
+ vqmmc-supply = <&vccio_sd>;
+ status = "okay";
+};
+
+&vcc_sd {
+ regulator-max-microvolt = <3000000>;
+ regulator-min-microvolt = <1800000>;
+};
+
+&vccio_sd {
+ regulator-max-microvolt = <1800000>;
+};
+
+&pinctrl {
+ btns {
+ btn_pins_vol: btn-pins-vol {
@ -385,7 +424,7 @@ diff -rupN linux.orig/arch/arm64/boot/dts/rockchip/rk3326-anbernic-rg351v.dts li
+};
diff -rupN linux.orig/arch/arm64/boot/dts/rockchip/rk3326-odroid-go.dtsi linux/arch/arm64/boot/dts/rockchip/rk3326-odroid-go.dtsi
--- linux.orig/arch/arm64/boot/dts/rockchip/rk3326-odroid-go.dtsi 1970-01-01 00:00:00.000000000 +0000
+++ linux/arch/arm64/boot/dts/rockchip/rk3326-odroid-go.dtsi 2023-08-04 18:52:52.277556396 +0000
+++ linux/arch/arm64/boot/dts/rockchip/rk3326-odroid-go.dtsi 2023-08-18 14:48:04.144844425 +0000
@@ -0,0 +1,566 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+/*
@ -955,7 +994,7 @@ diff -rupN linux.orig/arch/arm64/boot/dts/rockchip/rk3326-odroid-go.dtsi linux/a
+};
diff -rupN linux.orig/arch/arm64/boot/dts/rockchip/rk3326-odroid-go2-v11.dts linux/arch/arm64/boot/dts/rockchip/rk3326-odroid-go2-v11.dts
--- linux.orig/arch/arm64/boot/dts/rockchip/rk3326-odroid-go2-v11.dts 1970-01-01 00:00:00.000000000 +0000
+++ linux/arch/arm64/boot/dts/rockchip/rk3326-odroid-go2-v11.dts 2023-08-04 18:51:03.271015664 +0000
+++ linux/arch/arm64/boot/dts/rockchip/rk3326-odroid-go2-v11.dts 2023-08-18 14:48:04.144844425 +0000
@@ -0,0 +1,300 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+/*
@ -1258,8 +1297,8 @@ diff -rupN linux.orig/arch/arm64/boot/dts/rockchip/rk3326-odroid-go2-v11.dts lin
+ };
+};
diff -rupN linux.orig/arch/arm64/boot/dts/rockchip/rk3326-odroid-go2.dts linux/arch/arm64/boot/dts/rockchip/rk3326-odroid-go2.dts
--- linux.orig/arch/arm64/boot/dts/rockchip/rk3326-odroid-go2.dts 2023-08-03 08:24:19.000000000 +0000
+++ linux/arch/arm64/boot/dts/rockchip/rk3326-odroid-go2.dts 2023-08-04 18:51:46.908034443 +0000
--- linux.orig/arch/arm64/boot/dts/rockchip/rk3326-odroid-go2.dts 2023-08-16 16:27:31.000000000 +0000
+++ linux/arch/arm64/boot/dts/rockchip/rk3326-odroid-go2.dts 2023-08-18 14:48:04.144844425 +0000
@@ -2,55 +2,185 @@
/*
* Copyright (c) 2019 Hardkernel Co., Ltd
@ -2119,7 +2158,7 @@ diff -rupN linux.orig/arch/arm64/boot/dts/rockchip/rk3326-odroid-go2.dts linux/a
};
diff -rupN linux.orig/arch/arm64/boot/dts/rockchip/rk3326-odroid-go3.dts linux/arch/arm64/boot/dts/rockchip/rk3326-odroid-go3.dts
--- linux.orig/arch/arm64/boot/dts/rockchip/rk3326-odroid-go3.dts 1970-01-01 00:00:00.000000000 +0000
+++ linux/arch/arm64/boot/dts/rockchip/rk3326-odroid-go3.dts 2023-08-04 18:52:27.908989606 +0000
+++ linux/arch/arm64/boot/dts/rockchip/rk3326-odroid-go3.dts 2023-08-18 14:48:04.144844425 +0000
@@ -0,0 +1,284 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+/*
@ -2406,8 +2445,8 @@ diff -rupN linux.orig/arch/arm64/boot/dts/rockchip/rk3326-odroid-go3.dts linux/a
+ };
+};
diff -rupN linux.orig/drivers/devfreq/Kconfig linux/drivers/devfreq/Kconfig
--- linux.orig/drivers/devfreq/Kconfig 2023-08-03 08:24:19.000000000 +0000
+++ linux/drivers/devfreq/Kconfig 2023-08-04 16:55:20.877879413 +0000
--- linux.orig/drivers/devfreq/Kconfig 2023-08-16 16:27:31.000000000 +0000
+++ linux/drivers/devfreq/Kconfig 2023-08-18 14:48:04.144844425 +0000
@@ -142,6 +142,12 @@ config ARM_RK3399_DMC_DEVFREQ
It sets the frequency for the memory controller and reads the usage counts
from hardware.
@ -2422,8 +2461,8 @@ diff -rupN linux.orig/drivers/devfreq/Kconfig linux/drivers/devfreq/Kconfig
tristate "sun8i/sun50i MBUS DEVFREQ Driver"
depends on ARCH_SUNXI || COMPILE_TEST
diff -rupN linux.orig/drivers/devfreq/Makefile linux/drivers/devfreq/Makefile
--- linux.orig/drivers/devfreq/Makefile 2023-08-03 08:24:19.000000000 +0000
+++ linux/drivers/devfreq/Makefile 2023-08-04 16:55:20.877879413 +0000
--- linux.orig/drivers/devfreq/Makefile 2023-08-16 16:27:31.000000000 +0000
+++ linux/drivers/devfreq/Makefile 2023-08-18 14:48:04.144844425 +0000
@@ -13,6 +13,7 @@ obj-$(CONFIG_ARM_IMX_BUS_DEVFREQ) += imx
obj-$(CONFIG_ARM_IMX8M_DDRC_DEVFREQ) += imx8m-ddrc.o
obj-$(CONFIG_ARM_MEDIATEK_CCI_DEVFREQ) += mtk-cci-devfreq.o
@ -2434,7 +2473,7 @@ diff -rupN linux.orig/drivers/devfreq/Makefile linux/drivers/devfreq/Makefile
diff -rupN linux.orig/drivers/devfreq/rockchip_bus.c linux/drivers/devfreq/rockchip_bus.c
--- linux.orig/drivers/devfreq/rockchip_bus.c 1970-01-01 00:00:00.000000000 +0000
+++ linux/drivers/devfreq/rockchip_bus.c 2023-08-04 16:55:20.877879413 +0000
+++ linux/drivers/devfreq/rockchip_bus.c 2023-08-18 14:48:04.144844425 +0000
@@ -0,0 +1,258 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
@ -2695,8 +2734,8 @@ diff -rupN linux.orig/drivers/devfreq/rockchip_bus.c linux/drivers/devfreq/rockc
+MODULE_AUTHOR("Tony Xie <tony.xie@rock-chips.com>");
+MODULE_DESCRIPTION("rockchip busfreq driver with devfreq framework");
diff -rupN linux.orig/drivers/gpu/drm/panel/Kconfig linux/drivers/gpu/drm/panel/Kconfig
--- linux.orig/drivers/gpu/drm/panel/Kconfig 2023-08-03 08:24:19.000000000 +0000
+++ linux/drivers/gpu/drm/panel/Kconfig 2023-08-04 16:55:20.877879413 +0000
--- linux.orig/drivers/gpu/drm/panel/Kconfig 2023-08-16 16:27:31.000000000 +0000
+++ linux/drivers/gpu/drm/panel/Kconfig 2023-08-18 14:48:04.144844425 +0000
@@ -296,6 +296,15 @@ config DRM_PANEL_NEC_NL8048HL11
panel (found on the Zoom2/3/3630 SDP boards). To compile this driver
as a module, choose M here.
@ -2714,8 +2753,8 @@ diff -rupN linux.orig/drivers/gpu/drm/panel/Kconfig linux/drivers/gpu/drm/panel/
tristate "NewVision NV3052C RGB/SPI panel"
depends on OF && SPI
diff -rupN linux.orig/drivers/gpu/drm/panel/Makefile linux/drivers/gpu/drm/panel/Makefile
--- linux.orig/drivers/gpu/drm/panel/Makefile 2023-08-03 08:24:19.000000000 +0000
+++ linux/drivers/gpu/drm/panel/Makefile 2023-08-04 16:55:20.877879413 +0000
--- linux.orig/drivers/gpu/drm/panel/Makefile 2023-08-16 16:27:31.000000000 +0000
+++ linux/drivers/gpu/drm/panel/Makefile 2023-08-18 14:48:04.144844425 +0000
@@ -27,6 +27,7 @@ obj-$(CONFIG_DRM_PANEL_LEADTEK_LTK500HD1
obj-$(CONFIG_DRM_PANEL_LG_LB035Q02) += panel-lg-lb035q02.o
obj-$(CONFIG_DRM_PANEL_LG_LG4573) += panel-lg-lg4573.o
@ -2725,8 +2764,8 @@ diff -rupN linux.orig/drivers/gpu/drm/panel/Makefile linux/drivers/gpu/drm/panel
obj-$(CONFIG_DRM_PANEL_NOVATEK_NT35510) += panel-novatek-nt35510.o
obj-$(CONFIG_DRM_PANEL_NOVATEK_NT35560) += panel-novatek-nt35560.o
diff -rupN linux.orig/drivers/gpu/drm/panel/panel-elida-kd35t133.c linux/drivers/gpu/drm/panel/panel-elida-kd35t133.c
--- linux.orig/drivers/gpu/drm/panel/panel-elida-kd35t133.c 2023-08-03 08:24:19.000000000 +0000
+++ linux/drivers/gpu/drm/panel/panel-elida-kd35t133.c 2023-08-04 16:55:20.877879413 +0000
--- linux.orig/drivers/gpu/drm/panel/panel-elida-kd35t133.c 2023-08-16 16:27:31.000000000 +0000
+++ linux/drivers/gpu/drm/panel/panel-elida-kd35t133.c 2023-08-18 14:48:04.144844425 +0000
@@ -51,14 +51,6 @@ static inline struct kd35t133 *panel_to_
return container_of(panel, struct kd35t133, panel);
}
@ -2789,7 +2828,7 @@ diff -rupN linux.orig/drivers/gpu/drm/panel/panel-elida-kd35t133.c linux/drivers
dev_dbg(dev, "Panel init sequence done\n");
diff -rupN linux.orig/drivers/gpu/drm/panel/panel-newvision-nv3051d.c linux/drivers/gpu/drm/panel/panel-newvision-nv3051d.c
--- linux.orig/drivers/gpu/drm/panel/panel-newvision-nv3051d.c 1970-01-01 00:00:00.000000000 +0000
+++ linux/drivers/gpu/drm/panel/panel-newvision-nv3051d.c 2023-08-04 17:00:13.826040316 +0000
+++ linux/drivers/gpu/drm/panel/panel-newvision-nv3051d.c 2023-08-18 14:48:04.144844425 +0000
@@ -0,0 +1,518 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
@ -3310,8 +3349,8 @@ diff -rupN linux.orig/drivers/gpu/drm/panel/panel-newvision-nv3051d.c linux/driv
+MODULE_DESCRIPTION("DRM driver for Newvision NV3051D based MIPI DSI panels");
+MODULE_LICENSE("GPL");
diff -rupN linux.orig/drivers/gpu/drm/panel/panel-sitronix-st7701.c linux/drivers/gpu/drm/panel/panel-sitronix-st7701.c
--- linux.orig/drivers/gpu/drm/panel/panel-sitronix-st7701.c 2023-08-03 08:24:19.000000000 +0000
+++ linux/drivers/gpu/drm/panel/panel-sitronix-st7701.c 2023-08-04 16:55:20.877879413 +0000
--- linux.orig/drivers/gpu/drm/panel/panel-sitronix-st7701.c 2023-08-16 16:27:31.000000000 +0000
+++ linux/drivers/gpu/drm/panel/panel-sitronix-st7701.c 2023-08-18 14:48:04.144844425 +0000
@@ -19,6 +19,9 @@
/* Command2 BKx selection command */
@ -3627,8 +3666,8 @@ diff -rupN linux.orig/drivers/gpu/drm/panel/panel-sitronix-st7701.c linux/driver
{ }
};
diff -rupN linux.orig/drivers/input/Kconfig linux/drivers/input/Kconfig
--- linux.orig/drivers/input/Kconfig 2023-08-03 08:24:19.000000000 +0000
+++ linux/drivers/input/Kconfig 2023-08-04 16:55:20.877879413 +0000
--- linux.orig/drivers/input/Kconfig 2023-08-16 16:27:31.000000000 +0000
+++ linux/drivers/input/Kconfig 2023-08-18 14:48:04.144844425 +0000
@@ -51,6 +51,19 @@ config INPUT_FF_MEMLESS
To compile this driver as a module, choose M here: the
module will be called ff-memless.
@ -3650,8 +3689,8 @@ diff -rupN linux.orig/drivers/input/Kconfig linux/drivers/input/Kconfig
tristate "Sparse keymap support library"
help
diff -rupN linux.orig/drivers/input/Makefile linux/drivers/input/Makefile
--- linux.orig/drivers/input/Makefile 2023-08-03 08:24:19.000000000 +0000
+++ linux/drivers/input/Makefile 2023-08-04 16:55:20.877879413 +0000
--- linux.orig/drivers/input/Makefile 2023-08-16 16:27:31.000000000 +0000
+++ linux/drivers/input/Makefile 2023-08-18 14:48:04.144844425 +0000
@@ -10,6 +10,7 @@ input-core-y := input.o input-compat.o i
input-core-y += touchscreen.o
@ -3662,7 +3701,7 @@ diff -rupN linux.orig/drivers/input/Makefile linux/drivers/input/Makefile
obj-$(CONFIG_INPUT_VIVALDIFMAP) += vivaldi-fmap.o
diff -rupN linux.orig/drivers/input/input-polldev.c linux/drivers/input/input-polldev.c
--- linux.orig/drivers/input/input-polldev.c 1970-01-01 00:00:00.000000000 +0000
+++ linux/drivers/input/input-polldev.c 2023-08-04 16:55:20.877879413 +0000
+++ linux/drivers/input/input-polldev.c 2023-08-18 14:48:04.144844425 +0000
@@ -0,0 +1,362 @@
+// SPDX-License-Identifier: GPL-2.0-only
+/*
@ -4027,8 +4066,8 @@ diff -rupN linux.orig/drivers/input/input-polldev.c linux/drivers/input/input-po
+}
+EXPORT_SYMBOL(input_unregister_polled_device);
diff -rupN linux.orig/drivers/input/joystick/Kconfig linux/drivers/input/joystick/Kconfig
--- linux.orig/drivers/input/joystick/Kconfig 2023-08-03 08:24:19.000000000 +0000
+++ linux/drivers/input/joystick/Kconfig 2023-08-04 16:55:20.877879413 +0000
--- linux.orig/drivers/input/joystick/Kconfig 2023-08-16 16:27:31.000000000 +0000
+++ linux/drivers/input/joystick/Kconfig 2023-08-18 14:48:04.144844425 +0000
@@ -400,6 +400,21 @@ config JOYSTICK_N64
Say Y here if you want enable support for the four
built-in controller ports on the Nintendo 64 console.
@ -4052,8 +4091,8 @@ diff -rupN linux.orig/drivers/input/joystick/Kconfig linux/drivers/input/joystic
tristate "Raspberry Pi Sense HAT joystick"
depends on INPUT && I2C
diff -rupN linux.orig/drivers/input/joystick/Makefile linux/drivers/input/joystick/Makefile
--- linux.orig/drivers/input/joystick/Makefile 2023-08-03 08:24:19.000000000 +0000
+++ linux/drivers/input/joystick/Makefile 2023-08-04 16:55:20.877879413 +0000
--- linux.orig/drivers/input/joystick/Makefile 2023-08-16 16:27:31.000000000 +0000
+++ linux/drivers/input/joystick/Makefile 2023-08-18 14:48:04.144844425 +0000
@@ -25,6 +25,9 @@ obj-$(CONFIG_JOYSTICK_JOYDUMP) += joydu
obj-$(CONFIG_JOYSTICK_MAGELLAN) += magellan.o
obj-$(CONFIG_JOYSTICK_MAPLE) += maplecontrol.o
@ -4066,7 +4105,7 @@ diff -rupN linux.orig/drivers/input/joystick/Makefile linux/drivers/input/joysti
obj-$(CONFIG_JOYSTICK_QWIIC) += qwiic-joystick.o
diff -rupN linux.orig/drivers/input/joystick/odroidgo2-joypad.c linux/drivers/input/joystick/odroidgo2-joypad.c
--- linux.orig/drivers/input/joystick/odroidgo2-joypad.c 1970-01-01 00:00:00.000000000 +0000
+++ linux/drivers/input/joystick/odroidgo2-joypad.c 2023-08-04 16:55:20.877879413 +0000
+++ linux/drivers/input/joystick/odroidgo2-joypad.c 2023-08-18 14:48:04.144844425 +0000
@@ -0,0 +1,878 @@
+/*
+ * SARADC joystick & GPIO Button driver for Linux(Hardkernel ODROIDGO2-Advance)
@ -4948,7 +4987,7 @@ diff -rupN linux.orig/drivers/input/joystick/odroidgo2-joypad.c linux/drivers/in
+/*----------------------------------------------------------------------------*/
diff -rupN linux.orig/drivers/input/joystick/odroidgo2-v11-joypad.c linux/drivers/input/joystick/odroidgo2-v11-joypad.c
--- linux.orig/drivers/input/joystick/odroidgo2-v11-joypad.c 1970-01-01 00:00:00.000000000 +0000
+++ linux/drivers/input/joystick/odroidgo2-v11-joypad.c 2023-08-04 16:55:20.877879413 +0000
+++ linux/drivers/input/joystick/odroidgo2-v11-joypad.c 2023-08-18 14:48:04.144844425 +0000
@@ -0,0 +1,878 @@
+/*
+ * SARADC joystick & GPIO Button driver for Linux(Hardkernel ODROIDGO2-Advance)
@ -5830,7 +5869,7 @@ diff -rupN linux.orig/drivers/input/joystick/odroidgo2-v11-joypad.c linux/driver
+/*----------------------------------------------------------------------------*/
diff -rupN linux.orig/drivers/input/joystick/odroidgo3-joypad.c linux/drivers/input/joystick/odroidgo3-joypad.c
--- linux.orig/drivers/input/joystick/odroidgo3-joypad.c 1970-01-01 00:00:00.000000000 +0000
+++ linux/drivers/input/joystick/odroidgo3-joypad.c 2023-08-04 16:55:20.877879413 +0000
+++ linux/drivers/input/joystick/odroidgo3-joypad.c 2023-08-18 14:48:04.144844425 +0000
@@ -0,0 +1,1086 @@
+/*
+ * SARADC joystick & GPIO Button driver for Linux(Hardkernel ODROIDGO2-Advance)
@ -6919,8 +6958,8 @@ diff -rupN linux.orig/drivers/input/joystick/odroidgo3-joypad.c linux/drivers/in
+
+/*----------------------------------------------------------------------------*/
diff -rupN linux.orig/drivers/power/supply/rk817_charger.c linux/drivers/power/supply/rk817_charger.c
--- linux.orig/drivers/power/supply/rk817_charger.c 2023-08-03 08:24:19.000000000 +0000
+++ linux/drivers/power/supply/rk817_charger.c 2023-08-04 16:55:20.877879413 +0000
--- linux.orig/drivers/power/supply/rk817_charger.c 2023-08-16 16:27:31.000000000 +0000
+++ linux/drivers/power/supply/rk817_charger.c 2023-08-18 14:48:04.144844425 +0000
@@ -679,7 +679,7 @@ static enum power_supply_usb_type rk817_
};
@ -6932,7 +6971,7 @@ diff -rupN linux.orig/drivers/power/supply/rk817_charger.c linux/drivers/power/s
.num_properties = ARRAY_SIZE(rk817_bat_props),
diff -rupN linux.orig/include/linux/input-polldev.h linux/include/linux/input-polldev.h
--- linux.orig/include/linux/input-polldev.h 1970-01-01 00:00:00.000000000 +0000
+++ linux/include/linux/input-polldev.h 2023-08-04 16:55:20.877879413 +0000
+++ linux/include/linux/input-polldev.h 2023-08-18 14:48:04.144844425 +0000
@@ -0,0 +1,58 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
+#ifndef _INPUT_POLLDEV_H