diff --git a/Patchlist.changelog b/Patchlist.changelog index c4a2beba0..b5d31292b 100644 --- a/Patchlist.changelog +++ b/Patchlist.changelog @@ -1,3 +1,48 @@ +https://gitlab.com/cki-project/kernel-ark/-/commit/de68e5eaab5d0edabaccba2bf2782daea6c9ba83 + de68e5eaab5d0edabaccba2bf2782daea6c9ba83 arm64: dts: broadcom: bcm2712-rpi: Move the firmware node down 1 level + +https://gitlab.com/cki-project/kernel-ark/-/commit/b13e25cbff03f1ffaeff53ac726a001afc2acd28 + b13e25cbff03f1ffaeff53ac726a001afc2acd28 arm64: dts: broadcom: bcm2712-d-rpi-5-b: update uart10 interrupt + +https://gitlab.com/cki-project/kernel-ark/-/commit/b7b12b3cdc224bb9fa7af0d9b8461ccd94128694 + b7b12b3cdc224bb9fa7af0d9b8461ccd94128694 arm64: dts: broadcom: bcm2712-d-rpi-5-b: add fixes for pinctrl/pinctrl_aon + +https://gitlab.com/cki-project/kernel-ark/-/commit/e776024b4e71c560c5fa9f86f9711f84107c1085 + e776024b4e71c560c5fa9f86f9711f84107c1085 arm64: dts: broadcom: bcm2712-rpi-5-b: add pinctrl properties for csi i2cs + +https://gitlab.com/cki-project/kernel-ark/-/commit/dbbcdfc23ebb457be906cf86f57933114cb9df9a + dbbcdfc23ebb457be906cf86f57933114cb9df9a arm64: dts: broadcom: bcm2712: add camera backend node pispbe + +https://gitlab.com/cki-project/kernel-ark/-/commit/4ec3a96c4ae6fce03b2eda34beea81e2aeadc334 + 4ec3a96c4ae6fce03b2eda34beea81e2aeadc334 arm64: dts: broadcom: rp1: add csi nodes + +https://gitlab.com/cki-project/kernel-ark/-/commit/4a898ca72547f9a2b74c2b619d6c9c1fd6a5e2c9 + 4a898ca72547f9a2b74c2b619d6c9c1fd6a5e2c9 arm64: dts: broadcom: rp1: add i2c controller + +https://gitlab.com/cki-project/kernel-ark/-/commit/e003418b2456eafbc1993c5a88b24d85984b2692 + e003418b2456eafbc1993c5a88b24d85984b2692 mfd: bcm2835-pm: Add BCM2712 PM device support + +https://gitlab.com/cki-project/kernel-ark/-/commit/ec226769ae325543ae789b3fb5c0d20a6ba26844 + ec226769ae325543ae789b3fb5c0d20a6ba26844 mfd: bcm2835-pm: Introduce SoC-specific type identifier + +https://gitlab.com/cki-project/kernel-ark/-/commit/519850a88b679bb38ba2ab7bd2e9bc680849f8b7 + 519850a88b679bb38ba2ab7bd2e9bc680849f8b7 arm64: dts: broadcom: bcm2712: Add V3D device node + +https://gitlab.com/cki-project/kernel-ark/-/commit/73496aa2733c0317f1da90295dc6bb044b904ecd + 73496aa2733c0317f1da90295dc6bb044b904ecd pmdomain: bcm: bcm2835-power: Fix broken reset status read + +https://gitlab.com/cki-project/kernel-ark/-/commit/801150828dbd38167eb1c8cc9bb9228c77013377 + 801150828dbd38167eb1c8cc9bb9228c77013377 arm64: dts: imx93-11x11-frdm: enable additional devices + +https://gitlab.com/cki-project/kernel-ark/-/commit/97b7115db451722d13d0d92546fe80bfa5a9bd72 + 97b7115db451722d13d0d92546fe80bfa5a9bd72 arm64: dts: imx93-11x11-frdm: Add MQS audio support + +https://gitlab.com/cki-project/kernel-ark/-/commit/e1572f238963ed0440e1d0ab87a52e8de4b5bf14 + e1572f238963ed0440e1d0ab87a52e8de4b5bf14 arm64: dts: freescale: add support for NXP i.MX93 FRDM + +https://gitlab.com/cki-project/kernel-ark/-/commit/e714b8ef3cdb6636a5138078915b9169611f1651 + e714b8ef3cdb6636a5138078915b9169611f1651 Revert "Fix mute LED on HP OmniBook 7 Laptop 16" + https://gitlab.com/cki-project/kernel-ark/-/commit/05547c32f32ea1fb28868b3d8d7d4cac252c80ca 05547c32f32ea1fb28868b3d8d7d4cac252c80ca Fix mute LED on HP OmniBook 7 Laptop 16 diff --git a/kernel.changelog b/kernel.changelog index 91ca84f8a..9a4d8e297 100644 --- a/kernel.changelog +++ b/kernel.changelog @@ -1,3 +1,22 @@ +* Thu Mar 19 2026 Augusto Caringi [6.19.9-0] +- arm64: dts: broadcom: bcm2712-rpi: Move the firmware node down 1 level (Rob Herring (Arm)) +- arm64: dts: broadcom: bcm2712-d-rpi-5-b: update uart10 interrupt (Gregor Herburger) +- arm64: dts: broadcom: bcm2712-d-rpi-5-b: add fixes for pinctrl/pinctrl_aon (Gregor Herburger) +- arm64: dts: broadcom: bcm2712-rpi-5-b: add pinctrl properties for csi i2cs (Gregor Herburger) +- arm64: dts: broadcom: bcm2712: add camera backend node pispbe (Gregor Herburger) +- arm64: dts: broadcom: rp1: add csi nodes (Gregor Herburger) +- arm64: dts: broadcom: rp1: add i2c controller (Gregor Herburger) +- mfd: bcm2835-pm: Add BCM2712 PM device support (Phil Elwell) +- mfd: bcm2835-pm: Introduce SoC-specific type identifier (Phil Elwell) +- arm64: dts: broadcom: bcm2712: Add V3D device node (Maíra Canal) +- pmdomain: bcm: bcm2835-power: Fix broken reset status read (Maíra Canal) +- arm64: dts: imx93-11x11-frdm: enable additional devices (Francesco Valla) +- arm64: dts: imx93-11x11-frdm: Add MQS audio support (Daniel Baluta) +- arm64: dts: freescale: add support for NXP i.MX93 FRDM (Fabian Pflug) +- Revert "Fix mute LED on HP OmniBook 7 Laptop 16" (Justin M. Forbes) +- Linux v6.19.9 +Resolves: + * Fri Mar 13 2026 Justin M. Forbes [6.19.8-0] - Fix mute LED on HP OmniBook 7 Laptop 16 (Justin M. Forbes) - Add Lenovo bug to BugsFixed for 6.19.8 (Justin M. Forbes) diff --git a/kernel.spec b/kernel.spec index a32c24399..71643929b 100644 --- a/kernel.spec +++ b/kernel.spec @@ -184,18 +184,18 @@ Summary: The Linux kernel # the --with-release option overrides this setting.) %define debugbuildsenabled 1 # define buildid .local -%define specrpmversion 6.19.8 -%define specversion 6.19.8 +%define specrpmversion 6.19.9 +%define specversion 6.19.9 %define patchversion 6.19 %define pkgrelease 300 %define kversion 6 -%define tarfile_release 6.19.8 +%define tarfile_release 6.19.9 # This is needed to do merge window version magic %define patchlevel 19 # This allows pkg_release to have configurable %%{?dist} tag %define specrelease 300%{?buildid}%{?dist} # This defines the kabi tarball version -%define kabiversion 6.19.8 +%define kabiversion 6.19.9 # If this variable is set to 1, a bpf selftests build failure will cause a # fatal kernel package build error @@ -4814,6 +4814,24 @@ fi\ # # %changelog +* Thu Mar 19 2026 Augusto Caringi [6.19.9-0] +- arm64: dts: broadcom: bcm2712-rpi: Move the firmware node down 1 level (Rob Herring (Arm)) +- arm64: dts: broadcom: bcm2712-d-rpi-5-b: update uart10 interrupt (Gregor Herburger) +- arm64: dts: broadcom: bcm2712-d-rpi-5-b: add fixes for pinctrl/pinctrl_aon (Gregor Herburger) +- arm64: dts: broadcom: bcm2712-rpi-5-b: add pinctrl properties for csi i2cs (Gregor Herburger) +- arm64: dts: broadcom: bcm2712: add camera backend node pispbe (Gregor Herburger) +- arm64: dts: broadcom: rp1: add csi nodes (Gregor Herburger) +- arm64: dts: broadcom: rp1: add i2c controller (Gregor Herburger) +- mfd: bcm2835-pm: Add BCM2712 PM device support (Phil Elwell) +- mfd: bcm2835-pm: Introduce SoC-specific type identifier (Phil Elwell) +- arm64: dts: broadcom: bcm2712: Add V3D device node (Maíra Canal) +- pmdomain: bcm: bcm2835-power: Fix broken reset status read (Maíra Canal) +- arm64: dts: imx93-11x11-frdm: enable additional devices (Francesco Valla) +- arm64: dts: imx93-11x11-frdm: Add MQS audio support (Daniel Baluta) +- arm64: dts: freescale: add support for NXP i.MX93 FRDM (Fabian Pflug) +- Revert "Fix mute LED on HP OmniBook 7 Laptop 16" (Justin M. Forbes) +- Linux v6.19.9 + * Fri Mar 13 2026 Justin M. Forbes [6.19.8-0] - Fix mute LED on HP OmniBook 7 Laptop 16 (Justin M. Forbes) - Add Lenovo bug to BugsFixed for 6.19.8 (Justin M. Forbes) diff --git a/patch-6.19-redhat.patch b/patch-6.19-redhat.patch index 16709a8b5..cd2ff49af 100644 --- a/patch-6.19-redhat.patch +++ b/patch-6.19-redhat.patch @@ -1,46 +1,54 @@ - Makefile | 30 ++ + Makefile | 30 + arch/arm/Kconfig | 4 +- arch/arm64/Kconfig | 2 +- - arch/arm64/boot/dts/broadcom/bcm2712.dtsi | 15 + - arch/arm64/kernel/setup.c | 27 ++ + arch/arm64/boot/dts/broadcom/bcm2712-d-rpi-5-b.dts | 14 + + .../boot/dts/broadcom/bcm2712-rpi-5-b-base.dtsi | 46 +- + arch/arm64/boot/dts/broadcom/bcm2712-rpi-5-b.dts | 24 + + arch/arm64/boot/dts/broadcom/bcm2712.dtsi | 36 + + arch/arm64/boot/dts/broadcom/rp1-common.dtsi | 105 +++ + arch/arm64/boot/dts/freescale/Makefile | 1 + + arch/arm64/boot/dts/freescale/imx93-11x11-frdm.dts | 807 +++++++++++++++++++++ + arch/arm64/kernel/setup.c | 27 + arch/s390/include/asm/ipl.h | 1 + arch/s390/kernel/ipl.c | 5 + arch/s390/kernel/setup.c | 4 + arch/x86/kernel/setup.c | 22 +- crypto/akcipher.c | 3 +- - crypto/dh.c | 25 ++ + crypto/dh.c | 25 + crypto/seqiv.c | 15 +- crypto/sig.c | 3 +- crypto/testmgr.c | 6 +- drivers/acpi/apei/hest.c | 8 + drivers/acpi/irq.c | 17 +- drivers/acpi/scan.c | 9 + - drivers/ata/libahci.c | 18 ++ + drivers/ata/libahci.c | 18 + drivers/firmware/efi/Makefile | 1 + - drivers/firmware/efi/efi.c | 124 ++++++-- + drivers/firmware/efi/efi.c | 124 +++- drivers/firmware/efi/libstub/fdt.c | 5 + drivers/firmware/efi/libstub/secureboot.c | 14 +- - drivers/firmware/efi/secureboot.c | 38 +++ + drivers/firmware/efi/secureboot.c | 38 + drivers/gpu/drm/i915/display/intel_alpm.c | 6 +- drivers/gpu/drm/i915/display/intel_display.c | 8 - - drivers/gpu/drm/i915/display/intel_display_types.h | 46 ++- + drivers/gpu/drm/i915/display/intel_display_types.h | 46 +- drivers/gpu/drm/i915/display/intel_dp.c | 17 +- drivers/gpu/drm/i915/display/intel_plane.c | 10 +- - drivers/gpu/drm/i915/display/intel_psr.c | 317 +++++++++++---------- + drivers/gpu/drm/i915/display/intel_psr.c | 317 ++++---- drivers/gpu/drm/i915/display/intel_psr.h | 2 +- - drivers/hid/hid-rmi.c | 66 ----- - drivers/hwtracing/coresight/coresight-etm4x-core.c | 19 ++ - drivers/input/rmi4/rmi_driver.c | 124 ++++---- + drivers/hid/hid-rmi.c | 66 -- + drivers/hwtracing/coresight/coresight-etm4x-core.c | 19 + + drivers/input/rmi4/rmi_driver.c | 124 ++-- drivers/iommu/iommu.c | 28 +- drivers/media/pci/intel/ipu-bridge.c | 14 + + drivers/mfd/bcm2835-pm.c | 9 +- drivers/net/ethernet/cadence/macb_main.c | 29 +- - drivers/pci/quirks.c | 24 ++ + drivers/pci/quirks.c | 24 + drivers/scsi/sd.c | 10 + drivers/usb/core/hub.c | 7 + include/drm/display/drm_dp.h | 2 + include/linux/crypto.h | 2 + include/linux/efi.h | 22 +- include/linux/lsm_hook_defs.h | 1 + + include/linux/mfd/bcm2835-pm.h | 7 + include/linux/rmi.h | 1 + include/linux/security.h | 9 + kernel/module/signing.c | 9 +- @@ -49,14 +57,13 @@ security/integrity/platform_certs/load_uefi.c | 6 +- security/lockdown/Kconfig | 13 + security/lockdown/lockdown.c | 11 + - sound/hda/codecs/realtek/alc269.c | 2 +- sound/soc/sdca/sdca_class_function.c | 13 + tools/testing/selftests/bpf/Makefile | 2 +- - tools/testing/selftests/bpf/prog_tests/ksyms_btf.c | 31 -- - 55 files changed, 837 insertions(+), 415 deletions(-) + tools/testing/selftests/bpf/prog_tests/ksyms_btf.c | 31 - + 62 files changed, 1846 insertions(+), 438 deletions(-) diff --git a/Makefile b/Makefile -index 372d19dae59b..21a6ec6fbebd 100644 +index 96640a9632ef4..73d25b046b017 100644 --- a/Makefile +++ b/Makefile @@ -355,6 +355,17 @@ ifneq ($(filter install,$(MAKECMDGOALS)),) @@ -77,7 +84,7 @@ index 372d19dae59b..21a6ec6fbebd 100644 ifdef mixed-build # =========================================================================== # We're called with mixed targets (*config and build targets). -@@ -1338,6 +1349,8 @@ uapi-asm-generic: +@@ -1339,6 +1350,8 @@ uapi-asm-generic: # Generate some files # --------------------------------------------------------------------------- @@ -86,7 +93,7 @@ index 372d19dae59b..21a6ec6fbebd 100644 # KERNELRELEASE can change from a few different places, meaning version.h # needs to be updated, so this check is forced on all builds -@@ -1985,6 +1998,23 @@ endif +@@ -1986,6 +1999,23 @@ endif ifdef CONFIG_MODULES @@ -111,7 +118,7 @@ index 372d19dae59b..21a6ec6fbebd 100644 @: diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig -index fa83c040ee2d..96c9bcf9e7b1 100644 +index fa83c040ee2d4..96c9bcf9e7b17 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -1212,9 +1212,9 @@ config HIGHMEM @@ -127,7 +134,7 @@ index fa83c040ee2d..96c9bcf9e7b1 100644 The VM uses one page of physical memory for each page table. For systems with a lot of processes, this can use a lot of diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig -index 93173f0a09c7..8f992962ccd3 100644 +index 93173f0a09c7d..8f992962ccd35 100644 --- a/arch/arm64/Kconfig +++ b/arch/arm64/Kconfig @@ -1433,7 +1433,7 @@ endchoice @@ -139,11 +146,140 @@ index 93173f0a09c7..8f992962ccd3 100644 help For systems with 52-bit userspace VAs enabled, the kernel will attempt to maintain compatibility with older software by providing 48-bit VAs +diff --git a/arch/arm64/boot/dts/broadcom/bcm2712-d-rpi-5-b.dts b/arch/arm64/boot/dts/broadcom/bcm2712-d-rpi-5-b.dts +index 7de24d60bcd1a..127be0fc27c22 100644 +--- a/arch/arm64/boot/dts/broadcom/bcm2712-d-rpi-5-b.dts ++++ b/arch/arm64/boot/dts/broadcom/bcm2712-d-rpi-5-b.dts +@@ -35,3 +35,17 @@ &gio_aon { + "PMIC_SCL", // AON_SGPIO_04 + "PMIC_SDA"; // AON_SGPIO_05 + }; ++ ++&pinctrl { ++ compatible = "brcm,bcm2712d0-pinctrl"; ++ reg = <0x7d504100 0x20>; ++}; ++ ++&pinctrl_aon { ++ compatible = "brcm,bcm2712d0-aon-pinctrl"; ++ reg = <0x7d510700 0x1c>; ++}; ++ ++&uart10 { ++ interrupts = ; ++}; +diff --git a/arch/arm64/boot/dts/broadcom/bcm2712-rpi-5-b-base.dtsi b/arch/arm64/boot/dts/broadcom/bcm2712-rpi-5-b-base.dtsi +index 04738bf281ebd..eddaf72c4e734 100644 +--- a/arch/arm64/boot/dts/broadcom/bcm2712-rpi-5-b-base.dtsi ++++ b/arch/arm64/boot/dts/broadcom/bcm2712-rpi-5-b-base.dtsi +@@ -190,30 +190,32 @@ wifi: wifi@1 { + }; + + &soc { +- firmware: firmware { +- compatible = "raspberrypi,bcm2835-firmware", "simple-mfd"; +- #address-cells = <1>; +- #size-cells = <1>; +- +- mboxes = <&mailbox>; +- dma-ranges; +- +- firmware_clocks: clocks { +- compatible = "raspberrypi,firmware-clocks"; +- #clock-cells = <1>; ++ firmware { ++ firmware: rpi-firmware { ++ compatible = "raspberrypi,bcm2835-firmware", "simple-mfd"; ++ #address-cells = <1>; ++ #size-cells = <1>; ++ ++ mboxes = <&mailbox>; ++ dma-ranges; ++ ++ firmware_clocks: clocks { ++ compatible = "raspberrypi,firmware-clocks"; ++ #clock-cells = <1>; ++ }; ++ ++ reset: reset { ++ compatible = "raspberrypi,firmware-reset"; ++ #reset-cells = <1>; ++ }; + }; + +- reset: reset { +- compatible = "raspberrypi,firmware-reset"; +- #reset-cells = <1>; ++ power: power { ++ compatible = "raspberrypi,bcm2835-power"; ++ firmware = <&firmware>; ++ #power-domain-cells = <1>; + }; + }; +- +- power: power { +- compatible = "raspberrypi,bcm2835-power"; +- firmware = <&firmware>; +- #power-domain-cells = <1>; +- }; + }; + + /* uarta communicates with the BT module */ +@@ -252,3 +254,7 @@ &pcie1 { + &pcie2 { + status = "okay"; + }; ++ ++&v3d { ++ clocks = <&firmware_clocks 5>; ++}; +diff --git a/arch/arm64/boot/dts/broadcom/bcm2712-rpi-5-b.dts b/arch/arm64/boot/dts/broadcom/bcm2712-rpi-5-b.dts +index 2856082814462..0fc57e72632ed 100644 +--- a/arch/arm64/boot/dts/broadcom/bcm2712-rpi-5-b.dts ++++ b/arch/arm64/boot/dts/broadcom/bcm2712-rpi-5-b.dts +@@ -68,6 +68,30 @@ usb_vbus_default_state: usb-vbus-default-state { + function = "vbus1"; + groups = "vbus1"; + }; ++ ++ rp1_i2c4_default_state: rp1-i2c4-default-state { ++ function = "i2c4"; ++ groups = "i2c4_2"; ++ drive-strength = <12>; ++ bias-pull-up; ++ }; ++ ++ rp1_i2c6_default_state: rp1-i2c6-default-state { ++ function = "i2c6"; ++ groups = "i2c6_0"; ++ drive-strength = <12>; ++ bias-pull-up; ++ }; ++}; ++ ++&rp1_i2c4 { ++ pinctrl-0 = <&rp1_i2c4_default_state>; ++ pinctrl-names = "default"; ++}; ++ ++&rp1_i2c6 { ++ pinctrl-0 = <&rp1_i2c6_default_state>; ++ pinctrl-names = "default"; + }; + + &rp1_usb0 { diff --git a/arch/arm64/boot/dts/broadcom/bcm2712.dtsi b/arch/arm64/boot/dts/broadcom/bcm2712.dtsi -index 205b87f557d6..d57a9b1bff70 100644 +index 205b87f557d6d..98cb2173137ec 100644 --- a/arch/arm64/boot/dts/broadcom/bcm2712.dtsi +++ b/arch/arm64/boot/dts/broadcom/bcm2712.dtsi -@@ -250,6 +250,15 @@ uart10: serial@7d001000 { +@@ -1,5 +1,6 @@ + // SPDX-License-Identifier: (GPL-2.0 OR MIT) + #include ++#include + + / { + compatible = "brcm,bcm2712"; +@@ -250,6 +251,15 @@ uart10: serial@7d001000 { status = "disabled"; }; @@ -159,7 +295,7 @@ index 205b87f557d6..d57a9b1bff70 100644 pinctrl: pinctrl@7d504100 { compatible = "brcm,bcm2712c0-pinctrl"; reg = <0x7d504100 0x30>; -@@ -283,6 +292,12 @@ pinctrl_aon: pinctrl@7d510700 { +@@ -283,6 +293,12 @@ pinctrl_aon: pinctrl@7d510700 { reg = <0x7d510700 0x20>; }; @@ -172,8 +308,983 @@ index 205b87f557d6..d57a9b1bff70 100644 interrupt-controller@7d517000 { compatible = "brcm,bcm7271-l2-intc"; reg = <0x7d517000 0x10>; +@@ -631,6 +647,26 @@ mip1: msi-controller@1000131000 { + msi-ranges = <&gicv2 GIC_SPI 247 IRQ_TYPE_EDGE_RISING 8>; + brcm,msi-offset = <8>; + }; ++ ++ isp: isp@1000880000 { ++ compatible = "brcm,bcm2712-pispbe", "raspberrypi,pispbe"; ++ reg = <0x10 0x00880000 0x0 0x4000>; ++ interrupts = ; ++ clocks = <&firmware_clocks 7>; ++ }; ++ ++ v3d: gpu@1002000000 { ++ compatible = "brcm,2712-v3d"; ++ reg = <0x10 0x02000000 0x00 0x4000>, ++ <0x10 0x02008000 0x00 0x6000>, ++ <0x10 0x02030800 0x00 0x0700>; ++ reg-names = "hub", "core0", "sms"; ++ ++ power-domains = <&pm BCM2835_POWER_DOMAIN_GRAFX_V3D>; ++ resets = <&pm BCM2835_RESET_V3D>; ++ interrupts = , ++ ; ++ }; + }; + + timer { +diff --git a/arch/arm64/boot/dts/broadcom/rp1-common.dtsi b/arch/arm64/boot/dts/broadcom/rp1-common.dtsi +index 5a815c3797945..16f5359395835 100644 +--- a/arch/arm64/boot/dts/broadcom/rp1-common.dtsi ++++ b/arch/arm64/boot/dts/broadcom/rp1-common.dtsi +@@ -26,6 +26,83 @@ rp1_clocks: clocks@40018000 { + <200000000>; // RP1_CLK_SYS + }; + ++ rp1_i2c0: i2c@40070000 { ++ compatible = "snps,designware-i2c"; ++ reg = <0x0 0x40070000 0x0 0x1000>; ++ interrupts = <7 IRQ_TYPE_LEVEL_HIGH>; ++ clocks = <&rp1_clocks RP1_CLK_SYS>; ++ i2c-scl-rising-time-ns = <65>; ++ i2c-scl-falling-time-ns = <100>; ++ ++ status = "disabled"; ++ }; ++ ++ rp1_i2c1: i2c@40074000 { ++ compatible = "snps,designware-i2c"; ++ reg = <0x0 0x40074000 0x0 0x1000>; ++ interrupts = <8 IRQ_TYPE_LEVEL_HIGH>; ++ clocks = <&rp1_clocks RP1_CLK_SYS>; ++ i2c-scl-rising-time-ns = <65>; ++ i2c-scl-falling-time-ns = <100>; ++ ++ status = "disabled"; ++ }; ++ ++ rp1_i2c2: i2c@40078000 { ++ compatible = "snps,designware-i2c"; ++ reg = <0x0 0x40078000 0x0 0x1000>; ++ interrupts = <9 IRQ_TYPE_LEVEL_HIGH>; ++ clocks = <&rp1_clocks RP1_CLK_SYS>; ++ i2c-scl-rising-time-ns = <65>; ++ i2c-scl-falling-time-ns = <100>; ++ ++ status = "disabled"; ++ }; ++ ++ rp1_i2c3: i2c@4007c000 { ++ compatible = "snps,designware-i2c"; ++ reg = <0x0 0x4007c000 0x0 0x1000>; ++ interrupts = <10 IRQ_TYPE_LEVEL_HIGH>; ++ clocks = <&rp1_clocks RP1_CLK_SYS>; ++ i2c-scl-rising-time-ns = <65>; ++ i2c-scl-falling-time-ns = <100>; ++ ++ status = "disabled"; ++ }; ++ ++ rp1_i2c4: i2c@40080000 { ++ compatible = "snps,designware-i2c"; ++ reg = <0x0 0x40080000 0x0 0x1000>; ++ interrupts = <11 IRQ_TYPE_LEVEL_HIGH>; ++ clocks = <&rp1_clocks RP1_CLK_SYS>; ++ i2c-scl-rising-time-ns = <65>; ++ i2c-scl-falling-time-ns = <100>; ++ ++ status = "disabled"; ++ }; ++ ++ rp1_i2c5: i2c@40084000 { ++ compatible = "snps,designware-i2c"; ++ reg = <0x0 0x40084000 0x0 0x1000>; ++ interrupts = <12 IRQ_TYPE_LEVEL_HIGH>; ++ clocks = <&rp1_clocks RP1_CLK_SYS>; ++ i2c-scl-rising-time-ns = <65>; ++ i2c-scl-falling-time-ns = <100>; ++ ++ status = "disabled"; ++ }; ++ ++ rp1_i2c6: i2c@40088000 { ++ compatible = "snps,designware-i2c"; ++ reg = <0x0 0x40088000 0x0 0x1000>; ++ interrupts = <13 IRQ_TYPE_LEVEL_HIGH>; ++ clocks = <&rp1_clocks RP1_CLK_SYS>; ++ i2c-scl-rising-time-ns = <65>; ++ i2c-scl-falling-time-ns = <100>; ++ ++ status = "disabled"; ++ }; ++ + rp1_gpio: pinctrl@400d0000 { + compatible = "raspberrypi,rp1-gpio"; + reg = <0x00 0x400d0000 0x0 0xc000>, +@@ -56,6 +133,34 @@ rp1_eth: ethernet@40100000 { + #size-cells = <0>; + }; + ++ rp1_csi0: csi@40110000 { ++ compatible = "raspberrypi,rp1-cfe"; ++ reg = <0x0 0x40110000 0x0 0x100>, // CSI2 DMA address ++ <0x0 0x40114000 0x0 0x100>, // PHY/CSI Host address ++ <0x0 0x40120000 0x0 0x100>, // MIPI CFG address ++ <0x0 0x40124000 0x0 0x1000>; // PiSP FE address ++ interrupts = <47 IRQ_TYPE_LEVEL_HIGH>; ++ clocks = <&rp1_clocks RP1_CLK_MIPI0_CFG>; ++ assigned-clocks = <&rp1_clocks RP1_CLK_MIPI0_CFG>; ++ assigned-clock-rates = <25000000>; ++ ++ status = "disabled"; ++ }; ++ ++ rp1_csi1: csi@40128000 { ++ compatible = "raspberrypi,rp1-cfe"; ++ reg = <0x0 0x40128000 0x0 0x100>, // CSI2 DMA address ++ <0x0 0x4012c000 0x0 0x100>, // PHY/CSI Host address ++ <0x0 0x40138000 0x0 0x100>, // MIPI CFG address ++ <0x0 0x4013c000 0x0 0x1000>; // PiSP FE address ++ interrupts = <48 IRQ_TYPE_LEVEL_HIGH>; ++ clocks = <&rp1_clocks RP1_CLK_MIPI1_CFG>; ++ assigned-clocks = <&rp1_clocks RP1_CLK_MIPI1_CFG>; ++ assigned-clock-rates = <25000000>; ++ ++ status = "disabled"; ++ }; ++ + rp1_usb0: usb@40200000 { + compatible = "snps,dwc3"; + reg = <0x00 0x40200000 0x0 0x100000>; +diff --git a/arch/arm64/boot/dts/freescale/Makefile b/arch/arm64/boot/dts/freescale/Makefile +index f30d3fd724d0c..c08e23545d4b6 100644 +--- a/arch/arm64/boot/dts/freescale/Makefile ++++ b/arch/arm64/boot/dts/freescale/Makefile +@@ -376,6 +376,7 @@ imx93-9x9-qsb-i3c-dtbs += imx93-9x9-qsb.dtb imx93-9x9-qsb-i3c.dtbo + dtb-$(CONFIG_ARCH_MXC) += imx93-9x9-qsb-i3c.dtb + + dtb-$(CONFIG_ARCH_MXC) += imx93-11x11-evk.dtb ++dtb-$(CONFIG_ARCH_MXC) += imx93-11x11-frdm.dtb + dtb-$(CONFIG_ARCH_MXC) += imx93-14x14-evk.dtb + dtb-$(CONFIG_ARCH_MXC) += imx93-kontron-bl-osm-s.dtb + dtb-$(CONFIG_ARCH_MXC) += imx93-phyboard-nash.dtb +diff --git a/arch/arm64/boot/dts/freescale/imx93-11x11-frdm.dts b/arch/arm64/boot/dts/freescale/imx93-11x11-frdm.dts +new file mode 100644 +index 0000000000000..bd14ba28690c0 +--- /dev/null ++++ b/arch/arm64/boot/dts/freescale/imx93-11x11-frdm.dts +@@ -0,0 +1,807 @@ ++// SPDX-License-Identifier: (GPL-2.0+ OR MIT) ++/dts-v1/; ++ ++#include ++#include "imx93.dtsi" ++ ++/ { ++ compatible = "fsl,imx93-11x11-frdm", "fsl,imx93"; ++ model = "NXP i.MX93 11X11 FRDM board"; ++ ++ aliases { ++ can0 = &flexcan2; ++ ethernet0 = &fec; ++ ethernet1 = &eqos; ++ i2c0 = &lpi2c1; ++ i2c1 = &lpi2c2; ++ i2c2 = &lpi2c3; ++ mmc0 = &usdhc1; /* EMMC */ ++ mmc1 = &usdhc2; /* uSD */ ++ rtc0 = &pcf2131; ++ serial0 = &lpuart1; ++ serial4 = &lpuart5; ++ }; ++ ++ chosen { ++ stdout-path = &lpuart1; ++ }; ++ ++ flexcan2_phy: can-phy { ++ compatible = "nxp,tja1051"; ++ #phy-cells = <0>; ++ max-bitrate = <5000000>; ++ silent-gpios = <&pcal6524 23 GPIO_ACTIVE_HIGH>; ++ }; ++ ++ gpio-keys { ++ compatible = "gpio-keys"; ++ ++ button-k2 { ++ label = "Button K2"; ++ linux,code = ; ++ gpios = <&pcal6524 5 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>; ++ interrupt-parent = <&pcal6524>; ++ interrupts = <5 IRQ_TYPE_EDGE_FALLING>; ++ }; ++ ++ button-k3 { ++ label = "Button K3"; ++ linux,code = ; ++ gpios = <&pcal6524 6 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>; ++ interrupt-parent = <&pcal6524>; ++ interrupts = <6 IRQ_TYPE_EDGE_FALLING>; ++ }; ++ }; ++ ++ reg_usdhc2_vmmc: regulator-usdhc2 { ++ compatible = "regulator-fixed"; ++ off-on-delay-us = <12000>; ++ pinctrl-0 = <&pinctrl_reg_usdhc2_vmmc>; ++ pinctrl-names = "default"; ++ regulator-min-microvolt = <3300000>; ++ regulator-max-microvolt = <3300000>; ++ regulator-name = "VSD_3V3"; ++ vin-supply = <&buck4>; ++ gpio = <&gpio3 7 GPIO_ACTIVE_HIGH>; ++ enable-active-high; ++ }; ++ ++ reg_usdhc3_vmmc: regulator-usdhc3 { ++ compatible = "regulator-fixed"; ++ regulator-name = "VPCIe_3V3"; ++ regulator-min-microvolt = <3300000>; ++ regulator-max-microvolt = <3300000>; ++ startup-delay-us = <20000>; ++ gpio = <&pcal6524 13 GPIO_ACTIVE_HIGH>; ++ enable-active-high; ++ }; ++ ++ reserved-memory { ++ ranges; ++ #address-cells = <2>; ++ #size-cells = <2>; ++ ++ linux,cma { ++ compatible = "shared-dma-pool"; ++ alloc-ranges = <0 0x80000000 0 0x30000000>; ++ reusable; ++ size = <0 0x10000000>; ++ linux,cma-default; ++ }; ++ ++ rsc_table: rsc-table@2021e000 { ++ reg = <0 0x2021e000 0 0x1000>; ++ no-map; ++ }; ++ ++ vdev0vring0: vdev0vring0@a4000000 { ++ reg = <0 0xa4000000 0 0x8000>; ++ no-map; ++ }; ++ ++ vdev0vring1: vdev0vring1@a4008000 { ++ reg = <0 0xa4008000 0 0x8000>; ++ no-map; ++ }; ++ ++ vdev1vring0: vdev1vring0@a4010000 { ++ reg = <0 0xa4010000 0 0x8000>; ++ no-map; ++ }; ++ ++ vdev1vring1: vdev1vring1@a4018000 { ++ reg = <0 0xa4018000 0 0x8000>; ++ no-map; ++ }; ++ ++ vdevbuffer: vdevbuffer@a4020000 { ++ compatible = "shared-dma-pool"; ++ reg = <0 0xa4020000 0 0x100000>; ++ no-map; ++ }; ++ }; ++ ++ sound-mqs { ++ compatible = "fsl,imx-audio-mqs"; ++ model = "mqs-audio"; ++ audio-cpu = <&sai1>; ++ audio-codec = <&mqs1>; ++ }; ++ ++ usdhc3_pwrseq: mmc-pwrseq { ++ compatible = "mmc-pwrseq-simple"; ++ reset-gpios = <&pcal6524 12 GPIO_ACTIVE_LOW>; ++ }; ++}; ++ ++&adc1 { ++ vref-supply = <&buck5>; ++ status = "okay"; ++}; ++ ++&mu1 { ++ status = "okay"; ++}; ++ ++&cm33 { ++ mboxes = <&mu1 0 1>, ++ <&mu1 1 1>, ++ <&mu1 3 1>; ++ mbox-names = "tx", "rx", "rxdb"; ++ memory-region = <&vdevbuffer>, <&vdev0vring0>, <&vdev0vring1>, ++ <&vdev1vring0>, <&vdev1vring1>, <&rsc_table>; ++ status = "okay"; ++}; ++ ++&eqos { ++ pinctrl-names = "default", "sleep"; ++ pinctrl-0 = <&pinctrl_eqos>; ++ pinctrl-1 = <&pinctrl_eqos_sleep>; ++ phy-handle = <ðphy1>; ++ phy-mode = "rgmii-id"; ++ status = "okay"; ++ ++ mdio { ++ compatible = "snps,dwmac-mdio"; ++ #address-cells = <1>; ++ #size-cells = <0>; ++ clock-frequency = <5000000>; ++ ++ ethphy1: ethernet-phy@1 { ++ reg = <1>; ++ reset-assert-us = <10000>; ++ reset-deassert-us = <80000>; ++ reset-gpios = <&pcal6524 15 GPIO_ACTIVE_LOW>; ++ realtek,clkout-disable; ++ }; ++ }; ++}; ++ ++&fec { ++ pinctrl-names = "default", "sleep"; ++ pinctrl-0 = <&pinctrl_fec>; ++ pinctrl-1 = <&pinctrl_fec_sleep>; ++ phy-mode = "rgmii-id"; ++ phy-handle = <ðphy2>; ++ fsl,magic-packet; ++ status = "okay"; ++ ++ mdio { ++ #address-cells = <1>; ++ #size-cells = <0>; ++ clock-frequency = <5000000>; ++ ++ ethphy2: ethernet-phy@2 { ++ reg = <2>; ++ reset-assert-us = <10000>; ++ reset-deassert-us = <80000>; ++ reset-gpios = <&pcal6524 16 GPIO_ACTIVE_LOW>; ++ realtek,clkout-disable; ++ }; ++ }; ++}; ++ ++&flexcan2 { ++ phys = <&flexcan2_phy>; ++ pinctrl-0 = <&pinctrl_flexcan2>; ++ pinctrl-1 = <&pinctrl_flexcan2_sleep>; ++ pinctrl-names = "default", "sleep"; ++ status = "okay"; ++}; ++ ++&lpi2c1 { ++ clock-frequency = <400000>; ++ pinctrl-0 = <&pinctrl_lpi2c1>; ++ pinctrl-names = "default"; ++ status = "okay"; ++ ++ pcal6408: gpio@20 { ++ compatible = "nxp,pcal6408"; ++ reg = <0x20>; ++ #gpio-cells = <2>; ++ gpio-controller; ++ reset-gpios = <&pcal6524 20 GPIO_ACTIVE_LOW>; ++ }; ++}; ++ ++&lpi2c2 { ++ clock-frequency = <400000>; ++ pinctrl-0 = <&pinctrl_lpi2c2>; ++ pinctrl-names = "default"; ++ status = "okay"; ++ ++ pcal6524: gpio@22 { ++ compatible = "nxp,pcal6524"; ++ reg = <0x22>; ++ #interrupt-cells = <2>; ++ interrupt-controller; ++ interrupt-parent = <&gpio3>; ++ interrupts = <27 IRQ_TYPE_LEVEL_LOW>; ++ #gpio-cells = <2>; ++ gpio-controller; ++ pinctrl-0 = <&pinctrl_pcal6524>; ++ pinctrl-names = "default"; ++ /* does not boot with supplier set, because it is the bucks interrupt parent */ ++ /* vcc-supply = <&buck4>; */ ++ }; ++ ++ pmic@25 { ++ compatible = "nxp,pca9451a"; ++ reg = <0x25>; ++ interrupt-parent = <&pcal6524>; ++ interrupts = <11 IRQ_TYPE_EDGE_FALLING>; ++ ++ regulators { ++ ++ buck1: BUCK1 { ++ regulator-name = "VDD_SOC_0V8"; ++ regulator-min-microvolt = <610000>; ++ regulator-max-microvolt = <950000>; ++ regulator-always-on; ++ regulator-boot-on; ++ regulator-ramp-delay = <3125>; ++ }; ++ ++ buck2: BUCK2 { ++ regulator-name = "LPD4_x_VDDQ_0V6"; ++ regulator-min-microvolt = <600000>; ++ regulator-max-microvolt = <670000>; ++ regulator-always-on; ++ regulator-boot-on; ++ regulator-ramp-delay = <3125>; ++ }; ++ ++ buck4: BUCK4 { ++ regulator-name = "VDD_3V3"; ++ regulator-min-microvolt = <3300000>; ++ regulator-max-microvolt = <3300000>; ++ regulator-always-on; ++ regulator-boot-on; ++ }; ++ ++ buck5: BUCK5 { ++ regulator-name = "VDD_1V8"; ++ regulator-min-microvolt = <1800000>; ++ regulator-max-microvolt = <1800000>; ++ regulator-always-on; ++ regulator-boot-on; ++ }; ++ ++ buck6: BUCK6 { ++ regulator-name = "LPD4_x_VDD2_1V1"; ++ regulator-min-microvolt = <1060000>; ++ regulator-max-microvolt = <1140000>; ++ regulator-always-on; ++ regulator-boot-on; ++ }; ++ ++ ldo1: LDO1 { ++ regulator-name = "NVCC_BBSM_1V8"; ++ regulator-min-microvolt = <1620000>; ++ regulator-max-microvolt = <1980000>; ++ regulator-always-on; ++ regulator-boot-on; ++ }; ++ ++ ldo4: LDO4 { ++ regulator-name = "VDD_ANA_0V8"; ++ regulator-min-microvolt = <800000>; ++ regulator-max-microvolt = <840000>; ++ regulator-always-on; ++ regulator-boot-on; ++ }; ++ ++ ldo5: LDO5 { ++ regulator-name = "NVCC_SD"; ++ regulator-min-microvolt = <1800000>; ++ regulator-max-microvolt = <3300000>; ++ regulator-always-on; ++ regulator-boot-on; ++ }; ++ }; ++ }; ++ ++ eeprom: eeprom@50 { ++ compatible = "atmel,24c256"; ++ reg = <0x50>; ++ pagesize = <64>; ++ vcc-supply = <&buck4>; ++ }; ++}; ++ ++&lpi2c3 { ++ clock-frequency = <400000>; ++ pinctrl-0 = <&pinctrl_lpi2c3>; ++ pinctrl-names = "default"; ++ status = "okay"; ++ ++ ptn5110: tcpc@50 { ++ compatible = "nxp,ptn5110", "tcpci"; ++ reg = <0x50>; ++ interrupt-parent = <&gpio3>; ++ interrupts = <27 IRQ_TYPE_LEVEL_LOW>; ++ ++ typec1_con: connector { ++ compatible = "usb-c-connector"; ++ data-role = "dual"; ++ label = "USB-C"; ++ op-sink-microwatt = <15000000>; ++ power-role = "dual"; ++ self-powered; ++ sink-pdos = ; ++ source-pdos = ; ++ try-power-role = "sink"; ++ ++ ports { ++ #address-cells = <1>; ++ #size-cells = <0>; ++ ++ port@0 { ++ reg = <0>; ++ ++ typec1_dr_sw: endpoint { ++ remote-endpoint = <&usb1_drd_sw>; ++ }; ++ }; ++ }; ++ }; ++ }; ++ ++ pcf2131: rtc@53 { ++ compatible = "nxp,pcf2131"; ++ reg = <0x53>; ++ interrupt-parent = <&pcal6524>; ++ interrupts = <1 IRQ_TYPE_EDGE_FALLING>; ++ }; ++}; ++ ++&lpuart1 { /* console */ ++ pinctrl-0 = <&pinctrl_uart1>; ++ pinctrl-names = "default"; ++ status = "okay"; ++}; ++ ++&lpuart5 { ++ pinctrl-0 = <&pinctrl_uart5>; ++ pinctrl-names = "default"; ++ status = "okay"; ++ ++ uart-has-rtscts; ++ ++ bluetooth { ++ compatible = "nxp,88w8987-bt"; ++ device-wakeup-gpios = <&pcal6408 3 GPIO_ACTIVE_HIGH>; ++ reset-gpios = <&pcal6524 19 GPIO_ACTIVE_LOW>; ++ vcc-supply = <®_usdhc3_vmmc>; ++ }; ++}; ++ ++&mqs1 { ++ pinctrl-names = "default"; ++ pinctrl-0 = <&pinctrl_mqs1>; ++ clocks = <&clk IMX93_CLK_MQS1_GATE>; ++ clock-names = "mclk"; ++ status = "okay"; ++}; ++ ++&sai1 { ++ #sound-dai-cells = <0>; ++ clocks = <&clk IMX93_CLK_SAI1_IPG>, <&clk IMX93_CLK_DUMMY>, ++ <&clk IMX93_CLK_SAI1_GATE>, <&clk IMX93_CLK_DUMMY>, ++ <&clk IMX93_CLK_DUMMY>, <&clk IMX93_CLK_AUDIO_PLL>; ++ clock-names = "bus", "mclk0", "mclk1", "mclk2", "mclk3", "pll8k"; ++ assigned-clocks = <&clk IMX93_CLK_SAI1>; ++ assigned-clock-parents = <&clk IMX93_CLK_AUDIO_PLL>; ++ assigned-clock-rates = <24576000>; ++ fsl,sai-mclk-direction-output; ++ status = "okay"; ++}; ++ ++&usbotg1 { ++ adp-disable; ++ disable-over-current; ++ dr_mode = "otg"; ++ hnp-disable; ++ srp-disable; ++ usb-role-switch; ++ samsung,picophy-dc-vol-level-adjust = <7>; ++ samsung,picophy-pre-emp-curr-control = <3>; ++ status = "okay"; ++ ++ port { ++ usb1_drd_sw: endpoint { ++ remote-endpoint = <&typec1_dr_sw>; ++ }; ++ }; ++}; ++ ++&usbotg2 { ++ disable-over-current; ++ dr_mode = "host"; ++ samsung,picophy-dc-vol-level-adjust = <7>; ++ samsung,picophy-pre-emp-curr-control = <3>; ++ status = "okay"; ++}; ++ ++&usdhc1 { ++ bus-width = <8>; ++ non-removable; ++ pinctrl-0 = <&pinctrl_usdhc1>; ++ pinctrl-1 = <&pinctrl_usdhc1_100mhz>; ++ pinctrl-2 = <&pinctrl_usdhc1_200mhz>; ++ pinctrl-names = "default", "state_100mhz", "state_200mhz"; ++ vmmc-supply = <&buck4>; ++ status = "okay"; ++}; ++ ++&usdhc2 { ++ bus-width = <4>; ++ cd-gpios = <&gpio3 00 GPIO_ACTIVE_LOW>; ++ no-mmc; ++ no-sdio; ++ pinctrl-0 = <&pinctrl_usdhc2>, <&pinctrl_usdhc2_gpio>; ++ pinctrl-1 = <&pinctrl_usdhc2_100mhz>, <&pinctrl_usdhc2_gpio>; ++ pinctrl-2 = <&pinctrl_usdhc2_200mhz>, <&pinctrl_usdhc2_gpio>; ++ pinctrl-3 = <&pinctrl_usdhc2_sleep>, <&pinctrl_usdhc2_gpio_sleep>; ++ pinctrl-names = "default", "state_100mhz", "state_200mhz", "sleep"; ++ vmmc-supply = <®_usdhc2_vmmc>; ++ status = "okay"; ++}; ++ ++&usdhc3 { ++ bus-width = <4>; ++ keep-power-in-suspend; ++ mmc-pwrseq = <&usdhc3_pwrseq>; ++ non-removable; ++ pinctrl-0 = <&pinctrl_usdhc3>; ++ pinctrl-1 = <&pinctrl_usdhc3_100mhz>; ++ pinctrl-2 = <&pinctrl_usdhc3_200mhz>; ++ pinctrl-3 = <&pinctrl_usdhc3_sleep>; ++ pinctrl-names = "default", "state_100mhz", "state_200mhz", "sleep"; ++ vmmc-supply = <®_usdhc3_vmmc>; ++ status = "okay"; ++}; ++ ++&wdog3 { ++ pinctrl-names = "default"; ++ pinctrl-0 = <&pinctrl_wdog>; ++ fsl,ext-reset-output; ++ status = "okay"; ++}; ++ ++&iomuxc { ++ ++ pinctrl_eqos: eqosgrp { ++ fsl,pins = < ++ MX93_PAD_ENET1_MDC__ENET_QOS_MDC 0x57e ++ MX93_PAD_ENET1_MDIO__ENET_QOS_MDIO 0x57e ++ MX93_PAD_ENET1_RD0__ENET_QOS_RGMII_RD0 0x57e ++ MX93_PAD_ENET1_RD1__ENET_QOS_RGMII_RD1 0x57e ++ MX93_PAD_ENET1_RD2__ENET_QOS_RGMII_RD2 0x57e ++ MX93_PAD_ENET1_RD3__ENET_QOS_RGMII_RD3 0x57e ++ MX93_PAD_ENET1_RXC__CCM_ENET_QOS_CLOCK_GENERATE_RX_CLK 0x58e ++ MX93_PAD_ENET1_RX_CTL__ENET_QOS_RGMII_RX_CTL 0x57e ++ MX93_PAD_ENET1_TD0__ENET_QOS_RGMII_TD0 0x57e ++ MX93_PAD_ENET1_TD1__ENET_QOS_RGMII_TD1 0x57e ++ MX93_PAD_ENET1_TD2__ENET_QOS_RGMII_TD2 0x57e ++ MX93_PAD_ENET1_TD3__ENET_QOS_RGMII_TD3 0x57e ++ MX93_PAD_ENET1_TXC__CCM_ENET_QOS_CLOCK_GENERATE_TX_CLK 0x58e ++ MX93_PAD_ENET1_TX_CTL__ENET_QOS_RGMII_TX_CTL 0x57e ++ >; ++ }; ++ ++ pinctrl_eqos_sleep: eqossleepgrp { ++ fsl,pins = < ++ MX93_PAD_ENET1_MDC__GPIO4_IO00 0x31e ++ MX93_PAD_ENET1_MDIO__GPIO4_IO01 0x31e ++ MX93_PAD_ENET1_RD0__GPIO4_IO10 0x31e ++ MX93_PAD_ENET1_RD1__GPIO4_IO11 0x31e ++ MX93_PAD_ENET1_RD2__GPIO4_IO12 0x31e ++ MX93_PAD_ENET1_RD3__GPIO4_IO13 0x31e ++ MX93_PAD_ENET1_RXC__GPIO4_IO09 0x31e ++ MX93_PAD_ENET1_RX_CTL__GPIO4_IO08 0x31e ++ MX93_PAD_ENET1_TD0__GPIO4_IO05 0x31e ++ MX93_PAD_ENET1_TD1__GPIO4_IO04 0x31e ++ MX93_PAD_ENET1_TD2__GPIO4_IO03 0x31e ++ MX93_PAD_ENET1_TD3__GPIO4_IO02 0x31e ++ MX93_PAD_ENET1_TXC__GPIO4_IO07 0x31e ++ MX93_PAD_ENET1_TX_CTL__GPIO4_IO06 0x31e ++ >; ++ }; ++ ++ pinctrl_fec: fecgrp { ++ fsl,pins = < ++ MX93_PAD_ENET2_MDC__ENET1_MDC 0x57e ++ MX93_PAD_ENET2_MDIO__ENET1_MDIO 0x57e ++ MX93_PAD_ENET2_RD0__ENET1_RGMII_RD0 0x57e ++ MX93_PAD_ENET2_RD1__ENET1_RGMII_RD1 0x57e ++ MX93_PAD_ENET2_RD2__ENET1_RGMII_RD2 0x57e ++ MX93_PAD_ENET2_RD3__ENET1_RGMII_RD3 0x57e ++ MX93_PAD_ENET2_RXC__ENET1_RGMII_RXC 0x58e ++ MX93_PAD_ENET2_RX_CTL__ENET1_RGMII_RX_CTL 0x57e ++ MX93_PAD_ENET2_TD0__ENET1_RGMII_TD0 0x57e ++ MX93_PAD_ENET2_TD1__ENET1_RGMII_TD1 0x57e ++ MX93_PAD_ENET2_TD2__ENET1_RGMII_TD2 0x57e ++ MX93_PAD_ENET2_TD3__ENET1_RGMII_TD3 0x57e ++ MX93_PAD_ENET2_TXC__ENET1_RGMII_TXC 0x58e ++ MX93_PAD_ENET2_TX_CTL__ENET1_RGMII_TX_CTL 0x57e ++ >; ++ }; ++ ++ pinctrl_fec_sleep: fecsleepgrp { ++ fsl,pins = < ++ MX93_PAD_ENET2_MDC__GPIO4_IO14 0x51e ++ MX93_PAD_ENET2_MDIO__GPIO4_IO15 0x51e ++ MX93_PAD_ENET2_RD0__GPIO4_IO24 0x51e ++ MX93_PAD_ENET2_RD1__GPIO4_IO25 0x51e ++ MX93_PAD_ENET2_RD2__GPIO4_IO26 0x51e ++ MX93_PAD_ENET2_RD3__GPIO4_IO27 0x51e ++ MX93_PAD_ENET2_RXC__GPIO4_IO23 0x51e ++ MX93_PAD_ENET2_RX_CTL__GPIO4_IO22 0x51e ++ MX93_PAD_ENET2_TD0__GPIO4_IO19 0x51e ++ MX93_PAD_ENET2_TD1__GPIO4_IO18 0x51e ++ MX93_PAD_ENET2_TD2__GPIO4_IO17 0x51e ++ MX93_PAD_ENET2_TD3__GPIO4_IO16 0x51e ++ MX93_PAD_ENET2_TXC__GPIO4_IO21 0x51e ++ MX93_PAD_ENET2_TX_CTL__GPIO4_IO20 0x51e ++ >; ++ }; ++ ++ pinctrl_flexcan2: flexcan2grp { ++ fsl,pins = < ++ MX93_PAD_GPIO_IO25__CAN2_TX 0x139e ++ MX93_PAD_GPIO_IO27__CAN2_RX 0x139e ++ >; ++ }; ++ ++ pinctrl_flexcan2_sleep: flexcan2sleepgrp { ++ fsl,pins = < ++ MX93_PAD_GPIO_IO25__GPIO2_IO25 0x31e ++ MX93_PAD_GPIO_IO27__GPIO2_IO27 0x31e ++ >; ++ }; ++ ++ pinctrl_lpi2c1: lpi2c1grp { ++ fsl,pins = < ++ MX93_PAD_I2C1_SCL__LPI2C1_SCL 0x40000b9e ++ MX93_PAD_I2C1_SDA__LPI2C1_SDA 0x40000b9e ++ >; ++ }; ++ ++ pinctrl_lpi2c2: lpi2c2grp { ++ fsl,pins = < ++ MX93_PAD_I2C2_SCL__LPI2C2_SCL 0x40000b9e ++ MX93_PAD_I2C2_SDA__LPI2C2_SDA 0x40000b9e ++ >; ++ }; ++ ++ pinctrl_lpi2c3: lpi2c3grp { ++ fsl,pins = < ++ MX93_PAD_GPIO_IO28__LPI2C3_SDA 0x40000b9e ++ MX93_PAD_GPIO_IO29__LPI2C3_SCL 0x40000b9e ++ >; ++ }; ++ ++ pinctrl_mqs1: mqs1grp { ++ fsl,pins = < ++ MX93_PAD_PDM_CLK__MQS1_LEFT 0x31e ++ MX93_PAD_PDM_BIT_STREAM0__MQS1_RIGHT 0x31e ++ >; ++ }; ++ ++ pinctrl_pcal6524: pcal6524grp { ++ fsl,pins = < ++ MX93_PAD_CCM_CLKO2__GPIO3_IO27 0x31e ++ >; ++ }; ++ ++ pinctrl_reg_usdhc2_vmmc: regusdhc2vmmcgrp { ++ fsl,pins = < ++ MX93_PAD_SD2_RESET_B__GPIO3_IO07 0x31e ++ >; ++ }; ++ ++ pinctrl_uart1: uart1grp { ++ fsl,pins = < ++ MX93_PAD_UART1_RXD__LPUART1_RX 0x31e ++ MX93_PAD_UART1_TXD__LPUART1_TX 0x31e ++ >; ++ }; ++ ++ pinctrl_uart5: uart5grp { ++ fsl,pins = < ++ MX93_PAD_DAP_TDO_TRACESWO__LPUART5_TX 0x31e ++ MX93_PAD_DAP_TDI__LPUART5_RX 0x31e ++ MX93_PAD_DAP_TMS_SWDIO__LPUART5_RTS_B 0x31e ++ MX93_PAD_DAP_TCLK_SWCLK__LPUART5_CTS_B 0x31e ++ >; ++ }; ++ ++ /* need to config the SION for data and cmd pad, refer to ERR052021 */ ++ pinctrl_usdhc1: usdhc1grp { ++ fsl,pins = < ++ MX93_PAD_SD1_CLK__USDHC1_CLK 0x1582 ++ MX93_PAD_SD1_CMD__USDHC1_CMD 0x40001382 ++ MX93_PAD_SD1_DATA0__USDHC1_DATA0 0x40001382 ++ MX93_PAD_SD1_DATA1__USDHC1_DATA1 0x40001382 ++ MX93_PAD_SD1_DATA2__USDHC1_DATA2 0x40001382 ++ MX93_PAD_SD1_DATA3__USDHC1_DATA3 0x40001382 ++ MX93_PAD_SD1_DATA4__USDHC1_DATA4 0x40001382 ++ MX93_PAD_SD1_DATA5__USDHC1_DATA5 0x40001382 ++ MX93_PAD_SD1_DATA6__USDHC1_DATA6 0x40001382 ++ MX93_PAD_SD1_DATA7__USDHC1_DATA7 0x40001382 ++ MX93_PAD_SD1_STROBE__USDHC1_STROBE 0x1582 ++ >; ++ }; ++ ++ /* need to config the SION for data and cmd pad, refer to ERR052021 */ ++ pinctrl_usdhc1_100mhz: usdhc1-100mhzgrp { ++ fsl,pins = < ++ MX93_PAD_SD1_CLK__USDHC1_CLK 0x158e ++ MX93_PAD_SD1_CMD__USDHC1_CMD 0x4000138e ++ MX93_PAD_SD1_DATA0__USDHC1_DATA0 0x4000138e ++ MX93_PAD_SD1_DATA1__USDHC1_DATA1 0x4000138e ++ MX93_PAD_SD1_DATA2__USDHC1_DATA2 0x4000138e ++ MX93_PAD_SD1_DATA3__USDHC1_DATA3 0x4000138e ++ MX93_PAD_SD1_DATA4__USDHC1_DATA4 0x4000138e ++ MX93_PAD_SD1_DATA5__USDHC1_DATA5 0x4000138e ++ MX93_PAD_SD1_DATA6__USDHC1_DATA6 0x4000138e ++ MX93_PAD_SD1_DATA7__USDHC1_DATA7 0x4000138e ++ MX93_PAD_SD1_STROBE__USDHC1_STROBE 0x158e ++ >; ++ }; ++ ++ /* need to config the SION for data and cmd pad, refer to ERR052021 */ ++ pinctrl_usdhc1_200mhz: usdhc1-200mhzgrp { ++ fsl,pins = < ++ MX93_PAD_SD1_CLK__USDHC1_CLK 0x15fe ++ MX93_PAD_SD1_CMD__USDHC1_CMD 0x400013fe ++ MX93_PAD_SD1_DATA0__USDHC1_DATA0 0x400013fe ++ MX93_PAD_SD1_DATA1__USDHC1_DATA1 0x400013fe ++ MX93_PAD_SD1_DATA2__USDHC1_DATA2 0x400013fe ++ MX93_PAD_SD1_DATA3__USDHC1_DATA3 0x400013fe ++ MX93_PAD_SD1_DATA4__USDHC1_DATA4 0x400013fe ++ MX93_PAD_SD1_DATA5__USDHC1_DATA5 0x400013fe ++ MX93_PAD_SD1_DATA6__USDHC1_DATA6 0x400013fe ++ MX93_PAD_SD1_DATA7__USDHC1_DATA7 0x400013fe ++ MX93_PAD_SD1_STROBE__USDHC1_STROBE 0x15fe ++ >; ++ }; ++ ++ pinctrl_usdhc2_gpio: usdhc2gpiogrp { ++ fsl,pins = < ++ MX93_PAD_SD2_CD_B__GPIO3_IO00 0x31e ++ >; ++ }; ++ ++ pinctrl_usdhc2_gpio_sleep: usdhc2gpiosleepgrp { ++ fsl,pins = < ++ MX93_PAD_SD2_CD_B__GPIO3_IO00 0x51e ++ >; ++ }; ++ ++ /* need to config the SION for data and cmd pad, refer to ERR052021 */ ++ pinctrl_usdhc2: usdhc2grp { ++ fsl,pins = < ++ MX93_PAD_SD2_CLK__USDHC2_CLK 0x1582 ++ MX93_PAD_SD2_CMD__USDHC2_CMD 0x40001382 ++ MX93_PAD_SD2_DATA0__USDHC2_DATA0 0x40001382 ++ MX93_PAD_SD2_DATA1__USDHC2_DATA1 0x40001382 ++ MX93_PAD_SD2_DATA2__USDHC2_DATA2 0x40001382 ++ MX93_PAD_SD2_DATA3__USDHC2_DATA3 0x40001382 ++ MX93_PAD_SD2_VSELECT__USDHC2_VSELECT 0x51e ++ >; ++ }; ++ ++ /* need to config the SION for data and cmd pad, refer to ERR052021 */ ++ pinctrl_usdhc2_100mhz: usdhc2-100mhzgrp { ++ fsl,pins = < ++ MX93_PAD_SD2_CLK__USDHC2_CLK 0x158e ++ MX93_PAD_SD2_CMD__USDHC2_CMD 0x4000138e ++ MX93_PAD_SD2_DATA0__USDHC2_DATA0 0x4000138e ++ MX93_PAD_SD2_DATA1__USDHC2_DATA1 0x4000138e ++ MX93_PAD_SD2_DATA2__USDHC2_DATA2 0x4000138e ++ MX93_PAD_SD2_DATA3__USDHC2_DATA3 0x4000138e ++ MX93_PAD_SD2_VSELECT__USDHC2_VSELECT 0x51e ++ >; ++ }; ++ ++ /* need to config the SION for data and cmd pad, refer to ERR052021 */ ++ pinctrl_usdhc2_200mhz: usdhc2-200mhzgrp { ++ fsl,pins = < ++ MX93_PAD_SD2_CLK__USDHC2_CLK 0x15fe ++ MX93_PAD_SD2_CMD__USDHC2_CMD 0x400013fe ++ MX93_PAD_SD2_DATA0__USDHC2_DATA0 0x400013fe ++ MX93_PAD_SD2_DATA1__USDHC2_DATA1 0x400013fe ++ MX93_PAD_SD2_DATA2__USDHC2_DATA2 0x400013fe ++ MX93_PAD_SD2_DATA3__USDHC2_DATA3 0x400013fe ++ MX93_PAD_SD2_VSELECT__USDHC2_VSELECT 0x51e ++ >; ++ }; ++ ++ pinctrl_usdhc2_sleep: usdhc2-sleepgrp { ++ fsl,pins = < ++ MX93_PAD_SD2_CLK__GPIO3_IO01 0x51e ++ MX93_PAD_SD2_CMD__GPIO3_IO02 0x51e ++ MX93_PAD_SD2_DATA0__GPIO3_IO03 0x51e ++ MX93_PAD_SD2_DATA1__GPIO3_IO04 0x51e ++ MX93_PAD_SD2_DATA2__GPIO3_IO05 0x51e ++ MX93_PAD_SD2_DATA3__GPIO3_IO06 0x51e ++ MX93_PAD_SD2_VSELECT__GPIO3_IO19 0x51e ++ >; ++ }; ++ ++ /* need to config the SION for data and cmd pad, refer to ERR052021 */ ++ pinctrl_usdhc3: usdhc3grp { ++ fsl,pins = < ++ MX93_PAD_SD3_CLK__USDHC3_CLK 0x1582 ++ MX93_PAD_SD3_CMD__USDHC3_CMD 0x40001382 ++ MX93_PAD_SD3_DATA0__USDHC3_DATA0 0x40001382 ++ MX93_PAD_SD3_DATA1__USDHC3_DATA1 0x40001382 ++ MX93_PAD_SD3_DATA2__USDHC3_DATA2 0x40001382 ++ MX93_PAD_SD3_DATA3__USDHC3_DATA3 0x40001382 ++ >; ++ }; ++ ++ /* need to config the SION for data and cmd pad, refer to ERR052021 */ ++ pinctrl_usdhc3_100mhz: usdhc3-100mhzgrp { ++ fsl,pins = < ++ MX93_PAD_SD3_CLK__USDHC3_CLK 0x158e ++ MX93_PAD_SD3_CMD__USDHC3_CMD 0x4000138e ++ MX93_PAD_SD3_DATA0__USDHC3_DATA0 0x4000138e ++ MX93_PAD_SD3_DATA1__USDHC3_DATA1 0x4000138e ++ MX93_PAD_SD3_DATA2__USDHC3_DATA2 0x4000138e ++ MX93_PAD_SD3_DATA3__USDHC3_DATA3 0x4000138e ++ >; ++ }; ++ ++ /* need to config the SION for data and cmd pad, refer to ERR052021 */ ++ pinctrl_usdhc3_200mhz: usdhc3-200mhzgrp { ++ fsl,pins = < ++ MX93_PAD_SD3_CLK__USDHC3_CLK 0x15fe ++ MX93_PAD_SD3_CMD__USDHC3_CMD 0x400013fe ++ MX93_PAD_SD3_DATA0__USDHC3_DATA0 0x400013fe ++ MX93_PAD_SD3_DATA1__USDHC3_DATA1 0x400013fe ++ MX93_PAD_SD3_DATA2__USDHC3_DATA2 0x400013fe ++ MX93_PAD_SD3_DATA3__USDHC3_DATA3 0x400013fe ++ >; ++ }; ++ ++ pinctrl_usdhc3_sleep: usdhc3grpsleepgrp { ++ fsl,pins = < ++ MX93_PAD_SD3_CLK__GPIO3_IO20 0x31e ++ MX93_PAD_SD3_CMD__GPIO3_IO21 0x31e ++ MX93_PAD_SD3_DATA0__GPIO3_IO22 0x31e ++ MX93_PAD_SD3_DATA1__GPIO3_IO23 0x31e ++ MX93_PAD_SD3_DATA2__GPIO3_IO24 0x31e ++ MX93_PAD_SD3_DATA3__GPIO3_IO25 0x31e ++ >; ++ }; ++ ++ pinctrl_wdog: wdoggrp { ++ fsl,pins = < ++ MX93_PAD_WDOG_ANY__WDOG1_WDOG_ANY 0x31e ++ >; ++ }; ++}; diff --git a/arch/arm64/kernel/setup.c b/arch/arm64/kernel/setup.c -index 23c05dc7a8f2..d7b7b2f39e16 100644 +index 23c05dc7a8f2a..d7b7b2f39e169 100644 --- a/arch/arm64/kernel/setup.c +++ b/arch/arm64/kernel/setup.c @@ -32,6 +32,8 @@ @@ -225,7 +1336,7 @@ index 23c05dc7a8f2..d7b7b2f39e16 100644 arm64_memblock_init(); diff --git a/arch/s390/include/asm/ipl.h b/arch/s390/include/asm/ipl.h -index b0d00032479d..afb9544fb007 100644 +index b0d00032479d6..afb9544fb0074 100644 --- a/arch/s390/include/asm/ipl.h +++ b/arch/s390/include/asm/ipl.h @@ -139,6 +139,7 @@ int ipl_report_add_component(struct ipl_report *report, struct kexec_buf *kbuf, @@ -237,7 +1348,7 @@ index b0d00032479d..afb9544fb007 100644 /* * DIAG 308 support diff --git a/arch/s390/kernel/ipl.c b/arch/s390/kernel/ipl.c -index 049c557c452f..4c9fffbe6261 100644 +index 049c557c452ff..4c9fffbe62613 100644 --- a/arch/s390/kernel/ipl.c +++ b/arch/s390/kernel/ipl.c @@ -2521,3 +2521,8 @@ int ipl_report_free(struct ipl_report *report) @@ -250,7 +1361,7 @@ index 049c557c452f..4c9fffbe6261 100644 + return !!ipl_secure_flag; +} diff --git a/arch/s390/kernel/setup.c b/arch/s390/kernel/setup.c -index c1fe0b53c5ac..8e17bfe788cb 100644 +index c1fe0b53c5ac5..8e17bfe788cb9 100644 --- a/arch/s390/kernel/setup.c +++ b/arch/s390/kernel/setup.c @@ -47,6 +47,7 @@ @@ -272,7 +1383,7 @@ index c1fe0b53c5ac..8e17bfe788cb 100644 /* boot_command_line has been already set up in early.c */ *cmdline_p = boot_command_line; diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c -index 383d4a4784f5..45f428436e2d 100644 +index 383d4a4784f5b..45f428436e2d9 100644 --- a/arch/x86/kernel/setup.c +++ b/arch/x86/kernel/setup.c @@ -21,6 +21,7 @@ @@ -319,7 +1430,7 @@ index 383d4a4784f5..45f428436e2d 100644 reserve_initrd(); diff --git a/crypto/akcipher.c b/crypto/akcipher.c -index a36f50c83827..f4f421e6cff2 100644 +index a36f50c838278..f4f421e6cff20 100644 --- a/crypto/akcipher.c +++ b/crypto/akcipher.c @@ -142,8 +142,7 @@ int crypto_register_akcipher(struct akcipher_alg *alg) @@ -333,7 +1444,7 @@ index a36f50c83827..f4f421e6cff2 100644 alg->set_priv_key = akcipher_default_set_key; diff --git a/crypto/dh.c b/crypto/dh.c -index 8250eeeebd0f..01f0f3963a74 100644 +index 8250eeeebd0fe..01f0f3963a740 100644 --- a/crypto/dh.c +++ b/crypto/dh.c @@ -227,10 +227,35 @@ static int dh_compute_value(struct kpp_request *req) @@ -373,7 +1484,7 @@ index 8250eeeebd0f..01f0f3963a74 100644 } diff --git a/crypto/seqiv.c b/crypto/seqiv.c -index 678bb4145d78..fcc059e7d3db 100644 +index 678bb4145d783..fcc059e7d3db5 100644 --- a/crypto/seqiv.c +++ b/crypto/seqiv.c @@ -123,6 +123,19 @@ static int seqiv_aead_decrypt(struct aead_request *req) @@ -406,7 +1517,7 @@ index 678bb4145d78..fcc059e7d3db 100644 inst->alg.base.cra_ctxsize = sizeof(struct aead_geniv_ctx); diff --git a/crypto/sig.c b/crypto/sig.c -index beba745b6405..fd41f6d3abf9 100644 +index beba745b64057..fd41f6d3abf9a 100644 --- a/crypto/sig.c +++ b/crypto/sig.c @@ -112,8 +112,7 @@ static int sig_prepare_alg(struct sig_alg *alg) @@ -420,7 +1531,7 @@ index beba745b6405..fd41f6d3abf9 100644 alg->verify = sig_default_verify; if (!alg->set_priv_key) diff --git a/crypto/testmgr.c b/crypto/testmgr.c -index a302be53896d..ade6307dbf89 100644 +index a302be53896d3..ade6307dbf899 100644 --- a/crypto/testmgr.c +++ b/crypto/testmgr.c @@ -3843,7 +3843,7 @@ static int test_akcipher_one(struct crypto_akcipher *tfm, @@ -457,7 +1568,7 @@ index a302be53896d..ade6307dbf89 100644 .kpp = __VECS(ecdh_p384_tv_template) } diff --git a/drivers/acpi/apei/hest.c b/drivers/acpi/apei/hest.c -index 20d757687e3d..90a13f20f052 100644 +index 20d757687e3d9..90a13f20f052b 100644 --- a/drivers/acpi/apei/hest.c +++ b/drivers/acpi/apei/hest.c @@ -142,6 +142,14 @@ static int apei_hest_parse(apei_hest_func_t func, void *data) @@ -476,7 +1587,7 @@ index 20d757687e3d..90a13f20f052 100644 for (i = 0; i < hest_tab->error_source_count; i++) { len = hest_esrc_len(hest_hdr); diff --git a/drivers/acpi/irq.c b/drivers/acpi/irq.c -index d1595156c86a..9485212f1a6d 100644 +index d1595156c86a4..9485212f1a6d6 100644 --- a/drivers/acpi/irq.c +++ b/drivers/acpi/irq.c @@ -143,6 +143,7 @@ struct acpi_irq_parse_one_ctx { @@ -519,7 +1630,7 @@ index d1595156c86a..9485212f1a6d 100644 return ctx.rc; } diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c -index b78f6be2f946..8bf534f6f893 100644 +index b78f6be2f9468..8bf534f6f8933 100644 --- a/drivers/acpi/scan.c +++ b/drivers/acpi/scan.c @@ -1803,6 +1803,15 @@ static bool acpi_device_enumeration_by_parent(struct acpi_device *device) @@ -539,7 +1650,7 @@ index b78f6be2f946..8bf534f6f893 100644 acpi_dev_get_resources(device, &resource_list, acpi_check_serial_bus_slave, diff --git a/drivers/ata/libahci.c b/drivers/ata/libahci.c -index c79abdfcd7a9..e23bfb7f94c7 100644 +index c79abdfcd7a9b..e23bfb7f94c72 100644 --- a/drivers/ata/libahci.c +++ b/drivers/ata/libahci.c @@ -731,6 +731,24 @@ int ahci_stop_engine(struct ata_port *ap) @@ -568,7 +1679,7 @@ index c79abdfcd7a9..e23bfb7f94c7 100644 tmp = ata_wait_register(ap, port_mmio + PORT_CMD, PORT_CMD_LIST_ON, PORT_CMD_LIST_ON, 1, 500); diff --git a/drivers/firmware/efi/Makefile b/drivers/firmware/efi/Makefile -index 8efbcf699e4f..96d5a1ca981d 100644 +index 8efbcf699e4ff..96d5a1ca981df 100644 --- a/drivers/firmware/efi/Makefile +++ b/drivers/firmware/efi/Makefile @@ -25,6 +25,7 @@ subdir-$(CONFIG_EFI_STUB) += libstub @@ -580,7 +1691,7 @@ index 8efbcf699e4f..96d5a1ca981d 100644 obj-$(CONFIG_EFI_RCI2_TABLE) += rci2-table.o obj-$(CONFIG_EFI_EMBEDDED_FIRMWARE) += embedded-firmware.o diff --git a/drivers/firmware/efi/efi.c b/drivers/firmware/efi/efi.c -index 92e91c3eb469..aa4845ea0acb 100644 +index 92e91c3eb4690..aa4845ea0acb3 100644 --- a/drivers/firmware/efi/efi.c +++ b/drivers/firmware/efi/efi.c @@ -33,6 +33,7 @@ @@ -725,7 +1836,7 @@ index 92e91c3eb469..aa4845ea0acb 100644 EXPORT_SYMBOL_GPL(efi_status_to_err); diff --git a/drivers/firmware/efi/libstub/fdt.c b/drivers/firmware/efi/libstub/fdt.c -index 6a337f1f8787..89244e0d9fa8 100644 +index 6a337f1f8787b..89244e0d9fa86 100644 --- a/drivers/firmware/efi/libstub/fdt.c +++ b/drivers/firmware/efi/libstub/fdt.c @@ -132,6 +132,11 @@ static efi_status_t update_fdt(void *orig_fdt, unsigned long orig_fdt_size, @@ -741,7 +1852,7 @@ index 6a337f1f8787..89244e0d9fa8 100644 fdt_pack(fdt); diff --git a/drivers/firmware/efi/libstub/secureboot.c b/drivers/firmware/efi/libstub/secureboot.c -index 516f4f0069bd..380354755108 100644 +index 516f4f0069bd2..380354755108b 100644 --- a/drivers/firmware/efi/libstub/secureboot.c +++ b/drivers/firmware/efi/libstub/secureboot.c @@ -29,10 +29,13 @@ enum efi_secureboot_mode efi_get_secureboot(void) @@ -778,7 +1889,7 @@ index 516f4f0069bd..380354755108 100644 } diff --git a/drivers/firmware/efi/secureboot.c b/drivers/firmware/efi/secureboot.c new file mode 100644 -index 000000000000..de0a3714a5d4 +index 0000000000000..de0a3714a5d44 --- /dev/null +++ b/drivers/firmware/efi/secureboot.c @@ -0,0 +1,38 @@ @@ -821,10 +1932,10 @@ index 000000000000..de0a3714a5d4 + } +} diff --git a/drivers/gpu/drm/i915/display/intel_alpm.c b/drivers/gpu/drm/i915/display/intel_alpm.c -index 6372f533f65b..7ce8c674bb03 100644 +index affa3daefd594..f4f1b68f75435 100644 --- a/drivers/gpu/drm/i915/display/intel_alpm.c +++ b/drivers/gpu/drm/i915/display/intel_alpm.c -@@ -326,11 +326,9 @@ static void lnl_alpm_configure(struct intel_dp *intel_dp, +@@ -320,11 +320,9 @@ static void lnl_alpm_configure(struct intel_dp *intel_dp, if (intel_dp->as_sdp_supported) { u32 pr_alpm_ctl = PR_ALPM_CTL_ADAPTIVE_SYNC_SDP_POSITION_T1; @@ -839,10 +1950,10 @@ index 6372f533f65b..7ce8c674bb03 100644 intel_de_write(display, PR_ALPM_CTL(display, cpu_transcoder), diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c -index 095a319f8bc9..808ac34c1914 100644 +index 144f232d61c53..bdbb76aa282e7 100644 --- a/drivers/gpu/drm/i915/display/intel_display.c +++ b/drivers/gpu/drm/i915/display/intel_display.c -@@ -6032,14 +6032,6 @@ static int intel_async_flip_check_uapi(struct intel_atomic_state *state, +@@ -6031,14 +6031,6 @@ static int intel_async_flip_check_uapi(struct intel_atomic_state *state, return -EINVAL; } @@ -858,7 +1969,7 @@ index 095a319f8bc9..808ac34c1914 100644 new_plane_state, i) { if (plane->pipe != crtc->pipe) diff --git a/drivers/gpu/drm/i915/display/intel_display_types.h b/drivers/gpu/drm/i915/display/intel_display_types.h -index 6e26751e8d0e..a83620b8618f 100644 +index 6e26751e8d0e3..a83620b8618f2 100644 --- a/drivers/gpu/drm/i915/display/intel_display_types.h +++ b/drivers/gpu/drm/i915/display/intel_display_types.h @@ -510,6 +510,12 @@ struct intel_hdcp { @@ -970,10 +2081,10 @@ index 6e26751e8d0e..a83620b8618f 100644 u8 downstream_ports[DP_MAX_DOWNSTREAM_PORTS]; u8 edp_dpcd[EDP_DISPLAY_CTL_CAP_SIZE]; diff --git a/drivers/gpu/drm/i915/display/intel_dp.c b/drivers/gpu/drm/i915/display/intel_dp.c -index ee258df439a7..d818d2cde2af 100644 +index b6ce11267b92d..8c68fb56c8982 100644 --- a/drivers/gpu/drm/i915/display/intel_dp.c +++ b/drivers/gpu/drm/i915/display/intel_dp.c -@@ -4590,7 +4590,7 @@ intel_edp_init_dpcd(struct intel_dp *intel_dp, struct intel_connector *connector +@@ -4597,7 +4597,7 @@ intel_edp_init_dpcd(struct intel_dp *intel_dp, struct intel_connector *connector * This has to be called after intel_dp->edp_dpcd is filled, PSR checks * for SET_POWER_CAPABLE bit in intel_dp->edp_dpcd[1] */ @@ -982,7 +2093,7 @@ index ee258df439a7..d818d2cde2af 100644 intel_edp_set_sink_rates(intel_dp); intel_dp_set_max_sink_lane_count(intel_dp); -@@ -6077,10 +6077,19 @@ intel_dp_detect(struct drm_connector *_connector, +@@ -6084,10 +6084,19 @@ intel_dp_detect(struct drm_connector *_connector, if (status == connector_status_disconnected) { intel_dp_test_reset(intel_dp); @@ -1004,7 +2115,7 @@ index ee258df439a7..d818d2cde2af 100644 INTEL_DP_PANEL_REPLAY_DSC_NOT_SUPPORTED; intel_dp_mst_disconnect(intel_dp); -@@ -6103,7 +6112,7 @@ intel_dp_detect(struct drm_connector *_connector, +@@ -6110,7 +6119,7 @@ intel_dp_detect(struct drm_connector *_connector, connector->base.epoch_counter++; if (!intel_dp_is_edp(intel_dp)) @@ -1014,7 +2125,7 @@ index ee258df439a7..d818d2cde2af 100644 intel_dp_detect_dsc_caps(intel_dp, connector); diff --git a/drivers/gpu/drm/i915/display/intel_plane.c b/drivers/gpu/drm/i915/display/intel_plane.c -index ab6a58530b39..707670ff71ec 100644 +index ab6a58530b396..707670ff71ec1 100644 --- a/drivers/gpu/drm/i915/display/intel_plane.c +++ b/drivers/gpu/drm/i915/display/intel_plane.c @@ -651,11 +651,10 @@ static int intel_plane_atomic_calc_changes(const struct intel_crtc_state *old_cr @@ -1043,7 +2154,7 @@ index ab6a58530b39..707670ff71ec 100644 new_crtc_state->async_flip_planes |= BIT(plane->id); } diff --git a/drivers/gpu/drm/i915/display/intel_psr.c b/drivers/gpu/drm/i915/display/intel_psr.c -index 44063b578354..fa351a973e27 100644 +index ae23e30568515..8719b4e021de4 100644 --- a/drivers/gpu/drm/i915/display/intel_psr.c +++ b/drivers/gpu/drm/i915/display/intel_psr.c @@ -494,82 +494,37 @@ static u8 intel_dp_get_sink_sync_latency(struct intel_dp *intel_dp) @@ -1648,7 +2759,7 @@ index 44063b578354..fa351a973e27 100644 if (!psr_interrupt_error_check(intel_dp)) return; -@@ -2754,7 +2777,8 @@ static bool psr2_sel_fetch_plane_state_supported(const struct intel_plane_state +@@ -2763,7 +2786,8 @@ static bool psr2_sel_fetch_plane_state_supported(const struct intel_plane_state */ static bool psr2_sel_fetch_pipe_state_supported(const struct intel_crtc_state *crtc_state) { @@ -1658,7 +2769,7 @@ index 44063b578354..fa351a973e27 100644 return false; return true; -@@ -3050,6 +3074,8 @@ void intel_psr_pre_plane_update(struct intel_atomic_state *state, +@@ -3076,6 +3100,8 @@ void intel_psr_pre_plane_update(struct intel_atomic_state *state, * - Display WA #1136: skl, bxt */ if (intel_crtc_needs_modeset(new_crtc_state) || @@ -1667,7 +2778,7 @@ index 44063b578354..fa351a973e27 100644 !new_crtc_state->has_psr || !new_crtc_state->active_planes || new_crtc_state->has_sel_update != psr->sel_update_enabled || -@@ -4114,24 +4140,22 @@ psr_source_status(struct intel_dp *intel_dp, struct seq_file *m) +@@ -4140,24 +4166,22 @@ psr_source_status(struct intel_dp *intel_dp, struct seq_file *m) seq_printf(m, "Source PSR/PanelReplay status: %s [0x%08x]\n", status, val); } @@ -1701,7 +2812,7 @@ index 44063b578354..fa351a973e27 100644 DP_PANEL_REPLAY_EARLY_TRANSPORT_SUPPORT) seq_printf(m, " (Early Transport)"); seq_printf(m, "\n"); -@@ -4169,7 +4193,8 @@ static void intel_psr_print_mode(struct intel_dp *intel_dp, +@@ -4195,7 +4219,8 @@ static void intel_psr_print_mode(struct intel_dp *intel_dp, seq_printf(m, " %s\n", psr->no_psr_reason); } @@ -1711,7 +2822,7 @@ index 44063b578354..fa351a973e27 100644 { struct intel_display *display = to_intel_display(intel_dp); enum transcoder cpu_transcoder = intel_dp->psr.transcoder; -@@ -4178,9 +4203,9 @@ static int intel_psr_status(struct seq_file *m, struct intel_dp *intel_dp) +@@ -4204,9 +4229,9 @@ static int intel_psr_status(struct seq_file *m, struct intel_dp *intel_dp) bool enabled; u32 val, psr2_ctl; @@ -1723,7 +2834,7 @@ index 44063b578354..fa351a973e27 100644 return 0; wakeref = intel_display_rpm_get(display); -@@ -4294,7 +4319,7 @@ static int i915_edp_psr_status_show(struct seq_file *m, void *data) +@@ -4320,7 +4345,7 @@ static int i915_edp_psr_status_show(struct seq_file *m, void *data) if (!intel_dp) return -ENODEV; @@ -1732,7 +2843,7 @@ index 44063b578354..fa351a973e27 100644 } DEFINE_SHOW_ATTRIBUTE(i915_edp_psr_status); -@@ -4428,7 +4453,7 @@ static int i915_psr_status_show(struct seq_file *m, void *data) +@@ -4454,7 +4479,7 @@ static int i915_psr_status_show(struct seq_file *m, void *data) struct intel_connector *connector = m->private; struct intel_dp *intel_dp = intel_attached_dp(connector); @@ -1742,7 +2853,7 @@ index 44063b578354..fa351a973e27 100644 DEFINE_SHOW_ATTRIBUTE(i915_psr_status); diff --git a/drivers/gpu/drm/i915/display/intel_psr.h b/drivers/gpu/drm/i915/display/intel_psr.h -index 620b35928832..688ca3e73cdd 100644 +index 620b359288326..688ca3e73cdda 100644 --- a/drivers/gpu/drm/i915/display/intel_psr.h +++ b/drivers/gpu/drm/i915/display/intel_psr.h @@ -28,7 +28,7 @@ struct intel_plane_state; @@ -1755,7 +2866,7 @@ index 620b35928832..688ca3e73cdd 100644 void intel_psr_pre_plane_update(struct intel_atomic_state *state, struct intel_crtc *crtc); diff --git a/drivers/hid/hid-rmi.c b/drivers/hid/hid-rmi.c -index d4af17fdba46..154f0403cbf4 100644 +index d4af17fdba467..154f0403cbf4c 100644 --- a/drivers/hid/hid-rmi.c +++ b/drivers/hid/hid-rmi.c @@ -321,21 +321,12 @@ static int rmi_input_event(struct hid_device *hdev, u8 *data, int size) @@ -1857,7 +2968,7 @@ index d4af17fdba46..154f0403cbf4 100644 data->xport.ops = &hid_rmi_ops; diff --git a/drivers/hwtracing/coresight/coresight-etm4x-core.c b/drivers/hwtracing/coresight/coresight-etm4x-core.c -index 560975b70474..995bf2da877c 100644 +index 560975b70474c..995bf2da877ce 100644 --- a/drivers/hwtracing/coresight/coresight-etm4x-core.c +++ b/drivers/hwtracing/coresight/coresight-etm4x-core.c @@ -12,6 +12,7 @@ @@ -1908,7 +3019,7 @@ index 560975b70474..995bf2da877c 100644 platform_driver_unregister(&etm4_platform_driver); etm4_pm_clear(); diff --git a/drivers/input/rmi4/rmi_driver.c b/drivers/input/rmi4/rmi_driver.c -index ccd9338a44db..5c54e522e8a4 100644 +index ccd9338a44dbe..5c54e522e8a47 100644 --- a/drivers/input/rmi4/rmi_driver.c +++ b/drivers/input/rmi4/rmi_driver.c @@ -183,34 +183,47 @@ void rmi_set_attn_data(struct rmi_device *rmi_dev, unsigned long irq_status, @@ -2100,7 +3211,7 @@ index ccd9338a44db..5c54e522e8a4 100644 if (data->f01_container->dev.driver) { /* Driver already bound, so enable ATTN now. */ diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c -index 2ca990dfbb88..24c31555fb69 100644 +index 2ca990dfbb884..24c31555fb69a 100644 --- a/drivers/iommu/iommu.c +++ b/drivers/iommu/iommu.c @@ -8,6 +8,7 @@ @@ -2153,7 +3264,7 @@ index 2ca990dfbb88..24c31555fb69 100644 * iommu_setup_default_domain - Set the default_domain for the group * @group: Group to change diff --git a/drivers/media/pci/intel/ipu-bridge.c b/drivers/media/pci/intel/ipu-bridge.c -index b2b710094914..fd3c46aa0350 100644 +index b2b710094914c..fd3c46aa0350e 100644 --- a/drivers/media/pci/intel/ipu-bridge.c +++ b/drivers/media/pci/intel/ipu-bridge.c @@ -104,6 +104,13 @@ static const struct ipu_sensor_config ipu_supported_sensors[] = { @@ -2184,11 +3295,45 @@ index b2b710094914..fd3c46aa0350 100644 { .matches = { DMI_EXACT_MATCH(DMI_SYS_VENDOR, "Dell Inc."), +diff --git a/drivers/mfd/bcm2835-pm.c b/drivers/mfd/bcm2835-pm.c +index 8bed59816e82e..9e8e3dcf4bceb 100644 +--- a/drivers/mfd/bcm2835-pm.c ++++ b/drivers/mfd/bcm2835-pm.c +@@ -81,6 +81,7 @@ static int bcm2835_pm_probe(struct platform_device *pdev) + platform_set_drvdata(pdev, pm); + + pm->dev = dev; ++ pm->soc = (uintptr_t)device_get_match_data(dev); + + ret = bcm2835_pm_get_pdata(pdev, pm); + if (ret) +@@ -97,7 +98,7 @@ static int bcm2835_pm_probe(struct platform_device *pdev) + * bcm2835-pm binding as the key for whether we can reference + * the full PM register range and support power domains. + */ +- if (pm->asb) ++ if (pm->asb || pm->soc == BCM2835_PM_SOC_BCM2712) + return devm_mfd_add_devices(dev, -1, bcm2835_power_devs, + ARRAY_SIZE(bcm2835_power_devs), + NULL, 0, NULL); +@@ -106,9 +107,9 @@ static int bcm2835_pm_probe(struct platform_device *pdev) + + static const struct of_device_id bcm2835_pm_of_match[] = { + { .compatible = "brcm,bcm2835-pm-wdt", }, +- { .compatible = "brcm,bcm2835-pm", }, +- { .compatible = "brcm,bcm2711-pm", }, +- { .compatible = "brcm,bcm2712-pm", }, ++ { .compatible = "brcm,bcm2835-pm", .data = (void *)BCM2835_PM_SOC_BCM2835 }, ++ { .compatible = "brcm,bcm2711-pm", .data = (void *)BCM2835_PM_SOC_BCM2711 }, ++ { .compatible = "brcm,bcm2712-pm", .data = (void *)BCM2835_PM_SOC_BCM2712 }, + {}, + }; + MODULE_DEVICE_TABLE(of, bcm2835_pm_of_match); diff --git a/drivers/net/ethernet/cadence/macb_main.c b/drivers/net/ethernet/cadence/macb_main.c -index 4ebb40adfab3..43cd013bb70e 100644 +index 256cb5bcfac74..4cfb370b43bf7 100644 --- a/drivers/net/ethernet/cadence/macb_main.c +++ b/drivers/net/ethernet/cadence/macb_main.c -@@ -3849,6 +3849,13 @@ static int gem_get_all_flow_entries(struct net_device *netdev, +@@ -3941,6 +3941,13 @@ static int gem_get_all_flow_entries(struct net_device *netdev, return 0; } @@ -2202,7 +3347,7 @@ index 4ebb40adfab3..43cd013bb70e 100644 static int gem_get_rxnfc(struct net_device *netdev, struct ethtool_rxnfc *cmd, u32 *rule_locs) { -@@ -3856,9 +3863,6 @@ static int gem_get_rxnfc(struct net_device *netdev, struct ethtool_rxnfc *cmd, +@@ -3948,9 +3955,6 @@ static int gem_get_rxnfc(struct net_device *netdev, struct ethtool_rxnfc *cmd, int ret = 0; switch (cmd->cmd) { @@ -2212,7 +3357,7 @@ index 4ebb40adfab3..43cd013bb70e 100644 case ETHTOOL_GRXCLSRLCNT: cmd->rule_cnt = bp->rx_fs_list.count; break; -@@ -3940,6 +3944,7 @@ static const struct ethtool_ops gem_ethtool_ops = { +@@ -4032,6 +4036,7 @@ static const struct ethtool_ops gem_ethtool_ops = { .set_ringparam = macb_set_ringparam, .get_rxnfc = gem_get_rxnfc, .set_rxnfc = gem_set_rxnfc, @@ -2220,7 +3365,7 @@ index 4ebb40adfab3..43cd013bb70e 100644 }; static int macb_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) -@@ -4810,7 +4815,9 @@ static int at91ether_close(struct net_device *dev) +@@ -4902,7 +4907,9 @@ static int at91ether_close(struct net_device *dev) at91ether_stop(lp); @@ -2231,7 +3376,7 @@ index 4ebb40adfab3..43cd013bb70e 100644 } /* Transmit packet */ -@@ -5430,9 +5437,9 @@ static const struct macb_config default_gem_config = { +@@ -5522,9 +5529,9 @@ static const struct macb_config default_gem_config = { static int macb_probe(struct platform_device *pdev) { @@ -2243,7 +3388,7 @@ index 4ebb40adfab3..43cd013bb70e 100644 struct clk *tsu_clk = NULL; phy_interface_t interface; struct net_device *dev; -@@ -5448,13 +5455,9 @@ static int macb_probe(struct platform_device *pdev) +@@ -5540,13 +5547,9 @@ static int macb_probe(struct platform_device *pdev) if (IS_ERR(mem)) return PTR_ERR(mem); @@ -2261,7 +3406,7 @@ index 4ebb40adfab3..43cd013bb70e 100644 err = macb_config->clk_init(pdev, &pclk, &hclk, &tx_clk, &rx_clk, &tsu_clk); if (err) diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c -index fd86f72f54ae..34dbf67c104b 100644 +index fd86f72f54aef..34dbf67c104b0 100644 --- a/drivers/pci/quirks.c +++ b/drivers/pci/quirks.c @@ -4481,6 +4481,30 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_BROADCOM, 0x9000, @@ -2296,7 +3441,7 @@ index fd86f72f54ae..34dbf67c104b 100644 * Intersil/Techwell TW686[4589]-based video capture cards have an empty (zero) * class code. Fix it. diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c -index f50b92e63201..f1ca4960fc59 100644 +index f50b92e632018..f1ca4960fc592 100644 --- a/drivers/scsi/sd.c +++ b/drivers/scsi/sd.c @@ -121,6 +121,14 @@ static const char *sd_cache_types[] = { @@ -2324,7 +3469,7 @@ index f50b92e63201..f1ca4960fc59 100644 if (err) goto err_out_driver; diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c -index be50d03034a9..9ce9b6518acd 100644 +index be50d03034a96..9ce9b6518acd5 100644 --- a/drivers/usb/core/hub.c +++ b/drivers/usb/core/hub.c @@ -5894,6 +5894,13 @@ static void hub_event(struct work_struct *work) @@ -2342,7 +3487,7 @@ index be50d03034a9..9ce9b6518acd 100644 * disconnected while waiting for the lock to succeed. */ usb_lock_device(hdev); diff --git a/include/drm/display/drm_dp.h b/include/drm/display/drm_dp.h -index e4eebabab975..8b15d3eeb716 100644 +index e4eebabab9759..8b15d3eeb716a 100644 --- a/include/drm/display/drm_dp.h +++ b/include/drm/display/drm_dp.h @@ -571,6 +571,8 @@ @@ -2355,7 +3500,7 @@ index e4eebabab975..8b15d3eeb716 100644 /* Link Configuration */ diff --git a/include/linux/crypto.h b/include/linux/crypto.h -index a2137e19be7d..79ccb6fabc10 100644 +index a2137e19be7d8..79ccb6fabc108 100644 --- a/include/linux/crypto.h +++ b/include/linux/crypto.h @@ -152,6 +152,8 @@ @@ -2368,7 +3513,7 @@ index a2137e19be7d..79ccb6fabc10 100644 * Miscellaneous stuff. */ diff --git a/include/linux/efi.h b/include/linux/efi.h -index 2a43094e23f7..4fcf05f8232c 100644 +index 2a43094e23f70..4fcf05f8232c6 100644 --- a/include/linux/efi.h +++ b/include/linux/efi.h @@ -45,6 +45,8 @@ struct screen_info; @@ -2436,7 +3581,7 @@ index 2a43094e23f7..4fcf05f8232c 100644 enum efi_secureboot_mode efi_get_secureboot_mode(efi_get_variable_t *get_var) { diff --git a/include/linux/lsm_hook_defs.h b/include/linux/lsm_hook_defs.h -index 8c42b4bde09c..694ce5c5bcd4 100644 +index 8c42b4bde09c0..694ce5c5bcd43 100644 --- a/include/linux/lsm_hook_defs.h +++ b/include/linux/lsm_hook_defs.h @@ -446,6 +446,7 @@ LSM_HOOK(int, 0, bpf_token_capable, const struct bpf_token *token, int cap) @@ -2447,8 +3592,31 @@ index 8c42b4bde09c..694ce5c5bcd4 100644 #ifdef CONFIG_PERF_EVENTS LSM_HOOK(int, 0, perf_event_open, int type) LSM_HOOK(int, 0, perf_event_alloc, struct perf_event *event) +diff --git a/include/linux/mfd/bcm2835-pm.h b/include/linux/mfd/bcm2835-pm.h +index f70a810c55f7d..d2e17ab1dbfc5 100644 +--- a/include/linux/mfd/bcm2835-pm.h ++++ b/include/linux/mfd/bcm2835-pm.h +@@ -5,11 +5,18 @@ + + #include + ++enum bcm2835_soc { ++ BCM2835_PM_SOC_BCM2835, ++ BCM2835_PM_SOC_BCM2711, ++ BCM2835_PM_SOC_BCM2712, ++}; ++ + struct bcm2835_pm { + struct device *dev; + void __iomem *base; + void __iomem *asb; + void __iomem *rpivid_asb; ++ enum bcm2835_soc soc; + }; + + #endif /* BCM2835_MFD_PM_H */ diff --git a/include/linux/rmi.h b/include/linux/rmi.h -index ab7eea01ab42..fff7c5f737fc 100644 +index ab7eea01ab427..fff7c5f737fc8 100644 --- a/include/linux/rmi.h +++ b/include/linux/rmi.h @@ -364,6 +364,7 @@ struct rmi_driver_data { @@ -2460,7 +3628,7 @@ index ab7eea01ab42..fff7c5f737fc 100644 int rmi_register_transport_device(struct rmi_transport_dev *xport); diff --git a/include/linux/security.h b/include/linux/security.h -index 83a646d72f6f..65b72854a046 100644 +index 83a646d72f6f8..65b72854a0465 100644 --- a/include/linux/security.h +++ b/include/linux/security.h @@ -2404,4 +2404,13 @@ static inline void security_initramfs_populated(void) @@ -2478,7 +3646,7 @@ index 83a646d72f6f..65b72854a046 100644 + #endif /* ! __LINUX_SECURITY_H */ diff --git a/kernel/module/signing.c b/kernel/module/signing.c -index a2ff4242e623..f0d2be1ee4f1 100644 +index a2ff4242e623d..f0d2be1ee4f1c 100644 --- a/kernel/module/signing.c +++ b/kernel/module/signing.c @@ -61,10 +61,17 @@ int mod_verify_sig(const void *mod, struct load_info *info) @@ -2501,7 +3669,7 @@ index a2ff4242e623..f0d2be1ee4f1 100644 int module_sig_check(struct load_info *info, int flags) diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib -index 28a1c08e3b22..3126a6fa6328 100644 +index 28a1c08e3b221..3126a6fa63282 100644 --- a/scripts/Makefile.lib +++ b/scripts/Makefile.lib @@ -191,7 +191,10 @@ objtool-args-$(CONFIG_HAVE_STATIC_CALL_INLINE) += --static-call @@ -2516,7 +3684,7 @@ index 28a1c08e3b22..3126a6fa6328 100644 objtool-args = $(objtool-args-y) \ $(if $(delay-objtool), --link) \ diff --git a/scripts/tags.sh b/scripts/tags.sh -index 99ce427d9a69..f191cd9d7ee6 100755 +index 99ce427d9a69d..f191cd9d7ee6e 100755 --- a/scripts/tags.sh +++ b/scripts/tags.sh @@ -16,6 +16,8 @@ fi @@ -2529,7 +3697,7 @@ index 99ce427d9a69..f191cd9d7ee6 100755 # ignore arbitrary directories if [ -n "${IGNORE_DIRS}" ]; then diff --git a/security/integrity/platform_certs/load_uefi.c b/security/integrity/platform_certs/load_uefi.c -index d1fdd113450a..182e8090cfe8 100644 +index d1fdd113450a6..182e8090cfe85 100644 --- a/security/integrity/platform_certs/load_uefi.c +++ b/security/integrity/platform_certs/load_uefi.c @@ -74,7 +74,8 @@ static __init void *get_cert_list(efi_char16_t *name, efi_guid_t *guid, @@ -2553,7 +3721,7 @@ index d1fdd113450a..182e8090cfe8 100644 } diff --git a/security/lockdown/Kconfig b/security/lockdown/Kconfig -index e84ddf484010..d0501353a4b9 100644 +index e84ddf4840101..d0501353a4b95 100644 --- a/security/lockdown/Kconfig +++ b/security/lockdown/Kconfig @@ -16,6 +16,19 @@ config SECURITY_LOCKDOWN_LSM_EARLY @@ -2577,7 +3745,7 @@ index e84ddf484010..d0501353a4b9 100644 prompt "Kernel default lockdown mode" default LOCK_DOWN_KERNEL_FORCE_NONE diff --git a/security/lockdown/lockdown.c b/security/lockdown/lockdown.c -index 8d46886d2cca..14a9cdff942b 100644 +index 8d46886d2cca0..14a9cdff942b9 100644 --- a/security/lockdown/lockdown.c +++ b/security/lockdown/lockdown.c @@ -72,6 +72,17 @@ static int lockdown_is_locked_down(enum lockdown_reason what) @@ -2598,21 +3766,8 @@ index 8d46886d2cca..14a9cdff942b 100644 static struct security_hook_list lockdown_hooks[] __ro_after_init = { LSM_HOOK_INIT(locked_down, lockdown_is_locked_down), }; -diff --git a/sound/hda/codecs/realtek/alc269.c b/sound/hda/codecs/realtek/alc269.c -index f5719e630d28..2f35acccee5d 100644 ---- a/sound/hda/codecs/realtek/alc269.c -+++ b/sound/hda/codecs/realtek/alc269.c -@@ -7104,7 +7104,7 @@ static const struct hda_quirk alc269_fixup_tbl[] = { - SND_PCI_QUIRK(0x103c, 0x8e37, "HP 16 Piston OmniBook X", ALC287_FIXUP_CS35L41_I2C_2), - SND_PCI_QUIRK(0x103c, 0x8e3a, "HP Agusta", ALC287_FIXUP_CS35L41_I2C_2), - SND_PCI_QUIRK(0x103c, 0x8e3b, "HP Agusta", ALC287_FIXUP_CS35L41_I2C_2), -- SND_PCI_QUIRK(0x103c, 0x8e60, "HP Trekker ", ALC287_FIXUP_CS35L41_I2C_2), -+ SND_PCI_QUIRK(0x103c, 0x8e60, "HP Trekker ", ALC287_FIXUP_CS35L41_I2C_2_HP_GPIO_LED), - SND_PCI_QUIRK(0x103c, 0x8e61, "HP Trekker ", ALC287_FIXUP_CS35L41_I2C_2), - SND_PCI_QUIRK(0x103c, 0x8e62, "HP Trekker ", ALC287_FIXUP_CS35L41_I2C_2), - SND_PCI_QUIRK(0x103c, 0x8e8a, "HP NexusX", ALC245_FIXUP_HP_TAS2781_I2C_MUTE_LED), diff --git a/sound/soc/sdca/sdca_class_function.c b/sound/soc/sdca/sdca_class_function.c -index 0028482a1e75..416948cfb5cb 100644 +index 0028482a1e752..416948cfb5cb9 100644 --- a/sound/soc/sdca/sdca_class_function.c +++ b/sound/soc/sdca/sdca_class_function.c @@ -19,6 +19,7 @@ @@ -2650,7 +3805,7 @@ index 0028482a1e75..416948cfb5cb 100644 &dais, &num_dais, &class_function_sdw_ops); diff --git a/tools/testing/selftests/bpf/Makefile b/tools/testing/selftests/bpf/Makefile -index 4aa60e83ff19..eaceb09e4029 100644 +index 4aa60e83ff191..eaceb09e40290 100644 --- a/tools/testing/selftests/bpf/Makefile +++ b/tools/testing/selftests/bpf/Makefile @@ -492,7 +492,7 @@ LSKELS := fexit_sleep.c trace_printk.c trace_vprintk.c map_ptr_kern.c \ @@ -2663,7 +3818,7 @@ index 4aa60e83ff19..eaceb09e4029 100644 SKEL_BLACKLIST += $$(LSKELS) $$(LSKELS_SIGNED) diff --git a/tools/testing/selftests/bpf/prog_tests/ksyms_btf.c b/tools/testing/selftests/bpf/prog_tests/ksyms_btf.c -index 1d7a2f1e0731..b22f3a9cb8b8 100644 +index 1d7a2f1e07317..b22f3a9cb8b80 100644 --- a/tools/testing/selftests/bpf/prog_tests/ksyms_btf.c +++ b/tools/testing/selftests/bpf/prog_tests/ksyms_btf.c @@ -7,7 +7,6 @@ diff --git a/sources b/sources index 3ead553b8..ac3308a36 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (linux-6.19.8.tar.xz) = 6bc16e3973ee8d83528189c4023476270c88d81ccbbb26839fe1fd8fa4fccc6d1fb35706ce8515af7b9808f74d644c4235ed646b4825bcf1d8343abfad61c31b -SHA512 (kernel-abi-stablelists-6.19.8.tar.xz) = 2b9ec447d296f02cd1b8697e217bc9261478818262b71c2e7cfd75029d5a59c7be9763a144c62fbd9698f9eef1e570b50c0ebb98d875539ef1737f02091c066e -SHA512 (kernel-kabi-dw-6.19.8.tar.xz) = c1c9b5781d5db792dfd58faae82f40636d7f7566e755695ea74d73ef7ff91f4b43c553e590c1c7bc67325b0f1e6a47cb4a3f5e4bd278f95434640b0869b880ea +SHA512 (linux-6.19.9.tar.xz) = 3ed3b90e76062cdf409c224c04062b3b2afc908edb1119db63429b570fbbfe65f63cefedc1ef530625e7b0314cb131fbfd9dbc69d1d75972e3c695691e8296df +SHA512 (kernel-abi-stablelists-6.19.9.tar.xz) = dac56e4ede8fe5459d03dd1e5103f52d2dbec9fd408110d4c09c2f39cc1834d543109f59c4aa404eac2b710688e460eede4fff8bb1f044a7b9c41770f381f802 +SHA512 (kernel-kabi-dw-6.19.9.tar.xz) = f46ca2ef6398248731cfdb202e59a21f96457ddfec14a9505870298229516a436ed973db558f0174970a863ca6cb607566a8657f8b9a2d904afc53fef34907df