Update S922X u-boot, enable OGU HP detect gpio, increase Max 3 deadzone
This commit is contained in:
parent
5791ec7802
commit
c294f8280e
3 changed files with 62 additions and 49 deletions
|
@ -69,7 +69,7 @@
|
|||
WINDOWMANAGER="weston11"
|
||||
|
||||
# kernel serial console
|
||||
EXTRA_CMDLINE="rootwait quiet console=ttyAML0,115200 console=tty0 no_console_suspend net.ifnames=0 consoleblank=0 fbcon=rotate:3"
|
||||
EXTRA_CMDLINE="rootwait quiet console=ttyAML0,115200 console=tty0 no_console_suspend net.ifnames=0 consoleblank=0"
|
||||
|
||||
# additional packages to install
|
||||
# ADDITIONAL_PACKAGES=""
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
diff -rupN linux.orig/arch/arm64/boot/dts/amlogic/Makefile linux/arch/arm64/boot/dts/amlogic/Makefile
|
||||
--- linux.orig/arch/arm64/boot/dts/amlogic/Makefile 2023-08-11 10:08:27.000000000 +0000
|
||||
+++ linux/arch/arm64/boot/dts/amlogic/Makefile 2023-08-22 22:58:55.698672090 +0000
|
||||
--- linux.orig/arch/arm64/boot/dts/amlogic/Makefile 2023-09-12 12:02:56.937601871 +0000
|
||||
+++ linux/arch/arm64/boot/dts/amlogic/Makefile 2023-09-12 12:03:27.490291628 +0000
|
||||
@@ -12,8 +12,10 @@ dtb-$(CONFIG_ARCH_MESON) += meson-g12b-a
|
||||
dtb-$(CONFIG_ARCH_MESON) += meson-g12b-gsking-x.dtb
|
||||
dtb-$(CONFIG_ARCH_MESON) += meson-g12b-gtking-pro.dtb
|
||||
|
@ -13,8 +13,8 @@ diff -rupN linux.orig/arch/arm64/boot/dts/amlogic/Makefile linux/arch/arm64/boot
|
|||
dtb-$(CONFIG_ARCH_MESON) += meson-g12b-ugoos-am6.dtb
|
||||
dtb-$(CONFIG_ARCH_MESON) += meson-gxbb-kii-pro.dtb
|
||||
diff -rupN linux.orig/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi linux/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi
|
||||
--- linux.orig/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi 2023-08-11 10:08:27.000000000 +0000
|
||||
+++ linux/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi 2023-08-22 22:58:55.698672090 +0000
|
||||
--- linux.orig/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi 2023-09-12 12:02:56.937601871 +0000
|
||||
+++ linux/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi 2023-09-12 12:03:27.490291628 +0000
|
||||
@@ -61,18 +61,6 @@
|
||||
gpu_opp_table: opp-table-gpu {
|
||||
compatible = "operating-points-v2";
|
||||
|
@ -77,8 +77,8 @@ diff -rupN linux.orig/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi linux/ar
|
|||
operating-points-v2 = <&gpu_opp_table>;
|
||||
#cooling-cells = <2>;
|
||||
diff -rupN linux.orig/arch/arm64/boot/dts/amlogic/meson-g12b-a311d.dtsi linux/arch/arm64/boot/dts/amlogic/meson-g12b-a311d.dtsi
|
||||
--- linux.orig/arch/arm64/boot/dts/amlogic/meson-g12b-a311d.dtsi 2023-08-11 10:08:27.000000000 +0000
|
||||
+++ linux/arch/arm64/boot/dts/amlogic/meson-g12b-a311d.dtsi 2023-08-22 22:58:55.698672090 +0000
|
||||
--- linux.orig/arch/arm64/boot/dts/amlogic/meson-g12b-a311d.dtsi 2023-09-12 12:02:56.937601871 +0000
|
||||
+++ linux/arch/arm64/boot/dts/amlogic/meson-g12b-a311d.dtsi 2023-09-12 12:03:27.490291628 +0000
|
||||
@@ -11,6 +11,11 @@
|
||||
compatible = "operating-points-v2";
|
||||
opp-shared;
|
||||
|
@ -105,8 +105,8 @@ diff -rupN linux.orig/arch/arm64/boot/dts/amlogic/meson-g12b-a311d.dtsi linux/ar
|
|||
opp-microvolt = <731000>;
|
||||
diff -rupN linux.orig/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-go-ultra.dts linux/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-go-ultra.dts
|
||||
--- linux.orig/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-go-ultra.dts 1970-01-01 00:00:00.000000000 +0000
|
||||
+++ linux/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-go-ultra.dts 2023-08-22 23:01:52.052250995 +0000
|
||||
@@ -0,0 +1,1008 @@
|
||||
+++ linux/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-go-ultra.dts 2023-09-12 13:20:28.956694441 +0000
|
||||
@@ -0,0 +1,1021 @@
|
||||
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
|
||||
+/*
|
||||
+ * Copyright (c) 2022 Neil Armstrong <narmstrong@kernel.org>
|
||||
|
@ -188,8 +188,21 @@ diff -rupN linux.orig/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-go-ultra.dts
|
|||
+ };
|
||||
+ };
|
||||
+
|
||||
+ joypad: gou_joypad {
|
||||
+ compatible = "odroidgou-joypad";
|
||||
+ hp_detect_switch: hp-detect-switch {
|
||||
+ compatible = "gpio-keys-polled";
|
||||
+ poll-interval = <5>;
|
||||
+ autorepeat;
|
||||
+
|
||||
+ hp-detect-pin {
|
||||
+ label = "HEADPHONE";
|
||||
+ linux,input-type = <EV_SW>;
|
||||
+ linux,code = <SW_HEADPHONE_INSERT>;
|
||||
+ gpios = <&gpio_ao GPIOAO_9 GPIO_ACTIVE_HIGH>;
|
||||
+ };
|
||||
+ };
|
||||
+
|
||||
+ joypad: gou_joypad {
|
||||
+ compatible = "odroidgou-joypad";
|
||||
+ poll-interval = <10>;
|
||||
+ pinctrl-0 = <&keypad_gpio_pins>;
|
||||
+ pinctrl-names = "default";
|
||||
|
@ -1117,7 +1130,7 @@ diff -rupN linux.orig/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-go-ultra.dts
|
|||
+};
|
||||
diff -rupN linux.orig/arch/arm64/boot/dts/amlogic/meson-g12b-powkiddy-rgb10-max-3.dts linux/arch/arm64/boot/dts/amlogic/meson-g12b-powkiddy-rgb10-max-3.dts
|
||||
--- linux.orig/arch/arm64/boot/dts/amlogic/meson-g12b-powkiddy-rgb10-max-3.dts 1970-01-01 00:00:00.000000000 +0000
|
||||
+++ linux/arch/arm64/boot/dts/amlogic/meson-g12b-powkiddy-rgb10-max-3.dts 2023-08-22 23:00:58.898569055 +0000
|
||||
+++ linux/arch/arm64/boot/dts/amlogic/meson-g12b-powkiddy-rgb10-max-3.dts 2023-09-12 12:04:13.567330573 +0000
|
||||
@@ -0,0 +1,995 @@
|
||||
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
|
||||
+/*
|
||||
|
@ -1218,7 +1231,7 @@ diff -rupN linux.orig/arch/arm64/boot/dts/amlogic/meson-g12b-powkiddy-rgb10-max-
|
|||
+ io-channels = <&saradc 0>, <&saradc 1>, <&saradc 2>, <&saradc 3>;
|
||||
+ io-channel-names = "key-RY", "key-RX", "key-LY", "key-LX";
|
||||
+ button-adc-scale = <4>;
|
||||
+ button-adc-deadzone = <350>;
|
||||
+ button-adc-deadzone = <400>;
|
||||
+ button-adc-fuzz = <64>;
|
||||
+ button-adc-flat = <32>;
|
||||
+ abs_x-p-tuning = <350>;
|
||||
|
@ -2115,8 +2128,8 @@ diff -rupN linux.orig/arch/arm64/boot/dts/amlogic/meson-g12b-powkiddy-rgb10-max-
|
|||
+ phy-supply = <&usb_host>;
|
||||
+};
|
||||
diff -rupN linux.orig/arch/arm64/boot/dts/amlogic/meson-g12b-s922x.dtsi linux/arch/arm64/boot/dts/amlogic/meson-g12b-s922x.dtsi
|
||||
--- linux.orig/arch/arm64/boot/dts/amlogic/meson-g12b-s922x.dtsi 2023-08-11 10:08:27.000000000 +0000
|
||||
+++ linux/arch/arm64/boot/dts/amlogic/meson-g12b-s922x.dtsi 2023-08-22 22:58:55.698672090 +0000
|
||||
--- linux.orig/arch/arm64/boot/dts/amlogic/meson-g12b-s922x.dtsi 2023-09-12 12:02:56.937601871 +0000
|
||||
+++ linux/arch/arm64/boot/dts/amlogic/meson-g12b-s922x.dtsi 2023-09-12 12:03:27.490291628 +0000
|
||||
@@ -11,6 +11,11 @@
|
||||
compatible = "operating-points-v2";
|
||||
opp-shared;
|
||||
|
@ -2142,8 +2155,8 @@ diff -rupN linux.orig/arch/arm64/boot/dts/amlogic/meson-g12b-s922x.dtsi linux/ar
|
|||
opp-hz = /bits/ 64 <1000000000>;
|
||||
opp-microvolt = <771000>;
|
||||
diff -rupN linux.orig/arch/arm64/boot/dts/amlogic/meson-g12b.dtsi linux/arch/arm64/boot/dts/amlogic/meson-g12b.dtsi
|
||||
--- linux.orig/arch/arm64/boot/dts/amlogic/meson-g12b.dtsi 2023-08-11 10:08:27.000000000 +0000
|
||||
+++ linux/arch/arm64/boot/dts/amlogic/meson-g12b.dtsi 2023-08-22 22:58:55.698672090 +0000
|
||||
--- linux.orig/arch/arm64/boot/dts/amlogic/meson-g12b.dtsi 2023-09-12 12:02:56.937601871 +0000
|
||||
+++ linux/arch/arm64/boot/dts/amlogic/meson-g12b.dtsi 2023-09-12 12:03:27.490291628 +0000
|
||||
@@ -105,6 +105,8 @@
|
||||
|
||||
l2: l2-cache0 {
|
||||
|
@ -2162,8 +2175,8 @@ diff -rupN linux.orig/arch/arm64/boot/dts/amlogic/meson-g12b.dtsi linux/arch/arm
|
|||
+ power_policy = "always_on";
|
||||
};
|
||||
diff -rupN linux.orig/drivers/gpu/drm/drm_panel_orientation_quirks.c linux/drivers/gpu/drm/drm_panel_orientation_quirks.c
|
||||
--- linux.orig/drivers/gpu/drm/drm_panel_orientation_quirks.c 2023-08-11 10:08:27.000000000 +0000
|
||||
+++ linux/drivers/gpu/drm/drm_panel_orientation_quirks.c 2023-08-22 22:58:55.698672090 +0000
|
||||
--- linux.orig/drivers/gpu/drm/drm_panel_orientation_quirks.c 2023-09-12 12:02:57.953624819 +0000
|
||||
+++ linux/drivers/gpu/drm/drm_panel_orientation_quirks.c 2023-09-12 12:03:27.490291628 +0000
|
||||
@@ -461,7 +461,7 @@ EXPORT_SYMBOL(drm_get_panel_orientation_
|
||||
/* There are no quirks for non x86 devices yet */
|
||||
int drm_get_panel_orientation_quirk(int width, int height)
|
||||
|
@ -2174,8 +2187,8 @@ diff -rupN linux.orig/drivers/gpu/drm/drm_panel_orientation_quirks.c linux/drive
|
|||
EXPORT_SYMBOL(drm_get_panel_orientation_quirk);
|
||||
|
||||
diff -rupN linux.orig/drivers/input/Kconfig linux/drivers/input/Kconfig
|
||||
--- linux.orig/drivers/input/Kconfig 2023-08-11 10:08:27.000000000 +0000
|
||||
+++ linux/drivers/input/Kconfig 2023-08-22 22:58:55.698672090 +0000
|
||||
--- linux.orig/drivers/input/Kconfig 2023-09-12 12:02:58.173629790 +0000
|
||||
+++ linux/drivers/input/Kconfig 2023-09-12 12:03:27.490291628 +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.
|
||||
|
@ -2197,8 +2210,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-11 10:08:27.000000000 +0000
|
||||
+++ linux/drivers/input/Makefile 2023-08-22 22:58:55.698672090 +0000
|
||||
--- linux.orig/drivers/input/Makefile 2023-09-12 12:02:58.173629790 +0000
|
||||
+++ linux/drivers/input/Makefile 2023-09-12 12:03:27.490291628 +0000
|
||||
@@ -10,6 +10,7 @@ input-core-y := input.o input-compat.o i
|
||||
input-core-y += touchscreen.o
|
||||
|
||||
|
@ -2209,7 +2222,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-22 22:58:55.698672090 +0000
|
||||
+++ linux/drivers/input/input-polldev.c 2023-09-12 12:03:27.490291628 +0000
|
||||
@@ -0,0 +1,362 @@
|
||||
+// SPDX-License-Identifier: GPL-2.0-only
|
||||
+/*
|
||||
|
@ -2574,8 +2587,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-11 10:08:27.000000000 +0000
|
||||
+++ linux/drivers/input/joystick/Kconfig 2023-08-22 22:58:55.698672090 +0000
|
||||
--- linux.orig/drivers/input/joystick/Kconfig 2023-09-12 12:02:58.173629790 +0000
|
||||
+++ linux/drivers/input/joystick/Kconfig 2023-09-12 12:03:27.490291628 +0000
|
||||
@@ -344,6 +344,12 @@ config JOYSTICK_MAPLE
|
||||
To compile this as a module choose M here: the module will be called
|
||||
maplecontrol.
|
||||
|
@ -2590,8 +2603,8 @@ diff -rupN linux.orig/drivers/input/joystick/Kconfig linux/drivers/input/joystic
|
|||
tristate "PlayStation 1/2 joypads via SPI interface"
|
||||
depends on SPI
|
||||
diff -rupN linux.orig/drivers/input/joystick/Makefile linux/drivers/input/joystick/Makefile
|
||||
--- linux.orig/drivers/input/joystick/Makefile 2023-08-11 10:08:27.000000000 +0000
|
||||
+++ linux/drivers/input/joystick/Makefile 2023-08-22 22:58:55.698672090 +0000
|
||||
--- linux.orig/drivers/input/joystick/Makefile 2023-09-12 12:02:58.173629790 +0000
|
||||
+++ linux/drivers/input/joystick/Makefile 2023-09-12 12:03:27.490291628 +0000
|
||||
@@ -25,6 +25,7 @@ obj-$(CONFIG_JOYSTICK_JOYDUMP) += joydu
|
||||
obj-$(CONFIG_JOYSTICK_MAGELLAN) += magellan.o
|
||||
obj-$(CONFIG_JOYSTICK_MAPLE) += maplecontrol.o
|
||||
|
@ -2602,7 +2615,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/amlogic-saradc.h linux/drivers/input/joystick/amlogic-saradc.h
|
||||
--- linux.orig/drivers/input/joystick/amlogic-saradc.h 1970-01-01 00:00:00.000000000 +0000
|
||||
+++ linux/drivers/input/joystick/amlogic-saradc.h 2023-08-22 22:58:55.698672090 +0000
|
||||
+++ linux/drivers/input/joystick/amlogic-saradc.h 2023-09-12 12:03:27.490291628 +0000
|
||||
@@ -0,0 +1,32 @@
|
||||
+/*
|
||||
+ * include/dt-bindings/iio/adc/amlogic-saradc.h
|
||||
|
@ -2638,7 +2651,7 @@ diff -rupN linux.orig/drivers/input/joystick/amlogic-saradc.h linux/drivers/inpu
|
|||
+#endif
|
||||
diff -rupN linux.orig/drivers/input/joystick/odroid-gou-joypad.c linux/drivers/input/joystick/odroid-gou-joypad.c
|
||||
--- linux.orig/drivers/input/joystick/odroid-gou-joypad.c 1970-01-01 00:00:00.000000000 +0000
|
||||
+++ linux/drivers/input/joystick/odroid-gou-joypad.c 2023-08-22 22:58:55.698672090 +0000
|
||||
+++ linux/drivers/input/joystick/odroid-gou-joypad.c 2023-09-12 12:03:27.490291628 +0000
|
||||
@@ -0,0 +1,926 @@
|
||||
+/*----------------------------------------------------------------------------*/
|
||||
+#include <linux/kernel.h>
|
||||
|
@ -3567,8 +3580,8 @@ diff -rupN linux.orig/drivers/input/joystick/odroid-gou-joypad.c linux/drivers/i
|
|||
+
|
||||
+/*----------------------------------------------------------------------------*/
|
||||
diff -rupN linux.orig/drivers/mfd/rk808.c linux/drivers/mfd/rk808.c
|
||||
--- linux.orig/drivers/mfd/rk808.c 2023-08-11 10:08:27.000000000 +0000
|
||||
+++ linux/drivers/mfd/rk808.c 2023-08-22 22:58:55.698672090 +0000
|
||||
--- linux.orig/drivers/mfd/rk808.c 2023-09-12 12:02:58.341633584 +0000
|
||||
+++ linux/drivers/mfd/rk808.c 2023-09-12 12:03:27.490291628 +0000
|
||||
@@ -81,12 +81,47 @@ static bool rk817_is_volatile_reg(struct
|
||||
return false;
|
||||
}
|
||||
|
@ -3706,8 +3719,8 @@ diff -rupN linux.orig/drivers/mfd/rk808.c linux/drivers/mfd/rk808.c
|
|||
|
||||
static const struct regmap_irq rk805_irqs[] = {
|
||||
diff -rupN linux.orig/drivers/power/reset/Kconfig linux/drivers/power/reset/Kconfig
|
||||
--- linux.orig/drivers/power/reset/Kconfig 2023-08-11 10:08:27.000000000 +0000
|
||||
+++ linux/drivers/power/reset/Kconfig 2023-08-22 22:58:55.698672090 +0000
|
||||
--- linux.orig/drivers/power/reset/Kconfig 2023-09-12 12:02:58.741642619 +0000
|
||||
+++ linux/drivers/power/reset/Kconfig 2023-09-12 12:03:27.490291628 +0000
|
||||
@@ -141,6 +141,13 @@ config POWER_RESET_OCELOT_RESET
|
||||
help
|
||||
This driver supports restart for Microsemi Ocelot SoC and similar.
|
||||
|
@ -3723,8 +3736,8 @@ diff -rupN linux.orig/drivers/power/reset/Kconfig linux/drivers/power/reset/Kcon
|
|||
bool "OXNAS SoC restart driver"
|
||||
depends on ARCH_OXNAS
|
||||
diff -rupN linux.orig/drivers/power/reset/Makefile linux/drivers/power/reset/Makefile
|
||||
--- linux.orig/drivers/power/reset/Makefile 2023-08-11 10:08:27.000000000 +0000
|
||||
+++ linux/drivers/power/reset/Makefile 2023-08-22 22:58:55.698672090 +0000
|
||||
--- linux.orig/drivers/power/reset/Makefile 2023-09-12 12:02:58.741642619 +0000
|
||||
+++ linux/drivers/power/reset/Makefile 2023-09-12 12:03:27.490291628 +0000
|
||||
@@ -17,6 +17,7 @@ obj-$(CONFIG_POWER_RESET_MT6323) += mt63
|
||||
obj-$(CONFIG_POWER_RESET_OXNAS) += oxnas-restart.o
|
||||
obj-$(CONFIG_POWER_RESET_QCOM_PON) += qcom-pon.o
|
||||
|
@ -3735,7 +3748,7 @@ diff -rupN linux.orig/drivers/power/reset/Makefile linux/drivers/power/reset/Mak
|
|||
obj-$(CONFIG_POWER_RESET_QNAP) += qnap-poweroff.o
|
||||
diff -rupN linux.orig/drivers/power/reset/odroid-go-ultra-poweroff.c linux/drivers/power/reset/odroid-go-ultra-poweroff.c
|
||||
--- linux.orig/drivers/power/reset/odroid-go-ultra-poweroff.c 1970-01-01 00:00:00.000000000 +0000
|
||||
+++ linux/drivers/power/reset/odroid-go-ultra-poweroff.c 2023-08-22 22:58:55.698672090 +0000
|
||||
+++ linux/drivers/power/reset/odroid-go-ultra-poweroff.c 2023-09-12 12:03:27.490291628 +0000
|
||||
@@ -0,0 +1,177 @@
|
||||
+// SPDX-License-Identifier: GPL-2.0+
|
||||
+/*
|
||||
|
@ -3915,8 +3928,8 @@ diff -rupN linux.orig/drivers/power/reset/odroid-go-ultra-poweroff.c linux/drive
|
|||
+MODULE_DESCRIPTION("Odroid Go Ultra poweroff driver");
|
||||
+MODULE_LICENSE("GPL");
|
||||
diff -rupN linux.orig/drivers/power/supply/Kconfig linux/drivers/power/supply/Kconfig
|
||||
--- linux.orig/drivers/power/supply/Kconfig 2023-08-11 10:08:27.000000000 +0000
|
||||
+++ linux/drivers/power/supply/Kconfig 2023-08-22 22:58:55.698672090 +0000
|
||||
--- linux.orig/drivers/power/supply/Kconfig 2023-09-12 12:02:58.745642709 +0000
|
||||
+++ linux/drivers/power/supply/Kconfig 2023-09-12 12:03:27.490291628 +0000
|
||||
@@ -918,4 +918,12 @@ config BATTERY_UG3105
|
||||
device is off or suspended, the functionality of this driver is
|
||||
limited to reporting capacity only.
|
||||
|
@ -3931,8 +3944,8 @@ diff -rupN linux.orig/drivers/power/supply/Kconfig linux/drivers/power/supply/Kc
|
|||
+
|
||||
endif # POWER_SUPPLY
|
||||
diff -rupN linux.orig/drivers/power/supply/Makefile linux/drivers/power/supply/Makefile
|
||||
--- linux.orig/drivers/power/supply/Makefile 2023-08-11 10:08:27.000000000 +0000
|
||||
+++ linux/drivers/power/supply/Makefile 2023-08-22 22:58:55.698672090 +0000
|
||||
--- linux.orig/drivers/power/supply/Makefile 2023-09-12 12:02:58.745642709 +0000
|
||||
+++ linux/drivers/power/supply/Makefile 2023-09-12 12:03:27.490291628 +0000
|
||||
@@ -110,3 +110,4 @@ obj-$(CONFIG_BATTERY_ACER_A500) += acer_
|
||||
obj-$(CONFIG_BATTERY_SURFACE) += surface_battery.o
|
||||
obj-$(CONFIG_CHARGER_SURFACE) += surface_charger.o
|
||||
|
@ -3940,7 +3953,7 @@ diff -rupN linux.orig/drivers/power/supply/Makefile linux/drivers/power/supply/M
|
|||
+obj-$(CONFIG_CHARGER_RK818) += rk818_charger.o rk818_battery.o
|
||||
diff -rupN linux.orig/drivers/power/supply/rk818_battery.c linux/drivers/power/supply/rk818_battery.c
|
||||
--- linux.orig/drivers/power/supply/rk818_battery.c 1970-01-01 00:00:00.000000000 +0000
|
||||
+++ linux/drivers/power/supply/rk818_battery.c 2023-08-22 22:58:55.698672090 +0000
|
||||
+++ linux/drivers/power/supply/rk818_battery.c 2023-09-12 12:03:27.490291628 +0000
|
||||
@@ -0,0 +1,3498 @@
|
||||
+/*
|
||||
+ * rk818 battery driver
|
||||
|
@ -7442,7 +7455,7 @@ diff -rupN linux.orig/drivers/power/supply/rk818_battery.c linux/drivers/power/s
|
|||
+MODULE_AUTHOR("chenjh<chenjh@rock-chips.com>");
|
||||
diff -rupN linux.orig/drivers/power/supply/rk818_battery.h linux/drivers/power/supply/rk818_battery.h
|
||||
--- linux.orig/drivers/power/supply/rk818_battery.h 1970-01-01 00:00:00.000000000 +0000
|
||||
+++ linux/drivers/power/supply/rk818_battery.h 2023-08-22 22:58:55.698672090 +0000
|
||||
+++ linux/drivers/power/supply/rk818_battery.h 2023-09-12 12:03:27.490291628 +0000
|
||||
@@ -0,0 +1,168 @@
|
||||
+/*
|
||||
+ * rk818_battery.h: fuel gauge driver structures
|
||||
|
@ -7614,7 +7627,7 @@ diff -rupN linux.orig/drivers/power/supply/rk818_battery.h linux/drivers/power/s
|
|||
+#endif
|
||||
diff -rupN linux.orig/drivers/power/supply/rk818_charger.c linux/drivers/power/supply/rk818_charger.c
|
||||
--- linux.orig/drivers/power/supply/rk818_charger.c 1970-01-01 00:00:00.000000000 +0000
|
||||
+++ linux/drivers/power/supply/rk818_charger.c 2023-08-22 22:58:55.698672090 +0000
|
||||
+++ linux/drivers/power/supply/rk818_charger.c 2023-09-12 12:03:27.490291628 +0000
|
||||
@@ -0,0 +1,726 @@
|
||||
+// SPDX-License-Identifier: GPL-2.0-only
|
||||
+/*
|
||||
|
@ -8344,7 +8357,7 @@ diff -rupN linux.orig/drivers/power/supply/rk818_charger.c linux/drivers/power/s
|
|||
+MODULE_AUTHOR("Ondřej Jirman <megi@xff.cz>");
|
||||
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-22 22:58:55.698672090 +0000
|
||||
+++ linux/include/linux/input-polldev.h 2023-09-12 12:03:27.490291628 +0000
|
||||
@@ -0,0 +1,58 @@
|
||||
+/* SPDX-License-Identifier: GPL-2.0-only */
|
||||
+#ifndef _INPUT_POLLDEV_H
|
||||
|
@ -8405,8 +8418,8 @@ diff -rupN linux.orig/include/linux/input-polldev.h linux/include/linux/input-po
|
|||
+
|
||||
+#endif
|
||||
diff -rupN linux.orig/include/linux/mfd/rk808.h linux/include/linux/mfd/rk808.h
|
||||
--- linux.orig/include/linux/mfd/rk808.h 2023-08-11 10:08:27.000000000 +0000
|
||||
+++ linux/include/linux/mfd/rk808.h 2023-08-22 22:58:55.698672090 +0000
|
||||
--- linux.orig/include/linux/mfd/rk808.h 2023-09-12 12:02:59.205653098 +0000
|
||||
+++ linux/include/linux/mfd/rk808.h 2023-09-12 12:03:27.490291628 +0000
|
||||
@@ -138,6 +138,8 @@ enum rk818_reg {
|
||||
RK818_ID_OTG_SWITCH,
|
||||
};
|
||||
|
@ -8518,8 +8531,8 @@ diff -rupN linux.orig/include/linux/mfd/rk808.h linux/include/linux/mfd/rk808.h
|
|||
#define TEMP115C 0x0c
|
||||
#define TEMP_HOTDIE_MSK 0x0c
|
||||
diff -rupN linux.orig/sound/soc/meson/axg-card.c linux/sound/soc/meson/axg-card.c
|
||||
--- linux.orig/sound/soc/meson/axg-card.c 2023-08-11 10:08:27.000000000 +0000
|
||||
+++ linux/sound/soc/meson/axg-card.c 2023-08-22 22:58:55.698672090 +0000
|
||||
--- linux.orig/sound/soc/meson/axg-card.c 2023-09-12 12:02:59.597661952 +0000
|
||||
+++ linux/sound/soc/meson/axg-card.c 2023-09-12 12:03:27.490291628 +0000
|
||||
@@ -59,6 +59,13 @@ static int axg_card_tdm_dai_init(struct
|
||||
(struct axg_dai_link_tdm_data *)priv->link_data[rtd->num];
|
||||
struct snd_soc_dai *codec_dai;
|
||||
|
|
Binary file not shown.
Loading…
Reference in a new issue