guix_mirror_bot pushed a commit to branch kernel-updates
in repository guix.

commit 5d4f97515dc965bcd39fcb2dea9c96a5b1271b2d
Author: Vagrant Cascadian <[email protected]>
AuthorDate: Fri Nov 6 13:34:23 2026 -0800

    gnu: linux-libre-arm64-mnt-reform 6.12: Remove package.
    
    * gnu/packages/linux.scm (reform-debian-packages-for-6.12,
    linux-libre-arm64-mnt-reform-6.12): Remove variables.
    
gnu/packages/patches/linux-libre-arm64-mnt-reform-revert-phy-rockchip-samsung.patch:
    Remove file.
    
gnu/packages/patches/linux-libre-arm64-mnt-reform-revert-rk-samsung-hdptx.patch:
    Remove file.
    
gnu/packages/patches/linux-libre-arm64-mnt-reform-revert-vop2-display-modes.patch:
    Remove file.
---
 gnu/packages/linux.scm                             | 229 ---------------------
 ...64-mnt-reform-revert-phy-rockchip-samsung.patch |  35 ----
 ...-arm64-mnt-reform-revert-rk-samsung-hdptx.patch |  42 ----
 ...rm64-mnt-reform-revert-vop2-display-modes.patch |  94 ---------
 4 files changed, 400 deletions(-)

diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index d9a1167aaca..7fece5ed7b3 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -1898,48 +1898,6 @@ DFSDG}.")
               license:gpl3
               license:x11))))
 
-(define-public reform-debian-packages-for-6.12
-  (package
-    (name "reform-debian-packages")
-    (version "2023-07-10-320-gaf0a461") ;from git describe
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-             (url "https://source.mnt.re/reform/reform-debian-packages.git";)
-             (commit "af0a461d38e13481323f061d9ff6827d1d13873b")))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32 "1cylprld2ri3mprj5cgwla1l8qv9iqqvcra7h64yarzs49zaa16m"))))
-    (build-system copy-build-system)
-    (arguments
-     (list
-      #:install-plan
-      #~'(("linux/patches6.12/" "/patches6.12")
-          ("linux/" "/dts/amlogic"
-           #:include-regexp ("meson.*\\.dts$"))
-          ("linux/" "/dts/freescale"
-           #:include-regexp ("imx8.*\\.dts$"))
-          ("linux/" "/dts/freescale"
-           #:include-regexp ("fsl.*\\.dts$"))
-          ("linux/" "/dts/rockchip"
-           #:include-regexp ("rk3588.*\\.dts$"))
-          ("linux/config" "config"))))
-    (home-page "https://source.mnt.re/reform/reform-debian-packages";)
-    (synopsis
-     "Linux kernel patches and device-trees used for MNT Reform systems")
-    (description
-     "Linux kernel patches and device-trees used for the MNT Reform systems")
-    (license (list
-              (license:fsf-free "file://filter-output"
-                                
"https://www.gnu.org/prep/maintain/html_node/License-Notices-for-Other-Files.html";)
-              license:bsd-2
-              license:expat
-              license:gpl2
-              license:gpl2+
-              license:gpl3
-              license:x11))))
-
 (define (mnt-reform-kernel-options version)
   `(("CONFIG_DRM_LVDS_CODEC" . m)
     ("CONFIG_DRM_CDNS_MHDP8546" . m)
@@ -2617,193 +2575,6 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += 
rk3588-mnt-reform2-dsi.dtb
 dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588-mnt-reform-next.dtb
 dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588-mnt-pocket-reform.dtb")))))))))))
 
-(define-public linux-libre-arm64-mnt-reform-6.12
-  ;; Kernel for use on the MNT/Reform systems
-  ;; https://mntre.com/reform.html
-  (let ((base (make-linux-libre* linux-libre-6.12-version
-                                 linux-libre-6.12-gnu-revision
-                                 (source-with-patches linux-libre-6.12-source
-                                                      ;; Revert upstream 
patches
-                                                      ;; that conflict with
-                                                      ;; MNT/Reform patches
-                                                      (search-patches
-                                                       
"linux-libre-arm64-mnt-reform-revert-vop2-display-modes.patch"
-                                                       
"linux-libre-arm64-mnt-reform-revert-phy-rockchip-samsung.patch"
-                                                       
"linux-libre-arm64-mnt-reform-revert-rk-samsung-hdptx.patch"))
-                                 '("aarch64-linux")
-                                 #:extra-version "arm64-mnt-reform"
-                                 #:extra-options
-                                 ;; 
https://source.mnt.re/reform/reform-debian-packages/-/blob/main/linux/config
-                                 (append (mnt-reform-kernel-options
-                                          linux-libre-6.12-version)
-                                         (default-extra-linux-options
-                                          linux-libre-6.12-version)))))
-    (package
-      (inherit base)
-      (inputs (list reform-debian-packages-for-6.12))
-      (synopsis (string-append (package-synopsis base)
-                               " for MNT/Reform systems"))
-      (description (string-append (package-description base)
-                    "  Configuration options and patches have been applied for 
use with MNT/Reform systems."))
-      (arguments
-       (substitute-keyword-arguments arguments
-         ((#:phases phases)
-          #~(modify-phases #$phases
-              (add-after 'unpack 'apply-reform-patches
-                (lambda* (#:key inputs #:allow-other-keys)
-                  (for-each (lambda (patch)
-                              (invoke "patch" "-p1" "-i"
-                                      (search-input-file inputs
-                                                         (string-append
-                                                          "patches6.12/" 
patch))))
-                            (list
-                             
"imx8mp-mnt-pocket-reform/2ghz/0001-imx8mp-2ghz-clk.patch"
-                             
"imx8mp-mnt-pocket-reform/2ghz/0002-imx8mp-2ghz-opp.patch"
-                             
"imx8mp-mnt-pocket-reform/audio/0000-revert-crashy-audiomix-pm-support.patch"
-                             
"imx8mp-mnt-pocket-reform/mmc-sdio/0001-sdhci-add-no-sd-uhs-sdr104-devicetree-property.patch"
-                             
"imx8mp-mnt-pocket-reform/mmc-sdio/0002-During-the-card-init-the-host-side-sometimes-may-nee.patch"
-                             
"imx8mp-mnt-pocket-reform/mmc-sdio/0003-USDHC-IP-has-one-limitation-the-tuning-circuit-can-t.patch"
-                             
"imx8mp-mnt-pocket-reform/pocket-panel/0001-v5-add-multi-display-panel-driver.patch"
-                             
"imx8mp-mnt-reform2/0001-sn65dsi86-use-hs-clock-of-samsung-dsim-host-directly.patch"
-                             
"imx8mp-mnt-reform2/0002-lcdif-dont-exceed-desired-pixel-clock.patch"
-                             
"imx8mq-mnt-reform2/0001-nwl-dsi-fixup-mode-only-for-LCDIF-input-not-DCSS.patch"
-                             
"imx8mq-mnt-reform2/0002-pci-imx6-add-support-for-internal-refclk-imx8mq.patch"
-                             
"imx8mq-mnt-reform2/0003-lcdif-fix-pcie-interference.patch"
-                             
"imx8mq-mnt-reform2/0004-mnt4002-imx-gpcv2-wake-smccc.patch.patch"
-                             ;; Does not apply, needs further investigation
-                             ;; 
"imx8mq-mnt-reform2/v19_20241126_sandor_yu_initial_support_cadence_mhdp8501_hdmi_dp_for_i_mx8mq.mbx"
-                             "ls1028a-mnt-reform2/0000-dtsi-add-hdptx.patch"
-                             
"meson-g12b-bananapi-cm4-mnt-pocket-reform/0001-a311d-viu-fifo-lines-config.patch"
-                             
"meson-g12b-bananapi-cm4-mnt-pocket-reform/0002-a311d-viu-fifo-lines-config-header.patch"
-                             
"meson-g12b-bananapi-cm4-mnt-pocket-reform/0003-tlv320aic31xx-add-1228800hz-support.patch"
-                             
"meson-g12b-bananapi-cm4-mnt-reform2/0001-Revert-drm-bridge-synopsys-dw-mipi-dsi-enable-EoTp-b.patch"
-                             
"meson-g12b-bananapi-cm4-mnt-reform2/0011-dw-mipi-dsi-phy-stop-wait-time.patch"
-                             
"meson-g12b-bananapi-cm4-mnt-reform2/0012-innolux-n125hce-gn1-timing-tweaks.patch"
-                             
"meson-g12b-bananapi-cm4-mnt-reform2/0013-meson-viu-hold-fifo-lines.patch"
-                             
"meson-g12b-bananapi-cm4-mnt-reform2/0014-meson-venc-sync.patch.patch"
-                             
"meson-g12b-bananapi-cm4-mnt-reform2/0015-meson-dw-mipi-dsi-sync-invert.patch"
-                             
"meson-g12b-bananapi-cm4-mnt-reform2/0016-sn65dsi86-burst-mode-support.patch"
-                             
"meson-g12b-bananapi-cm4-mnt-reform2/0018-sn65dsi86-never-turn-off.patch"
-                             
"meson-g12b-bananapi-cm4-mnt-reform2/0020-LOCAL-ALSA-Assign-internal-PCM-chmap-ELD-IEC958-kctl.patch"
-                             
"meson-g12b-bananapi-cm4-mnt-reform2/0021-HACK-of-partial-revert-of-fdt.c-changes.patch"
-                             
"meson-g12b-bananapi-cm4-mnt-reform2/0022-add-bt-and-eth-resets.patch"
-                             
"meson-g12b-bananapi-cm4-mnt-reform2/0023-sdio-pullups.patch"
-                             
"meson-g12b-bananapi-cm4-mnt-reform2/0024-sdio-improve-wifi-speed.patch"
-                             
"rk3588-mnt-reform2/0001-regulator-Add-of_regulator_get_optional-for-pure-DT-.patch"
-                             
"rk3588-mnt-reform2/0001-scripts-package-builddeb-allow-hooks-also-in-usr-sha.patch"
-                             
"rk3588-mnt-reform2/0002-regulator-Add-devres-version-of-of_regulator_get_opt.patch"
-                             
"rk3588-mnt-reform2/0004-arm64-dts-rockchip-rk3588-rock5b-add-USB-C-support.patch"
-                             
"rk3588-mnt-reform2/0005-math.h-add-DIV_ROUND_UP_NO_OVERFLOW.patch"
-                             
"rk3588-mnt-reform2/0006-clk-divider-Fix-divisor-masking-on-64-bit-platforms.patch"
-                             
"rk3588-mnt-reform2/0007-clk-composite-replace-open-coded-abs_diff.patch"
-                             
"rk3588-mnt-reform2/0008-clk-rockchip-support-clocks-registered-late.patch"
-                             
"rk3588-mnt-reform2/0009-clk-rockchip-rk3588-register-GATE_LINK-later.patch"
-                             
"rk3588-mnt-reform2/0010-clk-rockchip-expose-rockchip_clk_set_lookup.patch"
-                             
"rk3588-mnt-reform2/0011-clk-rockchip-implement-linked-gate-clock-support.patch"
-                             
"rk3588-mnt-reform2/0012-clk-rockchip-rk3588-drop-RK3588_LINKED_CLK.patch"
-                             
"rk3588-mnt-reform2/0013-arm64-dts-rockchip-rk3588-evb1-add-bluetooth-rfkill.patch"
-                             
"rk3588-mnt-reform2/0014-arm64-dts-rockchip-rk3588-evb1-improve-PCIe-ethernet.patch"
-                             
"rk3588-mnt-reform2/0015-arm64-dts-rockchip-Slow-down-EMMC-a-bit-to-keep-IO-s.patch"
-                             
"rk3588-mnt-reform2/0016-vop2-Add-clock-resets-support.patch"
-                             
"rk3588-mnt-reform2/0017-arm64-dts-rockchip-Add-VOP-clock-resets-for-rk3588s.patch"
-                             
"rk3588-mnt-reform2/0018-dt-bindings-display-vop2-Add-VP-clock-resets.patch"
-                             
"rk3588-mnt-reform2/0019-media-v4l2-ctrls-core-Set-frame_mbs_only_flag-by-def.patch"
-                             
"rk3588-mnt-reform2/0020-media-rockchip-Move-H264-CABAC-table-to-header-file.patch"
-                             
"rk3588-mnt-reform2/0021-media-rockchip-Introduce-the-rkvdec2-driver.patch"
-                             
"rk3588-mnt-reform2/0022-media-dt-bindings-rockchip-Document-RK3588-Video-Dec.patch"
-                             
"rk3588-mnt-reform2/0023-arm64-dts-rockchip-Add-rkvdec2-Video-Decoder-on-rk35.patch"
-                             
"rk3588-mnt-reform2/0024-arm64-defconfig-enable-Rockchip-RK3588-video-decoder.patch"
-                             
"rk3588-mnt-reform2/0025-mfd-rk8xx-Fix-shutdown-handler.patch"
-                             
"rk3588-mnt-reform2/0026-WIP-phy-phy-rockchip-samsung-hdptx-Add-FRL-EARC-supp.patch"
-                             
"rk3588-mnt-reform2/0027-TESTING-phy-phy-rockchip-samsung-hdptx-Add-verbose-l.patch"
-                             
"rk3588-mnt-reform2/0028-WIP-dt-bindings-display-rockchip-drm-Add-optional-cl.patch"
-                             
"rk3588-mnt-reform2/0029-WIP-drm-rockchip-vop2-Improve-display-modes-handling.patch"
-                             
"rk3588-mnt-reform2/0030-arm64-dts-rockchip-Add-HDMI0-bridge-to-rk3588.patch"
-                             
"rk3588-mnt-reform2/0031-arm64-dts-rockchip-Enable-HDMI0-on-rock-5b.patch"
-                             
"rk3588-mnt-reform2/0032-arm64-dts-rockchip-Enable-HDMI0-on-rk3588-evb1.patch"
-                             
"rk3588-mnt-reform2/0033-WIP-arm64-dts-rockchip-Enable-HDMI0-PHY-clk-provider.patch"
-                             
"rk3588-mnt-reform2/0034-WIP-arm64-dts-rockchip-Make-use-of-HDMI0-PHY-PLL-on-.patch"
-                             
"rk3588-mnt-reform2/0035-WIP-arm64-dts-rockchip-Make-use-of-HDMI0-PHY-PLL-on-.patch"
-                             
"rk3588-mnt-reform2/0036-dt-bindings-display-bridge-Add-schema-for-Synopsys-D.patch"
-                             
"rk3588-mnt-reform2/0037-dt-bindings-display-rockchip-Add-schema-for-RK3588-H.patch"
-                             
"rk3588-mnt-reform2/0038-drm-bridge-synopsys-Add-DW-HDMI-QP-TX-controller-dri.patch"
-                             
"rk3588-mnt-reform2/0039-drm-rockchip-Add-basic-RK3588-HDMI-output-support.patch"
-                             
"rk3588-mnt-reform2/0040-arm64-defconfig-Enable-Rockchip-extensions-for-Synop.patch"
-                             
"rk3588-mnt-reform2/0041-MAINTAINERS-Add-entry-for-Synopsys-DesignWare-HDMI-R.patch"
-                             
"rk3588-mnt-reform2/0042-dt-bindings-media-Document-bindings-for-HDMI-RX-Cont.patch"
-                             
"rk3588-mnt-reform2/0043-arm64-dts-rockchip-Add-device-tree-support-for-HDMI-.patch"
-                             
"rk3588-mnt-reform2/0044-media-platform-synopsys-Add-support-for-HDMI-input-d.patch"
-                             
"rk3588-mnt-reform2/0045-arm64-defconfig-Enable-Synopsys-HDMI-receiver.patch"
-                             
"rk3588-mnt-reform2/0046-arm64-dts-rockchip-Enable-HDMI-receiver-on-rock-5b.patch"
-                             
"rk3588-mnt-reform2/0047-arm64-dts-rockchip-Enable-HDMI-receiver-on-RK3588-EV.patch"
-                             
"rk3588-mnt-reform2/0048-arm64-defconfig-Enable-default-EDID-for-Synopsys-HDM.patch"
-                             
"rk3588-mnt-reform2/0049-regulator-Add-devm_-of_regulator_get.patch"
-                             
"rk3588-mnt-reform2/0050-pmdomain-rockchip-cleanup-mutex-handling-in-rockchip.patch"
-                             
"rk3588-mnt-reform2/0051-pmdomain-rockchip-forward-rockchip_do_pmu_set_power_.patch"
-                             
"rk3588-mnt-reform2/0052-pmdomain-rockchip-reduce-indentation-in-rockchip_pd_.patch"
-                             
"rk3588-mnt-reform2/0053-dt-bindings-power-rockchip-add-regulator-support.patch"
-                             
"rk3588-mnt-reform2/0054-pmdomain-rockchip-add-regulator-support.patch"
-                             
"rk3588-mnt-reform2/0055-arm64-dts-rockchip-Add-GPU-power-domain-regulator-de.patch"
-                             
"rk3588-mnt-reform2/0056-dt-bindings-net-wireless-brcm4329-fmac-add-pci14e4-4.patch"
-                             
"rk3588-mnt-reform2/0057-dt-bindings-net-wireless-brcm4329-fmac-add-clock-des.patch"
-                             
"rk3588-mnt-reform2/0058-wifi-brcmfmac-Add-optional-lpo-clock-enable-support.patch"
-                             ;; does not apply cleanly due to DEBLOBBING
-                             ;; 
"rk3588-mnt-reform2/0059-wifi-brcmfmac-add-flag-for-random-seed-during-firmwa.patch"
-                             
"rk3588-mnt-reform2/0060-arm64-dts-rockchip-rk3588-evb1-add-WLAN-controller.patch"
-                             
"rk3588-mnt-reform2/0061-arm64-dts-rockchip-add-and-enable-gpu-node-for-Radxa.patch"
-                             
"rk3588-mnt-reform2/0062-arm64-dts-rockchip-Enable-HDMI0-on-rock-5a.patch"
-                             
"rk3588-mnt-reform2/0100-rk3588-dtsi-add-hdmi1-controller.patch"
-                             
"rk3588-mnt-reform2/0102-drm-panthor-Actually-suspend-IRQs-in-the-unplug-path.patch"
-                             
"rk3588-mnt-reform2/3001-display-rockchip-add-schema-for-rk3588-hdmi-tx.patch"
-                             
"rk3588-mnt-reform2/4000-mnt-rk3588-dual-hdmi-qp-rockchip.patch"
-                             
"rk3588-mnt-reform2/4001-mnt-rk3588-dual-hdmi-vop2-pll.patch"
-                             "rk3588-mnt-reform2/5001-rk3588-dsi2-driver.patch"
-                             
"rk3588-mnt-reform2/5002-rk3588-dsi-dts-nodes.patch"
-                             
"rk3588-mnt-reform2/5100-modernize-hdmi1-in-dtsi.patch"
-                             
"rk3588-mnt-reform2/5110-hdptx-crash-workaround.patch"
-                             
"rk3588-mnt-reform2/5200-drm-rockchip-Set-dma-mask-to-64-bit.patch"))))
-              (add-after 'apply-reform-patches 'copy-reform-dts-files
-                (lambda* (#:key inputs #:allow-other-keys)
-                  (for-each (lambda (dts)
-                              (copy-file (search-input-file inputs
-                                                            (string-append
-                                                             "/dts/" dts))
-                                         (string-append "arch/arm64/boot/dts/"
-                                          dts)))
-                            (list
-                             
"amlogic/meson-g12b-bananapi-cm4-mnt-pocket-reform.dts"
-                             "amlogic/meson-g12b-bananapi-cm4-mnt-reform2.dts"
-                             "freescale/fsl-ls1028a-mnt-reform2.dts"
-                             "freescale/imx8mp-mnt-pocket-reform.dts"
-                             "freescale/imx8mp-mnt-reform2.dts"
-                             "freescale/imx8mq-mnt-reform2-hdmi.dts"
-                             "freescale/imx8mq-mnt-reform2.dts"
-                             "rockchip/rk3588-mnt-pocket-reform.dts"
-                             "rockchip/rk3588-mnt-reform-next.dts"
-                             "rockchip/rk3588-mnt-reform2.dts"))))
-              (add-after 'apply-reform-patches 'adjust-makefiles-with-new-dtb
-                (lambda _
-                  (substitute* "arch/arm64/boot/dts/amlogic/Makefile"
-                    (("meson-g12b-bananapi-cm4-mnt-reform2.dtb")
-                     "meson-g12b-bananapi-cm4-mnt-reform2.dtb
-dtb-$(CONFIG_ARCH_MESON) += meson-g12b-bananapi-cm4-mnt-pocket-reform.dtb"))
-                  (substitute* "arch/arm64/boot/dts/freescale/Makefile"
-                    (("fsl-ls1028a-rdb.dtb")
-                     "fsl-ls1028a-rdb.dtb
-dtb-$(CONFIG_ARCH_LAYERSCAPE) += fsl-ls1028a-mnt-reform2.dtb"))
-                  (substitute* "arch/arm64/boot/dts/freescale/Makefile"
-                    (("imx8mq-mnt-reform2.dtb")
-                     "imx8mq-mnt-reform2.dtb
-dtb-$(CONFIG_ARCH_MXC) += imx8mp-mnt-reform2.dtb
-dtb-$(CONFIG_ARCH_MXC) += imx8mp-mnt-pocket-reform.dtb
-dtb-$(CONFIG_ARCH_MXC) += imx8mq-mnt-reform2-hdmi.dtb"))
-                  (substitute* "arch/arm64/boot/dts/rockchip/Makefile"
-                    (("rk3588-rock-5b.dtb")
-                     "rk3588-rock-5b.dtb
-dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588-mnt-reform2.dtb
-dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588-mnt-reform-next.dtb
-dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588-mnt-pocket-reform.dtb")))))))))))
-
 (define-public linux-libre-riscv64-generic
   (make-linux-libre* linux-libre-version
                      linux-libre-gnu-revision
diff --git 
a/gnu/packages/patches/linux-libre-arm64-mnt-reform-revert-phy-rockchip-samsung.patch
 
b/gnu/packages/patches/linux-libre-arm64-mnt-reform-revert-phy-rockchip-samsung.patch
deleted file mode 100644
index ce9677e827e..00000000000
--- 
a/gnu/packages/patches/linux-libre-arm64-mnt-reform-revert-phy-rockchip-samsung.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From ed3fed8d76a424cea002c5569769e46895c72139 Mon Sep 17 00:00:00 2001
-From: Vagrant Cascadian <[email protected]>
-Date: Thu, 3 Jul 2025 23:00:06 +0000
-Subject: [PATCH 2/3] Revert "phy: rockchip: samsung-hdptx: Fix clock ratio
- setup"
-
-This reverts commit e3f71127c6d9b33bd714a957fd62c72abd87c182.
----
- drivers/phy/rockchip/phy-rockchip-samsung-hdptx.c | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/drivers/phy/rockchip/phy-rockchip-samsung-hdptx.c 
b/drivers/phy/rockchip/phy-rockchip-samsung-hdptx.c
-index 5547f8df8e71..56d8f25c1852 100644
---- a/drivers/phy/rockchip/phy-rockchip-samsung-hdptx.c
-+++ b/drivers/phy/rockchip/phy-rockchip-samsung-hdptx.c
-@@ -192,7 +192,6 @@
- #define LN3_TX_SER_RATE_SEL_HBR2      BIT(3)
- #define LN3_TX_SER_RATE_SEL_HBR3      BIT(2)
- 
--#define HDMI14_MAX_RATE                       340000000
- #define HDMI20_MAX_RATE                       600000000
- 
- struct lcpll_config {
-@@ -854,7 +853,7 @@ static int rk_hdptx_ropll_tmds_mode_config(struct 
rk_hdptx_phy *hdptx,
- 
-       regmap_write(hdptx->regmap, LNTOP_REG(0200), 0x06);
- 
--      if (rate > HDMI14_MAX_RATE / 100) {
-+      if (rate >= 3400000) {
-               /* For 1/40 bitrate clk */
-               rk_hdptx_multi_reg_write(hdptx, rk_hdtpx_tmds_lntop_highbr_seq);
-       } else {
--- 
-2.50.0
-
diff --git 
a/gnu/packages/patches/linux-libre-arm64-mnt-reform-revert-rk-samsung-hdptx.patch
 
b/gnu/packages/patches/linux-libre-arm64-mnt-reform-revert-rk-samsung-hdptx.patch
deleted file mode 100644
index 400917c20d8..00000000000
--- 
a/gnu/packages/patches/linux-libre-arm64-mnt-reform-revert-rk-samsung-hdptx.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 678346ae18cd6b705993001826fd1d9e2e69e73b Mon Sep 17 00:00:00 2001
-From: Vagrant Cascadian <[email protected]>
-Date: Thu, 3 Jul 2025 23:00:26 +0000
-Subject: [PATCH 3/3] Revert "phy: rockchip: samsung-hdptx: Do no set
- rk_hdptx_phy->rate in case of errors"
-
-This reverts commit 5aac41632fffe7eb4708d9e88e203a2cb13283c9.
----
- drivers/phy/rockchip/phy-rockchip-samsung-hdptx.c | 10 ++++------
- 1 file changed, 4 insertions(+), 6 deletions(-)
-
-diff --git a/drivers/phy/rockchip/phy-rockchip-samsung-hdptx.c 
b/drivers/phy/rockchip/phy-rockchip-samsung-hdptx.c
-index 56d8f25c1852..9b99fdd43f5f 100644
---- a/drivers/phy/rockchip/phy-rockchip-samsung-hdptx.c
-+++ b/drivers/phy/rockchip/phy-rockchip-samsung-hdptx.c
-@@ -780,7 +780,9 @@ static int rk_hdptx_ropll_tmds_cmn_config(struct 
rk_hdptx_phy *hdptx,
- {
-       const struct ropll_config *cfg = NULL;
-       struct ropll_config rc = {0};
--      int ret, i;
-+      int i;
-+
-+      hdptx->rate = rate * 100;
- 
-       for (i = 0; i < ARRAY_SIZE(ropll_tmds_cfg); i++)
-               if (rate == ropll_tmds_cfg[i].bit_rate) {
-@@ -839,11 +841,7 @@ static int rk_hdptx_ropll_tmds_cmn_config(struct 
rk_hdptx_phy *hdptx,
-       regmap_update_bits(hdptx->regmap, CMN_REG(0086), PLL_PCG_CLK_EN,
-                          PLL_PCG_CLK_EN);
- 
--      ret = rk_hdptx_post_enable_pll(hdptx);
--      if (!ret)
--              hdptx->rate = rate * 100;
--
--      return ret;
-+      return rk_hdptx_post_enable_pll(hdptx);
- }
- 
- static int rk_hdptx_ropll_tmds_mode_config(struct rk_hdptx_phy *hdptx,
--- 
-2.50.0
-
diff --git 
a/gnu/packages/patches/linux-libre-arm64-mnt-reform-revert-vop2-display-modes.patch
 
b/gnu/packages/patches/linux-libre-arm64-mnt-reform-revert-vop2-display-modes.patch
deleted file mode 100644
index e91edb4ccfa..00000000000
--- 
a/gnu/packages/patches/linux-libre-arm64-mnt-reform-revert-vop2-display-modes.patch
+++ /dev/null
@@ -1,94 +0,0 @@
-From 3119142ea31ec13a64fbb6246f40ca9315b49b21 Mon Sep 17 00:00:00 2001
-From: Vagrant Cascadian <[email protected]>
-Date: Sun, 15 Jun 2025 02:19:50 +0000
-Subject: [PATCH 1/3] Revert "drm/rockchip: vop2: Improve display modes
- handling on RK3588 HDMI0"
-
-This reverts commit d2b58a10228a906d46155eb7c15d79f39be25b37.
----
- drivers/gpu/drm/rockchip/rockchip_drm_vop2.c | 34 --------------------
- 1 file changed, 34 deletions(-)
-
-diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c 
b/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c
-index 5d7df4c3b08c..2aab2a095678 100644
---- a/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c
-+++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c
-@@ -157,7 +157,6 @@ struct vop2_video_port {
-       struct drm_crtc crtc;
-       struct vop2 *vop2;
-       struct clk *dclk;
--      struct clk *dclk_src;
-       unsigned int id;
-       const struct vop2_video_port_data *data;
- 
-@@ -212,7 +211,6 @@ struct vop2 {
-       struct clk *hclk;
-       struct clk *aclk;
-       struct clk *pclk;
--      struct clk *pll_hdmiphy0;
- 
-       /* optional internal rgb encoder */
-       struct rockchip_rgb *rgb;
-@@ -221,8 +219,6 @@ struct vop2 {
-       struct vop2_win win[];
- };
- 
--#define VOP2_MAX_DCLK_RATE            600000000
--
- #define vop2_output_if_is_hdmi(x)     ((x) == ROCKCHIP_VOP2_EP_HDMI0 || \
-                                        (x) == ROCKCHIP_VOP2_EP_HDMI1)
- 
-@@ -1055,9 +1051,6 @@ static void vop2_crtc_atomic_disable(struct drm_crtc 
*crtc,
- 
-       vop2_crtc_disable_irq(vp, VP_INT_DSP_HOLD_VALID);
- 
--      if (vp->dclk_src)
--              clk_set_parent(vp->dclk, vp->dclk_src);
--
-       clk_disable_unprepare(vp->dclk);
- 
-       vop2->enable_count--;
-@@ -2078,27 +2071,6 @@ static void vop2_crtc_atomic_enable(struct drm_crtc 
*crtc,
- 
-       vop2_vp_write(vp, RK3568_VP_MIPI_CTRL, 0);
- 
--      /*
--       * Switch to HDMI PHY PLL as DCLK source for display modes up
--       * to 4K@60Hz, if available, otherwise keep using the system CRU.
--       */
--      if (vop2->pll_hdmiphy0 && clock <= VOP2_MAX_DCLK_RATE) {
--              drm_for_each_encoder_mask(encoder, crtc->dev, 
crtc_state->encoder_mask) {
--                      struct rockchip_encoder *rkencoder = 
to_rockchip_encoder(encoder);
--
--                      if (rkencoder->crtc_endpoint_id == 
ROCKCHIP_VOP2_EP_HDMI0) {
--                              if (!vp->dclk_src)
--                                      vp->dclk_src = clk_get_parent(vp->dclk);
--
--                              ret = clk_set_parent(vp->dclk, 
vop2->pll_hdmiphy0);
--                              if (ret < 0)
--                                      drm_warn(vop2->drm,
--                                               "Could not switch to HDMI0 PHY 
PLL: %d\n", ret);
--                              break;
--                      }
--              }
--      }
--
-       clk_set_rate(vp->dclk, clock);
- 
-       vop2_post_config(crtc);
-@@ -3270,12 +3242,6 @@ static int vop2_bind(struct device *dev, struct device 
*master, void *data)
-               return PTR_ERR(vop2->pclk);
-       }
- 
--      vop2->pll_hdmiphy0 = devm_clk_get_optional(vop2->dev, "pll_hdmiphy0");
--      if (IS_ERR(vop2->pll_hdmiphy0)) {
--              drm_err(vop2->drm, "failed to get pll_hdmiphy0\n");
--              return PTR_ERR(vop2->pll_hdmiphy0);
--      }
--
-       vop2->irq = platform_get_irq(pdev, 0);
-       if (vop2->irq < 0) {
-               drm_err(vop2->drm, "cannot find irq for vop2\n");
--- 
-2.50.0
-

Reply via email to