From 9eaaaae0441affa23202825ca59ba0b3fbe299f1 Mon Sep 17 00:00:00 2001 From: amazingfate Date: Sun, 1 Dec 2024 12:00:40 +0800 Subject: [PATCH] sm8250: bump current and edge to 6.12 --- config/sources/families/sm8250.conf | 6 +- ...m8250-move-lpass-codec-macros-to-use.patch | 96 -------- ...si-add-set-column-page-multi-helpers.patch | 43 ---- .../0001-drm-Add-drm-notifier-support.patch | 0 ...el-turn-on-off-signal-to-touchscreen.patch | 0 ...Input-Add-nt36523-touchscreen-driver.patch | 2 +- ...m8250-xiaomi-elish-enable-wifi-and-b.patch | 10 +- ...m8250-xiaomi-elish-enable-touchscree.patch | 4 +- ...006-ASoC-qcom-sm8250-Add-tdm-support.patch | 6 +- ...m8250-xiaomi-elish-Add-sound-support.patch | 4 +- ...0008-Asoc-wm_adsp-Add-prefix-support.patch | 0 ...m8250-oneplus-instantnoodlep-Add-dev.patch | 2 +- ...ge-sync-mode-to-sync-on-DSI0-rather-.patch | 0 ...dpu1-improve-support-for-active-CTLs.patch | 0 ...e-one-active-CTL-if-it-is-available.patch} | 20 +- ...late-has_active_ctls-in-the-catalog.patch} | 0 ..._encoder_phys_-proper-support-for-ac.patch | 0 ...-BIT-DPU_CTL_SPLIT_DISPLAY-from-acti.patch | 4 +- ...m8250-xiaomi-elish-add-keyboard-supp.patch | 4 +- ...m8250-xiaomi-elish-remove-framebuffe.patch | 0 ...-use-devm_mipi_dsi_-function-to-reg.patch} | 0 ...019-input-nt36xxx-Enable-pen-support.patch | 118 ++++++++++ ...020-nt36xxx-add-pen-input-resolution.patch | 58 +++++ ...m8250-oneplus-instantnoodlep-Restore.patch | 217 ++++++++++++++++++ ...pmi-spmi-pmic-arb.c-remove-warnings.patch} | 0 ...adsp-Use-xiaomi-elish-firmware-name.patch} | 0 ...rt-the-firmware-download-delay-from.patch} | 2 +- ...d-mipi_dsi_generic_write_multi_type.patch} | 4 +- ...panel-add-driver-for-samsung-amb655x.patch | 6 +- ...creen-add-Synaptics-TCM-oncell-S3908.patch | 15 +- ...-arm64-dts-qcom-add-OnePlus-8T-kebab.patch | 2 +- ...om-Add-venus-firmware-for-OnePlus-8T.patch | 0 ...t-choke-on-disabling-the-writeback-.patch} | 9 +- ...8250-add-uart16-Signed-off-by-Teguh.patch} | 16 +- ...er-for-Qualcomm-SMB5-Signed-off-by-.patch} | 34 ++- ...power-supply-Driver-for-Qualcomm-FG.patch} | 15 +- ...8150b-Add-a-charger-Signed-off-by-T.patch} | 12 +- ...8150b-Add-a-FG-Signed-off-by-Teguh-.patch} | 10 +- ...C-CH13726A-panel-Signed-off-by-Tegu.patch} | 25 +- ...or-HEROIC-HTR3212-Signed-off-by-Teg.patch} | 19 +- ...-Input-driver-for-AYN-Odin2-Gamepad.patch} | 15 +- ...ut-add-Qualcomm-SPMI-haptics-driver.patch} | 18 +- ...qcom-pm8150b-introduce-spmi-haptics.patch} | 10 +- ...d-SM8250-Retroid-Pocket-variant-Sig.patch} | 29 ++- .../0042-tools-disable-sched_ext_clean.patch | 25 ++ 45 files changed, 558 insertions(+), 302 deletions(-) delete mode 100644 patch/kernel/archive/sm8250-6.11/0019-arm64-dts-qcom-sm8250-move-lpass-codec-macros-to-use.patch delete mode 100644 patch/kernel/archive/sm8250-6.11/0025-drm-mipi-dsi-add-set-column-page-multi-helpers.patch rename patch/kernel/archive/{sm8250-6.11 => sm8250-6.12}/0001-drm-Add-drm-notifier-support.patch (100%) rename patch/kernel/archive/{sm8250-6.11 => sm8250-6.12}/0002-drm-dsi-emit-panel-turn-on-off-signal-to-touchscreen.patch (100%) rename patch/kernel/archive/{sm8250-6.11 => sm8250-6.12}/0003-Input-Add-nt36523-touchscreen-driver.patch (99%) rename patch/kernel/archive/{sm8250-6.11 => sm8250-6.12}/0004-arm64-dts-qcom-sm8250-xiaomi-elish-enable-wifi-and-b.patch (94%) rename patch/kernel/archive/{sm8250-6.11 => sm8250-6.12}/0005-arm64-dts-qcom-sm8250-xiaomi-elish-enable-touchscree.patch (97%) rename patch/kernel/archive/{sm8250-6.11 => sm8250-6.12}/0006-ASoC-qcom-sm8250-Add-tdm-support.patch (96%) rename patch/kernel/archive/{sm8250-6.11 => sm8250-6.12}/0007-arm64-dts-qcom-sm8250-xiaomi-elish-Add-sound-support.patch (98%) rename patch/kernel/archive/{sm8250-6.11 => sm8250-6.12}/0008-Asoc-wm_adsp-Add-prefix-support.patch (100%) rename patch/kernel/archive/{sm8250-6.11 => sm8250-6.12}/0009-arm64-dts-qcom-sm8250-oneplus-instantnoodlep-Add-dev.patch (99%) rename patch/kernel/archive/{sm8250-6.11 => sm8250-6.12}/0010-drm-msm-dsi-change-sync-mode-to-sync-on-DSI0-rather-.patch (100%) rename patch/kernel/archive/{sm8250-6.11 => sm8250-6.12}/0011-drm-msm-dpu1-improve-support-for-active-CTLs.patch (100%) rename patch/kernel/archive/{sm8250-6.11/0012-drm-msm-dpu1-use-one-active-CTL-if-it-is-available.patch.disabled => sm8250-6.12/0012-drm-msm-dpu1-use-one-active-CTL-if-it-is-available.patch} (87%) rename patch/kernel/archive/{sm8250-6.11/0013-drm-msm-dpu-populate-has_active_ctls-in-the-catalog.patch.disabled => sm8250-6.12/0013-drm-msm-dpu-populate-has_active_ctls-in-the-catalog.patch} (100%) rename patch/kernel/archive/{sm8250-6.11 => sm8250-6.12}/0014-drm-msm-dpu1-dpu_encoder_phys_-proper-support-for-ac.patch (100%) rename patch/kernel/archive/{sm8250-6.11 => sm8250-6.12}/0015-drm-msm-dpu-Drop-BIT-DPU_CTL_SPLIT_DISPLAY-from-acti.patch (98%) rename patch/kernel/archive/{sm8250-6.11 => sm8250-6.12}/0016-arm64-dts-qcom-sm8250-xiaomi-elish-add-keyboard-supp.patch (95%) rename patch/kernel/archive/{sm8250-6.11 => sm8250-6.12}/0017-arm64-dts-qcom-sm8250-xiaomi-elish-remove-framebuffe.patch (100%) rename patch/kernel/archive/{sm8250-6.11/0020-drm-panel-nt36523-use-devm_mipi_dsi_-function-to-reg.patch => sm8250-6.12/0018-drm-panel-nt36523-use-devm_mipi_dsi_-function-to-reg.patch} (100%) create mode 100644 patch/kernel/archive/sm8250-6.12/0019-input-nt36xxx-Enable-pen-support.patch create mode 100644 patch/kernel/archive/sm8250-6.12/0020-nt36xxx-add-pen-input-resolution.patch create mode 100644 patch/kernel/archive/sm8250-6.12/0021-arm64-dts-qcom-sm8250-oneplus-instantnoodlep-Restore.patch rename patch/kernel/archive/{sm8250-6.11/0021-drivers-spmi-spmi-pmic-arb.c-remove-warnings.patch => sm8250-6.12/0022-drivers-spmi-spmi-pmic-arb.c-remove-warnings.patch} (100%) rename patch/kernel/archive/{sm8250-6.11/0022-Asoc-wm_adsp-Use-xiaomi-elish-firmware-name.patch => sm8250-6.12/0023-Asoc-wm_adsp-Use-xiaomi-elish-firmware-name.patch} (100%) rename patch/kernel/archive/{sm8250-6.11/0023-input-nt36523-short-the-firmware-download-delay-from.patch => sm8250-6.12/0024-input-nt36523-short-the-firmware-download-delay-from.patch} (93%) rename patch/kernel/archive/{sm8250-6.11/0024-drm-mipi-add-mipi_dsi_generic_write_multi_type.patch => sm8250-6.12/0025-drm-mipi-add-mipi_dsi_generic_write_multi_type.patch} (95%) rename patch/kernel/archive/{sm8250-6.11 => sm8250-6.12}/0026-drm-panel-add-driver-for-samsung-amb655x.patch (98%) rename patch/kernel/archive/{sm8250-6.11 => sm8250-6.12}/0027-Input-touchscreen-add-Synaptics-TCM-oncell-S3908.patch (98%) rename patch/kernel/archive/{sm8250-6.11 => sm8250-6.12}/0028-arm64-dts-qcom-add-OnePlus-8T-kebab.patch (99%) rename patch/kernel/archive/{sm8250-6.11 => sm8250-6.12}/0029-arm64-dts-qcom-Add-venus-firmware-for-OnePlus-8T.patch (100%) rename patch/kernel/archive/{sm8250-6.11/0030_drm-msm-dpu1--don't-choke-on-disabling-the-writeba.patch => sm8250-6.12/0030-drm-msm-dpu1-don-t-choke-on-disabling-the-writeback-.patch} (88%) rename patch/kernel/archive/{sm8250-6.11/0031_arm64--dts--qcom--sm8250--add-uart16-Signed-off-by.patch => sm8250-6.12/0031-arm64-dts-qcom-sm8250-add-uart16-Signed-off-by-Teguh.patch} (77%) rename patch/kernel/archive/{sm8250-6.11/0032_power--supply--Driver-for-Qualcomm-SMB5-Signed-off.patch => sm8250-6.12/0032-power-supply-Driver-for-Qualcomm-SMB5-Signed-off-by-.patch} (97%) rename patch/kernel/archive/{sm8250-6.11/0033_power--supply--Driver-for-Qualcomm-FG.patch => sm8250-6.12/0033-power-supply-Driver-for-Qualcomm-FG.patch} (99%) rename patch/kernel/archive/{sm8250-6.11/0034_arm64--dts--qcom--pm8150b--Add-a-charger-Signed-of.patch => sm8250-6.12/0034-arm64-dts-qcom-pm8150b-Add-a-charger-Signed-off-by-T.patch} (82%) rename patch/kernel/archive/{sm8250-6.11/0035_arm64--dts--qcom--pm8150b--Add-a-FG-Signed-off-by-.patch => sm8250-6.12/0035-arm64-dts-qcom-pm8150b-Add-a-FG-Signed-off-by-Teguh-.patch} (77%) rename patch/kernel/archive/{sm8250-6.11/0036_drm--panel--Add-DDIC-CH13726A-panel-Signed-off-by-.patch => sm8250-6.12/0036-drm-panel-Add-DDIC-CH13726A-panel-Signed-off-by-Tegu.patch} (94%) rename patch/kernel/archive/{sm8250-6.11/0037_leds--Add-driver-for-HEROIC-HTR3212-Signed-off-by-.patch => sm8250-6.12/0037-leds-Add-driver-for-HEROIC-HTR3212-Signed-off-by-Teg.patch} (94%) rename patch/kernel/archive/{sm8250-6.11/0038_Input--driver-for-AYN-Odin2-Gamepad.patch => sm8250-6.12/0038-Input-driver-for-AYN-Odin2-Gamepad.patch} (96%) rename patch/kernel/archive/{sm8250-6.11/0039_input--add-Qualcomm-SPMI-haptics-driver.patch => sm8250-6.12/0039-input-add-Qualcomm-SPMI-haptics-driver.patch} (98%) rename patch/kernel/archive/{sm8250-6.11/0040_arm64--dts--qcom--pm8150b--introduce-spmi-haptics.patch => sm8250-6.12/0040-arm64-dts-qcom-pm8150b-introduce-spmi-haptics.patch} (82%) rename patch/kernel/archive/{sm8250-6.11/0041_arm64--dts--qcom--add-SM8250-Retroid-Pocket-varian.patch => sm8250-6.12/0041-arm64-dts-qcom-add-SM8250-Retroid-Pocket-variant-Sig.patch} (97%) create mode 100644 patch/kernel/archive/sm8250-6.12/0042-tools-disable-sched_ext_clean.patch diff --git a/config/sources/families/sm8250.conf b/config/sources/families/sm8250.conf index a0e4874bf1fe..da72ed0c511b 100644 --- a/config/sources/families/sm8250.conf +++ b/config/sources/families/sm8250.conf @@ -16,13 +16,13 @@ enable_extension "image-output-abl" case $BRANCH in current) - declare -g KERNEL_MAJOR_MINOR="6.11" # Major and minor versions of this kernel. - declare -g KERNELBRANCH='branch:linux-6.11.y' + declare -g KERNEL_MAJOR_MINOR="6.12" # Major and minor versions of this kernel. + declare -g KERNELBRANCH='branch:linux-6.12.y' declare -g -i KERNEL_GIT_CACHE_TTL=120 # 2 minutes; this is a high-traffic repo ;; edge) - declare -g KERNEL_MAJOR_MINOR="6.10" # Major and minor versions of this kernel. + declare -g KERNEL_MAJOR_MINOR="6.12" # Major and minor versions of this kernel. ;; esac diff --git a/patch/kernel/archive/sm8250-6.11/0019-arm64-dts-qcom-sm8250-move-lpass-codec-macros-to-use.patch b/patch/kernel/archive/sm8250-6.11/0019-arm64-dts-qcom-sm8250-move-lpass-codec-macros-to-use.patch deleted file mode 100644 index c55a83e1fba9..000000000000 --- a/patch/kernel/archive/sm8250-6.11/0019-arm64-dts-qcom-sm8250-move-lpass-codec-macros-to-use.patch +++ /dev/null @@ -1,96 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Srinivas Kandagatla -Date: Thu, 15 Aug 2024 18:05:42 +0100 -Subject: arm64: dts: qcom: sm8250: move lpass codec macros to use clks - directly - -Move lpass codecs va and wsa macros to use the clks directly from -AFE clock controller instead of going via gfm mux like other codec macros -and SoCs. - -This makes it more align with the other SoCs and codec macros in this SoC -which take AFE clocks directly. This will also avoid an extra clk mux layer, -provides consistency and avoids the buggy mux driver which will be removed. - -This should also fix RB5 audio. - -Remove the gfm mux drivers for both audiocc and aoncc. - -Signed-off-by: Srinivas Kandagatla ---- - arch/arm64/boot/dts/qcom/sm8250.dtsi | 31 ++-------- - 1 file changed, 4 insertions(+), 27 deletions(-) - -diff --git a/arch/arm64/boot/dts/qcom/sm8250.dtsi b/arch/arm64/boot/dts/qcom/sm8250.dtsi -index 111111111111..222222222222 100644 ---- a/arch/arm64/boot/dts/qcom/sm8250.dtsi -+++ b/arch/arm64/boot/dts/qcom/sm8250.dtsi -@@ -8,8 +8,6 @@ - #include - #include - #include --#include --#include - #include - #include - #include -@@ -2633,14 +2631,13 @@ tcsr: syscon@1fc0000 { - wsamacro: codec@3240000 { - compatible = "qcom,sm8250-lpass-wsa-macro"; - reg = <0 0x03240000 0 0x1000>; -- clocks = <&audiocc LPASS_CDC_WSA_MCLK>, -- <&audiocc LPASS_CDC_WSA_NPL>, -+ clocks = <&q6afecc LPASS_CLK_ID_TX_CORE_MCLK LPASS_CLK_ATTRIBUTE_COUPLE_NO>, -+ <&q6afecc LPASS_CLK_ID_TX_CORE_NPL_MCLK LPASS_CLK_ATTRIBUTE_COUPLE_NO>, - <&q6afecc LPASS_HW_MACRO_VOTE LPASS_CLK_ATTRIBUTE_COUPLE_NO>, - <&q6afecc LPASS_HW_DCODEC_VOTE LPASS_CLK_ATTRIBUTE_COUPLE_NO>, -- <&aoncc LPASS_CDC_VA_MCLK>, - <&vamacro>; - -- clock-names = "mclk", "npl", "macro", "dcodec", "va", "fsgen"; -+ clock-names = "mclk", "npl", "macro", "dcodec", "fsgen"; - - #clock-cells = <0>; - clock-output-names = "mclk"; -@@ -2674,20 +2671,10 @@ swr0: soundwire@3250000 { - status = "disabled"; - }; - -- audiocc: clock-controller@3300000 { -- compatible = "qcom,sm8250-lpass-audiocc"; -- reg = <0 0x03300000 0 0x30000>; -- #clock-cells = <1>; -- clocks = <&q6afecc LPASS_HW_MACRO_VOTE LPASS_CLK_ATTRIBUTE_COUPLE_NO>, -- <&q6afecc LPASS_HW_DCODEC_VOTE LPASS_CLK_ATTRIBUTE_COUPLE_NO>, -- <&q6afecc LPASS_CLK_ID_TX_CORE_MCLK LPASS_CLK_ATTRIBUTE_COUPLE_NO>; -- clock-names = "core", "audio", "bus"; -- }; -- - vamacro: codec@3370000 { - compatible = "qcom,sm8250-lpass-va-macro"; - reg = <0 0x03370000 0 0x1000>; -- clocks = <&aoncc LPASS_CDC_VA_MCLK>, -+ clocks = <&q6afecc LPASS_CLK_ID_TX_CORE_MCLK LPASS_CLK_ATTRIBUTE_COUPLE_NO>, - <&q6afecc LPASS_HW_MACRO_VOTE LPASS_CLK_ATTRIBUTE_COUPLE_NO>, - <&q6afecc LPASS_HW_DCODEC_VOTE LPASS_CLK_ATTRIBUTE_COUPLE_NO>; - -@@ -2792,16 +2779,6 @@ swr2: soundwire@3230000 { - #size-cells = <0>; - }; - -- aoncc: clock-controller@3380000 { -- compatible = "qcom,sm8250-lpass-aoncc"; -- reg = <0 0x03380000 0 0x40000>; -- #clock-cells = <1>; -- clocks = <&q6afecc LPASS_HW_MACRO_VOTE LPASS_CLK_ATTRIBUTE_COUPLE_NO>, -- <&q6afecc LPASS_HW_DCODEC_VOTE LPASS_CLK_ATTRIBUTE_COUPLE_NO>, -- <&q6afecc LPASS_CLK_ID_TX_CORE_NPL_MCLK LPASS_CLK_ATTRIBUTE_COUPLE_NO>; -- clock-names = "core", "audio", "bus"; -- }; -- - lpass_tlmm: pinctrl@33c0000 { - compatible = "qcom,sm8250-lpass-lpi-pinctrl"; - reg = <0 0x033c0000 0x0 0x20000>, --- -Armbian - diff --git a/patch/kernel/archive/sm8250-6.11/0025-drm-mipi-dsi-add-set-column-page-multi-helpers.patch b/patch/kernel/archive/sm8250-6.11/0025-drm-mipi-dsi-add-set-column-page-multi-helpers.patch deleted file mode 100644 index 40589713c455..000000000000 --- a/patch/kernel/archive/sm8250-6.11/0025-drm-mipi-dsi-add-set-column-page-multi-helpers.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Caleb Connolly -Date: Sun, 30 Jun 2024 20:36:28 +0200 -Subject: drm/mipi-dsi: add set column/page multi helpers - -Introduce mipi_dsi_dcs_set_column_address_multi() and -mipi_dsi_dcs_set_page_address_multi() helpers. - -Signed-off-by: Caleb Connolly ---- - include/drm/drm_mipi_dsi.h | 16 ++++++++++ - 1 file changed, 16 insertions(+) - -diff --git a/include/drm/drm_mipi_dsi.h b/include/drm/drm_mipi_dsi.h -index 111111111111..222222222222 100644 ---- a/include/drm/drm_mipi_dsi.h -+++ b/include/drm/drm_mipi_dsi.h -@@ -442,6 +442,22 @@ void mipi_dsi_dcs_set_tear_on_multi(struct mipi_dsi_multi_context *ctx, - mipi_dsi_dcs_write_buffer_multi(ctx, d, ARRAY_SIZE(d)); \ - } while (0) - -+#define mipi_dsi_dcs_set_column_address_multi(ctx, start, end) \ -+ do { \ -+ static const u8 d[] = { MIPI_DCS_SET_COLUMN_ADDRESS, \ -+ (start) >> 8, (start) & 0xff, \ -+ (end) >> 8, (end) & 0xff }; \ -+ mipi_dsi_dcs_write_buffer_multi(ctx, d, ARRAY_SIZE(d)); \ -+ } while (0) -+ -+#define mipi_dsi_dcs_set_page_address_multi(ctx, start, end) \ -+ do { \ -+ static const u8 d[] = { MIPI_DCS_SET_PAGE_ADDRESS, \ -+ (start) >> 8, (start) & 0xff, \ -+ (end) >> 8, (end) & 0xff }; \ -+ mipi_dsi_dcs_write_buffer_multi(ctx, d, ARRAY_SIZE(d)); \ -+ } while (0) -+ - /** - * mipi_dsi_dcs_write_long_multi - transmit a DCS long command with payload - * @ctx: Context for multiple DSI transactions --- -Armbian - diff --git a/patch/kernel/archive/sm8250-6.11/0001-drm-Add-drm-notifier-support.patch b/patch/kernel/archive/sm8250-6.12/0001-drm-Add-drm-notifier-support.patch similarity index 100% rename from patch/kernel/archive/sm8250-6.11/0001-drm-Add-drm-notifier-support.patch rename to patch/kernel/archive/sm8250-6.12/0001-drm-Add-drm-notifier-support.patch diff --git a/patch/kernel/archive/sm8250-6.11/0002-drm-dsi-emit-panel-turn-on-off-signal-to-touchscreen.patch b/patch/kernel/archive/sm8250-6.12/0002-drm-dsi-emit-panel-turn-on-off-signal-to-touchscreen.patch similarity index 100% rename from patch/kernel/archive/sm8250-6.11/0002-drm-dsi-emit-panel-turn-on-off-signal-to-touchscreen.patch rename to patch/kernel/archive/sm8250-6.12/0002-drm-dsi-emit-panel-turn-on-off-signal-to-touchscreen.patch diff --git a/patch/kernel/archive/sm8250-6.11/0003-Input-Add-nt36523-touchscreen-driver.patch b/patch/kernel/archive/sm8250-6.12/0003-Input-Add-nt36523-touchscreen-driver.patch similarity index 99% rename from patch/kernel/archive/sm8250-6.11/0003-Input-Add-nt36523-touchscreen-driver.patch rename to patch/kernel/archive/sm8250-6.12/0003-Input-Add-nt36523-touchscreen-driver.patch index b347a3b3515f..41aec6a8f27e 100644 --- a/patch/kernel/archive/sm8250-6.11/0003-Input-Add-nt36523-touchscreen-driver.patch +++ b/patch/kernel/archive/sm8250-6.12/0003-Input-Add-nt36523-touchscreen-driver.patch @@ -31,7 +31,7 @@ diff --git a/drivers/input/touchscreen/Makefile b/drivers/input/touchscreen/Make index 111111111111..222222222222 100644 --- a/drivers/input/touchscreen/Makefile +++ b/drivers/input/touchscreen/Makefile -@@ -121,3 +121,4 @@ obj-$(CONFIG_TOUCHSCREEN_IQS5XX) += iqs5xx.o +@@ -117,3 +117,4 @@ obj-$(CONFIG_TOUCHSCREEN_IQS5XX) += iqs5xx.o obj-$(CONFIG_TOUCHSCREEN_IQS7211) += iqs7211.o obj-$(CONFIG_TOUCHSCREEN_ZINITIX) += zinitix.o obj-$(CONFIG_TOUCHSCREEN_HIMAX_HX83112B) += himax_hx83112b.o diff --git a/patch/kernel/archive/sm8250-6.11/0004-arm64-dts-qcom-sm8250-xiaomi-elish-enable-wifi-and-b.patch b/patch/kernel/archive/sm8250-6.12/0004-arm64-dts-qcom-sm8250-xiaomi-elish-enable-wifi-and-b.patch similarity index 94% rename from patch/kernel/archive/sm8250-6.11/0004-arm64-dts-qcom-sm8250-xiaomi-elish-enable-wifi-and-b.patch rename to patch/kernel/archive/sm8250-6.12/0004-arm64-dts-qcom-sm8250-xiaomi-elish-enable-wifi-and-b.patch index 494ebd383a49..4750ef828042 100644 --- a/patch/kernel/archive/sm8250-6.11/0004-arm64-dts-qcom-sm8250-xiaomi-elish-enable-wifi-and-b.patch +++ b/patch/kernel/archive/sm8250-6.12/0004-arm64-dts-qcom-sm8250-xiaomi-elish-enable-wifi-and-b.patch @@ -5,8 +5,8 @@ Subject: arm64: dts: qcom: sm8250-xiaomi-elish: enable wifi and bluetooth Signed-off-by: Jianhua Lu --- - arch/arm64/boot/dts/qcom/sm8250-xiaomi-elish-common.dtsi | 113 ++++++++++ - 1 file changed, 113 insertions(+) + arch/arm64/boot/dts/qcom/sm8250-xiaomi-elish-common.dtsi | 115 ++++++++++ + 1 file changed, 115 insertions(+) diff --git a/arch/arm64/boot/dts/qcom/sm8250-xiaomi-elish-common.dtsi b/arch/arm64/boot/dts/qcom/sm8250-xiaomi-elish-common.dtsi index 111111111111..222222222222 100644 @@ -91,7 +91,7 @@ index 111111111111..222222222222 100644 reserved-memory { xbl_aop_mem: xbl-aop@80600000 { reg = <0x0 0x80600000 0x0 0x260000>; -@@ -619,6 +684,23 @@ &pcie0_phy { +@@ -619,6 +684,25 @@ &pcie0_phy { status = "okay"; }; @@ -109,13 +109,15 @@ index 111111111111..222222222222 100644 + vddrfa1p7-supply = <&vreg_pmu_rfa_1p7>; + vddpcie0p9-supply = <&vreg_pmu_pcie_0p9>; + vddpcie1p8-supply = <&vreg_pmu_pcie_1p8>; ++ ++ qcom,ath11k-calibration-variant = "Xiaomi_Pad_5Pro"; + }; +}; + &pm8150_gpios { vol_up_n: vol-up-n-state { pins = "gpio6"; -@@ -701,6 +783,37 @@ &slpi { +@@ -701,6 +785,37 @@ &slpi { &tlmm { gpio-reserved-ranges = <40 4>; diff --git a/patch/kernel/archive/sm8250-6.11/0005-arm64-dts-qcom-sm8250-xiaomi-elish-enable-touchscree.patch b/patch/kernel/archive/sm8250-6.12/0005-arm64-dts-qcom-sm8250-xiaomi-elish-enable-touchscree.patch similarity index 97% rename from patch/kernel/archive/sm8250-6.11/0005-arm64-dts-qcom-sm8250-xiaomi-elish-enable-touchscree.patch rename to patch/kernel/archive/sm8250-6.12/0005-arm64-dts-qcom-sm8250-xiaomi-elish-enable-touchscree.patch index 62966402d797..516e29c66a0e 100644 --- a/patch/kernel/archive/sm8250-6.11/0005-arm64-dts-qcom-sm8250-xiaomi-elish-enable-touchscree.patch +++ b/patch/kernel/archive/sm8250-6.12/0005-arm64-dts-qcom-sm8250-xiaomi-elish-enable-touchscree.patch @@ -27,7 +27,7 @@ diff --git a/arch/arm64/boot/dts/qcom/sm8250-xiaomi-elish-common.dtsi b/arch/arm index 111111111111..222222222222 100644 --- a/arch/arm64/boot/dts/qcom/sm8250-xiaomi-elish-common.dtsi +++ b/arch/arm64/boot/dts/qcom/sm8250-xiaomi-elish-common.dtsi -@@ -764,6 +764,16 @@ &pon_resin { +@@ -766,6 +766,16 @@ &pon_resin { status = "okay"; }; @@ -44,7 +44,7 @@ index 111111111111..222222222222 100644 &qupv3_id_0 { status = "okay"; }; -@@ -781,6 +791,28 @@ &slpi { +@@ -783,6 +793,28 @@ &slpi { status = "okay"; }; diff --git a/patch/kernel/archive/sm8250-6.11/0006-ASoC-qcom-sm8250-Add-tdm-support.patch b/patch/kernel/archive/sm8250-6.12/0006-ASoC-qcom-sm8250-Add-tdm-support.patch similarity index 96% rename from patch/kernel/archive/sm8250-6.11/0006-ASoC-qcom-sm8250-Add-tdm-support.patch rename to patch/kernel/archive/sm8250-6.12/0006-ASoC-qcom-sm8250-Add-tdm-support.patch index 7f9a5991ba62..a1a63d040936 100644 --- a/patch/kernel/archive/sm8250-6.11/0006-ASoC-qcom-sm8250-Add-tdm-support.patch +++ b/patch/kernel/archive/sm8250-6.12/0006-ASoC-qcom-sm8250-Add-tdm-support.patch @@ -86,8 +86,8 @@ index 111111111111..222222222222 100644 + int ret,j; switch (cpu_dai->id) { - case TERTIARY_MI2S_RX: -@@ -63,6 +118,21 @@ static int sm8250_snd_startup(struct snd_pcm_substream *substream) + case PRIMARY_MI2S_RX: +@@ -71,6 +126,21 @@ static int sm8250_snd_startup(struct snd_pcm_substream *substream) snd_soc_dai_set_fmt(cpu_dai, fmt); snd_soc_dai_set_fmt(codec_dai, codec_dai_fmt); break; @@ -109,7 +109,7 @@ index 111111111111..222222222222 100644 default: break; } -@@ -88,6 +158,11 @@ static int sm8250_snd_hw_params(struct snd_pcm_substream *substream, +@@ -96,6 +166,11 @@ static int sm8250_snd_hw_params(struct snd_pcm_substream *substream, struct snd_soc_dai *cpu_dai = snd_soc_rtd_to_cpu(rtd, 0); struct sm8250_snd_data *pdata = snd_soc_card_get_drvdata(rtd->card); diff --git a/patch/kernel/archive/sm8250-6.11/0007-arm64-dts-qcom-sm8250-xiaomi-elish-Add-sound-support.patch b/patch/kernel/archive/sm8250-6.12/0007-arm64-dts-qcom-sm8250-xiaomi-elish-Add-sound-support.patch similarity index 98% rename from patch/kernel/archive/sm8250-6.11/0007-arm64-dts-qcom-sm8250-xiaomi-elish-Add-sound-support.patch rename to patch/kernel/archive/sm8250-6.12/0007-arm64-dts-qcom-sm8250-xiaomi-elish-Add-sound-support.patch index 9b4575c657c4..869ac8acf6f4 100644 --- a/patch/kernel/archive/sm8250-6.11/0007-arm64-dts-qcom-sm8250-xiaomi-elish-Add-sound-support.patch +++ b/patch/kernel/archive/sm8250-6.12/0007-arm64-dts-qcom-sm8250-xiaomi-elish-Add-sound-support.patch @@ -173,7 +173,7 @@ index 111111111111..222222222222 100644 &i2c11 { clock-frequency = <400000>; status = "okay"; -@@ -786,11 +934,63 @@ &qupv3_id_2 { +@@ -788,11 +936,63 @@ &qupv3_id_2 { status = "okay"; }; @@ -237,7 +237,7 @@ index 111111111111..222222222222 100644 &spi4 { status = "okay"; pinctrl-names = "default"; -@@ -831,6 +1031,38 @@ wlan_en_state: wlan-default-state { +@@ -833,6 +1033,38 @@ wlan_en_state: wlan-default-state { output-low; bias-pull-up; }; diff --git a/patch/kernel/archive/sm8250-6.11/0008-Asoc-wm_adsp-Add-prefix-support.patch b/patch/kernel/archive/sm8250-6.12/0008-Asoc-wm_adsp-Add-prefix-support.patch similarity index 100% rename from patch/kernel/archive/sm8250-6.11/0008-Asoc-wm_adsp-Add-prefix-support.patch rename to patch/kernel/archive/sm8250-6.12/0008-Asoc-wm_adsp-Add-prefix-support.patch diff --git a/patch/kernel/archive/sm8250-6.11/0009-arm64-dts-qcom-sm8250-oneplus-instantnoodlep-Add-dev.patch b/patch/kernel/archive/sm8250-6.12/0009-arm64-dts-qcom-sm8250-oneplus-instantnoodlep-Add-dev.patch similarity index 99% rename from patch/kernel/archive/sm8250-6.11/0009-arm64-dts-qcom-sm8250-oneplus-instantnoodlep-Add-dev.patch rename to patch/kernel/archive/sm8250-6.12/0009-arm64-dts-qcom-sm8250-oneplus-instantnoodlep-Add-dev.patch index 2b07d24e8fe5..5992076411eb 100644 --- a/patch/kernel/archive/sm8250-6.11/0009-arm64-dts-qcom-sm8250-oneplus-instantnoodlep-Add-dev.patch +++ b/patch/kernel/archive/sm8250-6.12/0009-arm64-dts-qcom-sm8250-oneplus-instantnoodlep-Add-dev.patch @@ -13,7 +13,7 @@ diff --git a/arch/arm64/boot/dts/qcom/Makefile b/arch/arm64/boot/dts/qcom/Makefi index 111111111111..222222222222 100644 --- a/arch/arm64/boot/dts/qcom/Makefile +++ b/arch/arm64/boot/dts/qcom/Makefile -@@ -235,6 +235,7 @@ dtb-$(CONFIG_ARCH_QCOM) += sm8150-sony-xperia-kumano-bahamut.dtb +@@ -242,6 +242,7 @@ dtb-$(CONFIG_ARCH_QCOM) += sm8150-sony-xperia-kumano-bahamut.dtb dtb-$(CONFIG_ARCH_QCOM) += sm8150-sony-xperia-kumano-griffin.dtb dtb-$(CONFIG_ARCH_QCOM) += sm8250-hdk.dtb dtb-$(CONFIG_ARCH_QCOM) += sm8250-mtp.dtb diff --git a/patch/kernel/archive/sm8250-6.11/0010-drm-msm-dsi-change-sync-mode-to-sync-on-DSI0-rather-.patch b/patch/kernel/archive/sm8250-6.12/0010-drm-msm-dsi-change-sync-mode-to-sync-on-DSI0-rather-.patch similarity index 100% rename from patch/kernel/archive/sm8250-6.11/0010-drm-msm-dsi-change-sync-mode-to-sync-on-DSI0-rather-.patch rename to patch/kernel/archive/sm8250-6.12/0010-drm-msm-dsi-change-sync-mode-to-sync-on-DSI0-rather-.patch diff --git a/patch/kernel/archive/sm8250-6.11/0011-drm-msm-dpu1-improve-support-for-active-CTLs.patch b/patch/kernel/archive/sm8250-6.12/0011-drm-msm-dpu1-improve-support-for-active-CTLs.patch similarity index 100% rename from patch/kernel/archive/sm8250-6.11/0011-drm-msm-dpu1-improve-support-for-active-CTLs.patch rename to patch/kernel/archive/sm8250-6.12/0011-drm-msm-dpu1-improve-support-for-active-CTLs.patch diff --git a/patch/kernel/archive/sm8250-6.11/0012-drm-msm-dpu1-use-one-active-CTL-if-it-is-available.patch.disabled b/patch/kernel/archive/sm8250-6.12/0012-drm-msm-dpu1-use-one-active-CTL-if-it-is-available.patch similarity index 87% rename from patch/kernel/archive/sm8250-6.11/0012-drm-msm-dpu1-use-one-active-CTL-if-it-is-available.patch.disabled rename to patch/kernel/archive/sm8250-6.12/0012-drm-msm-dpu1-use-one-active-CTL-if-it-is-available.patch index bebd5a5f1193..61dd7e04aa29 100644 --- a/patch/kernel/archive/sm8250-6.11/0012-drm-msm-dpu1-use-one-active-CTL-if-it-is-available.patch.disabled +++ b/patch/kernel/archive/sm8250-6.12/0012-drm-msm-dpu1-use-one-active-CTL-if-it-is-available.patch @@ -10,37 +10,29 @@ available. Signed-off-by: Dmitry Baryshkov --- - drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c | 8 ++++-- + drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c | 6 +++- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h | 1 + drivers/gpu/drm/msm/disp/dpu1/dpu_rm.c | 14 +++++++--- drivers/gpu/drm/msm/disp/dpu1/dpu_rm.h | 1 + - 4 files changed, 18 insertions(+), 6 deletions(-) + 4 files changed, 17 insertions(+), 5 deletions(-) diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c index 111111111111..222222222222 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c -@@ -1180,14 +1180,18 @@ static void dpu_encoder_virt_atomic_mode_set(struct drm_encoder *drm_enc, +@@ -1198,7 +1198,11 @@ static void dpu_encoder_virt_atomic_mode_set(struct drm_encoder *drm_enc, return; } -- if (!hw_ctl[i]) { +- phys->hw_ctl = i < num_ctl ? to_dpu_hw_ctl(hw_ctl[i]) : NULL; + /* Use first (and only) CTL if active CTLs are supported */ + if (dpu_kms->catalog->caps->has_active_ctls) + phys->hw_ctl = to_dpu_hw_ctl(hw_ctl[0]); + else -+ phys->hw_ctl = to_dpu_hw_ctl(hw_ctl[i]); -+ if (!phys->hw_ctl) { ++ phys->hw_ctl = i < num_ctl ? to_dpu_hw_ctl(hw_ctl[i]) : NULL; + if (!phys->hw_ctl) { DPU_ERROR_ENC(dpu_enc, "no ctl block assigned at idx: %d\n", i); - return; - } - - phys->hw_pp = dpu_enc->hw_pp[i]; -- phys->hw_ctl = to_dpu_hw_ctl(hw_ctl[i]); - - phys->cached_mode = crtc_state->adjusted_mode; - if (phys->ops.atomic_mode_set) diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h index 111111111111..222222222222 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h diff --git a/patch/kernel/archive/sm8250-6.11/0013-drm-msm-dpu-populate-has_active_ctls-in-the-catalog.patch.disabled b/patch/kernel/archive/sm8250-6.12/0013-drm-msm-dpu-populate-has_active_ctls-in-the-catalog.patch similarity index 100% rename from patch/kernel/archive/sm8250-6.11/0013-drm-msm-dpu-populate-has_active_ctls-in-the-catalog.patch.disabled rename to patch/kernel/archive/sm8250-6.12/0013-drm-msm-dpu-populate-has_active_ctls-in-the-catalog.patch diff --git a/patch/kernel/archive/sm8250-6.11/0014-drm-msm-dpu1-dpu_encoder_phys_-proper-support-for-ac.patch b/patch/kernel/archive/sm8250-6.12/0014-drm-msm-dpu1-dpu_encoder_phys_-proper-support-for-ac.patch similarity index 100% rename from patch/kernel/archive/sm8250-6.11/0014-drm-msm-dpu1-dpu_encoder_phys_-proper-support-for-ac.patch rename to patch/kernel/archive/sm8250-6.12/0014-drm-msm-dpu1-dpu_encoder_phys_-proper-support-for-ac.patch diff --git a/patch/kernel/archive/sm8250-6.11/0015-drm-msm-dpu-Drop-BIT-DPU_CTL_SPLIT_DISPLAY-from-acti.patch b/patch/kernel/archive/sm8250-6.12/0015-drm-msm-dpu-Drop-BIT-DPU_CTL_SPLIT_DISPLAY-from-acti.patch similarity index 98% rename from patch/kernel/archive/sm8250-6.11/0015-drm-msm-dpu-Drop-BIT-DPU_CTL_SPLIT_DISPLAY-from-acti.patch rename to patch/kernel/archive/sm8250-6.12/0015-drm-msm-dpu-Drop-BIT-DPU_CTL_SPLIT_DISPLAY-from-acti.patch index 82a3959e819e..ecbb0d58dc36 100644 --- a/patch/kernel/archive/sm8250-6.11/0015-drm-msm-dpu-Drop-BIT-DPU_CTL_SPLIT_DISPLAY-from-acti.patch +++ b/patch/kernel/archive/sm8250-6.12/0015-drm-msm-dpu-Drop-BIT-DPU_CTL_SPLIT_DISPLAY-from-acti.patch @@ -21,7 +21,7 @@ diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_0_sm8150.h b/drivers/gp index 111111111111..222222222222 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_0_sm8150.h +++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_0_sm8150.h -@@ -37,17 +37,16 @@ static const struct dpu_mdp_cfg sm8150_mdp = { +@@ -38,17 +38,16 @@ static const struct dpu_mdp_cfg sm8150_mdp = { }, }; @@ -45,7 +45,7 @@ diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_1_sc8180x.h b/drivers/g index 111111111111..222222222222 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_1_sc8180x.h +++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_1_sc8180x.h -@@ -41,12 +41,12 @@ static const struct dpu_ctl_cfg sc8180x_ctl[] = { +@@ -42,12 +42,12 @@ static const struct dpu_ctl_cfg sc8180x_ctl[] = { { .name = "ctl_0", .id = CTL_0, .base = 0x1000, .len = 0x1e0, diff --git a/patch/kernel/archive/sm8250-6.11/0016-arm64-dts-qcom-sm8250-xiaomi-elish-add-keyboard-supp.patch b/patch/kernel/archive/sm8250-6.12/0016-arm64-dts-qcom-sm8250-xiaomi-elish-add-keyboard-supp.patch similarity index 95% rename from patch/kernel/archive/sm8250-6.11/0016-arm64-dts-qcom-sm8250-xiaomi-elish-add-keyboard-supp.patch rename to patch/kernel/archive/sm8250-6.12/0016-arm64-dts-qcom-sm8250-xiaomi-elish-add-keyboard-supp.patch index aa847f88f993..8815c6953024 100644 --- a/patch/kernel/archive/sm8250-6.11/0016-arm64-dts-qcom-sm8250-xiaomi-elish-add-keyboard-supp.patch +++ b/patch/kernel/archive/sm8250-6.12/0016-arm64-dts-qcom-sm8250-xiaomi-elish-add-keyboard-supp.patch @@ -27,7 +27,7 @@ index 111111111111..222222222222 100644 &mdss { status = "okay"; }; -@@ -1063,6 +1072,14 @@ dout-pins { +@@ -1065,6 +1074,14 @@ dout-pins { bias-disable; }; }; @@ -42,7 +42,7 @@ index 111111111111..222222222222 100644 }; &uart6 { -@@ -1106,6 +1123,29 @@ &usb_1_dwc3_hs_out { +@@ -1108,6 +1125,29 @@ &usb_1_dwc3_hs_out { remote-endpoint = <&pm8150b_hs_in>; }; diff --git a/patch/kernel/archive/sm8250-6.11/0017-arm64-dts-qcom-sm8250-xiaomi-elish-remove-framebuffe.patch b/patch/kernel/archive/sm8250-6.12/0017-arm64-dts-qcom-sm8250-xiaomi-elish-remove-framebuffe.patch similarity index 100% rename from patch/kernel/archive/sm8250-6.11/0017-arm64-dts-qcom-sm8250-xiaomi-elish-remove-framebuffe.patch rename to patch/kernel/archive/sm8250-6.12/0017-arm64-dts-qcom-sm8250-xiaomi-elish-remove-framebuffe.patch diff --git a/patch/kernel/archive/sm8250-6.11/0020-drm-panel-nt36523-use-devm_mipi_dsi_-function-to-reg.patch b/patch/kernel/archive/sm8250-6.12/0018-drm-panel-nt36523-use-devm_mipi_dsi_-function-to-reg.patch similarity index 100% rename from patch/kernel/archive/sm8250-6.11/0020-drm-panel-nt36523-use-devm_mipi_dsi_-function-to-reg.patch rename to patch/kernel/archive/sm8250-6.12/0018-drm-panel-nt36523-use-devm_mipi_dsi_-function-to-reg.patch diff --git a/patch/kernel/archive/sm8250-6.12/0019-input-nt36xxx-Enable-pen-support.patch b/patch/kernel/archive/sm8250-6.12/0019-input-nt36xxx-Enable-pen-support.patch new file mode 100644 index 000000000000..9818a190c7e5 --- /dev/null +++ b/patch/kernel/archive/sm8250-6.12/0019-input-nt36xxx-Enable-pen-support.patch @@ -0,0 +1,118 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: map220v +Date: Tue, 28 Nov 2023 15:28:53 +0300 +Subject: input: nt36xxx: Enable pen support + +--- + drivers/input/touchscreen/nt36523/nt36xxx.c | 47 +++++++++- + drivers/input/touchscreen/nt36523/nt36xxx.h | 1 + + drivers/input/touchscreen/nt36523/nt36xxx_fw_update.c | 1 + + 3 files changed, 45 insertions(+), 4 deletions(-) + +diff --git a/drivers/input/touchscreen/nt36523/nt36xxx.c b/drivers/input/touchscreen/nt36523/nt36xxx.c +index 111111111111..222222222222 100644 +--- a/drivers/input/touchscreen/nt36523/nt36xxx.c ++++ b/drivers/input/touchscreen/nt36523/nt36xxx.c +@@ -1173,6 +1173,43 @@ static int8_t nvt_ts_check_chip_ver_trim(uint32_t chip_ver_trim_addr) + return 0; + } + ++int32_t disable_pen_input_device(bool disable) { ++ uint8_t buf[8] = {0}; ++ int32_t ret = 0; ++ ++ NVT_LOG("++\n"); ++ if (!bTouchIsAwake || !ts) { ++ NVT_LOG("touch suspend, stop set pen state %s", disable ? "DISABLE" : "ENABLE"); ++ goto nvt_set_pen_enable_out; ++ } ++ ++ msleep(35); ++ disable = (!(ts->pen_input_dev_enable) || ts->pen_is_charge) ? true : disable; ++ ++ //---set xdata index to EVENT BUF ADDR--- ++ ret = nvt_set_page(ts->mmap->EVENT_BUF_ADDR | EVENT_MAP_HOST_CMD); ++ if (ret < 0) { ++ NVT_ERR("Set event buffer index fail!\n"); ++ goto nvt_set_pen_enable_out; ++ } ++ ++ buf[0] = EVENT_MAP_HOST_CMD; ++ buf[1] = 0x7B; ++ buf[2] = !!disable; ++ ret = CTP_SPI_WRITE(ts->client, buf, 3); ++ if (ret < 0) { ++ NVT_ERR("set pen %s failed!\n", disable ? "DISABLE" : "ENABLE"); ++ goto nvt_set_pen_enable_out; ++ } ++ NVT_LOG("pen charge state is %s, %s pen input device\n", ++ ts->pen_is_charge ? "ENABLE" : "DISABLE", ++ disable ? "DISABLE" : "ENABLE"); ++ ++nvt_set_pen_enable_out: ++ NVT_LOG("--\n"); ++ return ret; ++} ++ + static void nvt_suspend_work(struct work_struct *work) + { + struct nvt_ts_data *ts_core = container_of(work, struct nvt_ts_data, suspend_work); +@@ -1437,11 +1474,11 @@ static int32_t nvt_ts_probe(struct spi_device *client) + init_completion(&ts->dev_pm_suspend_completion); + ts->fw_debug = false; + +-#ifdef CONFIG_FACTORY_BUILD ++//#ifdef CONFIG_FACTORY_BUILD + ts->pen_input_dev_enable = 1; +-#else +- ts->pen_input_dev_enable = 0; +-#endif ++//#else ++// ts->pen_input_dev_enable = 0; ++//#endif + + #if BOOT_UPDATE_FIRMWARE + nvt_fwu_wq = alloc_workqueue("nvt_fwu_wq", WQ_UNBOUND | WQ_MEM_RECLAIM, 1); +@@ -1701,6 +1738,7 @@ static int32_t nvt_ts_suspend(struct device *dev) + + if (ts->pen_input_dev_enable) { + NVT_LOG("if enable pen,will close it"); ++ disable_pen_input_device(true); + } + + if (ts->db_wakeup) { +@@ -1798,6 +1836,7 @@ static int32_t nvt_ts_resume(struct device *dev) + + mutex_unlock(&ts->lock); + ++ disable_pen_input_device(false); + if (likely(ts->ic_state == NVT_IC_RESUME_IN)) { + ts->ic_state = NVT_IC_RESUME_OUT; + } else { +diff --git a/drivers/input/touchscreen/nt36523/nt36xxx.h b/drivers/input/touchscreen/nt36523/nt36xxx.h +index 111111111111..222222222222 100644 +--- a/drivers/input/touchscreen/nt36523/nt36xxx.h ++++ b/drivers/input/touchscreen/nt36523/nt36xxx.h +@@ -235,6 +235,7 @@ int32_t nvt_read_pid(void); + bool nvt_get_dbgfw_status(void); + int32_t nvt_set_pocket_palm_switch(uint8_t pocket_palm_switch); + void Boot_Update_Firmware(struct work_struct *work); ++int32_t disable_pen_input_device(bool disable); + #if NVT_TOUCH_ESD_PROTECT + extern void nvt_esd_check_enable(uint8_t enable); + #endif /* #if NVT_TOUCH_ESD_PROTECT */ +diff --git a/drivers/input/touchscreen/nt36523/nt36xxx_fw_update.c b/drivers/input/touchscreen/nt36523/nt36xxx_fw_update.c +index 111111111111..222222222222 100644 +--- a/drivers/input/touchscreen/nt36523/nt36xxx_fw_update.c ++++ b/drivers/input/touchscreen/nt36523/nt36xxx_fw_update.c +@@ -851,6 +851,7 @@ void Boot_Update_Firmware(struct work_struct *work) + { + mutex_lock(&ts->lock); + nvt_update_firmware(ts->fw_name); ++ disable_pen_input_device(false); + nvt_get_fw_info(); + mutex_unlock(&ts->lock); + } +-- +Armbian + diff --git a/patch/kernel/archive/sm8250-6.12/0020-nt36xxx-add-pen-input-resolution.patch b/patch/kernel/archive/sm8250-6.12/0020-nt36xxx-add-pen-input-resolution.patch new file mode 100644 index 000000000000..58cab04a837b --- /dev/null +++ b/patch/kernel/archive/sm8250-6.12/0020-nt36xxx-add-pen-input-resolution.patch @@ -0,0 +1,58 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Nicola Guerrera +Date: Thu, 14 Nov 2024 22:57:02 +0100 +Subject: nt36xxx: add pen input resolution + +--- + drivers/input/touchscreen/nt36523/nt36xxx.c | 15 +++++++--- + drivers/input/touchscreen/nt36523/nt36xxx.h | 4 ++- + 2 files changed, 14 insertions(+), 5 deletions(-) + +diff --git a/drivers/input/touchscreen/nt36523/nt36xxx.c b/drivers/input/touchscreen/nt36523/nt36xxx.c +index 111111111111..222222222222 100644 +--- a/drivers/input/touchscreen/nt36523/nt36xxx.c ++++ b/drivers/input/touchscreen/nt36523/nt36xxx.c +@@ -1421,14 +1421,21 @@ static int32_t nvt_ts_probe(struct spi_device *client) + ts->pen_input_dev->keybit[BIT_WORD(BTN_STYLUS2)] |= BIT_MASK(BTN_STYLUS2); + ts->pen_input_dev->propbit[0] = BIT(INPUT_PROP_DIRECT); + ++ int x_max, y_max; ++ + if (ts->wgp_stylus) { +- input_set_abs_params(ts->pen_input_dev, ABS_X, 0, ts->abs_x_max * 2 - 1, 0, 0); +- input_set_abs_params(ts->pen_input_dev, ABS_Y, 0, ts->abs_y_max * 2 - 1, 0, 0); ++ x_max = ts->abs_x_max * 2 - 1; ++ y_max = ts->abs_y_max * 2 - 1; + } else { +- input_set_abs_params(ts->pen_input_dev, ABS_X, 0, ts->abs_x_max - 1, 0, 0); +- input_set_abs_params(ts->pen_input_dev, ABS_Y, 0, ts->abs_y_max - 1, 0, 0); ++ x_max = ts->abs_x_max - 1; ++ y_max = ts->abs_y_max - 1; + } + ++ input_set_abs_params(ts->pen_input_dev, ABS_X, 0, x_max, 0, 0); ++ input_set_abs_params(ts->pen_input_dev, ABS_Y, 0, y_max , 0, 0); ++ input_abs_set_res(ts->pen_input_dev, ABS_X, x_max / PANEL_DEFAULT_WIDTH_MM); ++ input_abs_set_res(ts->pen_input_dev, ABS_Y, y_max / PANEL_DEFAULT_HEIGHT_MM); ++ + input_set_abs_params(ts->pen_input_dev, ABS_PRESSURE, 0, PEN_PRESSURE_MAX, 0, 0); + input_set_abs_params(ts->pen_input_dev, ABS_DISTANCE, 0, PEN_DISTANCE_MAX, 0, 0); + input_set_abs_params(ts->pen_input_dev, ABS_TILT_X, PEN_TILT_MIN, PEN_TILT_MAX, 0, 0); +diff --git a/drivers/input/touchscreen/nt36523/nt36xxx.h b/drivers/input/touchscreen/nt36523/nt36xxx.h +index 111111111111..222222222222 100644 +--- a/drivers/input/touchscreen/nt36523/nt36xxx.h ++++ b/drivers/input/touchscreen/nt36523/nt36xxx.h +@@ -70,7 +70,9 @@ extern const uint16_t touch_key_array[TOUCH_KEY_NUM]; + #define PEN_DISTANCE_MAX (1) + #define PEN_TILT_MIN (-60) + #define PEN_TILT_MAX (60) +- ++//---for pen resolution--- ++#define PANEL_DEFAULT_WIDTH_MM 148 // 148mm ++#define PANEL_DEFAULT_HEIGHT_MM 237 // 237mm + /* Enable only when module have tp reset pin and connected to host */ + #define NVT_TOUCH_SUPPORT_HW_RST 0 + +-- +Armbian + diff --git a/patch/kernel/archive/sm8250-6.12/0021-arm64-dts-qcom-sm8250-oneplus-instantnoodlep-Restore.patch b/patch/kernel/archive/sm8250-6.12/0021-arm64-dts-qcom-sm8250-oneplus-instantnoodlep-Restore.patch new file mode 100644 index 000000000000..126477e153d0 --- /dev/null +++ b/patch/kernel/archive/sm8250-6.12/0021-arm64-dts-qcom-sm8250-oneplus-instantnoodlep-Restore.patch @@ -0,0 +1,217 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Denys Vitali +Date: Fri, 22 Nov 2024 15:50:44 +0100 +Subject: arm64: dts: qcom: sm8250-oneplus-instantnoodlep: Restore Wi-Fi / BT + functionality + +--- + arch/arm64/boot/dts/qcom/sm8250-oneplus-instantnoodlep.dts | 131 ++++++++-- + 1 file changed, 110 insertions(+), 21 deletions(-) + +diff --git a/arch/arm64/boot/dts/qcom/sm8250-oneplus-instantnoodlep.dts b/arch/arm64/boot/dts/qcom/sm8250-oneplus-instantnoodlep.dts +index 111111111111..222222222222 100644 +--- a/arch/arm64/boot/dts/qcom/sm8250-oneplus-instantnoodlep.dts ++++ b/arch/arm64/boot/dts/qcom/sm8250-oneplus-instantnoodlep.dts +@@ -78,6 +78,67 @@ vol-down { + gpio-key,wakeup; + }; + }; ++ ++ qca6390-pmu { ++ compatible = "qcom,qca6390-pmu"; ++ ++ pinctrl-names = "default"; ++ pinctrl-0 = <&bt_en_state>, <&wlan_en_state>; ++ ++ vddaon-supply = <&vreg_s6a_0p95>; ++ vddpmu-supply = <&vreg_s2f_0p95>; ++ vddrfa0p95-supply = <&vreg_s2f_0p95>; ++ vddrfa1p3-supply = <&vreg_s8c_1p3>; ++ vddrfa1p9-supply = <&vreg_s5a_1p9>; ++ vddpcie1p3-supply = <&vreg_s8c_1p3>; ++ vddpcie1p9-supply = <&vreg_s5a_1p9>; ++ vddio-supply = <&vreg_s4a_1p8>; ++ ++ wlan-enable-gpios = <&tlmm 20 GPIO_ACTIVE_HIGH>; ++ bt-enable-gpios = <&tlmm 21 GPIO_ACTIVE_HIGH>; ++ ++ regulators { ++ vreg_pmu_rfa_cmn: ldo0 { ++ regulator-name = "vreg_pmu_rfa_cmn"; ++ }; ++ ++ vreg_pmu_aon_0p59: ldo1 { ++ regulator-name = "vreg_pmu_aon_0p59"; ++ }; ++ ++ vreg_pmu_wlcx_0p8: ldo2 { ++ regulator-name = "vreg_pmu_wlcx_0p8"; ++ }; ++ ++ vreg_pmu_wlmx_0p85: ldo3 { ++ regulator-name = "vreg_pmu_wlmx_0p85"; ++ }; ++ ++ vreg_pmu_btcmx_0p85: ldo4 { ++ regulator-name = "vreg_pmu_btcmx_0p85"; ++ }; ++ ++ vreg_pmu_rfa_0p8: ldo5 { ++ regulator-name = "vreg_pmu_rfa_0p8"; ++ }; ++ ++ vreg_pmu_rfa_1p2: ldo6 { ++ regulator-name = "vreg_pmu_rfa_1p2"; ++ }; ++ ++ vreg_pmu_rfa_1p7: ldo7 { ++ regulator-name = "vreg_pmu_rfa_1p7"; ++ }; ++ ++ vreg_pmu_pcie_0p9: ldo8 { ++ regulator-name = "vreg_pmu_pcie_0p9"; ++ }; ++ ++ vreg_pmu_pcie_1p8: ldo9 { ++ regulator-name = "vreg_pmu_pcie_1p8"; ++ }; ++ }; ++ }; + + reserved-memory { + removed_mem: memory@80b00000 { +@@ -192,7 +253,7 @@ vreg_s4a_1p8: vreg-s4a-1p8 { + qca639x: qca639x { + compatible = "qcom,qca6390"; + #power-domain-cells = <0>; +- ++ + vddaon-supply = <&vreg_s6a_0p95>; + vddpmu-supply = <&vreg_s2f_0p95>; + vddrfa1-supply = <&vreg_s2f_0p95>; +@@ -203,9 +264,9 @@ qca639x: qca639x { + vddio-supply = <&vreg_s4a_1p8>; + + pinctrl-names = "default", "sleep"; +- pinctrl-0 = <&wlan_en_active>; ++ pinctrl-0 = <&wlan_en_state>; + pinctrl-1 = <&wlan_en_sleep>; +- ++ + wlan-en-gpios = <&tlmm 20 GPIO_ACTIVE_HIGH>; + }; + +@@ -390,6 +451,7 @@ vreg_s5a_1p9: smps5 { + regulator-initial-mode = ; + }; + ++ + vreg_s6a_0p95: smps6 { + regulator-name = "vreg_s6a_0p95"; + regulator-min-microvolt = <920000>; +@@ -614,15 +676,32 @@ &slpi { + status = "okay"; + }; + ++ + &pcie0 { + status = "okay"; + }; + + &pcie0_phy { ++ status = "okay"; + vdda-phy-supply = <&vreg_l5a_0p88>; + vdda-pll-supply = <&vreg_l9a_1p2>; +- status = "okay"; +- power-domains = <&qca639x>; ++}; ++ ++&pcieport0 { ++ wifi@0 { ++ compatible = "pci17cb,1101"; ++ reg = <0x10000 0x0 0x0 0x0 0x0>; ++ ++ vddrfacmn-supply = <&vreg_pmu_rfa_cmn>; ++ vddaon-supply = <&vreg_pmu_aon_0p59>; ++ vddwlcx-supply = <&vreg_pmu_wlcx_0p8>; ++ vddwlmx-supply = <&vreg_pmu_wlmx_0p85>; ++ vddrfa0p8-supply = <&vreg_pmu_rfa_0p8>; ++ vddrfa1p2-supply = <&vreg_pmu_rfa_1p2>; ++ vddrfa1p7-supply = <&vreg_pmu_rfa_1p7>; ++ vddpcie0p9-supply = <&vreg_pmu_pcie_0p9>; ++ vddpcie1p8-supply = <&vreg_pmu_pcie_1p8>; ++ }; + }; + + &pcie1 { +@@ -697,7 +776,7 @@ &qupv3_id_2 { + &tlmm { + gpio-reserved-ranges = <28 4>, <40 4>; + +- bt_en_active: bt-default-state { ++ bt_en_state: bt-default-state { + bt-en { + pins = "gpio21"; + function = "gpio"; +@@ -717,7 +796,7 @@ bt_en_sleep: bt-sleep-state { + bias-pull-down; + }; + +- wlan_en_active: wlan-default-state { ++ wlan_en_state: wlan-default-state { + wlan-en { + pins = "gpio20"; + function = "gpio"; +@@ -752,20 +831,6 @@ ts_rst_suspend: ts-rst-suspend { + }; + }; + +-&uart6 { +- status = "okay"; +- +- bluetooth { +- compatible = "qcom,qca6390-bt"; +- pinctrl-names = "default", "sleep"; +- pinctrl-0 = <&bt_en_active>; +- pinctrl-1 = <&bt_en_sleep>; +- +- power-domains = <&qca639x>; +- enable-gpios = <&tlmm 21 GPIO_ACTIVE_HIGH>; +- }; +-}; +- + &ufs_mem_hc { + vcc-supply = <&vreg_l17a_3p0>; + vcc-max-microamp = <800000>; +@@ -830,3 +895,27 @@ &venus { + firmware-name = "postmarketos/venus.mbn"; + status = "okay"; + }; ++ ++ ++&uart6 { ++ status = "okay"; ++ ++ bluetooth { ++ compatible = "qcom,qca6390-bt"; ++ ++ vddrfacmn-supply = <&vreg_pmu_rfa_cmn>; ++ vddaon-supply = <&vreg_pmu_aon_0p59>; ++ vddbtcmx-supply = <&vreg_pmu_btcmx_0p85>; ++ vddrfa0p8-supply = <&vreg_pmu_rfa_0p8>; ++ vddrfa1p2-supply = <&vreg_pmu_rfa_1p2>; ++ vddrfa1p7-supply = <&vreg_pmu_rfa_1p7>; ++ }; ++}; ++ ++&qup_i2c7_default { ++ status = "disabled"; ++}; ++ ++&qup_spi7_data_clk { ++ status = "disabled"; ++}; +\ No newline at end of file +-- +Armbian + diff --git a/patch/kernel/archive/sm8250-6.11/0021-drivers-spmi-spmi-pmic-arb.c-remove-warnings.patch b/patch/kernel/archive/sm8250-6.12/0022-drivers-spmi-spmi-pmic-arb.c-remove-warnings.patch similarity index 100% rename from patch/kernel/archive/sm8250-6.11/0021-drivers-spmi-spmi-pmic-arb.c-remove-warnings.patch rename to patch/kernel/archive/sm8250-6.12/0022-drivers-spmi-spmi-pmic-arb.c-remove-warnings.patch diff --git a/patch/kernel/archive/sm8250-6.11/0022-Asoc-wm_adsp-Use-xiaomi-elish-firmware-name.patch b/patch/kernel/archive/sm8250-6.12/0023-Asoc-wm_adsp-Use-xiaomi-elish-firmware-name.patch similarity index 100% rename from patch/kernel/archive/sm8250-6.11/0022-Asoc-wm_adsp-Use-xiaomi-elish-firmware-name.patch rename to patch/kernel/archive/sm8250-6.12/0023-Asoc-wm_adsp-Use-xiaomi-elish-firmware-name.patch diff --git a/patch/kernel/archive/sm8250-6.11/0023-input-nt36523-short-the-firmware-download-delay-from.patch b/patch/kernel/archive/sm8250-6.12/0024-input-nt36523-short-the-firmware-download-delay-from.patch similarity index 93% rename from patch/kernel/archive/sm8250-6.11/0023-input-nt36523-short-the-firmware-download-delay-from.patch rename to patch/kernel/archive/sm8250-6.12/0024-input-nt36523-short-the-firmware-download-delay-from.patch index 8701c4e1d469..856c089f81e6 100644 --- a/patch/kernel/archive/sm8250-6.11/0023-input-nt36523-short-the-firmware-download-delay-from.patch +++ b/patch/kernel/archive/sm8250-6.12/0024-input-nt36523-short-the-firmware-download-delay-from.patch @@ -11,7 +11,7 @@ diff --git a/drivers/input/touchscreen/nt36523/nt36xxx.c b/drivers/input/touchsc index 111111111111..222222222222 100644 --- a/drivers/input/touchscreen/nt36523/nt36xxx.c +++ b/drivers/input/touchscreen/nt36523/nt36xxx.c -@@ -1452,7 +1452,7 @@ static int32_t nvt_ts_probe(struct spi_device *client) +@@ -1496,7 +1496,7 @@ static int32_t nvt_ts_probe(struct spi_device *client) } INIT_DELAYED_WORK(&ts->nvt_fwu_work, Boot_Update_Firmware); // please make sure boot update start after display reset(RESX) sequence diff --git a/patch/kernel/archive/sm8250-6.11/0024-drm-mipi-add-mipi_dsi_generic_write_multi_type.patch b/patch/kernel/archive/sm8250-6.12/0025-drm-mipi-add-mipi_dsi_generic_write_multi_type.patch similarity index 95% rename from patch/kernel/archive/sm8250-6.11/0024-drm-mipi-add-mipi_dsi_generic_write_multi_type.patch rename to patch/kernel/archive/sm8250-6.12/0025-drm-mipi-add-mipi_dsi_generic_write_multi_type.patch index e8fb4ab9e306..34bd63eacf20 100644 --- a/patch/kernel/archive/sm8250-6.11/0024-drm-mipi-add-mipi_dsi_generic_write_multi_type.patch +++ b/patch/kernel/archive/sm8250-6.12/0025-drm-mipi-add-mipi_dsi_generic_write_multi_type.patch @@ -20,7 +20,7 @@ diff --git a/drivers/gpu/drm/drm_mipi_dsi.c b/drivers/gpu/drm/drm_mipi_dsi.c index 111111111111..222222222222 100644 --- a/drivers/gpu/drm/drm_mipi_dsi.c +++ b/drivers/gpu/drm/drm_mipi_dsi.c -@@ -820,6 +820,46 @@ void mipi_dsi_generic_write_multi(struct mipi_dsi_multi_context *ctx, +@@ -824,6 +824,46 @@ void mipi_dsi_generic_write_multi(struct mipi_dsi_multi_context *ctx, } EXPORT_SYMBOL(mipi_dsi_generic_write_multi); @@ -80,7 +80,7 @@ index 111111111111..222222222222 100644 ssize_t mipi_dsi_generic_read(struct mipi_dsi_device *dsi, const void *params, size_t num_params, void *data, size_t size); -@@ -440,6 +442,20 @@ void mipi_dsi_dcs_set_tear_on_multi(struct mipi_dsi_multi_context *ctx, +@@ -452,6 +454,20 @@ void mipi_dsi_dcs_set_tear_scanline_multi(struct mipi_dsi_multi_context *ctx, mipi_dsi_dcs_write_buffer_multi(ctx, d, ARRAY_SIZE(d)); \ } while (0) diff --git a/patch/kernel/archive/sm8250-6.11/0026-drm-panel-add-driver-for-samsung-amb655x.patch b/patch/kernel/archive/sm8250-6.12/0026-drm-panel-add-driver-for-samsung-amb655x.patch similarity index 98% rename from patch/kernel/archive/sm8250-6.11/0026-drm-panel-add-driver-for-samsung-amb655x.patch rename to patch/kernel/archive/sm8250-6.12/0026-drm-panel-add-driver-for-samsung-amb655x.patch index 65b929f5144f..ce16fdcb57db 100644 --- a/patch/kernel/archive/sm8250-6.11/0026-drm-panel-add-driver-for-samsung-amb655x.patch +++ b/patch/kernel/archive/sm8250-6.12/0026-drm-panel-add-driver-for-samsung-amb655x.patch @@ -23,7 +23,7 @@ diff --git a/MAINTAINERS b/MAINTAINERS index 111111111111..222222222222 100644 --- a/MAINTAINERS +++ b/MAINTAINERS -@@ -7231,6 +7231,13 @@ S: Maintained +@@ -7334,6 +7334,13 @@ S: Maintained F: Documentation/devicetree/bindings/display/panel/raydium,rm67191.yaml F: drivers/gpu/drm/panel/panel-raydium-rm67191.c @@ -41,7 +41,7 @@ diff --git a/drivers/gpu/drm/panel/Kconfig b/drivers/gpu/drm/panel/Kconfig index 111111111111..222222222222 100644 --- a/drivers/gpu/drm/panel/Kconfig +++ b/drivers/gpu/drm/panel/Kconfig -@@ -611,6 +611,15 @@ config DRM_PANEL_SAMSUNG_S6E88A0_AMS452EF01 +@@ -620,6 +620,15 @@ config DRM_PANEL_SAMSUNG_S6E88A0_AMS452EF01 select DRM_MIPI_DSI select VIDEOMODE_HELPERS @@ -61,7 +61,7 @@ diff --git a/drivers/gpu/drm/panel/Makefile b/drivers/gpu/drm/panel/Makefile index 111111111111..222222222222 100644 --- a/drivers/gpu/drm/panel/Makefile +++ b/drivers/gpu/drm/panel/Makefile -@@ -61,6 +61,7 @@ obj-$(CONFIG_DRM_PANEL_RAYDIUM_RM68200) += panel-raydium-rm68200.o +@@ -62,6 +62,7 @@ obj-$(CONFIG_DRM_PANEL_RAYDIUM_RM68200) += panel-raydium-rm68200.o obj-$(CONFIG_DRM_PANEL_RAYDIUM_RM692E5) += panel-raydium-rm692e5.o obj-$(CONFIG_DRM_PANEL_RAYDIUM_RM69380) += panel-raydium-rm69380.o obj-$(CONFIG_DRM_PANEL_RONBO_RB070D30) += panel-ronbo-rb070d30.o diff --git a/patch/kernel/archive/sm8250-6.11/0027-Input-touchscreen-add-Synaptics-TCM-oncell-S3908.patch b/patch/kernel/archive/sm8250-6.12/0027-Input-touchscreen-add-Synaptics-TCM-oncell-S3908.patch similarity index 98% rename from patch/kernel/archive/sm8250-6.11/0027-Input-touchscreen-add-Synaptics-TCM-oncell-S3908.patch rename to patch/kernel/archive/sm8250-6.12/0027-Input-touchscreen-add-Synaptics-TCM-oncell-S3908.patch index 9abe97b62eea..e84393a9f28d 100644 --- a/patch/kernel/archive/sm8250-6.11/0027-Input-touchscreen-add-Synaptics-TCM-oncell-S3908.patch +++ b/patch/kernel/archive/sm8250-6.12/0027-Input-touchscreen-add-Synaptics-TCM-oncell-S3908.patch @@ -23,14 +23,14 @@ Signed-off-by: Caleb Connolly MAINTAINERS | 7 + drivers/input/touchscreen/Kconfig | 11 + drivers/input/touchscreen/Makefile | 1 + - drivers/input/touchscreen/synaptics_tcm_oncell.c | 571 ++++++++++ - 4 files changed, 590 insertions(+) + drivers/input/touchscreen/synaptics_tcm_oncell.c | 570 ++++++++++ + 4 files changed, 589 insertions(+) diff --git a/MAINTAINERS b/MAINTAINERS index 111111111111..222222222222 100644 --- a/MAINTAINERS +++ b/MAINTAINERS -@@ -22082,6 +22082,13 @@ S: Maintained +@@ -22333,6 +22333,13 @@ S: Maintained F: Documentation/devicetree/bindings/regulator/silergy,sy8106a.yaml F: drivers/regulator/sy8106a-regulator.c @@ -48,7 +48,7 @@ diff --git a/drivers/input/touchscreen/Kconfig b/drivers/input/touchscreen/Kconf index 111111111111..222222222222 100644 --- a/drivers/input/touchscreen/Kconfig +++ b/drivers/input/touchscreen/Kconfig -@@ -534,6 +534,17 @@ config TOUCHSCREEN_S6SY761 +@@ -504,6 +504,17 @@ config TOUCHSCREEN_S6SY761 To compile this driver as module, choose M here: the module will be called s6sy761. @@ -70,7 +70,7 @@ diff --git a/drivers/input/touchscreen/Makefile b/drivers/input/touchscreen/Make index 111111111111..222222222222 100644 --- a/drivers/input/touchscreen/Makefile +++ b/drivers/input/touchscreen/Makefile -@@ -89,6 +89,7 @@ obj-$(CONFIG_TOUCHSCREEN_STMPE) += stmpe-ts.o +@@ -85,6 +85,7 @@ obj-$(CONFIG_TOUCHSCREEN_STMPE) += stmpe-ts.o obj-$(CONFIG_TOUCHSCREEN_SUN4I) += sun4i-ts.o obj-$(CONFIG_TOUCHSCREEN_SUR40) += sur40.o obj-$(CONFIG_TOUCHSCREEN_SURFACE3_SPI) += surface3_spi.o @@ -83,7 +83,7 @@ new file mode 100644 index 000000000000..111111111111 --- /dev/null +++ b/drivers/input/touchscreen/synaptics_tcm_oncell.c -@@ -0,0 +1,571 @@ +@@ -0,0 +1,570 @@ +// SPDX-License-Identifier: GPL-2.0-only +/* + * Driver for Synaptics TCM Oncell Touchscreens @@ -92,14 +92,13 @@ index 000000000000..111111111111 + * Copyright (c) 2024 Caleb Connolly + */ + -+#include +#include +#include +#include +#include +#include +#include -+#include ++#include +#include +#include +#include diff --git a/patch/kernel/archive/sm8250-6.11/0028-arm64-dts-qcom-add-OnePlus-8T-kebab.patch b/patch/kernel/archive/sm8250-6.12/0028-arm64-dts-qcom-add-OnePlus-8T-kebab.patch similarity index 99% rename from patch/kernel/archive/sm8250-6.11/0028-arm64-dts-qcom-add-OnePlus-8T-kebab.patch rename to patch/kernel/archive/sm8250-6.12/0028-arm64-dts-qcom-add-OnePlus-8T-kebab.patch index 9bd221226aac..7580ba9f4b5c 100644 --- a/patch/kernel/archive/sm8250-6.11/0028-arm64-dts-qcom-add-OnePlus-8T-kebab.patch +++ b/patch/kernel/archive/sm8250-6.12/0028-arm64-dts-qcom-add-OnePlus-8T-kebab.patch @@ -18,7 +18,7 @@ diff --git a/arch/arm64/boot/dts/qcom/Makefile b/arch/arm64/boot/dts/qcom/Makefi index 111111111111..222222222222 100644 --- a/arch/arm64/boot/dts/qcom/Makefile +++ b/arch/arm64/boot/dts/qcom/Makefile -@@ -236,6 +236,7 @@ dtb-$(CONFIG_ARCH_QCOM) += sm8150-sony-xperia-kumano-griffin.dtb +@@ -243,6 +243,7 @@ dtb-$(CONFIG_ARCH_QCOM) += sm8150-sony-xperia-kumano-griffin.dtb dtb-$(CONFIG_ARCH_QCOM) += sm8250-hdk.dtb dtb-$(CONFIG_ARCH_QCOM) += sm8250-mtp.dtb dtb-$(CONFIG_ARCH_QCOM) += sm8250-oneplus-instantnoodlep.dtb diff --git a/patch/kernel/archive/sm8250-6.11/0029-arm64-dts-qcom-Add-venus-firmware-for-OnePlus-8T.patch b/patch/kernel/archive/sm8250-6.12/0029-arm64-dts-qcom-Add-venus-firmware-for-OnePlus-8T.patch similarity index 100% rename from patch/kernel/archive/sm8250-6.11/0029-arm64-dts-qcom-Add-venus-firmware-for-OnePlus-8T.patch rename to patch/kernel/archive/sm8250-6.12/0029-arm64-dts-qcom-Add-venus-firmware-for-OnePlus-8T.patch diff --git a/patch/kernel/archive/sm8250-6.11/0030_drm-msm-dpu1--don't-choke-on-disabling-the-writeba.patch b/patch/kernel/archive/sm8250-6.12/0030-drm-msm-dpu1-don-t-choke-on-disabling-the-writeback-.patch similarity index 88% rename from patch/kernel/archive/sm8250-6.11/0030_drm-msm-dpu1--don't-choke-on-disabling-the-writeba.patch rename to patch/kernel/archive/sm8250-6.12/0030-drm-msm-dpu1-don-t-choke-on-disabling-the-writeback-.patch index 4ab8620123d9..94fc5143d216 100644 --- a/patch/kernel/archive/sm8250-6.11/0030_drm-msm-dpu1--don't-choke-on-disabling-the-writeba.patch +++ b/patch/kernel/archive/sm8250-6.12/0030-drm-msm-dpu1-don-t-choke-on-disabling-the-writeback-.patch @@ -1,8 +1,7 @@ -From 5344b8b729fc379a54d6aa4fa1ae648395efa62c Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Dmitry Baryshkov Date: Fri, 2 Aug 2024 22:47:33 +0300 -Subject: [PATCH] drm/msm/dpu1: don't choke on disabling the writeback - connector +Subject: drm/msm/dpu1: don't choke on disabling the writeback connector During suspend/resume process all connectors are explicitly disabled and then reenabled. However resume fails because of the connector_status check: @@ -22,7 +21,7 @@ Signed-off-by: Dmitry Baryshkov 1 file changed, 3 deletions(-) diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_writeback.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_writeback.c -index 16f144cbc0c98..8ff496082902b 100644 +index 111111111111..222222222222 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_writeback.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_writeback.c @@ -42,9 +42,6 @@ static int dpu_wb_conn_atomic_check(struct drm_connector *connector, @@ -36,5 +35,5 @@ index 16f144cbc0c98..8ff496082902b 100644 crtc = conn_state->crtc; -- -2.34.1 +Armbian diff --git a/patch/kernel/archive/sm8250-6.11/0031_arm64--dts--qcom--sm8250--add-uart16-Signed-off-by.patch b/patch/kernel/archive/sm8250-6.12/0031-arm64-dts-qcom-sm8250-add-uart16-Signed-off-by-Teguh.patch similarity index 77% rename from patch/kernel/archive/sm8250-6.11/0031_arm64--dts--qcom--sm8250--add-uart16-Signed-off-by.patch rename to patch/kernel/archive/sm8250-6.12/0031-arm64-dts-qcom-sm8250-add-uart16-Signed-off-by-Teguh.patch index 601d6407f28d..0bccd7f07de5 100644 --- a/patch/kernel/archive/sm8250-6.11/0031_arm64--dts--qcom--sm8250--add-uart16-Signed-off-by.patch +++ b/patch/kernel/archive/sm8250-6.12/0031-arm64-dts-qcom-sm8250-add-uart16-Signed-off-by-Teguh.patch @@ -1,18 +1,18 @@ -From 275fcb4f35b6cffcaabde3f876b4453996a77ead Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Teguh Sobirin Date: Wed, 20 Nov 2024 22:58:09 +0700 -Subject: [PATCH] arm64: dts: qcom: sm8250: add uart16 Signed-off-by: Teguh - Sobirin +Subject: arm64: dts: qcom: sm8250: add uart16 Signed-off-by: Teguh Sobirin + --- - arch/arm64/boot/dts/qcom/sm8250.dtsi | 22 ++++++++++++++++++++++ + arch/arm64/boot/dts/qcom/sm8250.dtsi | 22 ++++++++++ 1 file changed, 22 insertions(+) diff --git a/arch/arm64/boot/dts/qcom/sm8250.dtsi b/arch/arm64/boot/dts/qcom/sm8250.dtsi -index 9d6c97d1fd9d6..eaf6cb8bdcb8f 100644 +index 111111111111..222222222222 100644 --- a/arch/arm64/boot/dts/qcom/sm8250.dtsi +++ b/arch/arm64/boot/dts/qcom/sm8250.dtsi -@@ -1155,6 +1155,23 @@ spi16: spi@888000 { +@@ -1153,6 +1153,23 @@ spi16: spi@888000 { status = "disabled"; }; @@ -36,7 +36,7 @@ index 9d6c97d1fd9d6..eaf6cb8bdcb8f 100644 i2c17: i2c@88c000 { compatible = "qcom,geni-i2c"; reg = <0 0x0088c000 0 0x4000>; -@@ -5748,6 +5765,11 @@ qup_uart12_default: qup-uart12-default-state { +@@ -5725,6 +5742,11 @@ qup_uart12_default: qup-uart12-default-state { function = "qup12"; }; @@ -49,5 +49,5 @@ index 9d6c97d1fd9d6..eaf6cb8bdcb8f 100644 pins = "gpio52", "gpio53", "gpio54", "gpio55"; function = "qup17"; -- -2.34.1 +Armbian diff --git a/patch/kernel/archive/sm8250-6.11/0032_power--supply--Driver-for-Qualcomm-SMB5-Signed-off.patch b/patch/kernel/archive/sm8250-6.12/0032-power-supply-Driver-for-Qualcomm-SMB5-Signed-off-by-.patch similarity index 97% rename from patch/kernel/archive/sm8250-6.11/0032_power--supply--Driver-for-Qualcomm-SMB5-Signed-off.patch rename to patch/kernel/archive/sm8250-6.12/0032-power-supply-Driver-for-Qualcomm-SMB5-Signed-off-by-.patch index 9fe70d09bec5..b6eb82558c84 100644 --- a/patch/kernel/archive/sm8250-6.11/0032_power--supply--Driver-for-Qualcomm-SMB5-Signed-off.patch +++ b/patch/kernel/archive/sm8250-6.12/0032-power-supply-Driver-for-Qualcomm-SMB5-Signed-off-by-.patch @@ -1,18 +1,17 @@ -From 8894f9ffb67033dcbfa54770c987e576e2ff82fb Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Teguh Sobirin Date: Sun, 24 Nov 2024 23:04:43 +0700 -Subject: [PATCH] power: supply: Driver for Qualcomm SMB5 Signed-off-by: Teguh - Sobirin +Subject: power: supply: Driver for Qualcomm SMB5 Signed-off-by: Teguh Sobirin + --- drivers/power/supply/Kconfig | 9 + drivers/power/supply/Makefile | 1 + - drivers/power/supply/qcom_pm8150b_charger.c | 945 ++++++++++++++++++++ - 3 files changed, 955 insertions(+) - create mode 100644 drivers/power/supply/qcom_pm8150b_charger.c + drivers/power/supply/qcom_pm8150b_charger.c | 940 ++++++++++ + 3 files changed, 950 insertions(+) diff --git a/drivers/power/supply/Kconfig b/drivers/power/supply/Kconfig -index bcfa63fb9f1e2..ec3f3d5b20c8f 100644 +index 111111111111..222222222222 100644 --- a/drivers/power/supply/Kconfig +++ b/drivers/power/supply/Kconfig @@ -1008,6 +1008,15 @@ config CHARGER_QCOM_SMB2 @@ -32,7 +31,7 @@ index bcfa63fb9f1e2..ec3f3d5b20c8f 100644 tristate "Mitsumi MM8013 fuel gauge driver" depends on I2C diff --git a/drivers/power/supply/Makefile b/drivers/power/supply/Makefile -index 8dcb415453171..9237f62701582 100644 +index 111111111111..222222222222 100644 --- a/drivers/power/supply/Makefile +++ b/drivers/power/supply/Makefile @@ -116,4 +116,5 @@ obj-$(CONFIG_BATTERY_SURFACE) += surface_battery.o @@ -43,10 +42,10 @@ index 8dcb415453171..9237f62701582 100644 obj-$(CONFIG_FUEL_GAUGE_MM8013) += mm8013.o diff --git a/drivers/power/supply/qcom_pm8150b_charger.c b/drivers/power/supply/qcom_pm8150b_charger.c new file mode 100644 -index 0000000000000..48791e145345d +index 000000000000..111111111111 --- /dev/null +++ b/drivers/power/supply/qcom_pm8150b_charger.c -@@ -0,0 +1,945 @@ +@@ -0,0 +1,940 @@ +// SPDX-License-Identifier: GPL-2.0-only +/* + * Copyright (c) 2024, Teguh Sobirin . @@ -369,13 +368,6 @@ index 0000000000000..48791e145345d + POWER_SUPPLY_PROP_USB_TYPE, +}; + -+static enum power_supply_usb_type smb5_usb_types[] = { -+ POWER_SUPPLY_USB_TYPE_UNKNOWN, -+ POWER_SUPPLY_USB_TYPE_SDP, -+ POWER_SUPPLY_USB_TYPE_DCP, -+ POWER_SUPPLY_USB_TYPE_CDP, -+}; -+ +static int smb5_get_prop_usb_online(struct smb5_chip *chip, int *val) +{ + unsigned int stat; @@ -744,8 +736,10 @@ index 0000000000000..48791e145345d +static const struct power_supply_desc smb5_psy_desc = { + .name = "pmi8998_charger", + .type = POWER_SUPPLY_TYPE_USB, -+ .usb_types = smb5_usb_types, -+ .num_usb_types = ARRAY_SIZE(smb5_usb_types), ++ .usb_types = BIT(POWER_SUPPLY_USB_TYPE_SDP) | ++ BIT(POWER_SUPPLY_USB_TYPE_CDP) | ++ BIT(POWER_SUPPLY_USB_TYPE_DCP) | ++ BIT(POWER_SUPPLY_USB_TYPE_UNKNOWN), + .properties = smb5_properties, + .num_properties = ARRAY_SIZE(smb5_properties), + .get_property = smb5_get_property, @@ -993,5 +987,5 @@ index 0000000000000..48791e145345d +MODULE_DESCRIPTION("Qualcomm SMB5 Charger Driver"); +MODULE_LICENSE("GPL"); -- -2.34.1 +Armbian diff --git a/patch/kernel/archive/sm8250-6.11/0033_power--supply--Driver-for-Qualcomm-FG.patch b/patch/kernel/archive/sm8250-6.12/0033-power-supply-Driver-for-Qualcomm-FG.patch similarity index 99% rename from patch/kernel/archive/sm8250-6.11/0033_power--supply--Driver-for-Qualcomm-FG.patch rename to patch/kernel/archive/sm8250-6.12/0033-power-supply-Driver-for-Qualcomm-FG.patch index 190a8e0cca53..9085b2a41388 100644 --- a/patch/kernel/archive/sm8250-6.11/0033_power--supply--Driver-for-Qualcomm-FG.patch +++ b/patch/kernel/archive/sm8250-6.12/0033-power-supply-Driver-for-Qualcomm-FG.patch @@ -1,7 +1,7 @@ -From 98c6370f7380874d5b78871b3d24d92b74b4bdcb Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Teguh Sobirin Date: Wed, 20 Nov 2024 23:00:52 +0700 -Subject: [PATCH] power: supply: Driver for Qualcomm FG +Subject: power: supply: Driver for Qualcomm FG support for pm8150 taken from: https://github.com/map220v/sm8150-mainline @@ -9,12 +9,11 @@ Signed-off-by: Teguh Sobirin --- drivers/power/supply/Kconfig | 8 + drivers/power/supply/Makefile | 1 + - drivers/power/supply/qcom_fg.c | 1364 ++++++++++++++++++++++++++++++++ + drivers/power/supply/qcom_fg.c | 1364 ++++++++++ 3 files changed, 1373 insertions(+) - create mode 100644 drivers/power/supply/qcom_fg.c diff --git a/drivers/power/supply/Kconfig b/drivers/power/supply/Kconfig -index ec3f3d5b20c8f..b1e56c53f6248 100644 +index 111111111111..222222222222 100644 --- a/drivers/power/supply/Kconfig +++ b/drivers/power/supply/Kconfig @@ -1017,6 +1017,14 @@ config CHARGER_QCOM_SMB5 @@ -33,7 +32,7 @@ index ec3f3d5b20c8f..b1e56c53f6248 100644 tristate "Mitsumi MM8013 fuel gauge driver" depends on I2C diff --git a/drivers/power/supply/Makefile b/drivers/power/supply/Makefile -index 9237f62701582..52a75dae57816 100644 +index 111111111111..222222222222 100644 --- a/drivers/power/supply/Makefile +++ b/drivers/power/supply/Makefile @@ -117,4 +117,5 @@ obj-$(CONFIG_CHARGER_SURFACE) += surface_charger.o @@ -44,7 +43,7 @@ index 9237f62701582..52a75dae57816 100644 obj-$(CONFIG_FUEL_GAUGE_MM8013) += mm8013.o diff --git a/drivers/power/supply/qcom_fg.c b/drivers/power/supply/qcom_fg.c new file mode 100644 -index 0000000000000..a3b164994fe4e +index 000000000000..111111111111 --- /dev/null +++ b/drivers/power/supply/qcom_fg.c @@ -0,0 +1,1364 @@ @@ -1414,5 +1413,5 @@ index 0000000000000..a3b164994fe4e +MODULE_LICENSE("GPL v2"); \ No newline at end of file -- -2.34.1 +Armbian diff --git a/patch/kernel/archive/sm8250-6.11/0034_arm64--dts--qcom--pm8150b--Add-a-charger-Signed-of.patch b/patch/kernel/archive/sm8250-6.12/0034-arm64-dts-qcom-pm8150b-Add-a-charger-Signed-off-by-T.patch similarity index 82% rename from patch/kernel/archive/sm8250-6.11/0034_arm64--dts--qcom--pm8150b--Add-a-charger-Signed-of.patch rename to patch/kernel/archive/sm8250-6.12/0034-arm64-dts-qcom-pm8150b-Add-a-charger-Signed-off-by-T.patch index 259a3f421c69..4facdb16f9de 100644 --- a/patch/kernel/archive/sm8250-6.11/0034_arm64--dts--qcom--pm8150b--Add-a-charger-Signed-of.patch +++ b/patch/kernel/archive/sm8250-6.12/0034-arm64-dts-qcom-pm8150b-Add-a-charger-Signed-off-by-T.patch @@ -1,15 +1,15 @@ -From 000b9f019f77eca40d579aa86bba3b1b63c374d0 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Teguh Sobirin Date: Wed, 20 Nov 2024 23:01:45 +0700 -Subject: [PATCH] arm64: dts: qcom: pm8150b: Add a charger Signed-off-by: Teguh - Sobirin +Subject: arm64: dts: qcom: pm8150b: Add a charger Signed-off-by: Teguh Sobirin + --- - arch/arm64/boot/dts/qcom/pm8150b.dtsi | 32 +++++++++++++++++++++++++++ + arch/arm64/boot/dts/qcom/pm8150b.dtsi | 32 ++++++++++ 1 file changed, 32 insertions(+) diff --git a/arch/arm64/boot/dts/qcom/pm8150b.dtsi b/arch/arm64/boot/dts/qcom/pm8150b.dtsi -index 3f7b0b6a1d109..d0cfe63619547 100644 +index 111111111111..222222222222 100644 --- a/arch/arm64/boot/dts/qcom/pm8150b.dtsi +++ b/arch/arm64/boot/dts/qcom/pm8150b.dtsi @@ -107,6 +107,26 @@ pm8150b_temp: temp-alarm@2400 { @@ -59,5 +59,5 @@ index 3f7b0b6a1d109..d0cfe63619547 100644 reg = ; qcom,pre-scaling = <1 1>; -- -2.34.1 +Armbian diff --git a/patch/kernel/archive/sm8250-6.11/0035_arm64--dts--qcom--pm8150b--Add-a-FG-Signed-off-by-.patch b/patch/kernel/archive/sm8250-6.12/0035-arm64-dts-qcom-pm8150b-Add-a-FG-Signed-off-by-Teguh-.patch similarity index 77% rename from patch/kernel/archive/sm8250-6.11/0035_arm64--dts--qcom--pm8150b--Add-a-FG-Signed-off-by-.patch rename to patch/kernel/archive/sm8250-6.12/0035-arm64-dts-qcom-pm8150b-Add-a-FG-Signed-off-by-Teguh-.patch index 02f13ad12eda..188da5346aa6 100644 --- a/patch/kernel/archive/sm8250-6.11/0035_arm64--dts--qcom--pm8150b--Add-a-FG-Signed-off-by-.patch +++ b/patch/kernel/archive/sm8250-6.12/0035-arm64-dts-qcom-pm8150b-Add-a-FG-Signed-off-by-Teguh-.patch @@ -1,15 +1,15 @@ -From 9cf8452cf472d813961ff4a970a759d197c5b99f Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Teguh Sobirin Date: Wed, 20 Nov 2024 23:02:30 +0700 -Subject: [PATCH] arm64: dts: qcom: pm8150b: Add a FG Signed-off-by: Teguh - Sobirin +Subject: arm64: dts: qcom: pm8150b: Add a FG Signed-off-by: Teguh Sobirin + --- arch/arm64/boot/dts/qcom/pm8150b.dtsi | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/arch/arm64/boot/dts/qcom/pm8150b.dtsi b/arch/arm64/boot/dts/qcom/pm8150b.dtsi -index d0cfe63619547..42ef21238f18b 100644 +index 111111111111..222222222222 100644 --- a/arch/arm64/boot/dts/qcom/pm8150b.dtsi +++ b/arch/arm64/boot/dts/qcom/pm8150b.dtsi @@ -127,6 +127,14 @@ pm8150b_charger: charger@1000 { @@ -28,5 +28,5 @@ index d0cfe63619547..42ef21238f18b 100644 compatible = "qcom,spmi-adc5"; reg = <0x3100>; -- -2.34.1 +Armbian diff --git a/patch/kernel/archive/sm8250-6.11/0036_drm--panel--Add-DDIC-CH13726A-panel-Signed-off-by-.patch b/patch/kernel/archive/sm8250-6.12/0036-drm-panel-Add-DDIC-CH13726A-panel-Signed-off-by-Tegu.patch similarity index 94% rename from patch/kernel/archive/sm8250-6.11/0036_drm--panel--Add-DDIC-CH13726A-panel-Signed-off-by-.patch rename to patch/kernel/archive/sm8250-6.12/0036-drm-panel-Add-DDIC-CH13726A-panel-Signed-off-by-Tegu.patch index f770162c3524..97baa1590c4d 100644 --- a/patch/kernel/archive/sm8250-6.11/0036_drm--panel--Add-DDIC-CH13726A-panel-Signed-off-by-.patch +++ b/patch/kernel/archive/sm8250-6.12/0036-drm-panel-Add-DDIC-CH13726A-panel-Signed-off-by-Tegu.patch @@ -1,18 +1,17 @@ -From a61edacbee6718f398f37358dc705dd434f3c219 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Teguh Sobirin Date: Wed, 20 Nov 2024 23:04:35 +0700 -Subject: [PATCH] drm: panel: Add DDIC CH13726A panel Signed-off-by: Teguh - Sobirin +Subject: drm: panel: Add DDIC CH13726A panel Signed-off-by: Teguh Sobirin + --- drivers/gpu/drm/panel/Kconfig | 11 + drivers/gpu/drm/panel/Makefile | 1 + - drivers/gpu/drm/panel/panel-ddic-ch13726a.c | 341 ++++++++++++++++++++ + drivers/gpu/drm/panel/panel-ddic-ch13726a.c | 341 ++++++++++ 3 files changed, 353 insertions(+) - create mode 100644 drivers/gpu/drm/panel/panel-ddic-ch13726a.c diff --git a/drivers/gpu/drm/panel/Kconfig b/drivers/gpu/drm/panel/Kconfig -index 9f49b0189d3b8..c6fcccdcffa07 100644 +index 111111111111..222222222222 100644 --- a/drivers/gpu/drm/panel/Kconfig +++ b/drivers/gpu/drm/panel/Kconfig @@ -87,6 +87,17 @@ config DRM_PANEL_BOE_TV101WUM_NL6 @@ -30,16 +29,16 @@ index 9f49b0189d3b8..c6fcccdcffa07 100644 + Say Y here if you want to enable support for DDIC CH13726A-based + display panels. + - config DRM_PANEL_EBBG_FT8719 - tristate "EBBG FT8719 panel driver" + config DRM_PANEL_BOE_TV101WUM_LL2 + tristate "BOE TV101WUM LL2 1200x1920 panel" depends on OF diff --git a/drivers/gpu/drm/panel/Makefile b/drivers/gpu/drm/panel/Makefile -index 5581387707c62..239a1049fb89e 100644 +index 111111111111..222222222222 100644 --- a/drivers/gpu/drm/panel/Makefile +++ b/drivers/gpu/drm/panel/Makefile -@@ -7,6 +7,7 @@ obj-$(CONFIG_DRM_PANEL_BOE_BF060Y8M_AJ0) += panel-boe-bf060y8m-aj0.o - obj-$(CONFIG_DRM_PANEL_BOE_HIMAX8279D) += panel-boe-himax8279d.o +@@ -8,6 +8,7 @@ obj-$(CONFIG_DRM_PANEL_BOE_HIMAX8279D) += panel-boe-himax8279d.o obj-$(CONFIG_DRM_PANEL_BOE_TH101MB31UIG002_28A) += panel-boe-th101mb31ig002-28a.o + obj-$(CONFIG_DRM_PANEL_BOE_TV101WUM_LL2) += panel-boe-tv101wum-ll2.o obj-$(CONFIG_DRM_PANEL_BOE_TV101WUM_NL6) += panel-boe-tv101wum-nl6.o +obj-$(CONFIG_DRM_PANEL_DDIC_CH13726A) += panel-ddic-ch13726a.o obj-$(CONFIG_DRM_PANEL_DSI_CM) += panel-dsi-cm.o @@ -47,7 +46,7 @@ index 5581387707c62..239a1049fb89e 100644 obj-$(CONFIG_DRM_PANEL_SIMPLE) += panel-simple.o diff --git a/drivers/gpu/drm/panel/panel-ddic-ch13726a.c b/drivers/gpu/drm/panel/panel-ddic-ch13726a.c new file mode 100644 -index 0000000000000..772bb057c44d8 +index 000000000000..111111111111 --- /dev/null +++ b/drivers/gpu/drm/panel/panel-ddic-ch13726a.c @@ -0,0 +1,341 @@ @@ -393,5 +392,5 @@ index 0000000000000..772bb057c44d8 +MODULE_DESCRIPTION("DRM driver for CH13726A DSI panels"); +MODULE_LICENSE("GPL"); -- -2.34.1 +Armbian diff --git a/patch/kernel/archive/sm8250-6.11/0037_leds--Add-driver-for-HEROIC-HTR3212-Signed-off-by-.patch b/patch/kernel/archive/sm8250-6.12/0037-leds-Add-driver-for-HEROIC-HTR3212-Signed-off-by-Teg.patch similarity index 94% rename from patch/kernel/archive/sm8250-6.11/0037_leds--Add-driver-for-HEROIC-HTR3212-Signed-off-by-.patch rename to patch/kernel/archive/sm8250-6.12/0037-leds-Add-driver-for-HEROIC-HTR3212-Signed-off-by-Teg.patch index 6f5553a3b82b..12f4023b6ee9 100644 --- a/patch/kernel/archive/sm8250-6.11/0037_leds--Add-driver-for-HEROIC-HTR3212-Signed-off-by-.patch +++ b/patch/kernel/archive/sm8250-6.12/0037-leds-Add-driver-for-HEROIC-HTR3212-Signed-off-by-Teg.patch @@ -1,18 +1,17 @@ -From 1ab0badb6c453857541e2c3cbe6a2332beca0e11 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Teguh Sobirin Date: Thu, 21 Nov 2024 00:16:42 +0700 -Subject: [PATCH] leds: Add driver for HEROIC HTR3212 Signed-off-by: Teguh - Sobirin +Subject: leds: Add driver for HEROIC HTR3212 Signed-off-by: Teguh Sobirin + --- - drivers/leds/Kconfig | 10 ++ + drivers/leds/Kconfig | 10 + drivers/leds/Makefile | 1 + - drivers/leds/leds-htr3212.c | 298 ++++++++++++++++++++++++++++++++++++ + drivers/leds/leds-htr3212.c | 298 ++++++++++ 3 files changed, 309 insertions(+) - create mode 100644 drivers/leds/leds-htr3212.c diff --git a/drivers/leds/Kconfig b/drivers/leds/Kconfig -index 8d9d8da376e46..30de92434e3b0 100644 +index 111111111111..222222222222 100644 --- a/drivers/leds/Kconfig +++ b/drivers/leds/Kconfig @@ -211,6 +211,16 @@ config LEDS_EXPRESSWIRE @@ -33,7 +32,7 @@ index 8d9d8da376e46..30de92434e3b0 100644 tristate "LED support for CZ.NIC's Turris Omnia" depends on LEDS_CLASS_MULTICOLOR diff --git a/drivers/leds/Makefile b/drivers/leds/Makefile -index 18afbb5a23ee5..e2277fa7f00dd 100644 +index 111111111111..222222222222 100644 --- a/drivers/leds/Makefile +++ b/drivers/leds/Makefile @@ -32,6 +32,7 @@ obj-$(CONFIG_LEDS_DA9052) += leds-da9052.o @@ -46,7 +45,7 @@ index 18afbb5a23ee5..e2277fa7f00dd 100644 obj-$(CONFIG_LEDS_IPAQ_MICRO) += leds-ipaq-micro.o diff --git a/drivers/leds/leds-htr3212.c b/drivers/leds/leds-htr3212.c new file mode 100644 -index 0000000000000..e9367c4aad04b +index 000000000000..111111111111 --- /dev/null +++ b/drivers/leds/leds-htr3212.c @@ -0,0 +1,298 @@ @@ -349,5 +348,5 @@ index 0000000000000..e9367c4aad04b +MODULE_DESCRIPTION("HEROIC HTR3212 LED Driver"); +MODULE_LICENSE("GPL v2"); -- -2.34.1 +Armbian diff --git a/patch/kernel/archive/sm8250-6.11/0038_Input--driver-for-AYN-Odin2-Gamepad.patch b/patch/kernel/archive/sm8250-6.12/0038-Input-driver-for-AYN-Odin2-Gamepad.patch similarity index 96% rename from patch/kernel/archive/sm8250-6.11/0038_Input--driver-for-AYN-Odin2-Gamepad.patch rename to patch/kernel/archive/sm8250-6.12/0038-Input-driver-for-AYN-Odin2-Gamepad.patch index 8c411610e31c..c839b1e85b0f 100644 --- a/patch/kernel/archive/sm8250-6.11/0038_Input--driver-for-AYN-Odin2-Gamepad.patch +++ b/patch/kernel/archive/sm8250-6.12/0038-Input-driver-for-AYN-Odin2-Gamepad.patch @@ -1,19 +1,18 @@ -From b195a31aa9e0fc606b1e938626ae533c2bcebab1 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Teguh Sobirin Date: Wed, 20 Nov 2024 23:13:18 +0700 -Subject: [PATCH] Input: driver for AYN Odin2 Gamepad +Subject: Input: driver for AYN Odin2 Gamepad There have been improvements from the original Odin 2 Gamepad driver Signed-off-by: Teguh Sobirin --- drivers/input/joystick/Kconfig | 4 + drivers/input/joystick/Makefile | 1 + - drivers/input/joystick/odin2.c | 313 ++++++++++++++++++++++++++++++++ + drivers/input/joystick/odin2.c | 313 ++++++++++ 3 files changed, 318 insertions(+) - create mode 100644 drivers/input/joystick/odin2.c diff --git a/drivers/input/joystick/Kconfig b/drivers/input/joystick/Kconfig -index 7755e5b454d2c..031b7428068a8 100644 +index 111111111111..222222222222 100644 --- a/drivers/input/joystick/Kconfig +++ b/drivers/input/joystick/Kconfig @@ -344,6 +344,10 @@ config JOYSTICK_MAPLE @@ -28,7 +27,7 @@ index 7755e5b454d2c..031b7428068a8 100644 tristate "PlayStation 1/2 joypads via SPI interface" depends on SPI diff --git a/drivers/input/joystick/Makefile b/drivers/input/joystick/Makefile -index 9976f596a9208..ba7d72514c8b9 100644 +index 111111111111..222222222222 100644 --- a/drivers/input/joystick/Makefile +++ b/drivers/input/joystick/Makefile @@ -25,6 +25,7 @@ obj-$(CONFIG_JOYSTICK_JOYDUMP) += joydump.o @@ -41,7 +40,7 @@ index 9976f596a9208..ba7d72514c8b9 100644 obj-$(CONFIG_JOYSTICK_QWIIC) += qwiic-joystick.o diff --git a/drivers/input/joystick/odin2.c b/drivers/input/joystick/odin2.c new file mode 100644 -index 0000000000000..63a32175b4415 +index 000000000000..111111111111 --- /dev/null +++ b/drivers/input/joystick/odin2.c @@ -0,0 +1,313 @@ @@ -359,5 +358,5 @@ index 0000000000000..63a32175b4415 +MODULE_AUTHOR("Teguh Sobirin "); +MODULE_ALIAS("platform:" DRIVER_NAME); -- -2.34.1 +Armbian diff --git a/patch/kernel/archive/sm8250-6.11/0039_input--add-Qualcomm-SPMI-haptics-driver.patch b/patch/kernel/archive/sm8250-6.12/0039-input-add-Qualcomm-SPMI-haptics-driver.patch similarity index 98% rename from patch/kernel/archive/sm8250-6.11/0039_input--add-Qualcomm-SPMI-haptics-driver.patch rename to patch/kernel/archive/sm8250-6.12/0039-input-add-Qualcomm-SPMI-haptics-driver.patch index c701a2040085..2437d2d0979e 100644 --- a/patch/kernel/archive/sm8250-6.11/0039_input--add-Qualcomm-SPMI-haptics-driver.patch +++ b/patch/kernel/archive/sm8250-6.12/0039-input-add-Qualcomm-SPMI-haptics-driver.patch @@ -1,7 +1,7 @@ -From 484a974e62ed69f1bb8b564f719613623e5eb3c6 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Teguh Sobirin Date: Mon, 25 Nov 2024 02:27:16 +0700 -Subject: [PATCH] input: add Qualcomm SPMI haptics driver +Subject: input: add Qualcomm SPMI haptics driver Add support for the haptics found in pmi8998 and related PMICs. Based on the ff-memless interface. Currently this driver provides @@ -13,14 +13,12 @@ Signed-off-by: Teguh Sobirin --- drivers/input/misc/Kconfig | 12 + drivers/input/misc/Makefile | 1 + - drivers/input/misc/qcom-spmi-haptics.c | 990 ++++++++++++++++++ + drivers/input/misc/qcom-spmi-haptics.c | 990 ++++++++++ include/dt-bindings/input/qcom,spmi-haptics.h | 31 + 4 files changed, 1034 insertions(+) - create mode 100644 drivers/input/misc/qcom-spmi-haptics.c - create mode 100644 include/dt-bindings/input/qcom,spmi-haptics.h diff --git a/drivers/input/misc/Kconfig b/drivers/input/misc/Kconfig -index 6a852c76331b6..df77c0fdc93e7 100644 +index 111111111111..222222222222 100644 --- a/drivers/input/misc/Kconfig +++ b/drivers/input/misc/Kconfig @@ -214,6 +214,18 @@ config INPUT_PMIC8XXX_PWRKEY @@ -43,7 +41,7 @@ index 6a852c76331b6..df77c0fdc93e7 100644 tristate "SPARC Speaker support" depends on PCI && SPARC64 diff --git a/drivers/input/misc/Makefile b/drivers/input/misc/Makefile -index 4f7f736831ba8..0a3fb90f366fe 100644 +index 111111111111..222222222222 100644 --- a/drivers/input/misc/Makefile +++ b/drivers/input/misc/Makefile @@ -41,6 +41,7 @@ obj-$(CONFIG_INPUT_DRV2667_HAPTICS) += drv2667.o @@ -56,7 +54,7 @@ index 4f7f736831ba8..0a3fb90f366fe 100644 obj-$(CONFIG_INPUT_IBM_PANEL) += ibm-panel.o diff --git a/drivers/input/misc/qcom-spmi-haptics.c b/drivers/input/misc/qcom-spmi-haptics.c new file mode 100644 -index 0000000000000..64ef78ec18218 +index 000000000000..111111111111 --- /dev/null +++ b/drivers/input/misc/qcom-spmi-haptics.c @@ -0,0 +1,990 @@ @@ -1052,7 +1050,7 @@ index 0000000000000..64ef78ec18218 +MODULE_AUTHOR("Caleb Connolly "); diff --git a/include/dt-bindings/input/qcom,spmi-haptics.h b/include/dt-bindings/input/qcom,spmi-haptics.h new file mode 100644 -index 0000000000000..c25c004807015 +index 000000000000..111111111111 --- /dev/null +++ b/include/dt-bindings/input/qcom,spmi-haptics.h @@ -0,0 +1,31 @@ @@ -1088,5 +1086,5 @@ index 0000000000000..c25c004807015 + +#endif /* _DT_BINDINGS_QCOM_PMIC_SPMI_HAPTICS_ */ -- -2.34.1 +Armbian diff --git a/patch/kernel/archive/sm8250-6.11/0040_arm64--dts--qcom--pm8150b--introduce-spmi-haptics.patch b/patch/kernel/archive/sm8250-6.12/0040-arm64-dts-qcom-pm8150b-introduce-spmi-haptics.patch similarity index 82% rename from patch/kernel/archive/sm8250-6.11/0040_arm64--dts--qcom--pm8150b--introduce-spmi-haptics.patch rename to patch/kernel/archive/sm8250-6.12/0040-arm64-dts-qcom-pm8150b-introduce-spmi-haptics.patch index a68a2757c292..e58dcbf12dc3 100644 --- a/patch/kernel/archive/sm8250-6.11/0040_arm64--dts--qcom--pm8150b--introduce-spmi-haptics.patch +++ b/patch/kernel/archive/sm8250-6.12/0040-arm64-dts-qcom-pm8150b-introduce-spmi-haptics.patch @@ -1,16 +1,16 @@ -From 67c96945a031cda1c5aa331f016d4e83b4557910 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Teguh Sobirin Date: Mon, 25 Nov 2024 02:17:47 +0700 -Subject: [PATCH] arm64: dts: qcom: pm8150b: introduce spmi haptics +Subject: arm64: dts: qcom: pm8150b: introduce spmi haptics Add bindings for Qualcomm SPMI haptics on platforms using pm8150b. Signed-off-by: Teguh Sobirin --- - arch/arm64/boot/dts/qcom/pm8150b.dtsi | 16 ++++++++++++++++ + arch/arm64/boot/dts/qcom/pm8150b.dtsi | 16 ++++++++++ 1 file changed, 16 insertions(+) diff --git a/arch/arm64/boot/dts/qcom/pm8150b.dtsi b/arch/arm64/boot/dts/qcom/pm8150b.dtsi -index 42ef21238f18b..efad258834df9 100644 +index 111111111111..222222222222 100644 --- a/arch/arm64/boot/dts/qcom/pm8150b.dtsi +++ b/arch/arm64/boot/dts/qcom/pm8150b.dtsi @@ -5,6 +5,7 @@ @@ -43,5 +43,5 @@ index 42ef21238f18b..efad258834df9 100644 }; }; -- -2.34.1 +Armbian diff --git a/patch/kernel/archive/sm8250-6.11/0041_arm64--dts--qcom--add-SM8250-Retroid-Pocket-varian.patch b/patch/kernel/archive/sm8250-6.12/0041-arm64-dts-qcom-add-SM8250-Retroid-Pocket-variant-Sig.patch similarity index 97% rename from patch/kernel/archive/sm8250-6.11/0041_arm64--dts--qcom--add-SM8250-Retroid-Pocket-varian.patch rename to patch/kernel/archive/sm8250-6.12/0041-arm64-dts-qcom-add-SM8250-Retroid-Pocket-variant-Sig.patch index 7ea59bbfbb4d..df0ac4ceb2ce 100644 --- a/patch/kernel/archive/sm8250-6.11/0041_arm64--dts--qcom--add-SM8250-Retroid-Pocket-varian.patch +++ b/patch/kernel/archive/sm8250-6.12/0041-arm64-dts-qcom-add-SM8250-Retroid-Pocket-variant-Sig.patch @@ -1,24 +1,21 @@ -From e1159a967783255e9f68f7bd449e12b5f2767b28 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Teguh Sobirin Date: Mon, 25 Nov 2024 02:19:13 +0700 -Subject: [PATCH] arm64: dts: qcom: add SM8250 Retroid Pocket variant - Signed-off-by: Teguh Sobirin +Subject: arm64: dts: qcom: add SM8250 Retroid Pocket variant Signed-off-by: + Teguh Sobirin --- - arch/arm64/boot/dts/qcom/Makefile | 2 + - .../dts/qcom/sm8250-retroidpocket-common.dtsi | 1435 +++++++++++++++++ - .../dts/qcom/sm8250-retroidpocket-rp5.dts | 100 ++ - .../dts/qcom/sm8250-retroidpocket-rpmini.dts | 98 ++ + arch/arm64/boot/dts/qcom/Makefile | 2 + + arch/arm64/boot/dts/qcom/sm8250-retroidpocket-common.dtsi | 1435 ++++++++++ + arch/arm64/boot/dts/qcom/sm8250-retroidpocket-rp5.dts | 100 + + arch/arm64/boot/dts/qcom/sm8250-retroidpocket-rpmini.dts | 98 + 4 files changed, 1635 insertions(+) - create mode 100644 arch/arm64/boot/dts/qcom/sm8250-retroidpocket-common.dtsi - create mode 100644 arch/arm64/boot/dts/qcom/sm8250-retroidpocket-rp5.dts - create mode 100644 arch/arm64/boot/dts/qcom/sm8250-retroidpocket-rpmini.dts diff --git a/arch/arm64/boot/dts/qcom/Makefile b/arch/arm64/boot/dts/qcom/Makefile -index 0e5c810304fbe..aecec23e2eaae 100644 +index 111111111111..222222222222 100644 --- a/arch/arm64/boot/dts/qcom/Makefile +++ b/arch/arm64/boot/dts/qcom/Makefile -@@ -237,6 +237,8 @@ dtb-$(CONFIG_ARCH_QCOM) += sm8250-hdk.dtb +@@ -244,6 +244,8 @@ dtb-$(CONFIG_ARCH_QCOM) += sm8250-hdk.dtb dtb-$(CONFIG_ARCH_QCOM) += sm8250-mtp.dtb dtb-$(CONFIG_ARCH_QCOM) += sm8250-oneplus-instantnoodlep.dtb dtb-$(CONFIG_ARCH_QCOM) += sm8250-oneplus-kebab.dtb @@ -29,7 +26,7 @@ index 0e5c810304fbe..aecec23e2eaae 100644 dtb-$(CONFIG_ARCH_QCOM) += sm8250-xiaomi-elish-boe.dtb diff --git a/arch/arm64/boot/dts/qcom/sm8250-retroidpocket-common.dtsi b/arch/arm64/boot/dts/qcom/sm8250-retroidpocket-common.dtsi new file mode 100644 -index 0000000000000..58ca9d330a152 +index 000000000000..111111111111 --- /dev/null +++ b/arch/arm64/boot/dts/qcom/sm8250-retroidpocket-common.dtsi @@ -0,0 +1,1435 @@ @@ -1470,7 +1467,7 @@ index 0000000000000..58ca9d330a152 +}; diff --git a/arch/arm64/boot/dts/qcom/sm8250-retroidpocket-rp5.dts b/arch/arm64/boot/dts/qcom/sm8250-retroidpocket-rp5.dts new file mode 100644 -index 0000000000000..a059378fcbea7 +index 000000000000..111111111111 --- /dev/null +++ b/arch/arm64/boot/dts/qcom/sm8250-retroidpocket-rp5.dts @@ -0,0 +1,100 @@ @@ -1576,7 +1573,7 @@ index 0000000000000..a059378fcbea7 +}; diff --git a/arch/arm64/boot/dts/qcom/sm8250-retroidpocket-rpmini.dts b/arch/arm64/boot/dts/qcom/sm8250-retroidpocket-rpmini.dts new file mode 100644 -index 0000000000000..9f572e87b84e7 +index 000000000000..111111111111 --- /dev/null +++ b/arch/arm64/boot/dts/qcom/sm8250-retroidpocket-rpmini.dts @@ -0,0 +1,98 @@ @@ -1679,5 +1676,5 @@ index 0000000000000..9f572e87b84e7 + }; +}; -- -2.34.1 +Armbian diff --git a/patch/kernel/archive/sm8250-6.12/0042-tools-disable-sched_ext_clean.patch b/patch/kernel/archive/sm8250-6.12/0042-tools-disable-sched_ext_clean.patch new file mode 100644 index 000000000000..2ce2dae21120 --- /dev/null +++ b/patch/kernel/archive/sm8250-6.12/0042-tools-disable-sched_ext_clean.patch @@ -0,0 +1,25 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: amazingfate +Date: Wed, 6 Nov 2024 19:57:53 +0800 +Subject: tools: disable sched_ext_clean + +--- + tools/Makefile | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/tools/Makefile b/tools/Makefile +index 111111111111..222222222222 100644 +--- a/tools/Makefile ++++ b/tools/Makefile +@@ -220,7 +220,6 @@ clean: acpi_clean counter_clean cpupower_clean hv_clean firewire_clean \ + mm_clean bpf_clean iio_clean x86_energy_perf_policy_clean tmon_clean \ + freefall_clean build_clean libbpf_clean libsubcmd_clean \ + gpio_clean objtool_clean leds_clean wmi_clean pci_clean firmware_clean debugging_clean \ +- intel-speed-select_clean tracing_clean thermal_clean thermometer_clean thermal-engine_clean \ +- sched_ext_clean ++ intel-speed-select_clean tracing_clean thermal_clean thermometer_clean thermal-engine_clean + + .PHONY: FORCE +-- +Armbian +