From 90c1b8820a55f9bd843438bc4c591c8b0bb4dc26 Mon Sep 17 00:00:00 2001 From: mason Date: Thu, 27 Jul 2023 01:51:09 +0000 Subject: [PATCH] Disable v4l2 on RK3399, small kernel cleanups --- packages/multimedia/ffmpeg/package.mk | 2 +- .../devices/RK3399/linux/linux.aarch64.conf | 5 +- .../patches/RK3399/000-rk3399-devices.patch | 147 ++++++++---------- 3 files changed, 68 insertions(+), 86 deletions(-) mode change 100755 => 100644 projects/Rockchip/packages/linux/patches/RK3399/000-rk3399-devices.patch diff --git a/packages/multimedia/ffmpeg/package.mk b/packages/multimedia/ffmpeg/package.mk index 4c17050bc..3ee28768d 100644 --- a/packages/multimedia/ffmpeg/package.mk +++ b/packages/multimedia/ffmpeg/package.mk @@ -45,7 +45,7 @@ get_graphicdrivers PKG_FFMPEG_HWACCEL="--enable-hwaccels" case ${DEVICE} in - RK3588) + RK3588|RK3399) V4L2_SUPPORT=no ;; esac diff --git a/projects/Rockchip/devices/RK3399/linux/linux.aarch64.conf b/projects/Rockchip/devices/RK3399/linux/linux.aarch64.conf index 04f8b7b77..7360751eb 100644 --- a/projects/Rockchip/devices/RK3399/linux/linux.aarch64.conf +++ b/projects/Rockchip/devices/RK3399/linux/linux.aarch64.conf @@ -3830,8 +3830,6 @@ CONFIG_VIDEO_V4L2_SUBDEV_API=y # CONFIG_VIDEO_ADV_DEBUG is not set # CONFIG_VIDEO_FIXED_MINOR_RANGES is not set CONFIG_VIDEO_TUNER=m -CONFIG_V4L2_H264=m -CONFIG_V4L2_VP9=m CONFIG_V4L2_MEM2MEM_DEV=y CONFIG_V4L2_FWNODE=y CONFIG_V4L2_ASYNC=y @@ -4115,8 +4113,7 @@ CONFIG_VIDEO_ROCKCHIP_ISP1=y # # Verisilicon media platform drivers # -CONFIG_VIDEO_HANTRO=m -CONFIG_VIDEO_HANTRO_ROCKCHIP=y +# CONFIG_VIDEO_HANTRO is not configured # # VIA media platform drivers diff --git a/projects/Rockchip/packages/linux/patches/RK3399/000-rk3399-devices.patch b/projects/Rockchip/packages/linux/patches/RK3399/000-rk3399-devices.patch old mode 100755 new mode 100644 index 321cc1195..eeb6cc406 --- a/projects/Rockchip/packages/linux/patches/RK3399/000-rk3399-devices.patch +++ b/projects/Rockchip/packages/linux/patches/RK3399/000-rk3399-devices.patch @@ -1,7 +1,7 @@ diff -rupN linux.orig/Makefile linux/Makefile ---- linux.orig/Makefile 2023-06-23 03:53:37.552116029 +0000 -+++ linux/Makefile 2023-07-22 17:35:56.978930533 +0000 -@@ -826,6 +826,8 @@ KBUILD_CFLAGS += $(call cc-disable-warni +--- linux.orig/Makefile 2023-07-24 16:56:41.000000000 +0000 ++++ linux/Makefile 2023-07-26 14:27:49.537460386 +0000 +@@ -814,6 +814,8 @@ KBUILD_CFLAGS += $(call cc-disable-warni KBUILD_CFLAGS += $(call cc-disable-warning, format-truncation) KBUILD_CFLAGS += $(call cc-disable-warning, format-overflow) KBUILD_CFLAGS += $(call cc-disable-warning, address-of-packed-member) @@ -10,7 +10,7 @@ diff -rupN linux.orig/Makefile linux/Makefile ifdef CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE KBUILD_CFLAGS += -O2 -@@ -1075,7 +1077,7 @@ endif +@@ -1069,7 +1071,7 @@ endif KBUILD_CFLAGS += -Werror=date-time # enforce correct pointer usage @@ -20,9 +20,9 @@ diff -rupN linux.orig/Makefile linux/Makefile # Require designated initializers for all marked structures KBUILD_CFLAGS += $(call cc-option,-Werror=designated-init) 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-06-23 03:53:36.244094795 +0000 -+++ linux/arch/arm64/boot/dts/rockchip/Makefile 2023-07-22 17:35:53.854832289 +0000 -@@ -46,6 +46,7 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-or +--- linux.orig/arch/arm64/boot/dts/rockchip/Makefile 2023-07-24 16:56:41.000000000 +0000 ++++ linux/arch/arm64/boot/dts/rockchip/Makefile 2023-07-26 14:27:49.537460386 +0000 +@@ -53,6 +53,7 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-or dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-pinebook-pro.dtb dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-pinephone-pro.dtb dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-puma-haikou.dtb @@ -32,8 +32,8 @@ diff -rupN linux.orig/arch/arm64/boot/dts/rockchip/Makefile linux/arch/arm64/boo dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-roc-pc-plus.dtb diff -rupN linux.orig/arch/arm64/boot/dts/rockchip/rk3399-rg552-linux.dts linux/arch/arm64/boot/dts/rockchip/rk3399-rg552-linux.dts --- linux.orig/arch/arm64/boot/dts/rockchip/rk3399-rg552-linux.dts 1970-01-01 00:00:00.000000000 +0000 -+++ linux/arch/arm64/boot/dts/rockchip/rk3399-rg552-linux.dts 2023-07-22 22:08:08.804900015 +0000 -@@ -0,0 +1,1353 @@ ++++ linux/arch/arm64/boot/dts/rockchip/rk3399-rg552-linux.dts 2023-07-26 14:27:49.537460386 +0000 +@@ -0,0 +1,1334 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +/* + * Copyright (c) 2017 Fuzhou Rockchip Electronics Co., Ltd. @@ -278,13 +278,11 @@ diff -rupN linux.orig/arch/arm64/boot/dts/rockchip/rk3399-rg552-linux.dts linux/ + gpios = <&gpio1 RK_PC4 GPIO_ACTIVE_HIGH>; + label = "battery_green"; + default-state= "on"; -+ // retain-state-suspended; + }; + + led@2 { + gpios = <&gpio3 RK_PD5 GPIO_ACTIVE_HIGH>; + label = "battery_red"; -+ // retain-state-suspended; + }; + + }; @@ -346,7 +344,6 @@ diff -rupN linux.orig/arch/arm64/boot/dts/rockchip/rk3399-rg552-linux.dts linux/ + status = "okay"; + compatible = "pwm-backlight"; + pwms = <&pwm0 0 25000 0>; -+ //power-supply = <&vcc12v_dcin>; + brightness-levels = < + 0 1 2 3 4 5 6 7 + 8 9 10 11 12 13 14 15 @@ -414,7 +411,6 @@ diff -rupN linux.orig/arch/arm64/boot/dts/rockchip/rk3399-rg552-linux.dts linux/ + #clock-cells = <0>; + }; + -+ /* TODO: shouldn't be here */ + vcc12v_dcin: vcc12v-dcin { + compatible = "regulator-fixed"; + regulator-name = "vcc12v_dcin"; @@ -661,7 +657,8 @@ diff -rupN linux.orig/arch/arm64/boot/dts/rockchip/rk3399-rg552-linux.dts linux/ + pinctrl-names = "default"; + pinctrl-0 = <&sdio0_clk &sdio0_cmd &sdio0_cd &sdio0_bus4>; + sd-uhs-sdr104; -+ vqmmc-supply = <&vcc3v0_touch>; ++// vqmmc-supply = <&vcc3v0_touch>; ++ vqmmc-supply = <&vcc_sdio>; + status = "okay"; +}; + @@ -851,13 +848,10 @@ diff -rupN linux.orig/arch/arm64/boot/dts/rockchip/rk3399-rg552-linux.dts linux/ + + vcc1v8_dvp: LDO_REG1 { + regulator-name = "vcc1v8_dvp"; -+ //regulator-always-on; -+ //regulator-boot-on; + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <1800000>; + regulator-state-mem { -+ regulator-on-in-suspend; -+ regulator-suspend-microvolt = <1800000>; ++ regulator-off-in-suspend; + }; + }; + @@ -892,7 +886,7 @@ diff -rupN linux.orig/arch/arm64/boot/dts/rockchip/rk3399-rg552-linux.dts linux/ + regulator-max-microvolt = <3300000>; + regulator-state-mem { + regulator-on-in-suspend; -+ regulator-suspend-microvolt = <3000000>; ++ regulator-suspend-microvolt = <3300000>; + }; + }; + @@ -1023,8 +1017,8 @@ diff -rupN linux.orig/arch/arm64/boot/dts/rockchip/rk3399-rg552-linux.dts linux/ + +&i2c1 { + clock-frequency = <100000>; -+ i2c-scl-rising-time-ns = <300>; -+ i2c-scl-falling-time-ns = <15>; ++ i2c-scl-rising-time-ns = <168>; ++ i2c-scl-falling-time-ns = <4>; + status = "okay"; + + es8316: es8316@11 { @@ -1058,6 +1052,8 @@ diff -rupN linux.orig/arch/arm64/boot/dts/rockchip/rk3399-rg552-linux.dts linux/ + touchscreen-inverted-y; + interrupt-parent = <&gpio3>; + interrupts = ; ++ AVDD28-supply = <&vcc3v0_touch>; ++ VDDIO-supply = <&vcc3v0_touch>; + }; + + fusb0: typec-portc@22 { @@ -1101,7 +1097,6 @@ diff -rupN linux.orig/arch/arm64/boot/dts/rockchip/rk3399-rg552-linux.dts linux/ + remote-endpoint = <&tcphy0_typec_ss>; + }; + }; -+ // displayport maybe? + }; + }; + }; @@ -1356,20 +1351,6 @@ diff -rupN linux.orig/arch/arm64/boot/dts/rockchip/rk3399-rg552-linux.dts linux/ +&usbdrd_dwc3_1 { + status = "okay"; + dr_mode = "host"; -+ #address-cells = <1>; -+ #size-cells = <0>; -+ -+ wifi_card: device@1 { -+ compatible = "usbbda,f179"; -+ reg = <1>; -+ #size-cells = <0>; -+ #address-cells = <2>; -+ -+ interface@0 { -+ compatible = "usbifbda,f179.config1.0"; -+ reg = <0 1>; -+ }; -+ }; +}; + +&vopb { @@ -1389,7 +1370,7 @@ diff -rupN linux.orig/arch/arm64/boot/dts/rockchip/rk3399-rg552-linux.dts linux/ +}; diff -rupN linux.orig/arch/arm64/boot/dts/rockchip/rk3399-rg552-opp.dtsi linux/arch/arm64/boot/dts/rockchip/rk3399-rg552-opp.dtsi --- linux.orig/arch/arm64/boot/dts/rockchip/rk3399-rg552-opp.dtsi 1970-01-01 00:00:00.000000000 +0000 -+++ linux/arch/arm64/boot/dts/rockchip/rk3399-rg552-opp.dtsi 2023-07-22 17:35:53.870832792 +0000 ++++ linux/arch/arm64/boot/dts/rockchip/rk3399-rg552-opp.dtsi 2023-07-26 14:27:49.537460386 +0000 @@ -0,0 +1,141 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +/* @@ -1532,9 +1513,21 @@ diff -rupN linux.orig/arch/arm64/boot/dts/rockchip/rk3399-rg552-opp.dtsi linux/a +&gpu { + operating-points-v2 = <&gpu_opp_table>; +}; +diff -rupN linux.orig/arch/arm64/boot/dts/rockchip/rk3399.dtsi linux/arch/arm64/boot/dts/rockchip/rk3399.dtsi +--- linux.orig/arch/arm64/boot/dts/rockchip/rk3399.dtsi 2023-07-24 16:56:41.000000000 +0000 ++++ linux/arch/arm64/boot/dts/rockchip/rk3399.dtsi 2023-07-26 14:27:49.537460386 +0000 +@@ -1489,7 +1489,7 @@ + <1000000000>, + <150000000>, <75000000>, + <37500000>, +- <100000000>, <100000000>, ++ <300000000>, <100000000>, + <50000000>, <600000000>, + <100000000>, <50000000>, + <400000000>, <400000000>, diff -rupN linux.orig/drivers/gpio/gpio-rockchip.c linux/drivers/gpio/gpio-rockchip.c ---- linux.orig/drivers/gpio/gpio-rockchip.c 2023-07-16 19:38:02.962868756 +0000 -+++ linux/drivers/gpio/gpio-rockchip.c 2023-07-22 17:35:57.766955315 +0000 +--- linux.orig/drivers/gpio/gpio-rockchip.c 2023-07-24 16:56:41.000000000 +0000 ++++ linux/drivers/gpio/gpio-rockchip.c 2023-07-26 14:27:49.537460386 +0000 @@ -335,13 +335,13 @@ static void rockchip_irq_demux(struct ir unsigned long pending; unsigned int irq; @@ -1552,28 +1545,28 @@ diff -rupN linux.orig/drivers/gpio/gpio-rockchip.c linux/drivers/gpio/gpio-rockc /* * Triggering IRQ on both rising and falling edge diff -rupN linux.orig/drivers/gpu/drm/panel/Kconfig linux/drivers/gpu/drm/panel/Kconfig ---- linux.orig/drivers/gpu/drm/panel/Kconfig 2023-06-23 03:53:39.968155272 +0000 -+++ linux/drivers/gpu/drm/panel/Kconfig 2023-07-22 17:35:58.626982361 +0000 -@@ -588,6 +588,15 @@ config DRM_PANEL_SHARP_LS043T1LE01 +--- linux.orig/drivers/gpu/drm/panel/Kconfig 2023-07-24 16:56:41.000000000 +0000 ++++ linux/drivers/gpu/drm/panel/Kconfig 2023-07-26 14:27:49.537460386 +0000 +@@ -657,6 +657,15 @@ config DRM_PANEL_SHARP_LS043T1LE01 Say Y here if you want to enable support for Sharp LS043T1LE01 qHD (540x960) DSI panel as found on the Qualcomm APQ8074 Dragonboard +config DRM_PANEL_SHARP_LS054B3SX01 -+ bool "Sharp LS054B3SX01 1152x1080 video mode panel" ++ bool "Sharp LS054B3SX01 1152x1920 video mode panel" + depends on OF + depends on DRM_MIPI_DSI + depends on BACKLIGHT_CLASS_DEVICE + help + say Y here if you want to enable support for Sharp LS054B3SX01 -+ 1152x1080 panel as found in Anbernic RG552. ++ 1152x1920 panel as found in Anbernic RG552. + config DRM_PANEL_SHARP_LS060T1SX01 tristate "Sharp LS060T1SX01 FullHD video mode panel" depends on OF diff -rupN linux.orig/drivers/gpu/drm/panel/Makefile linux/drivers/gpu/drm/panel/Makefile ---- linux.orig/drivers/gpu/drm/panel/Makefile 2023-06-23 03:53:39.968155272 +0000 -+++ linux/drivers/gpu/drm/panel/Makefile 2023-07-22 17:35:58.626982361 +0000 -@@ -59,6 +59,7 @@ obj-$(CONFIG_DRM_PANEL_SEIKO_43WVF1G) += +--- linux.orig/drivers/gpu/drm/panel/Makefile 2023-07-24 16:56:41.000000000 +0000 ++++ linux/drivers/gpu/drm/panel/Makefile 2023-07-26 14:27:49.537460386 +0000 +@@ -66,6 +66,7 @@ obj-$(CONFIG_DRM_PANEL_SEIKO_43WVF1G) += obj-$(CONFIG_DRM_PANEL_SHARP_LQ101R1SX01) += panel-sharp-lq101r1sx01.o obj-$(CONFIG_DRM_PANEL_SHARP_LS037V7DW01) += panel-sharp-ls037v7dw01.o obj-$(CONFIG_DRM_PANEL_SHARP_LS043T1LE01) += panel-sharp-ls043t1le01.o @@ -1583,8 +1576,8 @@ diff -rupN linux.orig/drivers/gpu/drm/panel/Makefile linux/drivers/gpu/drm/panel obj-$(CONFIG_DRM_PANEL_SITRONIX_ST7703) += panel-sitronix-st7703.o diff -rupN linux.orig/drivers/gpu/drm/panel/panel-sharp-ls054b3sx01.c linux/drivers/gpu/drm/panel/panel-sharp-ls054b3sx01.c --- linux.orig/drivers/gpu/drm/panel/panel-sharp-ls054b3sx01.c 1970-01-01 00:00:00.000000000 +0000 -+++ linux/drivers/gpu/drm/panel/panel-sharp-ls054b3sx01.c 2023-07-22 17:35:58.626982361 +0000 -@@ -0,0 +1,368 @@ ++++ linux/drivers/gpu/drm/panel/panel-sharp-ls054b3sx01.c 2023-07-26 14:27:49.537460386 +0000 +@@ -0,0 +1,360 @@ +// SPDX-License-Identifier: GPL-2.0-only +/* + * Copyright (c) 2022 Maya Matuszczyk @@ -1694,11 +1687,7 @@ diff -rupN linux.orig/drivers/gpu/drm/panel/panel-sharp-ls054b3sx01.c linux/driv + 0x0F, 0x01, 0x02, 0x05, 0x00, 0x00, 0x00, 0x3A); + dsi_dcs_write_seq(dsi, SHARP_LS054_SETMIPI, + 0x03, 0x82, 0xA0, 0xE5); -+ //dsi_dcs_write_seq(dsi, SHARP_LS054_SETPTBA, -+ // 0xCF, 0x00, 0x46, 0x00, 0x00, 0x00, 0x02, 0x54, -+ // 0x04, 0x61, 0x1C, 0x8C); + -+ + ret = mipi_dsi_dcs_exit_sleep_mode(dsi); + if (ret < 0) + { @@ -1735,7 +1724,7 @@ diff -rupN linux.orig/drivers/gpu/drm/panel/panel-sharp-ls054b3sx01.c linux/driv + return 0; + + gpiod_set_value_cansleep(ctx->reset_gpio, 0); -+ ++ + ret = regulator_enable(ctx->iovcc_supply); + if (ret < 0) + return ret; @@ -1752,7 +1741,6 @@ diff -rupN linux.orig/drivers/gpu/drm/panel/panel-sharp-ls054b3sx01.c linux/driv + if (ret < 0) + goto err_on; + -+ // TODO: move resetting into its own function + gpiod_set_value_cansleep(ctx->reset_gpio, 1); + + msleep(200); @@ -1762,12 +1750,11 @@ diff -rupN linux.orig/drivers/gpu/drm/panel/panel-sharp-ls054b3sx01.c linux/driv + dev_err(dev, "Failed to initialize panel: %d\n", ret); + goto err_on; + } -+ ++ + ctx->prepared = true; + + return 0; + -+ // TODO: make sure those labels are ok +err_on: + regulator_disable(ctx->vsn_supply); + @@ -1781,7 +1768,6 @@ diff -rupN linux.orig/drivers/gpu/drm/panel/panel-sharp-ls054b3sx01.c linux/driv + return ret; +} + -+// FIXME +static int sharp_ls054_unprepare(struct drm_panel *panel) +{ + struct sharp_ls054 *ctx = to_sharp_ls054(panel); @@ -1819,7 +1805,6 @@ diff -rupN linux.orig/drivers/gpu/drm/panel/panel-sharp-ls054b3sx01.c linux/driv + return 0; +} + -+// FIXME: should we strive for perfect 60hz? +static const struct drm_display_mode sharp_ls054_mode = { + .clock = ((1152 + 64 + 4 + 32) * (1920 + 56 + 3 + 6) * 60) / 1000, + .hdisplay = 1152, @@ -1830,8 +1815,8 @@ diff -rupN linux.orig/drivers/gpu/drm/panel/panel-sharp-ls054b3sx01.c linux/driv + .vsync_start = 1920 + 56, + .vsync_end = 1920 + 56 + 3, + .vtotal = 1920 + 56 + 3 + 6, -+ .width_mm = 70, -+ .height_mm = 117, ++ .width_mm = 75, ++ .height_mm = 132, + .flags = DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC, +}; + @@ -1846,10 +1831,11 @@ diff -rupN linux.orig/drivers/gpu/drm/panel/panel-sharp-ls054b3sx01.c linux/driv + return -ENOMEM; + + drm_mode_set_name(mode); -+ + mode->type = DRM_MODE_TYPE_DRIVER | DRM_MODE_TYPE_PREFERRED; ++ + connector->display_info.width_mm = mode->width_mm; + connector->display_info.height_mm = mode->height_mm; ++ + drm_mode_probed_add(connector, mode); + drm_connector_set_panel_orientation(connector, ctx->orientation); + @@ -1874,7 +1860,7 @@ diff -rupN linux.orig/drivers/gpu/drm/panel/panel-sharp-ls054b3sx01.c linux/driv + + ctx->iovcc_supply = devm_regulator_get(dev, "iovcc"); + if (IS_ERR(ctx->iovcc_supply)) -+ return PTR_ERR(ctx->iovcc_supply); // TODO: replace with dev_err_probe ++ return PTR_ERR(ctx->iovcc_supply); + + ctx->vsp_supply = devm_regulator_get(dev, "vsp"); + if (IS_ERR(ctx->vsp_supply)) @@ -1901,7 +1887,6 @@ diff -rupN linux.orig/drivers/gpu/drm/panel/panel-sharp-ls054b3sx01.c linux/driv + dsi->mode_flags = MIPI_DSI_MODE_VIDEO | MIPI_DSI_MODE_VIDEO_BURST | + MIPI_DSI_MODE_LPM | MIPI_DSI_MODE_NO_EOT_PACKET | + MIPI_DSI_CLOCK_NON_CONTINUOUS | MIPI_DSI_MODE_VIDEO_HSE | MIPI_DSI_MODE_VIDEO_AUTO_VERT; -+ // are all those flags really needed? + + drm_panel_init(&ctx->panel, dev, &sharp_ls054_panel_funcs, + DRM_MODE_CONNECTOR_DSI); @@ -1951,11 +1936,11 @@ diff -rupN linux.orig/drivers/gpu/drm/panel/panel-sharp-ls054b3sx01.c linux/driv +module_mipi_dsi_driver(sharp_ls054_driver); + +MODULE_AUTHOR("Maya Matuszczyk "); -+MODULE_DESCRIPTION("Panel driver for Sharp LS054B3SX01 1152x1080 Video Mode DSI Panel"); ++MODULE_DESCRIPTION("Panel driver for Sharp LS054B3SX01 1152x1920 Video Mode DSI Panel"); +MODULE_LICENSE("GPL v2"); diff -rupN linux.orig/drivers/input/Kconfig linux/drivers/input/Kconfig ---- linux.orig/drivers/input/Kconfig 2023-06-23 03:53:40.600165543 +0000 -+++ linux/drivers/input/Kconfig 2023-07-22 17:35:58.778987141 +0000 +--- linux.orig/drivers/input/Kconfig 2023-07-24 16:56:41.000000000 +0000 ++++ linux/drivers/input/Kconfig 2023-07-26 14:27:49.537460386 +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. @@ -1977,8 +1962,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-06-23 03:53:40.600165543 +0000 -+++ linux/drivers/input/Makefile 2023-07-22 17:35:58.810988147 +0000 +--- linux.orig/drivers/input/Makefile 2023-07-24 16:56:41.000000000 +0000 ++++ linux/drivers/input/Makefile 2023-07-26 14:27:49.537460386 +0000 @@ -10,6 +10,7 @@ input-core-y := input.o input-compat.o i input-core-y += touchscreen.o @@ -1989,7 +1974,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-07-22 17:35:58.810988147 +0000 ++++ linux/drivers/input/input-polldev.c 2023-07-26 14:27:49.537460386 +0000 @@ -0,0 +1,362 @@ +// SPDX-License-Identifier: GPL-2.0-only +/* @@ -2354,8 +2339,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-06-23 03:53:40.604165608 +0000 -+++ linux/drivers/input/joystick/Kconfig 2023-07-22 17:35:58.782987267 +0000 +--- linux.orig/drivers/input/joystick/Kconfig 2023-07-24 16:56:41.000000000 +0000 ++++ linux/drivers/input/joystick/Kconfig 2023-07-26 14:27:49.537460386 +0000 @@ -393,6 +393,12 @@ config JOYSTICK_FSIA6B To compile this driver as a module, choose M here: the module will be called fsia6b. @@ -2370,8 +2355,8 @@ diff -rupN linux.orig/drivers/input/joystick/Kconfig linux/drivers/input/joystic bool "N64 controller" depends on MACH_NINTENDO64 diff -rupN linux.orig/drivers/input/joystick/Makefile linux/drivers/input/joystick/Makefile ---- linux.orig/drivers/input/joystick/Makefile 2023-06-23 03:53:40.604165608 +0000 -+++ linux/drivers/input/joystick/Makefile 2023-07-22 17:35:58.782987267 +0000 +--- linux.orig/drivers/input/joystick/Makefile 2023-07-24 16:56:41.000000000 +0000 ++++ linux/drivers/input/joystick/Makefile 2023-07-26 14:27:49.537460386 +0000 @@ -30,6 +30,7 @@ obj-$(CONFIG_JOYSTICK_PXRC) += pxrc.o obj-$(CONFIG_JOYSTICK_QWIIC) += qwiic-joystick.o obj-$(CONFIG_JOYSTICK_SENSEHAT) += sensehat-joystick.o @@ -2382,7 +2367,7 @@ diff -rupN linux.orig/drivers/input/joystick/Makefile linux/drivers/input/joysti obj-$(CONFIG_JOYSTICK_STINGER) += stinger.o diff -rupN linux.orig/drivers/input/joystick/singleadcjoy.c linux/drivers/input/joystick/singleadcjoy.c --- linux.orig/drivers/input/joystick/singleadcjoy.c 1970-01-01 00:00:00.000000000 +0000 -+++ linux/drivers/input/joystick/singleadcjoy.c 2023-07-22 17:35:58.782987267 +0000 ++++ linux/drivers/input/joystick/singleadcjoy.c 2023-07-26 14:27:49.537460386 +0000 @@ -0,0 +1,1416 @@ +/*----------------------------------------------------------------------------*/ + @@ -3801,9 +3786,9 @@ diff -rupN linux.orig/drivers/input/joystick/singleadcjoy.c linux/drivers/input/ +late_initcall(joypad_init); +module_exit(joypad_exit); diff -rupN linux.orig/drivers/input/touchscreen/goodix.c linux/drivers/input/touchscreen/goodix.c ---- linux.orig/drivers/input/touchscreen/goodix.c 2023-06-23 03:53:40.656166453 +0000 -+++ linux/drivers/input/touchscreen/goodix.c 2023-07-22 17:35:58.806988021 +0000 -@@ -1010,7 +1010,7 @@ retry_get_irq_gpio: +--- linux.orig/drivers/input/touchscreen/goodix.c 2023-07-24 16:56:41.000000000 +0000 ++++ linux/drivers/input/touchscreen/goodix.c 2023-07-26 14:27:49.537460386 +0000 +@@ -1018,7 +1018,7 @@ retry_get_irq_gpio: default: if (ts->gpiod_int && ts->gpiod_rst) { ts->reset_controller_at_probe = true; @@ -3813,8 +3798,8 @@ diff -rupN linux.orig/drivers/input/touchscreen/goodix.c linux/drivers/input/tou } } diff -rupN linux.orig/drivers/power/supply/cw2015_battery.c linux/drivers/power/supply/cw2015_battery.c ---- linux.orig/drivers/power/supply/cw2015_battery.c 2023-06-23 03:53:42.860202281 +0000 -+++ linux/drivers/power/supply/cw2015_battery.c 2023-07-22 17:35:59.927023244 +0000 +--- linux.orig/drivers/power/supply/cw2015_battery.c 2023-07-24 16:56:41.000000000 +0000 ++++ linux/drivers/power/supply/cw2015_battery.c 2023-07-26 14:27:49.537460386 +0000 @@ -553,7 +553,7 @@ static enum power_supply_property cw_bat }; @@ -3826,7 +3811,7 @@ diff -rupN linux.orig/drivers/power/supply/cw2015_battery.c linux/drivers/power/ .num_properties = ARRAY_SIZE(cw_battery_properties), 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-07-22 17:35:57.254939213 +0000 ++++ linux/include/linux/input-polldev.h 2023-07-26 14:27:49.537460386 +0000 @@ -0,0 +1,58 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +#ifndef _INPUT_POLLDEV_H