From 178a6c8080863015b3058850ca2e4c62a4664f0a Mon Sep 17 00:00:00 2001
From: krant <aleksey.vasilenko@gmail.com>
Date: Mon, 10 Aug 2026 16:26:20 +0300
Subject: [PATCH] Refresh against linux-yocto v6.18.43

Delete upstreamed 0066-memory-tegra-Wire-up-system-sleep-PM-ops.patch

Signed-off-by: krant <aleksey.vasilenko@gmail.com>
---
 features/tegra/platform.scc                   | 368 +++++++++---------
 ...-tegra-Support-unique-names-for-mult.patch |   6 +-
 ...tegra194-Rename-Tegra239-to-Tegra238.patch |   6 +-
 ...freq-tegra194-Add-support-for-Tegra2.patch |   6 +-
 ...freq-tegra194-fix-policy-initializat.patch |   6 +-
 ...freq-tegra194-Support-read-only-init.patch |   6 +-
 ...-Add-devm_of_dma_controller_register.patch |   6 +-
 ...vidia-tegra186-gpc-dma-Add-iommu-ma.patch} |   6 +-
 ...nvidia-tegra186-gpc-dma-Make-reset-o.patch |  78 ----
 ...emove-fallback-compatible-for-GPCDMA.patch |  29 --
 ...e-tegra-Make-reset-control-optional.patch} |   8 +-
 ...gra-Use-struct-for-register-offsets.patch} |  36 +-
 ...tegra-Support-address-width-39-bits.patch} |  28 +-
 ...se-managed-DMA-controller-registrat.patch} |  10 +-
 ...e-tegra-Use-iommu-map-for-stream-ID.patch} |  18 +-
 ...maengine-tegra-Add-Tegra264-support.patch} |  12 +-
 ...e-GPCDMA-in-Tegra264-and-add-iommu-.patch} |   8 +-
 ...a-Update-ADMA-bindings-for-tegra264.patch} |   6 +-
 ...ngine-tegra210-adma-Update-Virtual-.patch} |   6 +-
 ...ngine-tegra210-adma-Fix-system-hang.patch} |  10 +-
 ...0-adma-Add-error-logging-on-failure.patch} |   6 +-
 ...ware-psci-Set-pm_set_resume-suspend.patch} |   6 +-
 ...ware-tegra-bpmp-Propagate-debugfs-e.patch} |   6 +-
 ...ware-tegra-bpmp-Add-support-for-mul.patch} |   6 +-
 ...-generic-macro-for-port-definitions.patch} |   6 +-
 ...o-tegra186-Add-support-for-Tegra410.patch} |   6 +-
 ...x-GPIO-name-collisions-for-Tegra410.patch} |   6 +-
 ...-bindings-gpio-Add-Tegra264-support.patch} |   8 +-
 ...o-tegra186-Add-support-for-Tegra264.patch} |   6 +-
 ...plify-GPIO-line-name-prefix-handlin.patch} |   6 +-
 ...gra186-Support-multi-socket-devices.patch} |   6 +-
 ...-tegra186-Add-suspend-resume-suppor.patch} |   6 +-
 ...-tegra186-Add-pinmux-support-for-PC.patch} |   6 +-
 ...io-tegra186-Enable-GTE-for-Tegra264.patch} |   6 +-
 ...f-system_unbound_wq-with-system_dfl.patch} |   6 +-
 ...e-tegra194-Add-Tegra264-GTE-support.patch} |   6 +-
 ...-not-configure-DMA-if-not-supported.patch} |   6 +-
 ...arate-variables-for-fast-and-fastpl.patch} |   6 +-
 ...a-Update-Tegra256-timing-parameters.patch} |   6 +-
 ... 0037-i2c-tegra-Add-HS-mode-support.patch} |   6 +-
 ...a-Add-support-for-SW-mutex-register.patch} |   6 +-
 ...0039-i2c-tegra-Add-Tegra264-support.patch} |   6 +-
 ...=> 0040-i2c-tegra-remove-unused-rst.patch} |   6 +-
 ...tegra-use-dmaengine_get_dma_device-.patch} |   6 +-
 ...tegra-resume-explicitly-if-pm_runti.patch} |   6 +-
 ...tegra-Do-not-mark-ACPI-devices-and-.patch} |   6 +-
 ...-tegra-Disable-fairness-arbitration.patch} |   6 +-
 ...241-cmdqv-Decouple-driver-from-ACPI.patch} |  10 +-
 ...-Add-device-tree-support-for-CMDQV-.patch} |   6 +-
 ...u-arm-smmu-v3-add-suspend-resume-su.patch} |   6 +-
 ...iommu-arm-smmu-v3-Add-pm-suspend-op.patch} |   6 +-
 ...u-arm-smmu-v3-Retain-prod-and-cons-.patch} |   6 +-
 ...u-arm-smmu-v3-Restore-IRQs-on-resum.patch} |   6 +-
 ...u-arm-smmu-v3-Implement-WAR-for-Teg.patch} |  10 +-
 ...mc-Do-not-print-error-on-icc_node_c.patch} |   6 +-
 ...mc-Simplify-and-handle-deferred-pro.patch} |   6 +-
 ...mc-Add-the-SoC-model-prefix-to-func.patch} |   6 +-
 ...y-tegra186-emc-Fix-missing-put_bpmp.patch} |   6 +-
 ...d-support-for-DBB-clock-on-Tegra264.patch} |   6 +-
 ...up-error-handling-related-registers.patch} |  32 +-
 ...ory-tegra-Group-register-and-fields.patch} |   6 +-
 ...tegra-Add-support-for-multiple-IRQs.patch} |  32 +-
 ...ory-tegra-Group-SoC-specific-fields.patch} |  30 +-
 ...are-for-supporting-multiple-intmask.patch} |  30 +-
 ...MC-error-logging-support-for-Tegra2.patch} |  16 +-
 ...ra-Make-resume-callback-return-void.patch} |   8 +-
 ...estore-MC-interrupt-masks-on-resume.patch} |   6 +-
 ...y-tegra-Add-nvidia-tegra238-mc-comp.patch} |   8 +-
 ...emory-tegra-Add-Tegra238-MC-support.patch} |  14 +-
 ...ry-tegra-Wire-up-system-sleep-PM-ops.patch |  64 ---
 ...y-tegra264-Add-full-set-of-MC-clien.patch} |   6 +-
 ...kip-clients-without-bpmp_id-or-type.patch} |   6 +-
 ...tegra264-Add-full-set-of-MC-clients.patch} |   6 +-
 ...mc-stop-borrowing-MC-aggregate-hook.patch} |   6 +-
 ...rop-redundant-tegra264_mc_icc_aggre.patch} |   6 +-
 ...rop-dead-NULL-check-in-tegra234_mc_.patch} |   6 +-
 ...multi-socket-support-to-the-memory-.patch} |  10 +-
 ...I-Add-ASPEED-vendor-ID-to-pci_ids.h.patch} |   8 +-
 ...E_NO_ALIAS-quirk-for-ASPEED-AST1150.patch} |  10 +-
 ...194-Broaden-architecture-dependency.patch} |   6 +-
 ...ot-mark-the-BAR-succeeding-a-64-bit.patch} |  18 +-
 ...nt-Allow-only_64bit-on-BAR_RESERVED.patch} |   6 +-
 ...ribe-reserved-subregions-within-BAR.patch} |   6 +-
 ...oduce-pci_epc_bar_type-BAR_DISABLED.patch} |   8 +-
 ...ertain-BAR_RESERVED-with-BAR_DISABL.patch} |  16 +-
 ...reserved-region-type-for-MSI-X-Tabl.patch} |   6 +-
 ...-BAR0-programmable-and-remove-1MB-s.patch} |   6 +-
 ...se-BAR2-MSI-X-and-BAR4-DMA-as-64-bi.patch} |   6 +-
 ...Assert-CLKREQ-explicitly-by-default.patch} |   6 +-
 ...brate-pipe-to-UPHY-for-Endpoint-mod.patch} |   6 +-
 ...ve-IRQF_ONESHOT-flag-during-Endpoin.patch} |   6 +-
 ...8-PCI-tegra194-Enable-DMA-interrupt.patch} |   6 +-
 ...le-hardware-hot-reset-mode-in-Endpo.patch} |   6 +-
 ...a194-Add-core-monitor-clock-support.patch} |   6 +-
 ...trl-tegra-Export-tegra_pinctrl_prob.patch} |   6 +-
 ...trl-tegra-Add-Tegra238-pinmux-drive.patch} |  10 +-
 ...trl-tegra-Add-Tegra264-pinmux-drive.patch} |  10 +-
 ...main-tegra-Add-support-for-multi-so.patch} |   6 +-
 ...gs-pwm-Document-Tegra264-controller.patch} |   6 +-
 ...void-hard-coded-max-clock-frequency.patch} |   6 +-
 ...read-write-accessors-for-multi-regi.patch} |   6 +-
 ...-Parametrize-enable-register-offset.patch} |   6 +-
 ...metrize-duty-and-scale-field-widths.patch} |   6 +-
 ...-pwm-tegra-Add-support-for-Tegra264.patch} |   6 +-
 ...core-Pass-context-data-to-callbacks.patch} | 264 ++++++-------
 ...-Don-t-fail-if-aotag-is-not-present.patch} |   6 +-
 ...mc-Document-tegra_pmc.syscore-field.patch} |   6 +-
 ...mc-Add-USB-wake-events-for-Tegra234.patch} |   6 +-
 ...-Fix-unsafe-generic_handle_irq-call.patch} |   6 +-
 ...-contextual-data-instead-of-global-.patch} |   6 +-
 ...s-struct-tegra_pmc-to-tegra_powerga.patch} |   6 +-
 ...gra-pmc-Store-PMC-context-in-clocks.patch} |   6 +-
 ...mbed-reboot-notifier-in-PMC-context.patch} |   6 +-
 ...s-PMC-context-via-sys-off-callback-.patch} |   6 +-
 ...mc-Pass-PMC-context-as-debugfs-data.patch} |   6 +-
 ...-PMC-context-embedded-in-powergates.patch} |   6 +-
 ...c-tegra-pmc-Use-driver-private-data.patch} |   6 +-
 ...-pmc-Do-not-rely-on-global-variable.patch} |   6 +-
 ...ra-pmc-Add-PMC-contextual-functions.patch} |   8 +-
 ...c-Add-kerneldoc-for-reboot-notifier.patch} |   6 +-
 ...Correct-function-names-in-kerneldoc.patch} |   6 +-
 ...Add-kerneldoc-for-wake-up-variables.patch} |   6 +-
 ...mc-Remove-unused-AOWAKE-definitions.patch} |   6 +-
 ...-support-for-SoC-specific-AOWAKE-of.patch} |   6 +-
 ...ra-pmc-Add-AOWAKE-regs-for-Tegra264.patch} |   6 +-
 ...-tegra-pmc-Add-Tegra264-wake-events.patch} |   6 +-
 ...pmc-Refactor-IO-pad-voltage-control.patch} |   6 +-
 ...ra-pmc-Rename-has_impl_33v_pwr-flag.patch} |   6 +-
 ...-tegra-pmc-Add-IO-pads-for-Tegra264.patch} |   6 +-
 ...-a-spelling-error-in-the-tegra194-c.patch} |   6 +-
 ...-support-for-CBB-fabrics-in-Tegra23.patch} |   6 +-
 ...ra-bpmp-Rename-Tegra239-to-Tegra238.patch} |   6 +-
 ...29-soc-tegra-Update-BPMP-ABI-header.patch} |   6 +-
 ...-pmc-Create-PMC-context-dynamically.patch} |   6 +-
 ...-Explicitly-specify-PMC-instance-to.patch} |   8 +-
 ...licitly-specify-PMC-instance-to-use.patch} |  22 +-
 ...plicitly-specify-PMC-instance-to-us.patch} |   6 +-
 ...licitly-specify-PMC-instance-to-use.patch} |   6 +-
 ...plicitly-specify-PMC-instance-to-us.patch} |   6 +-
 ...licitly-specify-PMC-instance-to-use.patch} |   8 +-
 ...-pmc-Remove-unused-legacy-functions.patch} |   8 +-
 ...e-legacy-code-behind-CONFIG_ARM-gua.patch} |   8 +-
 ...ulate-powergate-debugfs-only-when-n.patch} |   6 +-
 ...strict-power-off-handler-to-Nexus-7.patch} |   6 +-
 ...-soc-tegra-pmc-Add-Tegra238-support.patch} |   6 +-
 ...-t-register-sys-off-handler-for-mul.patch} |   6 +-
 ...-Refactor-error-handling-into-helpe.patch} |   6 +-
 ...ad-Check-hardware-status-on-timeout.patch} |   6 +-
 ...uad-Add-runtime-autosuspend-support.patch} |   6 +-
 ...-Remove-redundant-pm_runtime_mark_l.patch} |   6 +-
 ...-Fix-false-positive-WARN-on-interru.patch} |   6 +-
 ...-Introduce-skip_ibrd_fbrd-vendor-fl.patch} |   6 +-
 ...-Introduce-set_uartclk_rate-vendor-.patch} |   6 +-
 ...mba-pl011-Add-Tegra264-UART-support.patch} |   6 +-
 ...-Respect-DMA-controller-s-copy_alig.patch} |   6 +-
 ...sysfs-Add-sys-kernel-realtime-entry.patch} |   6 +-
 ...add-flat-cache-with-sparse-validity.patch} |  14 +-
 ...sers-about-uninitialized-flat-cache.patch} |   6 +-
 ...late-callback-to-separate-from-init.patch} |   8 +-
 ...ove-unneeded-check-and-error-messag.patch} |   6 +-
 ...cache-flat-Split-populate-from-init.patch} |   6 +-
 ...fault_cb-callback-for-flat-cache-de.patch} |  14 +-
 ...C-tegra-set-reg_default_cb-callback.patch} |  38 +-
 ...e-0Hz-sysclk-during-stream-shutdown.patch} |   6 +-
 ...ev_err_probe-in-tegra186_asrc-probe.patch} |   6 +-
 ...ev_err_probe-in-tegra186_dspk-probe.patch} |   6 +-
 ...rror-logging-in-tegra210_adx-driver.patch} |   6 +-
 ...ev_err_probe-in-tegra210_ahub-probe.patch} |  10 +-
 ...rror-logging-in-tegra210_amx-driver.patch} |   6 +-
 ...ev_err_probe-in-tegra210_dmic-probe.patch} |   6 +-
 ...rror-logging-in-tegra210_i2s-driver.patch} |   6 +-
 ...v_err_probe-in-tegra210_mixer-probe.patch} |   6 +-
 ...dev_err_probe-in-tegra210_mvc-probe.patch} |   6 +-
 ...dev_err_probe-in-tegra210_sfc-probe.patch} |   6 +-
 ...v_err_probe-in-tegra_asoc_machine-p.patch} |   6 +-
 ...v_err_probe-in-tegra_audio_graph_ca.patch} |   6 +-
 ...ror-logging-in-tegra210_admaif-driv.patch} |   6 +-
 ...v_err_probe-in-OPE-PEQ-and-MBDRC-dr.patch} |  10 +-
 ...v_err_probe-for-regmap-init-failure.patch} |  26 +-
 ...v_err_probe-in-tegra_asoc_machine-p.patch} |   6 +-
 ...-Add-per-stream-Mixer-Fade-controls.patch} |   8 +-
 ...t-Use-dev_err_probe-for-probe-error.patch} |   6 +-
 ...SoC-codecs-rt56-Remove-IRQF_ONESHOT.patch} |  10 +-
 ...0180-ASoC-rt5640-Handle-nested-IRQs.patch} |   6 +-
 ...vents-Use-evsel__match-for-legacy-e.patch} |   6 +-
 ...vents-Without-a-PMU-use-cpu-cycles-.patch} |   6 +-
 ...e-events-Remove-cpu-PMU-requirement.patch} |   6 +-
 ...-Constify-variables-storing-the-resu.patch |  41 --
 ...nst-for-variables-receiving-str-str.patch} |  33 +-
 ...-strlist-Don-t-write-to-const-memory.patch |  49 ---
 ...-t-write-to-memory-pointed-to-a-cons.patch |  46 ---
 ...-Constify-variables-storing-the-resu.patch |  28 --
 ...ify-variables-storing-the-result-of-.patch |  28 --
 ...Constify-variables-storing-the-resul.patch |  37 --
 ...va-Constify-variables-storing-the-re.patch |  28 --
 ...onstify-variables-storing-the-result.patch |  29 --
 ...stify-variables-storing-the-result-o.patch |  28 --
 ...pto-tcrypt-Changes-to-support-NVIDIA.patch |  10 +-
 ...-SAUCE-crypto-Skip-lrw-aes-in-tcrypt.patch |   4 +-
 ...uetooth-usb-Blacklist-8822CE-modules.patch |   4 +-
 ...usb-Disable-RTL8852CE-upstream-drive.patch |   4 +-
 ...bluetooth-usb-disable-8822CE-modules.patch |   4 +-
 ...CE-clk-tegra-make-nocache-for-clocks.patch |   4 +-
 ...cksource-timer-tegra186-adjust-WDT-t.patch |   4 +-
 ...cksource-timer-tegra186-Enable-WDT-a.patch |   4 +-
 ...mp-stop-mounting-bpmp-debugfs-on-vdk.patch |   4 +-
 ...lbox-tegra-hsp-add-support-for-multi.patch |   4 +-
 ...lbox-tegra-hsp-Add-sm-ops-route_irq-.patch |   4 +-
 ...lbox-tegra-hsp-Add-support-for-virtu.patch |   4 +-
 ...lbox-tegra-hsp-Add-virtualization-su.patch |   4 +-
 ...lbox-tegra-hsp-Do-not-clear-interrup.patch |   4 +-
 ...2-core-Add-new-packed-v4l2-pixel-for.patch |   4 +-
 ...2-core-Add-sync-op-to-subdev_core_op.patch |   6 +-
 ...lude-linux-Add-new-packed-v4l2-pixel.patch |   6 +-
 ...ia-uvc-zero-seq-number-when-disablin.patch |   6 +-
 ...-host-Add-support-to-bypass-clock-re.patch |   4 +-
 ...-core-separate-mmc_test-and-mmc-driv.patch |   8 +-
 ...-host-Add-eMMC-support-on-VSP-platfo.patch |   6 +-
 ...-core-Update-bus-status-on-sd-card-r.patch |   4 +-
 ...IA-SAUCE-mmc-host-Use-tegra_sku_info.patch |   6 +-
 ...AUCE-s25fs-Add-post-get-map-id-fixup.patch |  12 +-
 ...-spi-nor-support-for-spansion-and-ma.patch |   8 +-
 ...-phy-aqr113c-restore-PHY-configurati.patch |   4 +-
 ...CE-net-phy-add-10G-5G-for-fixed-link.patch |   4 +-
 ...-phy-enable-pause-in-realtek-and-aqu.patch |   6 +-
 ...-phy-aquantia-Enable-MAC-Controlled-.patch |   4 +-
 ...-phy-aqr113c-Enable-Wake-on-boot-con.patch |   4 +-
 ...UCE-net-phy-aqr-add-phy_mode-support.patch |   4 +-
 ...-phy-aqr-configure-1G-100M-of-aqr-PH.patch |   4 +-
 ...-phy-aqr113c-poll-for-TX-ready-at-PH.patch |   6 +-
 ...-phy-aqr113c-Read-WOL-status-registe.patch |   4 +-
 ...-phy-realtek-phy-Add-support-for-RTL.patch |   6 +-
 ...-phy-aqr113c-Handling-Duplicate-WOL-.patch |   4 +-
 ...-phy-aqr113c-skip-PHY-low-power-mode.patch |   6 +-
 ...IA-SAUCE-net-phy-fix-data-corruption.patch |   4 +-
 ...-phy-fix-ubsan-warning-network-layer.patch |   4 +-
 ...cmfmac-Fix-PCIE-suspend-resume-issue.patch |  22 +-
 ...antia-issue-PHY-reset-during-phy-ini.patch |   4 +-
 ...-NVIDIA-SAUCE-net-phy-add-new-speeds.patch |   4 +-
 ...et-phy-aquantia-Poll-for-valid-FW-ID.patch |   6 +-
 ...-net-phy-aquantia-Fix-PHY-interfaces.patch |   4 +-
 ...rf-smmuv3-Read-ceid-override-from-DT.patch |   4 +-
 ...CE-perf-arm_cspmu-add-pmpidr-support.patch |   6 +-
 ...f-arm_cspmu-nvidia-add-revision-id-m.patch |   4 +-
 ...rf-arm_cspmu-nvidia-add-T264-support.patch |   6 +-
 ...f-arm_cspmu-add-stop-counters-to-imp.patch |   6 +-
 ...f-arm_cspmu-NVIDIA-T264-PMU-leakage-.patch |   4 +-
 ...f-arm-spe-Add-Poseidon-AE-to-neovers.patch |   6 +-
 ...-phy-tegra-p2u-Add-lane-margin-suppo.patch |   4 +-
 ...-phy-tegra-p2u-update-power-on-seque.patch |   4 +-
 ...-tegra194-p2u-Fix-device-tree-backwa.patch |   4 +-
 ...-SAUCE-phy-tegra-xusb-add-vf-support.patch |  10 +-
 ...-tegra-Increase-timeout-for-USB2_TRK.patch |   4 +-
 ...AUCE-phy-tegra-fix-memory-corruption.patch |   6 +-
 ...58-NVIDIA-SAUCE-Add-tegra-EPL-driver.patch |  20 +-
 ...egra-epl-send-state-notification-fsi.patch |   4 +-
 ...ra-epl-Remove-dependency-on-ARCH_TEG.patch |   4 +-
 ...ra-epl-fix-deinit-notification-to-fs.patch |   4 +-
 ...ra-epl-Set-handshake-retry-count-to-.patch |   4 +-
 ...ra-epl-publish-kernel-pm-state-to-FS.patch |   4 +-
 ...ra-epl-Set-default-handshake-retry-c.patch |   4 +-
 ...ra-epl-Map-mission-status-reg-if-onl.patch |   4 +-
 ...ra-epl-allow-tegra-epl-to-be-built-a.patch |   8 +-
 ...ra-epl-add-plausibility-checks-and-i.patch |   4 +-
 ...ra-epl-Fix-CERT-C-violations-and-sec.patch |   4 +-
 ...ra-epl-add-periodic-alive-packet-fun.patch |   4 +-
 ...ra-epl-Add-dts-parameter-for-epl-mai.patch |   4 +-
 ...umentation-Add-DT-binding-for-tegra-.patch |   4 +-
 ...A-SAUCE-Add-tegra-HSI-Err-Inj-driver.patch |  14 +-
 ...CE-hsierrrptinj-Update-supported-IPs.patch |   6 +-
 ...IA-SAUCE-hsierrrptinj-add-ID-for-DLA.patch |   6 +-
 ...errrptinj-Update-Ethernet-IP-instanc.patch |   4 +-
 ...DIA-SAUCE-hsierrrptinj-update-driver.patch |   4 +-
 ...-hsierrrptinj-increase-SDMMC-clients.patch |   4 +-
 ...CE-hsierrrptinj-Update-I2C-instances.patch |   4 +-
 ...tform-tegra-Add-tegra-prod-as-built-.patch |  10 +-
 ...CE-scsi-ufs-Switch-UFS-init-sequence.patch |   4 +-
 ...AUCE-scsi-ufs-Export-query-functions.patch |   4 +-
 ...i-ufs-core-Add-config-flag-to-findou.patch |   4 +-
 ...i-ufs-Change-the-power-sequence-to-L.patch |   6 +-
 ...i-ufs-skip-ufs-init-if-already-initi.patch |   6 +-
 ...-xhci-tegra-don-t-assign-port-role-b.patch |   4 +-
 ...-typec-ucsi-Find-connector-fwnode-wi.patch |   6 +-
 ...i-tegra-avoid-usb-access-after-shutd.patch |   4 +-
 ...-xhci-tegra-use-reset-control-framew.patch |   4 +-
 ...SAUCE-xhci-tegra-enable-firmware-log.patch |   4 +-
 ...t-tegra-build-tegra_hv.c-driver-as-b.patch |  20 +-
 ...vers-tegra-virt-support-hvc-call-to-.patch |   4 +-
 ...drivers-tegra-virt-runtime-frequency.patch |   4 +-
 ..._sysfs-update-trace-hypercall-wrappe.patch |   4 +-
 ...CE-tegra_hv-Add-sysfs-to-trigger-HVC.patch |   8 +-
 ...ra_hv-cert-misra-fixes-in-tegra_hv.c.patch |   4 +-
 ...t-add-sanity-checks-for-ivc-info-s-m.patch |   6 +-
 ...ra_hv-don-t-expose-mempool-and-ivc-a.patch |   4 +-
 ...ra_hv-add-support-of-async-error-dia.patch |   6 +-
 ...ra_hv-use-prod-kernel-flag-exposed-b.patch |   6 +-
 ...egra_hv-add-max-number-of-vmid-check.patch |   4 +-
 ...ra_hv-use-kzalloc-instead-of-kmalloc.patch |   4 +-
 ...ra_hv-remove-tegra_hv_ivc_convert_co.patch |   6 +-
 ...ra_hv-clear-out-memory-before-releas.patch |   4 +-
 ...ra_hv-stop-logging-total-mempool-ivc.patch |   4 +-
 ...ra_hv-doxygen-comment-fixes-in-hv-dr.patch |  12 +-
 ...DIA-SAUCE-hv-ivc-add-doxygen-comment.patch |   8 +-
 ...ra_hv-clear-out-memory-while-unreser.patch |   8 +-
 ...IDIA-SAUCE-tegra_hv-cert-misra-fixes.patch |   4 +-
 ...IDIA-SAUCE-tegra_hv-cert-misra-fixes.patch |   6 +-
 ...ra_hv-Update-interrupt-property-hand.patch |   4 +-
 ...-reworked-changes-on-icd-doc-review-.patch |   6 +-
 ...ra_hv-stop-ivc-ops-for-unreserved-IV.patch |   4 +-
 ...ra_hv-change-to-fix-compilation-erro.patch |   4 +-
 ...irt-linux-hv-driver-cert-misra-fixes.patch |  10 +-
 ...t-tegra-segregate-hv-ivc-from-tegra_.patch |  12 +-
 ...t-tegra-add-nvlog-ability-to-access-.patch |   4 +-
 ...ra_hv_ivc-Add-interface-for-nvscicom.patch |   6 +-
 ...ra_hv_ivc-Add-API-to-reserve-an-IVC-.patch |   6 +-
 ...ra_hv_ivc-Defer-setting-the-IRQ-unti.patch |   4 +-
 ...mod-Create-dependency-list-for-displ.patch |   4 +-
 ...-Avoid-call-dump-trace-on-UBSAN-erro.patch |   4 +-
 ...-check-Disable-warning-for-plugin-DT.patch |   4 +-
 ...nel-script-depmod-Do-not-use-exec-fo.patch |   4 +-
 ...DIA-SAUCE-pstore-Avoid-using-pr_cont.patch |   4 +-
 ...-tegra-prod-use-legacy-prod-settings.patch |   4 +-
 ...ra-sdhci-do-not-apply-prod-settings-.patch |   4 +-
 ...-sd-Add-quirk-for-SanDisk-SR64G-Extr.patch |   4 +-
 ...-tegra-use-gpio-for-voltage-switchin.patch |   4 +-
 ...ci-tegra-t264-Add-T264-support-for-S.patch |   4 +-
 ...ctrl-tegra-Enhance-suspend-resume-to.patch |   4 +-
 ...ctrl-tegra-add-tegra_hv.h-header-fil.patch |   4 +-
 ...IDIA-SAUCE-xhci-tegra-add-VF-support.patch |   4 +-
 ...-gadget-xudc-use-reset-control-frame.patch |   4 +-
 ...UCE-usb-gadget-xudc-support-hv-guest.patch |   4 +-
 ...IA-SAUCE-xudc-Set-COREPLL_PWRDN-to-0.patch |   4 +-
 ...UCE-xhci-tegra-fix-memory-corruption.patch |   4 +-
 ...b-gadget-msc-fix-Error-Recovery-Test.patch |   4 +-
 ...sb-gadget-xudc-add-set_wedge-support.patch |   4 +-
 ...AUCE-xhci-tegra-fix-port-reset-issue.patch |   4 +-
 ...-gadget-xudc-Avoid-skipping-clear-fe.patch |   4 +-
 ...-xhci-Check-PSIM-value-to-determine-.patch |   4 +-
 ...-usb-gadget-udc-Add-Tegra264-support.patch |   4 +-
 ...-host-xhci-tegra-Add-Tegra264-XHCI-s.patch |   4 +-
 ...UCE-usb-xhci-skip-mbox-configuration.patch |   4 +-
 ...E-xudc-skip-SSPX-programming-in-xudc.patch |   4 +-
 ...-gadget-xudc-Enable-u1-u2-for-Tegra2.patch |   4 +-
 ...-gadget-xudc-Set-the-u1-timeout-defa.patch |   4 +-
 ...-gadget-xudc-Add-platform-init-funct.patch |   4 +-
 ...-gadget-tegra-xudc-Reduce-ping.LFPS-.patch |   4 +-
 ...-gadget-tegra-xudc-Increase-credit-H.patch |   4 +-
 ...-gadget-tegra-xudc-Increase-tPortCon.patch |   4 +-
 ...-host-xhci-Add-Tegra264-virtual-func.patch |   4 +-
 ...-host-xhci-Add-ELPG-support-in-virtu.patch |   4 +-
 ...-gadget-xudc-Add-Tegra264-virtualiza.patch |   4 +-
 ...-tegra-prod-use-legacy-prod-settings.patch |   4 +-
 ...-phy-tegra-xusb-Add-Tegra264-support.patch |  10 +-
 ...-xusb-skip-USB2-PAD-tracking-and-fus.patch |   6 +-
 ...y-tegra-xusb-Remove-ignore_fuse-flag.patch |   6 +-
 ...-tegra-fuse-Add-FUSE_USB_CALIB_EXT2-.patch |   4 +-
 ...-tegra-xusb-tegra186-Fix-and-extend-.patch |   4 +-
 ...SAUCE-phy-tegra-fix-port-reset-issue.patch |   4 +-
 ...gra_hv_ivc-Fix-build-for-Linux-v6.11.patch |   4 +-
 ...SAUCE-tegra_hv_nvsci-Add-header-file.patch |   4 +-
 ...t-tegra-add-include-tegra_hv_ivc.h-h.patch |   6 +-
 ...ra_hv_nvsci-include-tegra_hv_ivc.h-h.patch |   4 +-
 ...ve-IVC-layout-declarations-to-tegra_.patch |   6 +-
 ...name-header-from-tegra_hv_nvscicom.h.patch |   6 +-
 ...SAUCE-virt-tegra-Bump-max-IVC-queues.patch |   4 +-
 ...64-defconfig-Increase-FORCE_MAX_ORDE.patch |   4 +-
 ...-typec-ucsi_ccg-Add-retry-mechanism-.patch |   4 +-
 ...sci_ipc-Remove-knvsci_ipc.h-from-ker.patch |   4 +-
 ...egra-epl-Enable-by-default-for-Tegra.patch |   4 +-
 ...errrptinj-Enable-by-default-for-Tegr.patch |   4 +-
 ...AUCE-soc-tegra-add-mssnvlink-support.patch |   8 +-
 ...-tegra-cbb-add-multi-socket-error-ha.patch |   4 +-
 ...A-SAUCE-nvmem-Add-Tegra-efuse-driver.patch |  24 +-
 ...ctrl-Remove-duplication-of-PINCTRL_T.patch |   4 +-
 ...CE-efuse-Add-odm-id-odm-info-support.patch |   4 +-
 ...IDIA-SAUCE-efuse-update-ecid-changes.patch |   4 +-
 ...-tegra-pmc-Add-sysfs-nodes-to-select.patch |   4 +-
 ...-tegra-cbb-Fix-build-with-ACPI-disab.patch |   4 +-
 ...E-soc-tegra-pmc-Multi-socket-support.patch |   4 +-
 ...-tegra-pmc-Add-Tegra234-PCIe-wake-ev.patch |   4 +-
 ...o-tegra-add-1ms-delay-before-setting.patch |   4 +-
 ...o-pca953x-Use-NOIRQ-suspend-resume-f.patch |   4 +-
 ...o-tegra-add-is_tegra_hypervisor-chec.patch |   4 +-
 ...pio-tegra-add-tegra_hv.h-header-file.patch |   4 +-
 ...mware-bpmp-build-bpmp-hv-driver-as-b.patch |  10 +-
 ...mware-ivc-merge-ivc_ext.c-with-upstr.patch |   6 +-
 ...rning-instead-of-panicing-the-target.patch |   4 +-
 ...nts-raised-by-secure-code-inspection.patch |   4 +-
 ...92-ivc-cert-misra-fixes-in-ivc.c-drv.patch |   4 +-
 ...mware-bpmp-include-tegra_hv_ivc.h-he.patch |   4 +-
 ...E-bpmp-hv-driver-multi-socket-update.patch |   4 +-
 ...-tegra-Report-critical-errors-to-FSI.patch |   4 +-
 ...-Error-report-injection-utility-supp.patch |   4 +-
 ...-core-skip-prod-settings-node-during.patch |   4 +-
 ...-tegra-prod-use-legacy-prod-settings.patch |   4 +-
 ...-tegra-Register-Err-Injection-driver.patch |   4 +-
 ...mu-io-pgtable-arm-Support-contiguous.patch |   4 +-
 ...mu-arm-smmu-v3-use-reserved-memory-f.patch |   4 +-
 ...mu-tegra241-cmdqv-WAR-for-64-bit-wri.patch |   4 +-
 ...memory-tegra-Skip-SID-override-on-HV.patch |   4 +-
 ...i-add-tegra-spidev-compatible-string.patch |   4 +-
 ...UCE-spi-add-tegra-spidev-name-string.patch |   4 +-
 ...drivers-spi-fix-warnings-in-spi-core.patch |   4 +-
 ...spi-spi-tegra114-retain-the-spi-mode.patch |   4 +-
 ...-tegra-prod-use-legacy-prod-settings.patch |   4 +-
 ...SAUCE-ASoC-tegra-support-codec2codec.patch |  22 +-
 ...C-tegra-codec2codec-mode-for-AHUB-DA.patch |  42 +-
 ...oC-tegra-support-few-external-codecs.patch |  12 +-
 ...VIDIA-SAUCE-ASoC-Fix-pll-clock-issue.patch |   4 +-
 ...SoC-tegra-Update-ASRC-ratio-controls.patch |   4 +-
 ...C-tegra-Add-S8-PCM-format-support-fo.patch |   4 +-
 ...-dwc-Use-pci_alloc_host_bridge-in-pl.patch |   4 +-
 ...-designware-host-Update-resource-cle.patch |   4 +-
 ...-tegra194-Apply-pinctrl-settings-for.patch |   4 +-
 ...-tegra194-Add-PEX_PRSNT-GPIO-support.patch |   4 +-
 ...-tegra194-Disable-AER-interrupt-duri.patch |   4 +-
 ...-tegra194-Add-ASPM-L1-entrance-laten.patch |   4 +-
 ...-tegra194-Disable-interrupt-before-l.patch |   4 +-
 ...I-tegra194-Remove-debugfs-if-link-up.patch |   4 +-
 ...irq-Adjust-of_pci_irq-parsing-for-mu.patch |   4 +-
 ...mu-of-Fix-pci_request_acs-before-enu.patch |   6 +-
 ...SAUCE-PCI-of-Use-of_property_present.patch |   4 +-
 ...-Add-quirk-to-mask-AER-receiver-erro.patch |   4 +-
 ...-tegra194-Fix-stop_link-callback-to-.patch |   4 +-
 ...A-SAUCE-PCI-DOE-Increase-DOE-timeout.patch |   4 +-
 ...-Add-wait-for-link-condition-before-.patch |   4 +-
 ...i-Mask-ADV-NF-AER-for-Pericom-switch.patch |   4 +-
 ...-tegra194-Disable-pex_rst_irq-only-i.patch |   4 +-
 ...CE-PCI-Add-support-for-PEX-WAKE-GPIO.patch |   4 +-
 ...-MSI-Skip-EP-register-access-when-de.patch |   8 +-
 ...A-SAUCE-PCI-tegra194-Add-HSI-support.patch |   4 +-
 ...E-PCI-tegra194-Fix-core_clk-rate-set.patch |   4 +-
 ...-Move-dw_pcie_ep_linkup-to-threaded_.patch |   4 +-
 ...-optee-ffa-add-static-shared-memory-.patch |   8 +-
 ...o-tegra186-enable-interrupt-for-all-.patch |   4 +-
 ...o-tegra186-fix-pinctrl-for-multi-soc.patch |   4 +-
 ...UCE-soc-tegra-pmc-Multi-socket-suppo.patch |   4 +-
 437 files changed, 1677 insertions(+), 2201 deletions(-)
 rename features/tegra/platform/patches/{0009-dt-bindings-dma-nvidia-tegra186-gpc-dma-Add-iommu-ma.patch => 0007-dt-bindings-dma-nvidia-tegra186-gpc-dma-Add-iommu-ma.patch} (93%)
 delete mode 100644 features/tegra/platform/patches/0007-dt-bindings-dma-nvidia-tegra186-gpc-dma-Make-reset-o.patch
 delete mode 100644 features/tegra/platform/patches/0008-arm64-tegra-Remove-fallback-compatible-for-GPCDMA.patch
 rename features/tegra/platform/patches/{0010-dmaengine-tegra-Make-reset-control-optional.patch => 0008-dmaengine-tegra-Make-reset-control-optional.patch} (86%)
 rename features/tegra/platform/patches/{0011-dmaengine-tegra-Use-struct-for-register-offsets.patch => 0009-dmaengine-tegra-Use-struct-for-register-offsets.patch} (95%)
 rename features/tegra/platform/patches/{0012-dmaengine-tegra-Support-address-width-39-bits.patch => 0010-dmaengine-tegra-Support-address-width-39-bits.patch} (90%)
 rename features/tegra/platform/patches/{0013-dmaengine-tegra-Use-managed-DMA-controller-registrat.patch => 0011-dmaengine-tegra-Use-managed-DMA-controller-registrat.patch} (89%)
 rename features/tegra/platform/patches/{0014-dmaengine-tegra-Use-iommu-map-for-stream-ID.patch => 0012-dmaengine-tegra-Use-iommu-map-for-stream-ID.patch} (89%)
 rename features/tegra/platform/patches/{0015-dmaengine-tegra-Add-Tegra264-support.patch => 0013-dmaengine-tegra-Add-Tegra264-support.patch} (85%)
 rename features/tegra/platform/patches/{0016-arm64-tegra-Enable-GPCDMA-in-Tegra264-and-add-iommu-.patch => 0014-arm64-tegra-Enable-GPCDMA-in-Tegra264-and-add-iommu-.patch} (88%)
 rename features/tegra/platform/patches/{0017-dt-bindings-dma-Update-ADMA-bindings-for-tegra264.patch => 0015-dt-bindings-dma-Update-ADMA-bindings-for-tegra264.patch} (95%)
 rename features/tegra/platform/patches/{0018-NVIDIA-SAUCE-dmaengine-tegra210-adma-Update-Virtual-.patch => 0016-NVIDIA-SAUCE-dmaengine-tegra210-adma-Update-Virtual-.patch} (91%)
 rename features/tegra/platform/patches/{0019-NVIDIA-SAUCE-dmaengine-tegra210-adma-Fix-system-hang.patch => 0017-NVIDIA-SAUCE-dmaengine-tegra210-adma-Fix-system-hang.patch} (98%)
 rename features/tegra/platform/patches/{0020-dmaengine-tegra210-adma-Add-error-logging-on-failure.patch => 0018-dmaengine-tegra210-adma-Add-error-logging-on-failure.patch} (98%)
 rename features/tegra/platform/patches/{0021-NVIDIA-SAUCE-firmware-psci-Set-pm_set_resume-suspend.patch => 0019-NVIDIA-SAUCE-firmware-psci-Set-pm_set_resume-suspend.patch} (95%)
 rename features/tegra/platform/patches/{0022-NVIDIA-SAUCE-firmware-tegra-bpmp-Propagate-debugfs-e.patch => 0020-NVIDIA-SAUCE-firmware-tegra-bpmp-Propagate-debugfs-e.patch} (95%)
 rename features/tegra/platform/patches/{0023-NVIDIA-SAUCE-firmware-tegra-bpmp-Add-support-for-mul.patch => 0021-NVIDIA-SAUCE-firmware-tegra-bpmp-Add-support-for-mul.patch} (96%)
 rename features/tegra/platform/patches/{0024-gpio-tegra186-Use-generic-macro-for-port-definitions.patch => 0022-gpio-tegra186-Use-generic-macro-for-port-definitions.patch} (98%)
 rename features/tegra/platform/patches/{0025-gpio-tegra186-Add-support-for-Tegra410.patch => 0023-gpio-tegra186-Add-support-for-Tegra410.patch} (97%)
 rename features/tegra/platform/patches/{0026-gpio-tegra186-Fix-GPIO-name-collisions-for-Tegra410.patch => 0024-gpio-tegra186-Fix-GPIO-name-collisions-for-Tegra410.patch} (96%)
 rename features/tegra/platform/patches/{0027-dt-bindings-gpio-Add-Tegra264-support.patch => 0025-dt-bindings-gpio-Add-Tegra264-support.patch} (97%)
 rename features/tegra/platform/patches/{0028-gpio-tegra186-Add-support-for-Tegra264.patch => 0026-gpio-tegra186-Add-support-for-Tegra264.patch} (97%)
 rename features/tegra/platform/patches/{0029-gpio-tegra186-Simplify-GPIO-line-name-prefix-handlin.patch => 0027-gpio-tegra186-Simplify-GPIO-line-name-prefix-handlin.patch} (95%)
 rename features/tegra/platform/patches/{0030-gpio-tegra186-Support-multi-socket-devices.patch => 0028-gpio-tegra186-Support-multi-socket-devices.patch} (94%)
 rename features/tegra/platform/patches/{0031-NVIDIA-SAUCE-gpio-tegra186-Add-suspend-resume-suppor.patch => 0029-NVIDIA-SAUCE-gpio-tegra186-Add-suspend-resume-suppor.patch} (97%)
 rename features/tegra/platform/patches/{0032-NVIDIA-SAUCE-gpio-tegra186-Add-pinmux-support-for-PC.patch => 0030-NVIDIA-SAUCE-gpio-tegra186-Add-pinmux-support-for-PC.patch} (94%)
 rename features/tegra/platform/patches/{0033-NVIDIA-SAUCE-gpio-tegra186-Enable-GTE-for-Tegra264.patch => 0031-NVIDIA-SAUCE-gpio-tegra186-Enable-GTE-for-Tegra264.patch} (86%)
 rename features/tegra/platform/patches/{0034-hte-replace-use-of-system_unbound_wq-with-system_dfl.patch => 0032-hte-replace-use-of-system_unbound_wq-with-system_dfl.patch} (93%)
 rename features/tegra/platform/patches/{0035-hte-tegra194-Add-Tegra264-GTE-support.patch => 0033-hte-tegra194-Add-Tegra264-GTE-support.patch} (98%)
 rename features/tegra/platform/patches/{0036-i2c-tegra-Do-not-configure-DMA-if-not-supported.patch => 0034-i2c-tegra-Do-not-configure-DMA-if-not-supported.patch} (92%)
 rename features/tegra/platform/patches/{0037-i2c-tegra-Use-separate-variables-for-fast-and-fastpl.patch => 0035-i2c-tegra-Use-separate-variables-for-fast-and-fastpl.patch} (98%)
 rename features/tegra/platform/patches/{0038-i2c-tegra-Update-Tegra256-timing-parameters.patch => 0036-i2c-tegra-Update-Tegra256-timing-parameters.patch} (94%)
 rename features/tegra/platform/patches/{0039-i2c-tegra-Add-HS-mode-support.patch => 0037-i2c-tegra-Add-HS-mode-support.patch} (98%)
 rename features/tegra/platform/patches/{0040-i2c-tegra-Add-support-for-SW-mutex-register.patch => 0038-i2c-tegra-Add-support-for-SW-mutex-register.patch} (98%)
 rename features/tegra/platform/patches/{0041-i2c-tegra-Add-Tegra264-support.patch => 0039-i2c-tegra-Add-Tegra264-support.patch} (95%)
 rename features/tegra/platform/patches/{0042-i2c-tegra-remove-unused-rst.patch => 0040-i2c-tegra-remove-unused-rst.patch} (93%)
 rename features/tegra/platform/patches/{0043-NVIDIA-SAUCE-i2c-tegra-use-dmaengine_get_dma_device-.patch => 0041-NVIDIA-SAUCE-i2c-tegra-use-dmaengine_get_dma_device-.patch} (93%)
 rename features/tegra/platform/patches/{0044-NVIDIA-SAUCE-i2c-tegra-resume-explicitly-if-pm_runti.patch => 0042-NVIDIA-SAUCE-i2c-tegra-resume-explicitly-if-pm_runti.patch} (95%)
 rename features/tegra/platform/patches/{0045-NVIDIA-SAUCE-i2c-tegra-Do-not-mark-ACPI-devices-and-.patch => 0043-NVIDIA-SAUCE-i2c-tegra-Do-not-mark-ACPI-devices-and-.patch} (96%)
 rename features/tegra/platform/patches/{0046-NVIDIA-SAUCE-i2c-tegra-Disable-fairness-arbitration.patch => 0044-NVIDIA-SAUCE-i2c-tegra-Disable-fairness-arbitration.patch} (97%)
 rename features/tegra/platform/patches/{0047-iommu-tegra241-cmdqv-Decouple-driver-from-ACPI.patch => 0045-iommu-tegra241-cmdqv-Decouple-driver-from-ACPI.patch} (96%)
 rename features/tegra/platform/patches/{0048-iommu-arm-smmu-v3-Add-device-tree-support-for-CMDQV-.patch => 0046-iommu-arm-smmu-v3-Add-device-tree-support-for-CMDQV-.patch} (95%)
 rename features/tegra/platform/patches/{0049-NVIDIA-SAUCE-iommu-arm-smmu-v3-add-suspend-resume-su.patch => 0047-NVIDIA-SAUCE-iommu-arm-smmu-v3-add-suspend-resume-su.patch} (95%)
 rename features/tegra/platform/patches/{0050-NVIDIA-SAUCE-iommu-arm-smmu-v3-Add-pm-suspend-op.patch => 0048-NVIDIA-SAUCE-iommu-arm-smmu-v3-Add-pm-suspend-op.patch} (94%)
 rename features/tegra/platform/patches/{0051-NVIDIA-SAUCE-iommu-arm-smmu-v3-Retain-prod-and-cons-.patch => 0049-NVIDIA-SAUCE-iommu-arm-smmu-v3-Retain-prod-and-cons-.patch} (91%)
 rename features/tegra/platform/patches/{0052-NVIDIA-SAUCE-iommu-arm-smmu-v3-Restore-IRQs-on-resum.patch => 0050-NVIDIA-SAUCE-iommu-arm-smmu-v3-Restore-IRQs-on-resum.patch} (96%)
 rename features/tegra/platform/patches/{0053-NVIDIA-SAUCE-iommu-arm-smmu-v3-Implement-WAR-for-Teg.patch => 0051-NVIDIA-SAUCE-iommu-arm-smmu-v3-Implement-WAR-for-Teg.patch} (97%)
 rename features/tegra/platform/patches/{0054-memory-tegra186-emc-Do-not-print-error-on-icc_node_c.patch => 0052-memory-tegra186-emc-Do-not-print-error-on-icc_node_c.patch} (92%)
 rename features/tegra/platform/patches/{0055-memory-tegra186-emc-Simplify-and-handle-deferred-pro.patch => 0053-memory-tegra186-emc-Simplify-and-handle-deferred-pro.patch} (94%)
 rename features/tegra/platform/patches/{0056-memory-tegra186-emc-Add-the-SoC-model-prefix-to-func.patch => 0054-memory-tegra186-emc-Add-the-SoC-model-prefix-to-func.patch} (96%)
 rename features/tegra/platform/patches/{0057-memory-tegra186-emc-Fix-missing-put_bpmp.patch => 0055-memory-tegra186-emc-Fix-missing-put_bpmp.patch} (92%)
 rename features/tegra/platform/patches/{0058-memory-tegra-Add-support-for-DBB-clock-on-Tegra264.patch => 0056-memory-tegra-Add-support-for-DBB-clock-on-Tegra264.patch} (93%)
 rename features/tegra/platform/patches/{0059-memory-tegra-Group-error-handling-related-registers.patch => 0057-memory-tegra-Group-error-handling-related-registers.patch} (93%)
 rename features/tegra/platform/patches/{0060-memory-tegra-Group-register-and-fields.patch => 0058-memory-tegra-Group-register-and-fields.patch} (97%)
 rename features/tegra/platform/patches/{0061-memory-tegra-Add-support-for-multiple-IRQs.patch => 0059-memory-tegra-Add-support-for-multiple-IRQs.patch} (91%)
 rename features/tegra/platform/patches/{0062-memory-tegra-Group-SoC-specific-fields.patch => 0060-memory-tegra-Group-SoC-specific-fields.patch} (90%)
 rename features/tegra/platform/patches/{0063-memory-tegra-Prepare-for-supporting-multiple-intmask.patch => 0061-memory-tegra-Prepare-for-supporting-multiple-intmask.patch} (95%)
 rename features/tegra/platform/patches/{0064-memory-tegra-Add-MC-error-logging-support-for-Tegra2.patch => 0062-memory-tegra-Add-MC-error-logging-support-for-Tegra2.patch} (98%)
 rename features/tegra/platform/patches/{0065-memory-tegra-Make-resume-callback-return-void.patch => 0063-memory-tegra-Make-resume-callback-return-void.patch} (92%)
 rename features/tegra/platform/patches/{0067-memory-tegra-Restore-MC-interrupt-masks-on-resume.patch => 0064-memory-tegra-Restore-MC-interrupt-masks-on-resume.patch} (95%)
 rename features/tegra/platform/patches/{0068-dt-bindings-memory-tegra-Add-nvidia-tegra238-mc-comp.patch => 0065-dt-bindings-memory-tegra-Add-nvidia-tegra238-mc-comp.patch} (96%)
 rename features/tegra/platform/patches/{0069-memory-tegra-Add-Tegra238-MC-support.patch => 0066-memory-tegra-Add-Tegra238-MC-support.patch} (97%)
 delete mode 100644 features/tegra/platform/patches/0066-memory-tegra-Wire-up-system-sleep-PM-ops.patch
 rename features/tegra/platform/patches/{0070-dt-bindings-memory-tegra264-Add-full-set-of-MC-clien.patch => 0067-dt-bindings-memory-tegra264-Add-full-set-of-MC-clien.patch} (99%)
 rename features/tegra/platform/patches/{0071-memory-tegra264-Skip-clients-without-bpmp_id-or-type.patch => 0068-memory-tegra264-Skip-clients-without-bpmp_id-or-type.patch} (91%)
 rename features/tegra/platform/patches/{0072-memory-tegra264-Add-full-set-of-MC-clients.patch => 0069-memory-tegra264-Add-full-set-of-MC-clients.patch} (99%)
 rename features/tegra/platform/patches/{0073-memory-tegra186-emc-stop-borrowing-MC-aggregate-hook.patch => 0070-memory-tegra186-emc-stop-borrowing-MC-aggregate-hook.patch} (95%)
 rename features/tegra/platform/patches/{0074-memory-tegra264-drop-redundant-tegra264_mc_icc_aggre.patch => 0071-memory-tegra264-drop-redundant-tegra264_mc_icc_aggre.patch} (94%)
 rename features/tegra/platform/patches/{0075-memory-tegra234-drop-dead-NULL-check-in-tegra234_mc_.patch => 0072-memory-tegra234-drop-dead-NULL-check-in-tegra234_mc_.patch} (91%)
 rename features/tegra/platform/patches/{0076-memory-tegra-add-multi-socket-support-to-the-memory-.patch => 0073-memory-tegra-add-multi-socket-support-to-the-memory-.patch} (98%)
 rename features/tegra/platform/patches/{0077-PCI-Add-ASPEED-vendor-ID-to-pci_ids.h.patch => 0074-PCI-Add-ASPEED-vendor-ID-to-pci_ids.h.patch} (90%)
 rename features/tegra/platform/patches/{0078-PCI-Add-PCI_BRIDGE_NO_ALIAS-quirk-for-ASPEED-AST1150.patch => 0075-PCI-Add-PCI_BRIDGE_NO_ALIAS-quirk-for-ASPEED-AST1150.patch} (93%)
 rename features/tegra/platform/patches/{0079-PCI-dwc-tegra194-Broaden-architecture-dependency.patch => 0076-PCI-dwc-tegra194-Broaden-architecture-dependency.patch} (94%)
 rename features/tegra/platform/patches/{0080-PCI-endpoint-Do-not-mark-the-BAR-succeeding-a-64-bit.patch => 0077-PCI-endpoint-Do-not-mark-the-BAR-succeeding-a-64-bit.patch} (94%)
 rename features/tegra/platform/patches/{0081-PCI-endpoint-Allow-only_64bit-on-BAR_RESERVED.patch => 0078-PCI-endpoint-Allow-only_64bit-on-BAR_RESERVED.patch} (93%)
 rename features/tegra/platform/patches/{0082-PCI-endpoint-Describe-reserved-subregions-within-BAR.patch => 0079-PCI-endpoint-Describe-reserved-subregions-within-BAR.patch} (96%)
 rename features/tegra/platform/patches/{0083-PCI-endpoint-Introduce-pci_epc_bar_type-BAR_DISABLED.patch => 0080-PCI-endpoint-Introduce-pci_epc_bar_type-BAR_DISABLED.patch} (94%)
 rename features/tegra/platform/patches/{0084-PCI-dwc-Replace-certain-BAR_RESERVED-with-BAR_DISABL.patch => 0081-PCI-dwc-Replace-certain-BAR_RESERVED-with-BAR_DISABL.patch} (94%)
 rename features/tegra/platform/patches/{0085-PCI-endpoint-Add-reserved-region-type-for-MSI-X-Tabl.patch => 0082-PCI-endpoint-Add-reserved-region-type-for-MSI-X-Tabl.patch} (93%)
 rename features/tegra/platform/patches/{0086-PCI-tegra194-Make-BAR0-programmable-and-remove-1MB-s.patch => 0083-PCI-tegra194-Make-BAR0-programmable-and-remove-1MB-s.patch} (93%)
 rename features/tegra/platform/patches/{0087-PCI-tegra194-Expose-BAR2-MSI-X-and-BAR4-DMA-as-64-bi.patch => 0084-PCI-tegra194-Expose-BAR2-MSI-X-and-BAR4-DMA-as-64-bi.patch} (96%)
 rename features/tegra/platform/patches/{0088-PCI-tegra194-Assert-CLKREQ-explicitly-by-default.patch => 0085-PCI-tegra194-Assert-CLKREQ-explicitly-by-default.patch} (95%)
 rename features/tegra/platform/patches/{0089-PCI-tegra194-Calibrate-pipe-to-UPHY-for-Endpoint-mod.patch => 0086-PCI-tegra194-Calibrate-pipe-to-UPHY-for-Endpoint-mod.patch} (92%)
 rename features/tegra/platform/patches/{0090-PCI-tegra194-Remove-IRQF_ONESHOT-flag-during-Endpoin.patch => 0087-PCI-tegra194-Remove-IRQF_ONESHOT-flag-during-Endpoin.patch} (96%)
 rename features/tegra/platform/patches/{0091-PCI-tegra194-Enable-DMA-interrupt.patch => 0088-PCI-tegra194-Enable-DMA-interrupt.patch} (96%)
 rename features/tegra/platform/patches/{0092-PCI-tegra194-Enable-hardware-hot-reset-mode-in-Endpo.patch => 0089-PCI-tegra194-Enable-hardware-hot-reset-mode-in-Endpo.patch} (93%)
 rename features/tegra/platform/patches/{0093-PCI-tegra194-Add-core-monitor-clock-support.patch => 0090-PCI-tegra194-Add-core-monitor-clock-support.patch} (96%)
 rename features/tegra/platform/patches/{0094-NVIDIA-SAUCE-pinctrl-tegra-Export-tegra_pinctrl_prob.patch => 0091-NVIDIA-SAUCE-pinctrl-tegra-Export-tegra_pinctrl_prob.patch} (89%)
 rename features/tegra/platform/patches/{0095-NVIDIA-SAUCE-pinctrl-tegra-Add-Tegra238-pinmux-drive.patch => 0092-NVIDIA-SAUCE-pinctrl-tegra-Add-Tegra238-pinmux-drive.patch} (99%)
 rename features/tegra/platform/patches/{0096-NVIDIA-SAUCE-pinctrl-tegra-Add-Tegra264-pinmux-drive.patch => 0093-NVIDIA-SAUCE-pinctrl-tegra-Add-Tegra264-pinmux-drive.patch} (99%)
 rename features/tegra/platform/patches/{0097-NVIDIA-SAUCE-pmdomain-tegra-Add-support-for-multi-so.patch => 0094-NVIDIA-SAUCE-pmdomain-tegra-Add-support-for-multi-so.patch} (95%)
 rename features/tegra/platform/patches/{0098-dt-bindings-pwm-Document-Tegra264-controller.patch => 0095-dt-bindings-pwm-Document-Tegra264-controller.patch} (89%)
 rename features/tegra/platform/patches/{0099-pwm-tegra-Avoid-hard-coded-max-clock-frequency.patch => 0096-pwm-tegra-Avoid-hard-coded-max-clock-frequency.patch} (95%)
 rename features/tegra/platform/patches/{0100-pwm-tegra-Modify-read-write-accessors-for-multi-regi.patch => 0097-pwm-tegra-Modify-read-write-accessors-for-multi-regi.patch} (96%)
 rename features/tegra/platform/patches/{0101-pwm-tegra-Parametrize-enable-register-offset.patch => 0098-pwm-tegra-Parametrize-enable-register-offset.patch} (95%)
 rename features/tegra/platform/patches/{0102-pwm-tegra-Parametrize-duty-and-scale-field-widths.patch => 0099-pwm-tegra-Parametrize-duty-and-scale-field-widths.patch} (97%)
 rename features/tegra/platform/patches/{0103-pwm-tegra-Add-support-for-Tegra264.patch => 0100-pwm-tegra-Add-support-for-Tegra264.patch} (98%)
 rename features/tegra/platform/patches/{0104-syscore-Pass-context-data-to-callbacks.patch => 0101-syscore-Pass-context-data-to-callbacks.patch} (95%)
 rename features/tegra/platform/patches/{0105-soc-tegra-pmc-Don-t-fail-if-aotag-is-not-present.patch => 0102-soc-tegra-pmc-Don-t-fail-if-aotag-is-not-present.patch} (93%)
 rename features/tegra/platform/patches/{0106-soc-tegra-pmc-Document-tegra_pmc.syscore-field.patch => 0103-soc-tegra-pmc-Document-tegra_pmc.syscore-field.patch} (88%)
 rename features/tegra/platform/patches/{0107-soc-tegra-pmc-Add-USB-wake-events-for-Tegra234.patch => 0104-soc-tegra-pmc-Add-USB-wake-events-for-Tegra234.patch} (91%)
 rename features/tegra/platform/patches/{0108-soc-tegra-pmc-Fix-unsafe-generic_handle_irq-call.patch => 0105-soc-tegra-pmc-Fix-unsafe-generic_handle_irq-call.patch} (98%)
 rename features/tegra/platform/patches/{0109-soc-tegra-pmc-Use-contextual-data-instead-of-global-.patch => 0106-soc-tegra-pmc-Use-contextual-data-instead-of-global-.patch} (92%)
 rename features/tegra/platform/patches/{0110-soc-tegra-pmc-Pass-struct-tegra_pmc-to-tegra_powerga.patch => 0107-soc-tegra-pmc-Pass-struct-tegra_pmc-to-tegra_powerga.patch} (95%)
 rename features/tegra/platform/patches/{0111-soc-tegra-pmc-Store-PMC-context-in-clocks.patch => 0108-soc-tegra-pmc-Store-PMC-context-in-clocks.patch} (97%)
 rename features/tegra/platform/patches/{0112-soc-tegra-pmc-Embed-reboot-notifier-in-PMC-context.patch => 0109-soc-tegra-pmc-Embed-reboot-notifier-in-PMC-context.patch} (95%)
 rename features/tegra/platform/patches/{0113-soc-tegra-pmc-Pass-PMC-context-via-sys-off-callback-.patch => 0110-soc-tegra-pmc-Pass-PMC-context-via-sys-off-callback-.patch} (95%)
 rename features/tegra/platform/patches/{0114-soc-tegra-pmc-Pass-PMC-context-as-debugfs-data.patch => 0111-soc-tegra-pmc-Pass-PMC-context-as-debugfs-data.patch} (90%)
 rename features/tegra/platform/patches/{0115-soc-tegra-pmc-Use-PMC-context-embedded-in-powergates.patch => 0112-soc-tegra-pmc-Use-PMC-context-embedded-in-powergates.patch} (96%)
 rename features/tegra/platform/patches/{0116-soc-tegra-pmc-Use-driver-private-data.patch => 0113-soc-tegra-pmc-Use-driver-private-data.patch} (90%)
 rename features/tegra/platform/patches/{0117-soc-tegra-pmc-Do-not-rely-on-global-variable.patch => 0114-soc-tegra-pmc-Do-not-rely-on-global-variable.patch} (90%)
 rename features/tegra/platform/patches/{0118-soc-tegra-pmc-Add-PMC-contextual-functions.patch => 0115-soc-tegra-pmc-Add-PMC-contextual-functions.patch} (98%)
 rename features/tegra/platform/patches/{0119-soc-tegra-pmc-Add-kerneldoc-for-reboot-notifier.patch => 0116-soc-tegra-pmc-Add-kerneldoc-for-reboot-notifier.patch} (91%)
 rename features/tegra/platform/patches/{0120-soc-tegra-pmc-Correct-function-names-in-kerneldoc.patch => 0117-soc-tegra-pmc-Correct-function-names-in-kerneldoc.patch} (92%)
 rename features/tegra/platform/patches/{0121-soc-tegra-pmc-Add-kerneldoc-for-wake-up-variables.patch => 0118-soc-tegra-pmc-Add-kerneldoc-for-wake-up-variables.patch} (91%)
 rename features/tegra/platform/patches/{0122-soc-tegra-pmc-Remove-unused-AOWAKE-definitions.patch => 0119-soc-tegra-pmc-Remove-unused-AOWAKE-definitions.patch} (91%)
 rename features/tegra/platform/patches/{0123-soc-tegra-pmc-Add-support-for-SoC-specific-AOWAKE-of.patch => 0120-soc-tegra-pmc-Add-support-for-SoC-specific-AOWAKE-of.patch} (98%)
 rename features/tegra/platform/patches/{0124-soc-tegra-pmc-Add-AOWAKE-regs-for-Tegra264.patch => 0121-soc-tegra-pmc-Add-AOWAKE-regs-for-Tegra264.patch} (89%)
 rename features/tegra/platform/patches/{0125-soc-tegra-pmc-Add-Tegra264-wake-events.patch => 0122-soc-tegra-pmc-Add-Tegra264-wake-events.patch} (92%)
 rename features/tegra/platform/patches/{0126-soc-tegra-pmc-Refactor-IO-pad-voltage-control.patch => 0123-soc-tegra-pmc-Refactor-IO-pad-voltage-control.patch} (99%)
 rename features/tegra/platform/patches/{0127-soc-tegra-pmc-Rename-has_impl_33v_pwr-flag.patch => 0124-soc-tegra-pmc-Rename-has_impl_33v_pwr-flag.patch} (97%)
 rename features/tegra/platform/patches/{0128-soc-tegra-pmc-Add-IO-pads-for-Tegra264.patch => 0125-soc-tegra-pmc-Add-IO-pads-for-Tegra264.patch} (97%)
 rename features/tegra/platform/patches/{0129-soc-tegra-Resolve-a-spelling-error-in-the-tegra194-c.patch => 0126-soc-tegra-Resolve-a-spelling-error-in-the-tegra194-c.patch} (91%)
 rename features/tegra/platform/patches/{0130-soc-tegra-cbb-Add-support-for-CBB-fabrics-in-Tegra23.patch => 0127-soc-tegra-cbb-Add-support-for-CBB-fabrics-in-Tegra23.patch} (98%)
 rename features/tegra/platform/patches/{0131-firmware-tegra-bpmp-Rename-Tegra239-to-Tegra238.patch => 0128-firmware-tegra-bpmp-Rename-Tegra239-to-Tegra238.patch} (98%)
 rename features/tegra/platform/patches/{0132-soc-tegra-Update-BPMP-ABI-header.patch => 0129-soc-tegra-Update-BPMP-ABI-header.patch} (99%)
 rename features/tegra/platform/patches/{0133-soc-tegra-pmc-Create-PMC-context-dynamically.patch => 0130-soc-tegra-pmc-Create-PMC-context-dynamically.patch} (99%)
 rename features/tegra/platform/patches/{0134-drm-nouveau-tegra-Explicitly-specify-PMC-instance-to.patch => 0131-drm-nouveau-tegra-Explicitly-specify-PMC-instance-to.patch} (92%)
 rename features/tegra/platform/patches/{0135-drm-tegra-Explicitly-specify-PMC-instance-to-use.patch => 0132-drm-tegra-Explicitly-specify-PMC-instance-to-use.patch} (90%)
 rename features/tegra/platform/patches/{0136-usb-xhci-tegra-Explicitly-specify-PMC-instance-to-us.patch => 0133-usb-xhci-tegra-Explicitly-specify-PMC-instance-to-us.patch} (96%)
 rename features/tegra/platform/patches/{0137-PCI-tegra-Explicitly-specify-PMC-instance-to-use.patch => 0134-PCI-tegra-Explicitly-specify-PMC-instance-to-use.patch} (96%)
 rename features/tegra/platform/patches/{0138-ata-ahci_tegra-Explicitly-specify-PMC-instance-to-us.patch => 0135-ata-ahci_tegra-Explicitly-specify-PMC-instance-to-us.patch} (95%)
 rename features/tegra/platform/patches/{0139-media-vde-Explicitly-specify-PMC-instance-to-use.patch => 0136-media-vde-Explicitly-specify-PMC-instance-to-use.patch} (93%)
 rename features/tegra/platform/patches/{0140-soc-tegra-pmc-Remove-unused-legacy-functions.patch => 0137-soc-tegra-pmc-Remove-unused-legacy-functions.patch} (97%)
 rename features/tegra/platform/patches/{0141-soc-tegra-pmc-Move-legacy-code-behind-CONFIG_ARM-gua.patch => 0138-soc-tegra-pmc-Move-legacy-code-behind-CONFIG_ARM-gua.patch} (98%)
 rename features/tegra/platform/patches/{0142-soc-tegra-pmc-Populate-powergate-debugfs-only-when-n.patch => 0139-soc-tegra-pmc-Populate-powergate-debugfs-only-when-n.patch} (90%)
 rename features/tegra/platform/patches/{0143-soc-tegra-pmc-Restrict-power-off-handler-to-Nexus-7.patch => 0140-soc-tegra-pmc-Restrict-power-off-handler-to-Nexus-7.patch} (96%)
 rename features/tegra/platform/patches/{0144-soc-tegra-pmc-Add-Tegra238-support.patch => 0141-soc-tegra-pmc-Add-Tegra238-support.patch} (98%)
 rename features/tegra/platform/patches/{0145-soc-tegra-pmc-Don-t-register-sys-off-handler-for-mul.patch => 0142-soc-tegra-pmc-Don-t-register-sys-off-handler-for-mul.patch} (93%)
 rename features/tegra/platform/patches/{0146-spi-tegra210-quad-Refactor-error-handling-into-helpe.patch => 0143-spi-tegra210-quad-Refactor-error-handling-into-helpe.patch} (97%)
 rename features/tegra/platform/patches/{0147-spi-tegra210-quad-Check-hardware-status-on-timeout.patch => 0144-spi-tegra210-quad-Check-hardware-status-on-timeout.patch} (97%)
 rename features/tegra/platform/patches/{0148-spi-tegra210-quad-Add-runtime-autosuspend-support.patch => 0145-spi-tegra210-quad-Add-runtime-autosuspend-support.patch} (96%)
 rename features/tegra/platform/patches/{0149-spi-tegra210-quad-Remove-redundant-pm_runtime_mark_l.patch => 0146-spi-tegra210-quad-Remove-redundant-pm_runtime_mark_l.patch} (94%)
 rename features/tegra/platform/patches/{0150-spi-tegra210-quad-Fix-false-positive-WARN-on-interru.patch => 0147-spi-tegra210-quad-Fix-false-positive-WARN-on-interru.patch} (96%)
 rename features/tegra/platform/patches/{0151-serial-amba-pl011-Introduce-skip_ibrd_fbrd-vendor-fl.patch => 0148-serial-amba-pl011-Introduce-skip_ibrd_fbrd-vendor-fl.patch} (97%)
 rename features/tegra/platform/patches/{0152-serial-amba-pl011-Introduce-set_uartclk_rate-vendor-.patch => 0149-serial-amba-pl011-Introduce-set_uartclk_rate-vendor-.patch} (95%)
 rename features/tegra/platform/patches/{0153-serial-amba-pl011-Add-Tegra264-UART-support.patch => 0150-serial-amba-pl011-Add-Tegra264-UART-support.patch} (94%)
 rename features/tegra/platform/patches/{0154-serial-amba-pl011-Respect-DMA-controller-s-copy_alig.patch => 0151-serial-amba-pl011-Respect-DMA-controller-s-copy_alig.patch} (93%)
 rename features/tegra/platform/patches/{0155-NVIDIA-SAUCE-sysfs-Add-sys-kernel-realtime-entry.patch => 0152-NVIDIA-SAUCE-sysfs-Add-sys-kernel-realtime-entry.patch} (92%)
 rename features/tegra/platform/patches/{0156-regmap-add-flat-cache-with-sparse-validity.patch => 0153-regmap-add-flat-cache-with-sparse-validity.patch} (97%)
 rename features/tegra/platform/patches/{0157-regmap-warn-users-about-uninitialized-flat-cache.patch => 0154-regmap-warn-users-about-uninitialized-flat-cache.patch} (95%)
 rename features/tegra/platform/patches/{0158-regcache-Add-populate-callback-to-separate-from-init.patch => 0155-regcache-Add-populate-callback-to-separate-from-init.patch} (92%)
 rename features/tegra/platform/patches/{0159-regcache-flat-Remove-unneeded-check-and-error-messag.patch => 0156-regcache-flat-Remove-unneeded-check-and-error-messag.patch} (94%)
 rename features/tegra/platform/patches/{0160-regcache-flat-Split-populate-from-init.patch => 0157-regcache-flat-Split-populate-from-init.patch} (95%)
 rename features/tegra/platform/patches/{0161-regmap-Add-reg_default_cb-callback-for-flat-cache-de.patch => 0158-regmap-Add-reg_default_cb-callback-for-flat-cache-de.patch} (95%)
 rename features/tegra/platform/patches/{0162-ASoC-tegra-set-reg_default_cb-callback.patch => 0159-ASoC-tegra-set-reg_default_cb-callback.patch} (91%)
 rename features/tegra/platform/patches/{0163-ASoC-rt5640-Handle-0Hz-sysclk-during-stream-shutdown.patch => 0160-ASoC-rt5640-Handle-0Hz-sysclk-during-stream-shutdown.patch} (91%)
 rename features/tegra/platform/patches/{0164-ASoC-tegra-Use-dev_err_probe-in-tegra186_asrc-probe.patch => 0161-ASoC-tegra-Use-dev_err_probe-in-tegra186_asrc-probe.patch} (90%)
 rename features/tegra/platform/patches/{0165-ASoC-tegra-Use-dev_err_probe-in-tegra186_dspk-probe.patch => 0162-ASoC-tegra-Use-dev_err_probe-in-tegra186_dspk-probe.patch} (93%)
 rename features/tegra/platform/patches/{0166-ASoC-tegra-Add-error-logging-in-tegra210_adx-driver.patch => 0163-ASoC-tegra-Add-error-logging-in-tegra210_adx-driver.patch} (93%)
 rename features/tegra/platform/patches/{0167-ASoC-tegra-Use-dev_err_probe-in-tegra210_ahub-probe.patch => 0164-ASoC-tegra-Use-dev_err_probe-in-tegra210_ahub-probe.patch} (87%)
 rename features/tegra/platform/patches/{0168-ASoC-tegra-Add-error-logging-in-tegra210_amx-driver.patch => 0165-ASoC-tegra-Add-error-logging-in-tegra210_amx-driver.patch} (92%)
 rename features/tegra/platform/patches/{0169-ASoC-tegra-Use-dev_err_probe-in-tegra210_dmic-probe.patch => 0166-ASoC-tegra-Use-dev_err_probe-in-tegra210_dmic-probe.patch} (93%)
 rename features/tegra/platform/patches/{0170-ASoC-tegra-Add-error-logging-in-tegra210_i2s-driver.patch => 0167-ASoC-tegra-Add-error-logging-in-tegra210_i2s-driver.patch} (95%)
 rename features/tegra/platform/patches/{0171-ASoC-tegra-Use-dev_err_probe-in-tegra210_mixer-probe.patch => 0168-ASoC-tegra-Use-dev_err_probe-in-tegra210_mixer-probe.patch} (90%)
 rename features/tegra/platform/patches/{0172-ASoC-tegra-Use-dev_err_probe-in-tegra210_mvc-probe.patch => 0169-ASoC-tegra-Use-dev_err_probe-in-tegra210_mvc-probe.patch} (90%)
 rename features/tegra/platform/patches/{0173-ASoC-tegra-Use-dev_err_probe-in-tegra210_sfc-probe.patch => 0170-ASoC-tegra-Use-dev_err_probe-in-tegra210_sfc-probe.patch} (90%)
 rename features/tegra/platform/patches/{0174-ASoC-tegra-Use-dev_err_probe-in-tegra_asoc_machine-p.patch => 0171-ASoC-tegra-Use-dev_err_probe-in-tegra_asoc_machine-p.patch} (97%)
 rename features/tegra/platform/patches/{0175-ASoC-tegra-Use-dev_err_probe-in-tegra_audio_graph_ca.patch => 0172-ASoC-tegra-Use-dev_err_probe-in-tegra_audio_graph_ca.patch} (94%)
 rename features/tegra/platform/patches/{0176-ASoC-tegra-Add-error-logging-in-tegra210_admaif-driv.patch => 0173-ASoC-tegra-Add-error-logging-in-tegra210_admaif-driv.patch} (96%)
 rename features/tegra/platform/patches/{0177-ASoC-tegra-Use-dev_err_probe-in-OPE-PEQ-and-MBDRC-dr.patch => 0174-ASoC-tegra-Use-dev_err_probe-in-OPE-PEQ-and-MBDRC-dr.patch} (95%)
 rename features/tegra/platform/patches/{0178-ASoC-tegra-Use-dev_err_probe-for-regmap-init-failure.patch => 0175-ASoC-tegra-Use-dev_err_probe-for-regmap-init-failure.patch} (92%)
 rename features/tegra/platform/patches/{0179-ASoC-tegra-Use-dev_err_probe-in-tegra_asoc_machine-p.patch => 0176-ASoC-tegra-Use-dev_err_probe-in-tegra_asoc_machine-p.patch} (93%)
 rename features/tegra/platform/patches/{0180-ASoC-tegra-Add-per-stream-Mixer-Fade-controls.patch => 0177-ASoC-tegra-Add-per-stream-Mixer-Fade-controls.patch} (98%)
 rename features/tegra/platform/patches/{0181-bus-tegra-aconnect-Use-dev_err_probe-for-probe-error.patch => 0178-bus-tegra-aconnect-Use-dev_err_probe-for-probe-error.patch} (92%)
 rename features/tegra/platform/patches/{0182-ASoC-codecs-rt56-Remove-IRQF_ONESHOT.patch => 0179-ASoC-codecs-rt56-Remove-IRQF_ONESHOT.patch} (93%)
 rename features/tegra/platform/patches/{0183-ASoC-rt5640-Handle-nested-IRQs.patch => 0180-ASoC-rt5640-Handle-nested-IRQs.patch} (96%)
 rename features/tegra/platform/patches/{0193-perf-test-parse-events-Use-evsel__match-for-legacy-e.patch => 0181-perf-test-parse-events-Use-evsel__match-for-legacy-e.patch} (99%)
 rename features/tegra/platform/patches/{0194-perf-test-parse-events-Without-a-PMU-use-cpu-cycles-.patch => 0182-perf-test-parse-events-Without-a-PMU-use-cpu-cycles-.patch} (98%)
 rename features/tegra/platform/patches/{0195-perf-test-parse-events-Remove-cpu-PMU-requirement.patch => 0183-perf-test-parse-events-Remove-cpu-PMU-requirement.patch} (99%)
 delete mode 100644 features/tegra/platform/patches/0184-perf-metricgroup-Constify-variables-storing-the-resu.patch
 rename features/tegra/platform/patches/{0196-perf-tools-Use-const-for-variables-receiving-str-str.patch => 0184-perf-tools-Use-const-for-variables-receiving-str-str.patch} (56%)
 delete mode 100644 features/tegra/platform/patches/0185-perf-strlist-Don-t-write-to-const-memory.patch
 delete mode 100644 features/tegra/platform/patches/0186-perf-session-Don-t-write-to-memory-pointed-to-a-cons.patch
 delete mode 100644 features/tegra/platform/patches/0187-perf-trace-event-Constify-variables-storing-the-resu.patch
 delete mode 100644 features/tegra/platform/patches/0188-perf-units-Constify-variables-storing-the-result-of-.patch
 delete mode 100644 features/tegra/platform/patches/0189-perf-time-utils-Constify-variables-storing-the-resul.patch
 delete mode 100644 features/tegra/platform/patches/0190-perf-demangle-java-Constify-variables-storing-the-re.patch
 delete mode 100644 features/tegra/platform/patches/0191-perf-bpf-event-Constify-variables-storing-the-result.patch
 delete mode 100644 features/tegra/platform/patches/0192-perf-jitdump-Constify-variables-storing-the-result-o.patch

diff --git a/features/tegra/platform.scc b/features/tegra/platform.scc
index 0a7a374..b66c584 100644
--- a/features/tegra/platform.scc
+++ b/features/tegra/platform.scc
@@ -8,194 +8,182 @@ patch platform/patches/0003-NVIDIA-SAUCE-cpufreq-tegra194-Add-support-for-Tegra2
 patch platform/patches/0004-NVIDIA-SAUCE-cpufreq-tegra194-fix-policy-initializat.patch
 patch platform/patches/0005-NVIDIA-SAUCE-cpufreq-tegra194-Support-read-only-init.patch
 patch platform/patches/0006-dmaengine-of_dma-Add-devm_of_dma_controller_register.patch
-patch platform/patches/0007-dt-bindings-dma-nvidia-tegra186-gpc-dma-Make-reset-o.patch
-patch platform/patches/0008-arm64-tegra-Remove-fallback-compatible-for-GPCDMA.patch
-patch platform/patches/0009-dt-bindings-dma-nvidia-tegra186-gpc-dma-Add-iommu-ma.patch
-patch platform/patches/0010-dmaengine-tegra-Make-reset-control-optional.patch
-patch platform/patches/0011-dmaengine-tegra-Use-struct-for-register-offsets.patch
-patch platform/patches/0012-dmaengine-tegra-Support-address-width-39-bits.patch
-patch platform/patches/0013-dmaengine-tegra-Use-managed-DMA-controller-registrat.patch
-patch platform/patches/0014-dmaengine-tegra-Use-iommu-map-for-stream-ID.patch
-patch platform/patches/0015-dmaengine-tegra-Add-Tegra264-support.patch
-patch platform/patches/0016-arm64-tegra-Enable-GPCDMA-in-Tegra264-and-add-iommu-.patch
-patch platform/patches/0017-dt-bindings-dma-Update-ADMA-bindings-for-tegra264.patch
-patch platform/patches/0018-NVIDIA-SAUCE-dmaengine-tegra210-adma-Update-Virtual-.patch
-patch platform/patches/0019-NVIDIA-SAUCE-dmaengine-tegra210-adma-Fix-system-hang.patch
-patch platform/patches/0020-dmaengine-tegra210-adma-Add-error-logging-on-failure.patch
-patch platform/patches/0021-NVIDIA-SAUCE-firmware-psci-Set-pm_set_resume-suspend.patch
-patch platform/patches/0022-NVIDIA-SAUCE-firmware-tegra-bpmp-Propagate-debugfs-e.patch
-patch platform/patches/0023-NVIDIA-SAUCE-firmware-tegra-bpmp-Add-support-for-mul.patch
-patch platform/patches/0024-gpio-tegra186-Use-generic-macro-for-port-definitions.patch
-patch platform/patches/0025-gpio-tegra186-Add-support-for-Tegra410.patch
-patch platform/patches/0026-gpio-tegra186-Fix-GPIO-name-collisions-for-Tegra410.patch
-patch platform/patches/0027-dt-bindings-gpio-Add-Tegra264-support.patch
-patch platform/patches/0028-gpio-tegra186-Add-support-for-Tegra264.patch
-patch platform/patches/0029-gpio-tegra186-Simplify-GPIO-line-name-prefix-handlin.patch
-patch platform/patches/0030-gpio-tegra186-Support-multi-socket-devices.patch
-patch platform/patches/0031-NVIDIA-SAUCE-gpio-tegra186-Add-suspend-resume-suppor.patch
-patch platform/patches/0032-NVIDIA-SAUCE-gpio-tegra186-Add-pinmux-support-for-PC.patch
-patch platform/patches/0033-NVIDIA-SAUCE-gpio-tegra186-Enable-GTE-for-Tegra264.patch
-patch platform/patches/0034-hte-replace-use-of-system_unbound_wq-with-system_dfl.patch
-patch platform/patches/0035-hte-tegra194-Add-Tegra264-GTE-support.patch
-patch platform/patches/0036-i2c-tegra-Do-not-configure-DMA-if-not-supported.patch
-patch platform/patches/0037-i2c-tegra-Use-separate-variables-for-fast-and-fastpl.patch
-patch platform/patches/0038-i2c-tegra-Update-Tegra256-timing-parameters.patch
-patch platform/patches/0039-i2c-tegra-Add-HS-mode-support.patch
-patch platform/patches/0040-i2c-tegra-Add-support-for-SW-mutex-register.patch
-patch platform/patches/0041-i2c-tegra-Add-Tegra264-support.patch
-patch platform/patches/0042-i2c-tegra-remove-unused-rst.patch
-patch platform/patches/0043-NVIDIA-SAUCE-i2c-tegra-use-dmaengine_get_dma_device-.patch
-patch platform/patches/0044-NVIDIA-SAUCE-i2c-tegra-resume-explicitly-if-pm_runti.patch
-patch platform/patches/0045-NVIDIA-SAUCE-i2c-tegra-Do-not-mark-ACPI-devices-and-.patch
-patch platform/patches/0046-NVIDIA-SAUCE-i2c-tegra-Disable-fairness-arbitration.patch
-patch platform/patches/0047-iommu-tegra241-cmdqv-Decouple-driver-from-ACPI.patch
-patch platform/patches/0048-iommu-arm-smmu-v3-Add-device-tree-support-for-CMDQV-.patch
-patch platform/patches/0049-NVIDIA-SAUCE-iommu-arm-smmu-v3-add-suspend-resume-su.patch
-patch platform/patches/0050-NVIDIA-SAUCE-iommu-arm-smmu-v3-Add-pm-suspend-op.patch
-patch platform/patches/0051-NVIDIA-SAUCE-iommu-arm-smmu-v3-Retain-prod-and-cons-.patch
-patch platform/patches/0052-NVIDIA-SAUCE-iommu-arm-smmu-v3-Restore-IRQs-on-resum.patch
-patch platform/patches/0053-NVIDIA-SAUCE-iommu-arm-smmu-v3-Implement-WAR-for-Teg.patch
-patch platform/patches/0054-memory-tegra186-emc-Do-not-print-error-on-icc_node_c.patch
-patch platform/patches/0055-memory-tegra186-emc-Simplify-and-handle-deferred-pro.patch
-patch platform/patches/0056-memory-tegra186-emc-Add-the-SoC-model-prefix-to-func.patch
-patch platform/patches/0057-memory-tegra186-emc-Fix-missing-put_bpmp.patch
-patch platform/patches/0058-memory-tegra-Add-support-for-DBB-clock-on-Tegra264.patch
-patch platform/patches/0059-memory-tegra-Group-error-handling-related-registers.patch
-patch platform/patches/0060-memory-tegra-Group-register-and-fields.patch
-patch platform/patches/0061-memory-tegra-Add-support-for-multiple-IRQs.patch
-patch platform/patches/0062-memory-tegra-Group-SoC-specific-fields.patch
-patch platform/patches/0063-memory-tegra-Prepare-for-supporting-multiple-intmask.patch
-patch platform/patches/0064-memory-tegra-Add-MC-error-logging-support-for-Tegra2.patch
-patch platform/patches/0065-memory-tegra-Make-resume-callback-return-void.patch
-patch platform/patches/0066-memory-tegra-Wire-up-system-sleep-PM-ops.patch
-patch platform/patches/0067-memory-tegra-Restore-MC-interrupt-masks-on-resume.patch
-patch platform/patches/0068-dt-bindings-memory-tegra-Add-nvidia-tegra238-mc-comp.patch
-patch platform/patches/0069-memory-tegra-Add-Tegra238-MC-support.patch
-patch platform/patches/0070-dt-bindings-memory-tegra264-Add-full-set-of-MC-clien.patch
-patch platform/patches/0071-memory-tegra264-Skip-clients-without-bpmp_id-or-type.patch
-patch platform/patches/0072-memory-tegra264-Add-full-set-of-MC-clients.patch
-patch platform/patches/0073-memory-tegra186-emc-stop-borrowing-MC-aggregate-hook.patch
-patch platform/patches/0074-memory-tegra264-drop-redundant-tegra264_mc_icc_aggre.patch
-patch platform/patches/0075-memory-tegra234-drop-dead-NULL-check-in-tegra234_mc_.patch
-patch platform/patches/0076-memory-tegra-add-multi-socket-support-to-the-memory-.patch
-patch platform/patches/0077-PCI-Add-ASPEED-vendor-ID-to-pci_ids.h.patch
-patch platform/patches/0078-PCI-Add-PCI_BRIDGE_NO_ALIAS-quirk-for-ASPEED-AST1150.patch
-patch platform/patches/0079-PCI-dwc-tegra194-Broaden-architecture-dependency.patch
-patch platform/patches/0080-PCI-endpoint-Do-not-mark-the-BAR-succeeding-a-64-bit.patch
-patch platform/patches/0081-PCI-endpoint-Allow-only_64bit-on-BAR_RESERVED.patch
-patch platform/patches/0082-PCI-endpoint-Describe-reserved-subregions-within-BAR.patch
-patch platform/patches/0083-PCI-endpoint-Introduce-pci_epc_bar_type-BAR_DISABLED.patch
-patch platform/patches/0084-PCI-dwc-Replace-certain-BAR_RESERVED-with-BAR_DISABL.patch
-patch platform/patches/0085-PCI-endpoint-Add-reserved-region-type-for-MSI-X-Tabl.patch
-patch platform/patches/0086-PCI-tegra194-Make-BAR0-programmable-and-remove-1MB-s.patch
-patch platform/patches/0087-PCI-tegra194-Expose-BAR2-MSI-X-and-BAR4-DMA-as-64-bi.patch
-patch platform/patches/0088-PCI-tegra194-Assert-CLKREQ-explicitly-by-default.patch
-patch platform/patches/0089-PCI-tegra194-Calibrate-pipe-to-UPHY-for-Endpoint-mod.patch
-patch platform/patches/0090-PCI-tegra194-Remove-IRQF_ONESHOT-flag-during-Endpoin.patch
-patch platform/patches/0091-PCI-tegra194-Enable-DMA-interrupt.patch
-patch platform/patches/0092-PCI-tegra194-Enable-hardware-hot-reset-mode-in-Endpo.patch
-patch platform/patches/0093-PCI-tegra194-Add-core-monitor-clock-support.patch
-patch platform/patches/0094-NVIDIA-SAUCE-pinctrl-tegra-Export-tegra_pinctrl_prob.patch
-patch platform/patches/0095-NVIDIA-SAUCE-pinctrl-tegra-Add-Tegra238-pinmux-drive.patch
-patch platform/patches/0096-NVIDIA-SAUCE-pinctrl-tegra-Add-Tegra264-pinmux-drive.patch
-patch platform/patches/0097-NVIDIA-SAUCE-pmdomain-tegra-Add-support-for-multi-so.patch
-patch platform/patches/0098-dt-bindings-pwm-Document-Tegra264-controller.patch
-patch platform/patches/0099-pwm-tegra-Avoid-hard-coded-max-clock-frequency.patch
-patch platform/patches/0100-pwm-tegra-Modify-read-write-accessors-for-multi-regi.patch
-patch platform/patches/0101-pwm-tegra-Parametrize-enable-register-offset.patch
-patch platform/patches/0102-pwm-tegra-Parametrize-duty-and-scale-field-widths.patch
-patch platform/patches/0103-pwm-tegra-Add-support-for-Tegra264.patch
-patch platform/patches/0104-syscore-Pass-context-data-to-callbacks.patch
-patch platform/patches/0105-soc-tegra-pmc-Don-t-fail-if-aotag-is-not-present.patch
-patch platform/patches/0106-soc-tegra-pmc-Document-tegra_pmc.syscore-field.patch
-patch platform/patches/0107-soc-tegra-pmc-Add-USB-wake-events-for-Tegra234.patch
-patch platform/patches/0108-soc-tegra-pmc-Fix-unsafe-generic_handle_irq-call.patch
-patch platform/patches/0109-soc-tegra-pmc-Use-contextual-data-instead-of-global-.patch
-patch platform/patches/0110-soc-tegra-pmc-Pass-struct-tegra_pmc-to-tegra_powerga.patch
-patch platform/patches/0111-soc-tegra-pmc-Store-PMC-context-in-clocks.patch
-patch platform/patches/0112-soc-tegra-pmc-Embed-reboot-notifier-in-PMC-context.patch
-patch platform/patches/0113-soc-tegra-pmc-Pass-PMC-context-via-sys-off-callback-.patch
-patch platform/patches/0114-soc-tegra-pmc-Pass-PMC-context-as-debugfs-data.patch
-patch platform/patches/0115-soc-tegra-pmc-Use-PMC-context-embedded-in-powergates.patch
-patch platform/patches/0116-soc-tegra-pmc-Use-driver-private-data.patch
-patch platform/patches/0117-soc-tegra-pmc-Do-not-rely-on-global-variable.patch
-patch platform/patches/0118-soc-tegra-pmc-Add-PMC-contextual-functions.patch
-patch platform/patches/0119-soc-tegra-pmc-Add-kerneldoc-for-reboot-notifier.patch
-patch platform/patches/0120-soc-tegra-pmc-Correct-function-names-in-kerneldoc.patch
-patch platform/patches/0121-soc-tegra-pmc-Add-kerneldoc-for-wake-up-variables.patch
-patch platform/patches/0122-soc-tegra-pmc-Remove-unused-AOWAKE-definitions.patch
-patch platform/patches/0123-soc-tegra-pmc-Add-support-for-SoC-specific-AOWAKE-of.patch
-patch platform/patches/0124-soc-tegra-pmc-Add-AOWAKE-regs-for-Tegra264.patch
-patch platform/patches/0125-soc-tegra-pmc-Add-Tegra264-wake-events.patch
-patch platform/patches/0126-soc-tegra-pmc-Refactor-IO-pad-voltage-control.patch
-patch platform/patches/0127-soc-tegra-pmc-Rename-has_impl_33v_pwr-flag.patch
-patch platform/patches/0128-soc-tegra-pmc-Add-IO-pads-for-Tegra264.patch
-patch platform/patches/0129-soc-tegra-Resolve-a-spelling-error-in-the-tegra194-c.patch
-patch platform/patches/0130-soc-tegra-cbb-Add-support-for-CBB-fabrics-in-Tegra23.patch
-patch platform/patches/0131-firmware-tegra-bpmp-Rename-Tegra239-to-Tegra238.patch
-patch platform/patches/0132-soc-tegra-Update-BPMP-ABI-header.patch
-patch platform/patches/0133-soc-tegra-pmc-Create-PMC-context-dynamically.patch
-patch platform/patches/0134-drm-nouveau-tegra-Explicitly-specify-PMC-instance-to.patch
-patch platform/patches/0135-drm-tegra-Explicitly-specify-PMC-instance-to-use.patch
-patch platform/patches/0136-usb-xhci-tegra-Explicitly-specify-PMC-instance-to-us.patch
-patch platform/patches/0137-PCI-tegra-Explicitly-specify-PMC-instance-to-use.patch
-patch platform/patches/0138-ata-ahci_tegra-Explicitly-specify-PMC-instance-to-us.patch
-patch platform/patches/0139-media-vde-Explicitly-specify-PMC-instance-to-use.patch
-patch platform/patches/0140-soc-tegra-pmc-Remove-unused-legacy-functions.patch
-patch platform/patches/0141-soc-tegra-pmc-Move-legacy-code-behind-CONFIG_ARM-gua.patch
-patch platform/patches/0142-soc-tegra-pmc-Populate-powergate-debugfs-only-when-n.patch
-patch platform/patches/0143-soc-tegra-pmc-Restrict-power-off-handler-to-Nexus-7.patch
-patch platform/patches/0144-soc-tegra-pmc-Add-Tegra238-support.patch
-patch platform/patches/0145-soc-tegra-pmc-Don-t-register-sys-off-handler-for-mul.patch
-patch platform/patches/0146-spi-tegra210-quad-Refactor-error-handling-into-helpe.patch
-patch platform/patches/0147-spi-tegra210-quad-Check-hardware-status-on-timeout.patch
-patch platform/patches/0148-spi-tegra210-quad-Add-runtime-autosuspend-support.patch
-patch platform/patches/0149-spi-tegra210-quad-Remove-redundant-pm_runtime_mark_l.patch
-patch platform/patches/0150-spi-tegra210-quad-Fix-false-positive-WARN-on-interru.patch
-patch platform/patches/0151-serial-amba-pl011-Introduce-skip_ibrd_fbrd-vendor-fl.patch
-patch platform/patches/0152-serial-amba-pl011-Introduce-set_uartclk_rate-vendor-.patch
-patch platform/patches/0153-serial-amba-pl011-Add-Tegra264-UART-support.patch
-patch platform/patches/0154-serial-amba-pl011-Respect-DMA-controller-s-copy_alig.patch
-patch platform/patches/0155-NVIDIA-SAUCE-sysfs-Add-sys-kernel-realtime-entry.patch
-patch platform/patches/0156-regmap-add-flat-cache-with-sparse-validity.patch
-patch platform/patches/0157-regmap-warn-users-about-uninitialized-flat-cache.patch
-patch platform/patches/0158-regcache-Add-populate-callback-to-separate-from-init.patch
-patch platform/patches/0159-regcache-flat-Remove-unneeded-check-and-error-messag.patch
-patch platform/patches/0160-regcache-flat-Split-populate-from-init.patch
-patch platform/patches/0161-regmap-Add-reg_default_cb-callback-for-flat-cache-de.patch
-patch platform/patches/0162-ASoC-tegra-set-reg_default_cb-callback.patch
-patch platform/patches/0163-ASoC-rt5640-Handle-0Hz-sysclk-during-stream-shutdown.patch
-patch platform/patches/0164-ASoC-tegra-Use-dev_err_probe-in-tegra186_asrc-probe.patch
-patch platform/patches/0165-ASoC-tegra-Use-dev_err_probe-in-tegra186_dspk-probe.patch
-patch platform/patches/0166-ASoC-tegra-Add-error-logging-in-tegra210_adx-driver.patch
-patch platform/patches/0167-ASoC-tegra-Use-dev_err_probe-in-tegra210_ahub-probe.patch
-patch platform/patches/0168-ASoC-tegra-Add-error-logging-in-tegra210_amx-driver.patch
-patch platform/patches/0169-ASoC-tegra-Use-dev_err_probe-in-tegra210_dmic-probe.patch
-patch platform/patches/0170-ASoC-tegra-Add-error-logging-in-tegra210_i2s-driver.patch
-patch platform/patches/0171-ASoC-tegra-Use-dev_err_probe-in-tegra210_mixer-probe.patch
-patch platform/patches/0172-ASoC-tegra-Use-dev_err_probe-in-tegra210_mvc-probe.patch
-patch platform/patches/0173-ASoC-tegra-Use-dev_err_probe-in-tegra210_sfc-probe.patch
-patch platform/patches/0174-ASoC-tegra-Use-dev_err_probe-in-tegra_asoc_machine-p.patch
-patch platform/patches/0175-ASoC-tegra-Use-dev_err_probe-in-tegra_audio_graph_ca.patch
-patch platform/patches/0176-ASoC-tegra-Add-error-logging-in-tegra210_admaif-driv.patch
-patch platform/patches/0177-ASoC-tegra-Use-dev_err_probe-in-OPE-PEQ-and-MBDRC-dr.patch
-patch platform/patches/0178-ASoC-tegra-Use-dev_err_probe-for-regmap-init-failure.patch
-patch platform/patches/0179-ASoC-tegra-Use-dev_err_probe-in-tegra_asoc_machine-p.patch
-patch platform/patches/0180-ASoC-tegra-Add-per-stream-Mixer-Fade-controls.patch
-patch platform/patches/0181-bus-tegra-aconnect-Use-dev_err_probe-for-probe-error.patch
-patch platform/patches/0182-ASoC-codecs-rt56-Remove-IRQF_ONESHOT.patch
-patch platform/patches/0183-ASoC-rt5640-Handle-nested-IRQs.patch
-patch platform/patches/0184-perf-metricgroup-Constify-variables-storing-the-resu.patch
-patch platform/patches/0185-perf-strlist-Don-t-write-to-const-memory.patch
-patch platform/patches/0186-perf-session-Don-t-write-to-memory-pointed-to-a-cons.patch
-patch platform/patches/0187-perf-trace-event-Constify-variables-storing-the-resu.patch
-patch platform/patches/0188-perf-units-Constify-variables-storing-the-result-of-.patch
-patch platform/patches/0189-perf-time-utils-Constify-variables-storing-the-resul.patch
-patch platform/patches/0190-perf-demangle-java-Constify-variables-storing-the-re.patch
-patch platform/patches/0191-perf-bpf-event-Constify-variables-storing-the-result.patch
-patch platform/patches/0192-perf-jitdump-Constify-variables-storing-the-result-o.patch
-patch platform/patches/0193-perf-test-parse-events-Use-evsel__match-for-legacy-e.patch
-patch platform/patches/0194-perf-test-parse-events-Without-a-PMU-use-cpu-cycles-.patch
-patch platform/patches/0195-perf-test-parse-events-Remove-cpu-PMU-requirement.patch
-patch platform/patches/0196-perf-tools-Use-const-for-variables-receiving-str-str.patch
+patch platform/patches/0007-dt-bindings-dma-nvidia-tegra186-gpc-dma-Add-iommu-ma.patch
+patch platform/patches/0008-dmaengine-tegra-Make-reset-control-optional.patch
+patch platform/patches/0009-dmaengine-tegra-Use-struct-for-register-offsets.patch
+patch platform/patches/0010-dmaengine-tegra-Support-address-width-39-bits.patch
+patch platform/patches/0011-dmaengine-tegra-Use-managed-DMA-controller-registrat.patch
+patch platform/patches/0012-dmaengine-tegra-Use-iommu-map-for-stream-ID.patch
+patch platform/patches/0013-dmaengine-tegra-Add-Tegra264-support.patch
+patch platform/patches/0014-arm64-tegra-Enable-GPCDMA-in-Tegra264-and-add-iommu-.patch
+patch platform/patches/0015-dt-bindings-dma-Update-ADMA-bindings-for-tegra264.patch
+patch platform/patches/0016-NVIDIA-SAUCE-dmaengine-tegra210-adma-Update-Virtual-.patch
+patch platform/patches/0017-NVIDIA-SAUCE-dmaengine-tegra210-adma-Fix-system-hang.patch
+patch platform/patches/0018-dmaengine-tegra210-adma-Add-error-logging-on-failure.patch
+patch platform/patches/0019-NVIDIA-SAUCE-firmware-psci-Set-pm_set_resume-suspend.patch
+patch platform/patches/0020-NVIDIA-SAUCE-firmware-tegra-bpmp-Propagate-debugfs-e.patch
+patch platform/patches/0021-NVIDIA-SAUCE-firmware-tegra-bpmp-Add-support-for-mul.patch
+patch platform/patches/0022-gpio-tegra186-Use-generic-macro-for-port-definitions.patch
+patch platform/patches/0023-gpio-tegra186-Add-support-for-Tegra410.patch
+patch platform/patches/0024-gpio-tegra186-Fix-GPIO-name-collisions-for-Tegra410.patch
+patch platform/patches/0025-dt-bindings-gpio-Add-Tegra264-support.patch
+patch platform/patches/0026-gpio-tegra186-Add-support-for-Tegra264.patch
+patch platform/patches/0027-gpio-tegra186-Simplify-GPIO-line-name-prefix-handlin.patch
+patch platform/patches/0028-gpio-tegra186-Support-multi-socket-devices.patch
+patch platform/patches/0029-NVIDIA-SAUCE-gpio-tegra186-Add-suspend-resume-suppor.patch
+patch platform/patches/0030-NVIDIA-SAUCE-gpio-tegra186-Add-pinmux-support-for-PC.patch
+patch platform/patches/0031-NVIDIA-SAUCE-gpio-tegra186-Enable-GTE-for-Tegra264.patch
+patch platform/patches/0032-hte-replace-use-of-system_unbound_wq-with-system_dfl.patch
+patch platform/patches/0033-hte-tegra194-Add-Tegra264-GTE-support.patch
+patch platform/patches/0034-i2c-tegra-Do-not-configure-DMA-if-not-supported.patch
+patch platform/patches/0035-i2c-tegra-Use-separate-variables-for-fast-and-fastpl.patch
+patch platform/patches/0036-i2c-tegra-Update-Tegra256-timing-parameters.patch
+patch platform/patches/0037-i2c-tegra-Add-HS-mode-support.patch
+patch platform/patches/0038-i2c-tegra-Add-support-for-SW-mutex-register.patch
+patch platform/patches/0039-i2c-tegra-Add-Tegra264-support.patch
+patch platform/patches/0040-i2c-tegra-remove-unused-rst.patch
+patch platform/patches/0041-NVIDIA-SAUCE-i2c-tegra-use-dmaengine_get_dma_device-.patch
+patch platform/patches/0042-NVIDIA-SAUCE-i2c-tegra-resume-explicitly-if-pm_runti.patch
+patch platform/patches/0043-NVIDIA-SAUCE-i2c-tegra-Do-not-mark-ACPI-devices-and-.patch
+patch platform/patches/0044-NVIDIA-SAUCE-i2c-tegra-Disable-fairness-arbitration.patch
+patch platform/patches/0045-iommu-tegra241-cmdqv-Decouple-driver-from-ACPI.patch
+patch platform/patches/0046-iommu-arm-smmu-v3-Add-device-tree-support-for-CMDQV-.patch
+patch platform/patches/0047-NVIDIA-SAUCE-iommu-arm-smmu-v3-add-suspend-resume-su.patch
+patch platform/patches/0048-NVIDIA-SAUCE-iommu-arm-smmu-v3-Add-pm-suspend-op.patch
+patch platform/patches/0049-NVIDIA-SAUCE-iommu-arm-smmu-v3-Retain-prod-and-cons-.patch
+patch platform/patches/0050-NVIDIA-SAUCE-iommu-arm-smmu-v3-Restore-IRQs-on-resum.patch
+patch platform/patches/0051-NVIDIA-SAUCE-iommu-arm-smmu-v3-Implement-WAR-for-Teg.patch
+patch platform/patches/0052-memory-tegra186-emc-Do-not-print-error-on-icc_node_c.patch
+patch platform/patches/0053-memory-tegra186-emc-Simplify-and-handle-deferred-pro.patch
+patch platform/patches/0054-memory-tegra186-emc-Add-the-SoC-model-prefix-to-func.patch
+patch platform/patches/0055-memory-tegra186-emc-Fix-missing-put_bpmp.patch
+patch platform/patches/0056-memory-tegra-Add-support-for-DBB-clock-on-Tegra264.patch
+patch platform/patches/0057-memory-tegra-Group-error-handling-related-registers.patch
+patch platform/patches/0058-memory-tegra-Group-register-and-fields.patch
+patch platform/patches/0059-memory-tegra-Add-support-for-multiple-IRQs.patch
+patch platform/patches/0060-memory-tegra-Group-SoC-specific-fields.patch
+patch platform/patches/0061-memory-tegra-Prepare-for-supporting-multiple-intmask.patch
+patch platform/patches/0062-memory-tegra-Add-MC-error-logging-support-for-Tegra2.patch
+patch platform/patches/0063-memory-tegra-Make-resume-callback-return-void.patch
+patch platform/patches/0064-memory-tegra-Restore-MC-interrupt-masks-on-resume.patch
+patch platform/patches/0065-dt-bindings-memory-tegra-Add-nvidia-tegra238-mc-comp.patch
+patch platform/patches/0066-memory-tegra-Add-Tegra238-MC-support.patch
+patch platform/patches/0067-dt-bindings-memory-tegra264-Add-full-set-of-MC-clien.patch
+patch platform/patches/0068-memory-tegra264-Skip-clients-without-bpmp_id-or-type.patch
+patch platform/patches/0069-memory-tegra264-Add-full-set-of-MC-clients.patch
+patch platform/patches/0070-memory-tegra186-emc-stop-borrowing-MC-aggregate-hook.patch
+patch platform/patches/0071-memory-tegra264-drop-redundant-tegra264_mc_icc_aggre.patch
+patch platform/patches/0072-memory-tegra234-drop-dead-NULL-check-in-tegra234_mc_.patch
+patch platform/patches/0073-memory-tegra-add-multi-socket-support-to-the-memory-.patch
+patch platform/patches/0074-PCI-Add-ASPEED-vendor-ID-to-pci_ids.h.patch
+patch platform/patches/0075-PCI-Add-PCI_BRIDGE_NO_ALIAS-quirk-for-ASPEED-AST1150.patch
+patch platform/patches/0076-PCI-dwc-tegra194-Broaden-architecture-dependency.patch
+patch platform/patches/0077-PCI-endpoint-Do-not-mark-the-BAR-succeeding-a-64-bit.patch
+patch platform/patches/0078-PCI-endpoint-Allow-only_64bit-on-BAR_RESERVED.patch
+patch platform/patches/0079-PCI-endpoint-Describe-reserved-subregions-within-BAR.patch
+patch platform/patches/0080-PCI-endpoint-Introduce-pci_epc_bar_type-BAR_DISABLED.patch
+patch platform/patches/0081-PCI-dwc-Replace-certain-BAR_RESERVED-with-BAR_DISABL.patch
+patch platform/patches/0082-PCI-endpoint-Add-reserved-region-type-for-MSI-X-Tabl.patch
+patch platform/patches/0083-PCI-tegra194-Make-BAR0-programmable-and-remove-1MB-s.patch
+patch platform/patches/0084-PCI-tegra194-Expose-BAR2-MSI-X-and-BAR4-DMA-as-64-bi.patch
+patch platform/patches/0085-PCI-tegra194-Assert-CLKREQ-explicitly-by-default.patch
+patch platform/patches/0086-PCI-tegra194-Calibrate-pipe-to-UPHY-for-Endpoint-mod.patch
+patch platform/patches/0087-PCI-tegra194-Remove-IRQF_ONESHOT-flag-during-Endpoin.patch
+patch platform/patches/0088-PCI-tegra194-Enable-DMA-interrupt.patch
+patch platform/patches/0089-PCI-tegra194-Enable-hardware-hot-reset-mode-in-Endpo.patch
+patch platform/patches/0090-PCI-tegra194-Add-core-monitor-clock-support.patch
+patch platform/patches/0091-NVIDIA-SAUCE-pinctrl-tegra-Export-tegra_pinctrl_prob.patch
+patch platform/patches/0092-NVIDIA-SAUCE-pinctrl-tegra-Add-Tegra238-pinmux-drive.patch
+patch platform/patches/0093-NVIDIA-SAUCE-pinctrl-tegra-Add-Tegra264-pinmux-drive.patch
+patch platform/patches/0094-NVIDIA-SAUCE-pmdomain-tegra-Add-support-for-multi-so.patch
+patch platform/patches/0095-dt-bindings-pwm-Document-Tegra264-controller.patch
+patch platform/patches/0096-pwm-tegra-Avoid-hard-coded-max-clock-frequency.patch
+patch platform/patches/0097-pwm-tegra-Modify-read-write-accessors-for-multi-regi.patch
+patch platform/patches/0098-pwm-tegra-Parametrize-enable-register-offset.patch
+patch platform/patches/0099-pwm-tegra-Parametrize-duty-and-scale-field-widths.patch
+patch platform/patches/0100-pwm-tegra-Add-support-for-Tegra264.patch
+patch platform/patches/0101-syscore-Pass-context-data-to-callbacks.patch
+patch platform/patches/0102-soc-tegra-pmc-Don-t-fail-if-aotag-is-not-present.patch
+patch platform/patches/0103-soc-tegra-pmc-Document-tegra_pmc.syscore-field.patch
+patch platform/patches/0104-soc-tegra-pmc-Add-USB-wake-events-for-Tegra234.patch
+patch platform/patches/0105-soc-tegra-pmc-Fix-unsafe-generic_handle_irq-call.patch
+patch platform/patches/0106-soc-tegra-pmc-Use-contextual-data-instead-of-global-.patch
+patch platform/patches/0107-soc-tegra-pmc-Pass-struct-tegra_pmc-to-tegra_powerga.patch
+patch platform/patches/0108-soc-tegra-pmc-Store-PMC-context-in-clocks.patch
+patch platform/patches/0109-soc-tegra-pmc-Embed-reboot-notifier-in-PMC-context.patch
+patch platform/patches/0110-soc-tegra-pmc-Pass-PMC-context-via-sys-off-callback-.patch
+patch platform/patches/0111-soc-tegra-pmc-Pass-PMC-context-as-debugfs-data.patch
+patch platform/patches/0112-soc-tegra-pmc-Use-PMC-context-embedded-in-powergates.patch
+patch platform/patches/0113-soc-tegra-pmc-Use-driver-private-data.patch
+patch platform/patches/0114-soc-tegra-pmc-Do-not-rely-on-global-variable.patch
+patch platform/patches/0115-soc-tegra-pmc-Add-PMC-contextual-functions.patch
+patch platform/patches/0116-soc-tegra-pmc-Add-kerneldoc-for-reboot-notifier.patch
+patch platform/patches/0117-soc-tegra-pmc-Correct-function-names-in-kerneldoc.patch
+patch platform/patches/0118-soc-tegra-pmc-Add-kerneldoc-for-wake-up-variables.patch
+patch platform/patches/0119-soc-tegra-pmc-Remove-unused-AOWAKE-definitions.patch
+patch platform/patches/0120-soc-tegra-pmc-Add-support-for-SoC-specific-AOWAKE-of.patch
+patch platform/patches/0121-soc-tegra-pmc-Add-AOWAKE-regs-for-Tegra264.patch
+patch platform/patches/0122-soc-tegra-pmc-Add-Tegra264-wake-events.patch
+patch platform/patches/0123-soc-tegra-pmc-Refactor-IO-pad-voltage-control.patch
+patch platform/patches/0124-soc-tegra-pmc-Rename-has_impl_33v_pwr-flag.patch
+patch platform/patches/0125-soc-tegra-pmc-Add-IO-pads-for-Tegra264.patch
+patch platform/patches/0126-soc-tegra-Resolve-a-spelling-error-in-the-tegra194-c.patch
+patch platform/patches/0127-soc-tegra-cbb-Add-support-for-CBB-fabrics-in-Tegra23.patch
+patch platform/patches/0128-firmware-tegra-bpmp-Rename-Tegra239-to-Tegra238.patch
+patch platform/patches/0129-soc-tegra-Update-BPMP-ABI-header.patch
+patch platform/patches/0130-soc-tegra-pmc-Create-PMC-context-dynamically.patch
+patch platform/patches/0131-drm-nouveau-tegra-Explicitly-specify-PMC-instance-to.patch
+patch platform/patches/0132-drm-tegra-Explicitly-specify-PMC-instance-to-use.patch
+patch platform/patches/0133-usb-xhci-tegra-Explicitly-specify-PMC-instance-to-us.patch
+patch platform/patches/0134-PCI-tegra-Explicitly-specify-PMC-instance-to-use.patch
+patch platform/patches/0135-ata-ahci_tegra-Explicitly-specify-PMC-instance-to-us.patch
+patch platform/patches/0136-media-vde-Explicitly-specify-PMC-instance-to-use.patch
+patch platform/patches/0137-soc-tegra-pmc-Remove-unused-legacy-functions.patch
+patch platform/patches/0138-soc-tegra-pmc-Move-legacy-code-behind-CONFIG_ARM-gua.patch
+patch platform/patches/0139-soc-tegra-pmc-Populate-powergate-debugfs-only-when-n.patch
+patch platform/patches/0140-soc-tegra-pmc-Restrict-power-off-handler-to-Nexus-7.patch
+patch platform/patches/0141-soc-tegra-pmc-Add-Tegra238-support.patch
+patch platform/patches/0142-soc-tegra-pmc-Don-t-register-sys-off-handler-for-mul.patch
+patch platform/patches/0143-spi-tegra210-quad-Refactor-error-handling-into-helpe.patch
+patch platform/patches/0144-spi-tegra210-quad-Check-hardware-status-on-timeout.patch
+patch platform/patches/0145-spi-tegra210-quad-Add-runtime-autosuspend-support.patch
+patch platform/patches/0146-spi-tegra210-quad-Remove-redundant-pm_runtime_mark_l.patch
+patch platform/patches/0147-spi-tegra210-quad-Fix-false-positive-WARN-on-interru.patch
+patch platform/patches/0148-serial-amba-pl011-Introduce-skip_ibrd_fbrd-vendor-fl.patch
+patch platform/patches/0149-serial-amba-pl011-Introduce-set_uartclk_rate-vendor-.patch
+patch platform/patches/0150-serial-amba-pl011-Add-Tegra264-UART-support.patch
+patch platform/patches/0151-serial-amba-pl011-Respect-DMA-controller-s-copy_alig.patch
+patch platform/patches/0152-NVIDIA-SAUCE-sysfs-Add-sys-kernel-realtime-entry.patch
+patch platform/patches/0153-regmap-add-flat-cache-with-sparse-validity.patch
+patch platform/patches/0154-regmap-warn-users-about-uninitialized-flat-cache.patch
+patch platform/patches/0155-regcache-Add-populate-callback-to-separate-from-init.patch
+patch platform/patches/0156-regcache-flat-Remove-unneeded-check-and-error-messag.patch
+patch platform/patches/0157-regcache-flat-Split-populate-from-init.patch
+patch platform/patches/0158-regmap-Add-reg_default_cb-callback-for-flat-cache-de.patch
+patch platform/patches/0159-ASoC-tegra-set-reg_default_cb-callback.patch
+patch platform/patches/0160-ASoC-rt5640-Handle-0Hz-sysclk-during-stream-shutdown.patch
+patch platform/patches/0161-ASoC-tegra-Use-dev_err_probe-in-tegra186_asrc-probe.patch
+patch platform/patches/0162-ASoC-tegra-Use-dev_err_probe-in-tegra186_dspk-probe.patch
+patch platform/patches/0163-ASoC-tegra-Add-error-logging-in-tegra210_adx-driver.patch
+patch platform/patches/0164-ASoC-tegra-Use-dev_err_probe-in-tegra210_ahub-probe.patch
+patch platform/patches/0165-ASoC-tegra-Add-error-logging-in-tegra210_amx-driver.patch
+patch platform/patches/0166-ASoC-tegra-Use-dev_err_probe-in-tegra210_dmic-probe.patch
+patch platform/patches/0167-ASoC-tegra-Add-error-logging-in-tegra210_i2s-driver.patch
+patch platform/patches/0168-ASoC-tegra-Use-dev_err_probe-in-tegra210_mixer-probe.patch
+patch platform/patches/0169-ASoC-tegra-Use-dev_err_probe-in-tegra210_mvc-probe.patch
+patch platform/patches/0170-ASoC-tegra-Use-dev_err_probe-in-tegra210_sfc-probe.patch
+patch platform/patches/0171-ASoC-tegra-Use-dev_err_probe-in-tegra_asoc_machine-p.patch
+patch platform/patches/0172-ASoC-tegra-Use-dev_err_probe-in-tegra_audio_graph_ca.patch
+patch platform/patches/0173-ASoC-tegra-Add-error-logging-in-tegra210_admaif-driv.patch
+patch platform/patches/0174-ASoC-tegra-Use-dev_err_probe-in-OPE-PEQ-and-MBDRC-dr.patch
+patch platform/patches/0175-ASoC-tegra-Use-dev_err_probe-for-regmap-init-failure.patch
+patch platform/patches/0176-ASoC-tegra-Use-dev_err_probe-in-tegra_asoc_machine-p.patch
+patch platform/patches/0177-ASoC-tegra-Add-per-stream-Mixer-Fade-controls.patch
+patch platform/patches/0178-bus-tegra-aconnect-Use-dev_err_probe-for-probe-error.patch
+patch platform/patches/0179-ASoC-codecs-rt56-Remove-IRQF_ONESHOT.patch
+patch platform/patches/0180-ASoC-rt5640-Handle-nested-IRQs.patch
+patch platform/patches/0181-perf-test-parse-events-Use-evsel__match-for-legacy-e.patch
+patch platform/patches/0182-perf-test-parse-events-Without-a-PMU-use-cpu-cycles-.patch
+patch platform/patches/0183-perf-test-parse-events-Remove-cpu-PMU-requirement.patch
+patch platform/patches/0184-perf-tools-Use-const-for-variables-receiving-str-str.patch
 
diff --git a/features/tegra/platform/patches/0001-NVIDIA-SAUCE-clk-tegra-Support-unique-names-for-mult.patch b/features/tegra/platform/patches/0001-NVIDIA-SAUCE-clk-tegra-Support-unique-names-for-mult.patch
index 9fd5e92..e72ba87 100644
--- a/features/tegra/platform/patches/0001-NVIDIA-SAUCE-clk-tegra-Support-unique-names-for-mult.patch
+++ b/features/tegra/platform/patches/0001-NVIDIA-SAUCE-clk-tegra-Support-unique-names-for-mult.patch
@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Jon Hunter <jonathanh@nvidia.com>
 Date: Tue, 2 Jun 2026 09:43:34 +0100
-Subject: [PATCH 001/196] NVIDIA: SAUCE: clk: tegra: Support unique names for
+Subject: [PATCH 001/184] NVIDIA: SAUCE: clk: tegra: Support unique names for
  multi-socket platforms
 
 On multi-socket platforms each socket has its own BPMP which exposes the
@@ -26,7 +26,7 @@ GVS: buildbot_gerritrpt <buildbot_gerritrpt@nvidia.com>
 (cherry picked from commit bf6c3abf6a338a24975f4de15e0e81ea4ccb3ac1)
 
 diff --git a/drivers/clk/tegra/clk-bpmp.c b/drivers/clk/tegra/clk-bpmp.c
-index 77a2586dbe000..8bf469639c607 100644
+index 77a2586dbe00..8bf469639c60 100644
 --- a/drivers/clk/tegra/clk-bpmp.c
 +++ b/drivers/clk/tegra/clk-bpmp.c
 @@ -367,7 +367,15 @@ static int tegra_bpmp_clk_get_info(struct tegra_bpmp *bpmp, unsigned int id,
@@ -47,5 +47,5 @@ index 77a2586dbe000..8bf469639c607 100644
  
  	for (i = 0; i < info->num_parents; i++)
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/platform/patches/0002-cpufreq-tegra194-Rename-Tegra239-to-Tegra238.patch b/features/tegra/platform/patches/0002-cpufreq-tegra194-Rename-Tegra239-to-Tegra238.patch
index 23bdedb..5e2da4d 100644
--- a/features/tegra/platform/patches/0002-cpufreq-tegra194-Rename-Tegra239-to-Tegra238.patch
+++ b/features/tegra/platform/patches/0002-cpufreq-tegra194-Rename-Tegra239-to-Tegra238.patch
@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Thierry Reding <treding@nvidia.com>
 Date: Thu, 26 Feb 2026 16:12:12 +0100
-Subject: [PATCH 002/196] cpufreq: tegra194: Rename Tegra239 to Tegra238
+Subject: [PATCH 002/184] cpufreq: tegra194: Rename Tegra239 to Tegra238
 
 This chip identifies as Tegra238, so update the device tree compatible
 string and data structures associated with it to use the correct name.
@@ -11,7 +11,7 @@ Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>
 (cherry picked from commit 2d14bf98e6b445afbb799b170448f628f6d4ab69)
 
 diff --git a/drivers/cpufreq/tegra194-cpufreq.c b/drivers/cpufreq/tegra194-cpufreq.c
-index 9b4f516f313e0..6fe8a3f9797a2 100644
+index 9b4f516f313e..6fe8a3f9797a 100644
 --- a/drivers/cpufreq/tegra194-cpufreq.c
 +++ b/drivers/cpufreq/tegra194-cpufreq.c
 @@ -196,7 +196,7 @@ static const struct tegra_cpufreq_soc tegra234_cpufreq_soc = {
@@ -33,5 +33,5 @@ index 9b4f516f313e0..6fe8a3f9797a2 100644
  };
  MODULE_DEVICE_TABLE(of, tegra194_cpufreq_of_match);
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/platform/patches/0003-NVIDIA-SAUCE-cpufreq-tegra194-Add-support-for-Tegra2.patch b/features/tegra/platform/patches/0003-NVIDIA-SAUCE-cpufreq-tegra194-Add-support-for-Tegra2.patch
index 082450c..266fee1 100644
--- a/features/tegra/platform/patches/0003-NVIDIA-SAUCE-cpufreq-tegra194-Add-support-for-Tegra2.patch
+++ b/features/tegra/platform/patches/0003-NVIDIA-SAUCE-cpufreq-tegra194-Add-support-for-Tegra2.patch
@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Ishan Shah <ishah@nvidia.com>
 Date: Mon, 19 Aug 2024 19:41:05 +0000
-Subject: [PATCH 003/196] NVIDIA: SAUCE: cpufreq: tegra194: Add support for
+Subject: [PATCH 003/184] NVIDIA: SAUCE: cpufreq: tegra194: Add support for
  Tegra264
 
 Adding support for Tegra264, which has clusters sharing clock-sources.
@@ -34,7 +34,7 @@ Signed-off-by: Ishan Shah <ishah@nvidia.com>
 Signed-off-by: Jon Hunter <jonathanh@nvidia.com>
 
 diff --git a/drivers/cpufreq/tegra194-cpufreq.c b/drivers/cpufreq/tegra194-cpufreq.c
-index 6fe8a3f9797a2..e25a51b60fd4e 100644
+index 6fe8a3f9797a..e25a51b60fd4 100644
 --- a/drivers/cpufreq/tegra194-cpufreq.c
 +++ b/drivers/cpufreq/tegra194-cpufreq.c
 @@ -14,6 +14,7 @@
@@ -349,5 +349,5 @@ index 6fe8a3f9797a2..e25a51b60fd4e 100644
  };
  MODULE_DEVICE_TABLE(of, tegra194_cpufreq_of_match);
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/platform/patches/0004-NVIDIA-SAUCE-cpufreq-tegra194-fix-policy-initializat.patch b/features/tegra/platform/patches/0004-NVIDIA-SAUCE-cpufreq-tegra194-fix-policy-initializat.patch
index e30e49d..563f8dc 100644
--- a/features/tegra/platform/patches/0004-NVIDIA-SAUCE-cpufreq-tegra194-fix-policy-initializat.patch
+++ b/features/tegra/platform/patches/0004-NVIDIA-SAUCE-cpufreq-tegra194-fix-policy-initializat.patch
@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Ishan Shah <ishah@nvidia.com>
 Date: Fri, 11 Apr 2025 22:23:31 +0000
-Subject: [PATCH 004/196] NVIDIA: SAUCE: cpufreq: tegra194: fix policy
+Subject: [PATCH 004/184] NVIDIA: SAUCE: cpufreq: tegra194: fix policy
  initialization
 
 Fix the policy-initialization scheme to correctly be dependent on cores
@@ -18,7 +18,7 @@ Reviewed-on: https://git-master.nvidia.com/r/c/3rdparty/canonical/linux-noble/+/
 (cherry picked from commit c7e345eedd65f65a9fcc09805c1feb7afd3e6942)
 
 diff --git a/drivers/cpufreq/tegra194-cpufreq.c b/drivers/cpufreq/tegra194-cpufreq.c
-index e25a51b60fd4e..de989cef6d649 100644
+index e25a51b60fd4..de989cef6d64 100644
 --- a/drivers/cpufreq/tegra194-cpufreq.c
 +++ b/drivers/cpufreq/tegra194-cpufreq.c
 @@ -683,17 +683,24 @@ static int tegra194_cpufreq_init(struct cpufreq_policy *policy)
@@ -52,5 +52,5 @@ index e25a51b60fd4e..de989cef6d649 100644
  	policy->cpuinfo.transition_latency = TEGRA_CPUFREQ_TRANSITION_LATENCY;
  
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/platform/patches/0005-NVIDIA-SAUCE-cpufreq-tegra194-Support-read-only-init.patch b/features/tegra/platform/patches/0005-NVIDIA-SAUCE-cpufreq-tegra194-Support-read-only-init.patch
index 352d42b..c3a652b 100644
--- a/features/tegra/platform/patches/0005-NVIDIA-SAUCE-cpufreq-tegra194-Support-read-only-init.patch
+++ b/features/tegra/platform/patches/0005-NVIDIA-SAUCE-cpufreq-tegra194-Support-read-only-init.patch
@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Sumit Gupta <sumitg@nvidia.com>
 Date: Mon, 14 Apr 2025 16:37:11 +0000
-Subject: [PATCH 005/196] NVIDIA: SAUCE: cpufreq: tegra194: Support read-only
+Subject: [PATCH 005/184] NVIDIA: SAUCE: cpufreq: tegra194: Support read-only
  initialization
 
 If a platform uses system registers for frequency readback, support
@@ -23,7 +23,7 @@ Reviewed-by: Brad Griffis <bgriffis@nvidia.com>
 (cherry picked from commit 485d868fa01e2d6522bdf851c47c532b98122cd7)
 
 diff --git a/drivers/cpufreq/tegra194-cpufreq.c b/drivers/cpufreq/tegra194-cpufreq.c
-index de989cef6d649..e0e742a034171 100644
+index de989cef6d64..e0e742a03417 100644
 --- a/drivers/cpufreq/tegra194-cpufreq.c
 +++ b/drivers/cpufreq/tegra194-cpufreq.c
 @@ -1,6 +1,6 @@
@@ -231,5 +231,5 @@ index de989cef6d649..e0e742a034171 100644
  
  	data->cpu_data = devm_kcalloc(&pdev->dev, data->soc->num_clusters *
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/platform/patches/0006-dmaengine-of_dma-Add-devm_of_dma_controller_register.patch b/features/tegra/platform/patches/0006-dmaengine-of_dma-Add-devm_of_dma_controller_register.patch
index 5356965..2579b79 100644
--- a/features/tegra/platform/patches/0006-dmaengine-of_dma-Add-devm_of_dma_controller_register.patch
+++ b/features/tegra/platform/patches/0006-dmaengine-of_dma-Add-devm_of_dma_controller_register.patch
@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Frank Li <Frank.Li@nxp.com>
 Date: Wed, 25 Feb 2026 16:41:37 -0500
-Subject: [PATCH 006/196] dmaengine: of_dma: Add
+Subject: [PATCH 006/184] dmaengine: of_dma: Add
  devm_of_dma_controller_register()
 
 Add a managed API, devm_of_dma_controller_register(), to simplify DMA
@@ -14,7 +14,7 @@ Signed-off-by: Vinod Koul <vkoul@kernel.org>
 (cherry picked from commit 3a005126c9d7f30093627a6f329656c358e16b3a)
 
 diff --git a/include/linux/of_dma.h b/include/linux/of_dma.h
-index fd706cdf255c6..16b08234d03b3 100644
+index fd706cdf255c..16b08234d03b 100644
 --- a/include/linux/of_dma.h
 +++ b/include/linux/of_dma.h
 @@ -38,6 +38,26 @@ extern int of_dma_controller_register(struct device_node *np,
@@ -61,5 +61,5 @@ index fd706cdf255c6..16b08234d03b3 100644
  		void *(*of_dma_route_allocate)
  		(struct of_phandle_args *, struct of_dma *),
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/platform/patches/0009-dt-bindings-dma-nvidia-tegra186-gpc-dma-Add-iommu-ma.patch b/features/tegra/platform/patches/0007-dt-bindings-dma-nvidia-tegra186-gpc-dma-Add-iommu-ma.patch
similarity index 93%
rename from features/tegra/platform/patches/0009-dt-bindings-dma-nvidia-tegra186-gpc-dma-Add-iommu-ma.patch
rename to features/tegra/platform/patches/0007-dt-bindings-dma-nvidia-tegra186-gpc-dma-Add-iommu-ma.patch
index 4309b76..0cb52e5 100644
--- a/features/tegra/platform/patches/0009-dt-bindings-dma-nvidia-tegra186-gpc-dma-Add-iommu-ma.patch
+++ b/features/tegra/platform/patches/0007-dt-bindings-dma-nvidia-tegra186-gpc-dma-Add-iommu-ma.patch
@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Akhil R <akhilrajeev@nvidia.com>
 Date: Tue, 31 Mar 2026 15:52:56 +0530
-Subject: [PATCH 009/196] dt-bindings: dma: nvidia,tegra186-gpc-dma: Add
+Subject: [PATCH 007/184] dt-bindings: dma: nvidia,tegra186-gpc-dma: Add
  iommu-map property
 
 Add iommu-map property to specify separate stream IDs for each DMA
@@ -18,7 +18,7 @@ Acked-by: Rob Herring (Arm) <robh@kernel.org>
 Reviewed-by: Jon Hunter <jonathanh@nvidia.com>
 
 diff --git a/Documentation/devicetree/bindings/dma/nvidia,tegra186-gpc-dma.yaml b/Documentation/devicetree/bindings/dma/nvidia,tegra186-gpc-dma.yaml
-index 64f1e9d9896df..bc093c783d986 100644
+index 64f1e9d9896d..bc093c783d98 100644
 --- a/Documentation/devicetree/bindings/dma/nvidia,tegra186-gpc-dma.yaml
 +++ b/Documentation/devicetree/bindings/dma/nvidia,tegra186-gpc-dma.yaml
 @@ -14,6 +14,7 @@ description: |
@@ -45,5 +45,5 @@ index 64f1e9d9896df..bc093c783d986 100644
  
    dma-channel-mask:
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/platform/patches/0007-dt-bindings-dma-nvidia-tegra186-gpc-dma-Make-reset-o.patch b/features/tegra/platform/patches/0007-dt-bindings-dma-nvidia-tegra186-gpc-dma-Make-reset-o.patch
deleted file mode 100644
index 3451f6c..0000000
--- a/features/tegra/platform/patches/0007-dt-bindings-dma-nvidia-tegra186-gpc-dma-Make-reset-o.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Akhil R <akhilrajeev@nvidia.com>
-Date: Tue, 31 Mar 2026 15:52:54 +0530
-Subject: [PATCH 007/196] dt-bindings: dma: nvidia,tegra186-gpc-dma: Make reset
- optional
-
-On Tegra264, GPCDMA reset control is not exposed to Linux and is handled
-by the boot firmware.
-
-Although reset was not exposed in Tegra234 as well, the firmware supported
-a dummy reset which just returns success on reset without doing an actual
-reset. This is also not supported in Tegra264 BPMP. Therefore mark 'reset'
-and 'reset-names' properties as required only for devices prior to
-Tegra264.
-
-This also necessitates that the Tegra264 compatible be standalone and
-cannot have the fallback compatible of Tegra186. Since there is no
-functional impact, we keep reset as required for Tegra234 to avoid
-breaking the ABI.
-
-Fixes: bb8c97571db5 ("dt-bindings: dma: Add Tegra264 compatible string")
-Signed-off-by: Akhil R <akhilrajeev@nvidia.com>
-Acked-by: Rob Herring (Arm) <robh@kernel.org>
-Reviewed-by: Jon Hunter <jonathanh@nvidia.com>
-
-diff --git a/Documentation/devicetree/bindings/dma/nvidia,tegra186-gpc-dma.yaml b/Documentation/devicetree/bindings/dma/nvidia,tegra186-gpc-dma.yaml
-index 0dabe9bbb219b..64f1e9d9896df 100644
---- a/Documentation/devicetree/bindings/dma/nvidia,tegra186-gpc-dma.yaml
-+++ b/Documentation/devicetree/bindings/dma/nvidia,tegra186-gpc-dma.yaml
-@@ -15,16 +15,14 @@ maintainers:
-   - Jon Hunter <jonathanh@nvidia.com>
-   - Rajesh Gumasta <rgumasta@nvidia.com>
- 
--allOf:
--  - $ref: dma-controller.yaml#
--
- properties:
-   compatible:
-     oneOf:
--      - const: nvidia,tegra186-gpcdma
-+      - enum:
-+          - nvidia,tegra264-gpcdma
-+          - nvidia,tegra186-gpcdma
-       - items:
-           - enum:
--              - nvidia,tegra264-gpcdma
-               - nvidia,tegra234-gpcdma
-               - nvidia,tegra194-gpcdma
-           - const: nvidia,tegra186-gpcdma
-@@ -60,12 +58,23 @@ required:
-   - compatible
-   - reg
-   - interrupts
--  - resets
--  - reset-names
-   - "#dma-cells"
-   - iommus
-   - dma-channel-mask
- 
-+allOf:
-+  - $ref: dma-controller.yaml#
-+  - if:
-+      properties:
-+        compatible:
-+          contains:
-+            enum:
-+              - nvidia,tegra186-gpcdma
-+    then:
-+      required:
-+        - resets
-+        - reset-names
-+
- additionalProperties: false
- 
- examples:
--- 
-2.43.0
-
diff --git a/features/tegra/platform/patches/0008-arm64-tegra-Remove-fallback-compatible-for-GPCDMA.patch b/features/tegra/platform/patches/0008-arm64-tegra-Remove-fallback-compatible-for-GPCDMA.patch
deleted file mode 100644
index 62110d2..0000000
--- a/features/tegra/platform/patches/0008-arm64-tegra-Remove-fallback-compatible-for-GPCDMA.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Akhil R <akhilrajeev@nvidia.com>
-Date: Tue, 31 Mar 2026 15:52:55 +0530
-Subject: [PATCH 008/196] arm64: tegra: Remove fallback compatible for GPCDMA
-
-Remove the fallback compatible string "nvidia,tegra186-gpcdma" for GPCDMA
-in Tegra264. Tegra186 compatible cannot work on Tegra264 because of the
-register offset changes and absence of the reset property.
-
-Fixes: 65ef237e4810 ("arm64: tegra: Add Tegra264 support")
-Signed-off-by: Akhil R <akhilrajeev@nvidia.com>
-Reviewed-by: Jon Hunter <jonathanh@nvidia.com>
-
-diff --git a/arch/arm64/boot/dts/nvidia/tegra264.dtsi b/arch/arm64/boot/dts/nvidia/tegra264.dtsi
-index 872a69553e3c8..b16d380209a50 100644
---- a/arch/arm64/boot/dts/nvidia/tegra264.dtsi
-+++ b/arch/arm64/boot/dts/nvidia/tegra264.dtsi
-@@ -50,7 +50,7 @@ timer@8000000 {
- 		};
- 
- 		gpcdma: dma-controller@8400000 {
--			compatible = "nvidia,tegra264-gpcdma", "nvidia,tegra186-gpcdma";
-+			compatible = "nvidia,tegra264-gpcdma";
- 			reg = <0x0 0x08400000 0x0 0x210000>;
- 			interrupts = <GIC_SPI 584 IRQ_TYPE_LEVEL_HIGH>,
- 				     <GIC_SPI 585 IRQ_TYPE_LEVEL_HIGH>,
--- 
-2.43.0
-
diff --git a/features/tegra/platform/patches/0010-dmaengine-tegra-Make-reset-control-optional.patch b/features/tegra/platform/patches/0008-dmaengine-tegra-Make-reset-control-optional.patch
similarity index 86%
rename from features/tegra/platform/patches/0010-dmaengine-tegra-Make-reset-control-optional.patch
rename to features/tegra/platform/patches/0008-dmaengine-tegra-Make-reset-control-optional.patch
index fe93280..3bf02a7 100644
--- a/features/tegra/platform/patches/0010-dmaengine-tegra-Make-reset-control-optional.patch
+++ b/features/tegra/platform/patches/0008-dmaengine-tegra-Make-reset-control-optional.patch
@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Akhil R <akhilrajeev@nvidia.com>
 Date: Tue, 31 Mar 2026 15:52:57 +0530
-Subject: [PATCH 010/196] dmaengine: tegra: Make reset control optional
+Subject: [PATCH 008/184] dmaengine: tegra: Make reset control optional
 
 On Tegra264, reset is not available for the driver to control as
 this is handled by the boot firmware. Hence make the reset control
@@ -12,10 +12,10 @@ Reviewed-by: Frank Li <Frank.Li@nxp.com>
 Reviewed-by: Jon Hunter <jonathanh@nvidia.com>
 
 diff --git a/drivers/dma/tegra186-gpc-dma.c b/drivers/dma/tegra186-gpc-dma.c
-index 4d6fe0efa76e4..09a1717aa808f 100644
+index 7df0a745e7b8..7857396e859f 100644
 --- a/drivers/dma/tegra186-gpc-dma.c
 +++ b/drivers/dma/tegra186-gpc-dma.c
-@@ -1382,10 +1382,10 @@ static int tegra_dma_probe(struct platform_device *pdev)
+@@ -1389,10 +1389,10 @@ static int tegra_dma_probe(struct platform_device *pdev)
  	if (IS_ERR(tdma->base_addr))
  		return PTR_ERR(tdma->base_addr);
  
@@ -29,5 +29,5 @@ index 4d6fe0efa76e4..09a1717aa808f 100644
  	reset_control_reset(tdma->rst);
  
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/platform/patches/0011-dmaengine-tegra-Use-struct-for-register-offsets.patch b/features/tegra/platform/patches/0009-dmaengine-tegra-Use-struct-for-register-offsets.patch
similarity index 95%
rename from features/tegra/platform/patches/0011-dmaengine-tegra-Use-struct-for-register-offsets.patch
rename to features/tegra/platform/patches/0009-dmaengine-tegra-Use-struct-for-register-offsets.patch
index 200deaa..da6a19f 100644
--- a/features/tegra/platform/patches/0011-dmaengine-tegra-Use-struct-for-register-offsets.patch
+++ b/features/tegra/platform/patches/0009-dmaengine-tegra-Use-struct-for-register-offsets.patch
@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Akhil R <akhilrajeev@nvidia.com>
 Date: Tue, 31 Mar 2026 15:52:58 +0530
-Subject: [PATCH 011/196] dmaengine: tegra: Use struct for register offsets
+Subject: [PATCH 009/184] dmaengine: tegra: Use struct for register offsets
 
 Repurpose the struct tegra_dma_channel_regs to define offsets for all the
 channel registers. Previously, the struct only held the register values
@@ -16,7 +16,7 @@ Reviewed-by: Frank Li <Frank.Li@nxp.com>
 Reviewed-by: Jon Hunter <jonathanh@nvidia.com>
 
 diff --git a/drivers/dma/tegra186-gpc-dma.c b/drivers/dma/tegra186-gpc-dma.c
-index 09a1717aa808f..ab433529e8bbb 100644
+index 7857396e859f..ac7b4c37b6af 100644
 --- a/drivers/dma/tegra186-gpc-dma.c
 +++ b/drivers/dma/tegra186-gpc-dma.c
 @@ -22,7 +22,6 @@
@@ -409,7 +409,7 @@ index 09a1717aa808f..ab433529e8bbb 100644
  	if (status & TEGRA_GPCDMA_STATUS_ISE_EOC)
  		wcount = 0;
  
-@@ -893,7 +875,7 @@ tegra_dma_prep_dma_memset(struct dma_chan *dc, dma_addr_t dest, int value,
+@@ -900,7 +882,7 @@ tegra_dma_prep_dma_memset(struct dma_chan *dc, dma_addr_t dest, int value,
  	/* Configure default priority weight for the channel */
  	csr |= FIELD_PREP(TEGRA_GPCDMA_CSR_WEIGHT, 1);
  
@@ -418,7 +418,7 @@ index 09a1717aa808f..ab433529e8bbb 100644
  	/* retain stream-id and clean rest */
  	mc_seq &= TEGRA_GPCDMA_MCSEQ_STREAM_ID0_MASK;
  
-@@ -916,16 +898,16 @@ tegra_dma_prep_dma_memset(struct dma_chan *dc, dma_addr_t dest, int value,
+@@ -923,16 +905,16 @@ tegra_dma_prep_dma_memset(struct dma_chan *dc, dma_addr_t dest, int value,
  	dma_desc->sg_count = 1;
  	sg_req = dma_desc->sg_req;
  
@@ -443,7 +443,7 @@ index 09a1717aa808f..ab433529e8bbb 100644
  	sg_req[0].len = len;
  
  	dma_desc->cyclic = false;
-@@ -961,7 +943,7 @@ tegra_dma_prep_dma_memcpy(struct dma_chan *dc, dma_addr_t dest,
+@@ -968,7 +950,7 @@ tegra_dma_prep_dma_memcpy(struct dma_chan *dc, dma_addr_t dest,
  	/* Configure default priority weight for the channel */
  	csr |= FIELD_PREP(TEGRA_GPCDMA_CSR_WEIGHT, 1);
  
@@ -452,7 +452,7 @@ index 09a1717aa808f..ab433529e8bbb 100644
  	/* retain stream-id and clean rest */
  	mc_seq &= (TEGRA_GPCDMA_MCSEQ_STREAM_ID0_MASK) |
  		  (TEGRA_GPCDMA_MCSEQ_STREAM_ID1_MASK);
-@@ -985,17 +967,17 @@ tegra_dma_prep_dma_memcpy(struct dma_chan *dc, dma_addr_t dest,
+@@ -992,17 +974,17 @@ tegra_dma_prep_dma_memcpy(struct dma_chan *dc, dma_addr_t dest,
  	dma_desc->sg_count = 1;
  	sg_req = dma_desc->sg_req;
  
@@ -478,7 +478,7 @@ index 09a1717aa808f..ab433529e8bbb 100644
  	sg_req[0].len = len;
  
  	dma_desc->cyclic = false;
-@@ -1049,7 +1031,7 @@ tegra_dma_prep_slave_sg(struct dma_chan *dc, struct scatterlist *sgl,
+@@ -1056,7 +1038,7 @@ tegra_dma_prep_slave_sg(struct dma_chan *dc, struct scatterlist *sgl,
  	if (flags & DMA_PREP_INTERRUPT)
  		csr |= TEGRA_GPCDMA_CSR_IE_EOC;
  
@@ -487,7 +487,7 @@ index 09a1717aa808f..ab433529e8bbb 100644
  	/* retain stream-id and clean rest */
  	mc_seq &= TEGRA_GPCDMA_MCSEQ_STREAM_ID0_MASK;
  
-@@ -1096,14 +1078,14 @@ tegra_dma_prep_slave_sg(struct dma_chan *dc, struct scatterlist *sgl,
+@@ -1103,14 +1085,14 @@ tegra_dma_prep_slave_sg(struct dma_chan *dc, struct scatterlist *sgl,
  		dma_desc->bytes_req += len;
  
  		if (direction == DMA_MEM_TO_DEV) {
@@ -508,7 +508,7 @@ index 09a1717aa808f..ab433529e8bbb 100644
  				FIELD_PREP(TEGRA_GPCDMA_HIGH_ADDR_DST_PTR, (mem >> 32));
  		}
  
-@@ -1111,10 +1093,10 @@ tegra_dma_prep_slave_sg(struct dma_chan *dc, struct scatterlist *sgl,
+@@ -1118,10 +1100,10 @@ tegra_dma_prep_slave_sg(struct dma_chan *dc, struct scatterlist *sgl,
  		 * Word count register takes input in words. Writing a value
  		 * of N into word count register means a req of (N+1) words.
  		 */
@@ -523,7 +523,7 @@ index 09a1717aa808f..ab433529e8bbb 100644
  		sg_req[i].len = len;
  	}
  
-@@ -1186,7 +1168,7 @@ tegra_dma_prep_dma_cyclic(struct dma_chan *dc, dma_addr_t buf_addr, size_t buf_l
+@@ -1193,7 +1175,7 @@ tegra_dma_prep_dma_cyclic(struct dma_chan *dc, dma_addr_t buf_addr, size_t buf_l
  
  	mmio_seq |= FIELD_PREP(TEGRA_GPCDMA_MMIOSEQ_WRAP_WORD, 1);
  
@@ -532,7 +532,7 @@ index 09a1717aa808f..ab433529e8bbb 100644
  	/* retain stream-id and clean rest */
  	mc_seq &= TEGRA_GPCDMA_MCSEQ_STREAM_ID0_MASK;
  
-@@ -1218,24 +1200,24 @@ tegra_dma_prep_dma_cyclic(struct dma_chan *dc, dma_addr_t buf_addr, size_t buf_l
+@@ -1225,24 +1207,24 @@ tegra_dma_prep_dma_cyclic(struct dma_chan *dc, dma_addr_t buf_addr, size_t buf_l
  	for (i = 0; i < period_count; i++) {
  		mmio_seq |= get_burst_size(tdc, burst_size, slave_bw, len);
  		if (direction == DMA_MEM_TO_DEV) {
@@ -567,7 +567,7 @@ index 09a1717aa808f..ab433529e8bbb 100644
  		sg_req[i].len = len;
  
  		mem += len;
-@@ -1305,11 +1287,28 @@ static struct dma_chan *tegra_dma_of_xlate(struct of_phandle_args *dma_spec,
+@@ -1312,11 +1294,28 @@ static struct dma_chan *tegra_dma_of_xlate(struct of_phandle_args *dma_spec,
  	return chan;
  }
  
@@ -596,7 +596,7 @@ index 09a1717aa808f..ab433529e8bbb 100644
  	.terminate = tegra_dma_stop_client,
  };
  
-@@ -1318,6 +1317,7 @@ static const struct tegra_dma_chip_data tegra194_dma_chip_data = {
+@@ -1325,6 +1324,7 @@ static const struct tegra_dma_chip_data tegra194_dma_chip_data = {
  	.channel_reg_size = SZ_64K,
  	.max_dma_count = SZ_1G,
  	.hw_support_pause = true,
@@ -604,7 +604,7 @@ index 09a1717aa808f..ab433529e8bbb 100644
  	.terminate = tegra_dma_pause,
  };
  
-@@ -1326,6 +1326,7 @@ static const struct tegra_dma_chip_data tegra234_dma_chip_data = {
+@@ -1333,6 +1333,7 @@ static const struct tegra_dma_chip_data tegra234_dma_chip_data = {
  	.channel_reg_size = SZ_64K,
  	.max_dma_count = SZ_1G,
  	.hw_support_pause = true,
@@ -612,7 +612,7 @@ index 09a1717aa808f..ab433529e8bbb 100644
  	.terminate = tegra_dma_pause_noerr,
  };
  
-@@ -1346,7 +1347,7 @@ MODULE_DEVICE_TABLE(of, tegra_dma_of_match);
+@@ -1353,7 +1354,7 @@ MODULE_DEVICE_TABLE(of, tegra_dma_of_match);
  
  static int tegra_dma_program_sid(struct tegra_dma_channel *tdc, int stream_id)
  {
@@ -621,7 +621,7 @@ index 09a1717aa808f..ab433529e8bbb 100644
  
  	reg_val &= ~(TEGRA_GPCDMA_MCSEQ_STREAM_ID0_MASK);
  	reg_val &= ~(TEGRA_GPCDMA_MCSEQ_STREAM_ID1_MASK);
-@@ -1354,7 +1355,7 @@ static int tegra_dma_program_sid(struct tegra_dma_channel *tdc, int stream_id)
+@@ -1361,7 +1362,7 @@ static int tegra_dma_program_sid(struct tegra_dma_channel *tdc, int stream_id)
  	reg_val |= FIELD_PREP(TEGRA_GPCDMA_MCSEQ_STREAM_ID0_MASK, stream_id);
  	reg_val |= FIELD_PREP(TEGRA_GPCDMA_MCSEQ_STREAM_ID1_MASK, stream_id);
  
@@ -630,7 +630,7 @@ index 09a1717aa808f..ab433529e8bbb 100644
  	return 0;
  }
  
-@@ -1420,6 +1421,7 @@ static int tegra_dma_probe(struct platform_device *pdev)
+@@ -1427,6 +1428,7 @@ static int tegra_dma_probe(struct platform_device *pdev)
  		tdc->chan_base_offset = TEGRA_GPCDMA_CHANNEL_BASE_ADDR_OFFSET +
  					i * cdata->channel_reg_size;
  		snprintf(tdc->name, sizeof(tdc->name), "gpcdma.%d", i);
@@ -639,5 +639,5 @@ index 09a1717aa808f..ab433529e8bbb 100644
  		tdc->id = i;
  		tdc->slave_id = -1;
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/platform/patches/0012-dmaengine-tegra-Support-address-width-39-bits.patch b/features/tegra/platform/patches/0010-dmaengine-tegra-Support-address-width-39-bits.patch
similarity index 90%
rename from features/tegra/platform/patches/0012-dmaengine-tegra-Support-address-width-39-bits.patch
rename to features/tegra/platform/patches/0010-dmaengine-tegra-Support-address-width-39-bits.patch
index 92fc99a..8e2bb53 100644
--- a/features/tegra/platform/patches/0012-dmaengine-tegra-Support-address-width-39-bits.patch
+++ b/features/tegra/platform/patches/0010-dmaengine-tegra-Support-address-width-39-bits.patch
@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Akhil R <akhilrajeev@nvidia.com>
 Date: Tue, 31 Mar 2026 15:52:59 +0530
-Subject: [PATCH 012/196] dmaengine: tegra: Support address width > 39 bits
+Subject: [PATCH 010/184] dmaengine: tegra: Support address width > 39 bits
 
 Tegra264 supports address width of 41 bits. Unlike older SoCs which use
 a common high_addr register for upper address bits, Tegra264 has separate
@@ -20,7 +20,7 @@ Reviewed-by: Frank Li <Frank.Li@nxp.com>
 Reviewed-by: Jon Hunter <jonathanh@nvidia.com>
 
 diff --git a/drivers/dma/tegra186-gpc-dma.c b/drivers/dma/tegra186-gpc-dma.c
-index ab433529e8bbb..7e71497ebb866 100644
+index ac7b4c37b6af..c88bcb0e1d9f 100644
 --- a/drivers/dma/tegra186-gpc-dma.c
 +++ b/drivers/dma/tegra186-gpc-dma.c
 @@ -146,6 +146,7 @@ struct tegra_dma_channel;
@@ -128,7 +128,7 @@ index ab433529e8bbb..7e71497ebb866 100644
  	tdc_write(tdc, tdc->regs->fixed_pattern, sg_req->fixed_pattern);
  	tdc_write(tdc, tdc->regs->mmio_seq, sg_req->mmio_seq);
  	tdc_write(tdc, tdc->regs->mc_seq, sg_req->mc_seq);
-@@ -819,7 +846,7 @@ static unsigned int get_burst_size(struct tegra_dma_channel *tdc,
+@@ -826,7 +853,7 @@ static unsigned int get_burst_size(struct tegra_dma_channel *tdc,
  
  static int get_transfer_param(struct tegra_dma_channel *tdc,
  			      enum dma_transfer_direction direction,
@@ -137,7 +137,7 @@ index ab433529e8bbb..7e71497ebb866 100644
  			      u32 *mmio_seq,
  			      u32 *csr,
  			      unsigned int *burst_size,
-@@ -897,11 +924,9 @@ tegra_dma_prep_dma_memset(struct dma_chan *dc, dma_addr_t dest, int value,
+@@ -904,11 +931,9 @@ tegra_dma_prep_dma_memset(struct dma_chan *dc, dma_addr_t dest, int value,
  	dma_desc->bytes_req = len;
  	dma_desc->sg_count = 1;
  	sg_req = dma_desc->sg_req;
@@ -150,7 +150,7 @@ index ab433529e8bbb..7e71497ebb866 100644
  	sg_req[0].fixed_pattern = value;
  	/* Word count reg takes value as (N +1) words */
  	sg_req[0].wcount = ((len - 4) >> 2);
-@@ -969,10 +994,7 @@ tegra_dma_prep_dma_memcpy(struct dma_chan *dc, dma_addr_t dest,
+@@ -976,10 +1001,7 @@ tegra_dma_prep_dma_memcpy(struct dma_chan *dc, dma_addr_t dest,
  
  	sg_req[0].src = src;
  	sg_req[0].dst = dest;
@@ -162,7 +162,7 @@ index ab433529e8bbb..7e71497ebb866 100644
  	/* Word count reg takes value as (N +1) words */
  	sg_req[0].wcount = ((len - 4) >> 2);
  	sg_req[0].csr = csr;
-@@ -992,7 +1014,8 @@ tegra_dma_prep_slave_sg(struct dma_chan *dc, struct scatterlist *sgl,
+@@ -999,7 +1021,8 @@ tegra_dma_prep_slave_sg(struct dma_chan *dc, struct scatterlist *sgl,
  	struct tegra_dma_channel *tdc = to_tegra_dma_chan(dc);
  	unsigned int max_dma_count = tdc->tdma->chip_data->max_dma_count;
  	enum dma_slave_buswidth slave_bw = DMA_SLAVE_BUSWIDTH_UNDEFINED;
@@ -172,7 +172,7 @@ index ab433529e8bbb..7e71497ebb866 100644
  	struct tegra_dma_sg_req *sg_req;
  	struct tegra_dma_desc *dma_desc;
  	struct scatterlist *sg;
-@@ -1080,13 +1103,9 @@ tegra_dma_prep_slave_sg(struct dma_chan *dc, struct scatterlist *sgl,
+@@ -1087,13 +1110,9 @@ tegra_dma_prep_slave_sg(struct dma_chan *dc, struct scatterlist *sgl,
  		if (direction == DMA_MEM_TO_DEV) {
  			sg_req[i].src = mem;
  			sg_req[i].dst = apb_ptr;
@@ -186,7 +186,7 @@ index ab433529e8bbb..7e71497ebb866 100644
  		}
  
  		/*
-@@ -1110,7 +1129,8 @@ tegra_dma_prep_dma_cyclic(struct dma_chan *dc, dma_addr_t buf_addr, size_t buf_l
+@@ -1117,7 +1136,8 @@ tegra_dma_prep_dma_cyclic(struct dma_chan *dc, dma_addr_t buf_addr, size_t buf_l
  			  unsigned long flags)
  {
  	enum dma_slave_buswidth slave_bw = DMA_SLAVE_BUSWIDTH_UNDEFINED;
@@ -196,7 +196,7 @@ index ab433529e8bbb..7e71497ebb866 100644
  	unsigned int max_dma_count, len, period_count, i;
  	struct tegra_dma_channel *tdc = to_tegra_dma_chan(dc);
  	struct tegra_dma_desc *dma_desc;
-@@ -1202,13 +1222,9 @@ tegra_dma_prep_dma_cyclic(struct dma_chan *dc, dma_addr_t buf_addr, size_t buf_l
+@@ -1209,13 +1229,9 @@ tegra_dma_prep_dma_cyclic(struct dma_chan *dc, dma_addr_t buf_addr, size_t buf_l
  		if (direction == DMA_MEM_TO_DEV) {
  			sg_req[i].src = mem;
  			sg_req[i].dst = apb_ptr;
@@ -210,7 +210,7 @@ index ab433529e8bbb..7e71497ebb866 100644
  		}
  		/*
  		 * Word count register takes input in words. Writing a value
-@@ -1305,6 +1321,7 @@ static const struct tegra_dma_channel_regs tegra186_reg_offsets = {
+@@ -1312,6 +1328,7 @@ static const struct tegra_dma_channel_regs tegra186_reg_offsets = {
  
  static const struct tegra_dma_chip_data tegra186_dma_chip_data = {
  	.nr_channels = 32,
@@ -218,7 +218,7 @@ index ab433529e8bbb..7e71497ebb866 100644
  	.channel_reg_size = SZ_64K,
  	.max_dma_count = SZ_1G,
  	.hw_support_pause = false,
-@@ -1314,6 +1331,7 @@ static const struct tegra_dma_chip_data tegra186_dma_chip_data = {
+@@ -1321,6 +1338,7 @@ static const struct tegra_dma_chip_data tegra186_dma_chip_data = {
  
  static const struct tegra_dma_chip_data tegra194_dma_chip_data = {
  	.nr_channels = 32,
@@ -226,7 +226,7 @@ index ab433529e8bbb..7e71497ebb866 100644
  	.channel_reg_size = SZ_64K,
  	.max_dma_count = SZ_1G,
  	.hw_support_pause = true,
-@@ -1323,6 +1341,7 @@ static const struct tegra_dma_chip_data tegra194_dma_chip_data = {
+@@ -1330,6 +1348,7 @@ static const struct tegra_dma_chip_data tegra194_dma_chip_data = {
  
  static const struct tegra_dma_chip_data tegra234_dma_chip_data = {
  	.nr_channels = 32,
@@ -234,7 +234,7 @@ index ab433529e8bbb..7e71497ebb866 100644
  	.channel_reg_size = SZ_64K,
  	.max_dma_count = SZ_1G,
  	.hw_support_pause = true,
-@@ -1434,6 +1453,8 @@ static int tegra_dma_probe(struct platform_device *pdev)
+@@ -1441,6 +1460,8 @@ static int tegra_dma_probe(struct platform_device *pdev)
  		tdc->stream_id = stream_id;
  	}
  
@@ -244,5 +244,5 @@ index ab433529e8bbb..7e71497ebb866 100644
  	dma_cap_set(DMA_PRIVATE, tdma->dma_dev.cap_mask);
  	dma_cap_set(DMA_MEMCPY, tdma->dma_dev.cap_mask);
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/platform/patches/0013-dmaengine-tegra-Use-managed-DMA-controller-registrat.patch b/features/tegra/platform/patches/0011-dmaengine-tegra-Use-managed-DMA-controller-registrat.patch
similarity index 89%
rename from features/tegra/platform/patches/0013-dmaengine-tegra-Use-managed-DMA-controller-registrat.patch
rename to features/tegra/platform/patches/0011-dmaengine-tegra-Use-managed-DMA-controller-registrat.patch
index 870e6ae..3290dfa 100644
--- a/features/tegra/platform/patches/0013-dmaengine-tegra-Use-managed-DMA-controller-registrat.patch
+++ b/features/tegra/platform/patches/0011-dmaengine-tegra-Use-managed-DMA-controller-registrat.patch
@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Akhil R <akhilrajeev@nvidia.com>
 Date: Tue, 31 Mar 2026 15:53:00 +0530
-Subject: [PATCH 013/196] dmaengine: tegra: Use managed DMA controller
+Subject: [PATCH 011/184] dmaengine: tegra: Use managed DMA controller
  registration
 
 Switch to managed registration in probe. This simplifies the error
@@ -13,10 +13,10 @@ Suggested-by: Frank Li <frank.li@nxp.com>
 Reviewed-by: Jon Hunter <jonathanh@nvidia.com>
 
 diff --git a/drivers/dma/tegra186-gpc-dma.c b/drivers/dma/tegra186-gpc-dma.c
-index 7e71497ebb866..cc9b2126739c6 100644
+index c88bcb0e1d9f..06ed30bef368 100644
 --- a/drivers/dma/tegra186-gpc-dma.c
 +++ b/drivers/dma/tegra186-gpc-dma.c
-@@ -1484,37 +1484,27 @@ static int tegra_dma_probe(struct platform_device *pdev)
+@@ -1491,37 +1491,27 @@ static int tegra_dma_probe(struct platform_device *pdev)
  	tdma->dma_dev.device_synchronize = tegra_dma_chan_synchronize;
  	tdma->dma_dev.residue_granularity = DMA_RESIDUE_GRANULARITY_BURST;
  
@@ -58,7 +58,7 @@ index 7e71497ebb866..cc9b2126739c6 100644
  static int __maybe_unused tegra_dma_pm_suspend(struct device *dev)
  {
  	struct tegra_dma *tdma = dev_get_drvdata(dev);
-@@ -1565,7 +1555,6 @@ static struct platform_driver tegra_dma_driver = {
+@@ -1572,7 +1562,6 @@ static struct platform_driver tegra_dma_driver = {
  		.of_match_table = tegra_dma_of_match,
  	},
  	.probe		= tegra_dma_probe,
@@ -67,5 +67,5 @@ index 7e71497ebb866..cc9b2126739c6 100644
  
  module_platform_driver(tegra_dma_driver);
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/platform/patches/0014-dmaengine-tegra-Use-iommu-map-for-stream-ID.patch b/features/tegra/platform/patches/0012-dmaengine-tegra-Use-iommu-map-for-stream-ID.patch
similarity index 89%
rename from features/tegra/platform/patches/0014-dmaengine-tegra-Use-iommu-map-for-stream-ID.patch
rename to features/tegra/platform/patches/0012-dmaengine-tegra-Use-iommu-map-for-stream-ID.patch
index fb8cc35..721f17d 100644
--- a/features/tegra/platform/patches/0014-dmaengine-tegra-Use-iommu-map-for-stream-ID.patch
+++ b/features/tegra/platform/patches/0012-dmaengine-tegra-Use-iommu-map-for-stream-ID.patch
@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Akhil R <akhilrajeev@nvidia.com>
 Date: Tue, 31 Mar 2026 15:53:01 +0530
-Subject: [PATCH 014/196] dmaengine: tegra: Use iommu-map for stream ID
+Subject: [PATCH 012/184] dmaengine: tegra: Use iommu-map for stream ID
 
 Use 'iommu-map', when provided, to get the stream ID to be programmed
 for each channel. Iterate over the channels registered and configure
@@ -19,7 +19,7 @@ Reviewed-by: Frank Li <Frank.Li@nxp.com>
 Reviewed-by: Jon Hunter <jonathanh@nvidia.com>
 
 diff --git a/drivers/dma/tegra186-gpc-dma.c b/drivers/dma/tegra186-gpc-dma.c
-index cc9b2126739c6..5ab2163da3b8c 100644
+index 06ed30bef368..19568aed3698 100644
 --- a/drivers/dma/tegra186-gpc-dma.c
 +++ b/drivers/dma/tegra186-gpc-dma.c
 @@ -15,6 +15,7 @@
@@ -30,7 +30,7 @@ index cc9b2126739c6..5ab2163da3b8c 100644
  #include <linux/platform_device.h>
  #include <linux/reset.h>
  #include <linux/slab.h>
-@@ -1381,9 +1382,13 @@ static int tegra_dma_program_sid(struct tegra_dma_channel *tdc, int stream_id)
+@@ -1388,9 +1389,13 @@ static int tegra_dma_program_sid(struct tegra_dma_channel *tdc, int stream_id)
  static int tegra_dma_probe(struct platform_device *pdev)
  {
  	const struct tegra_dma_chip_data *cdata = NULL;
@@ -45,7 +45,7 @@ index cc9b2126739c6..5ab2163da3b8c 100644
  	int ret;
  
  	cdata = of_device_get_match_data(&pdev->dev);
-@@ -1411,9 +1416,10 @@ static int tegra_dma_probe(struct platform_device *pdev)
+@@ -1418,9 +1423,10 @@ static int tegra_dma_probe(struct platform_device *pdev)
  
  	tdma->dma_dev.dev = &pdev->dev;
  
@@ -59,7 +59,7 @@ index cc9b2126739c6..5ab2163da3b8c 100644
  	}
  
  	ret = device_property_read_u32(&pdev->dev, "dma-channel-mask",
-@@ -1425,9 +1431,10 @@ static int tegra_dma_probe(struct platform_device *pdev)
+@@ -1432,9 +1438,10 @@ static int tegra_dma_probe(struct platform_device *pdev)
  		tdma->chan_mask = TEGRA_GPCDMA_DEFAULT_CHANNEL_MASK;
  	}
  
@@ -71,7 +71,7 @@ index cc9b2126739c6..5ab2163da3b8c 100644
  
  		/* Check for channel mask */
  		if (!(tdma->chan_mask & BIT(i)))
-@@ -1447,10 +1454,6 @@ static int tegra_dma_probe(struct platform_device *pdev)
+@@ -1454,10 +1461,6 @@ static int tegra_dma_probe(struct platform_device *pdev)
  
  		vchan_init(&tdc->vc, &tdma->dma_dev);
  		tdc->vc.desc_free = tegra_dma_desc_free;
@@ -82,7 +82,7 @@ index cc9b2126739c6..5ab2163da3b8c 100644
  	}
  
  	dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(cdata->addr_bits));
-@@ -1484,6 +1487,7 @@ static int tegra_dma_probe(struct platform_device *pdev)
+@@ -1491,6 +1494,7 @@ static int tegra_dma_probe(struct platform_device *pdev)
  	tdma->dma_dev.device_synchronize = tegra_dma_chan_synchronize;
  	tdma->dma_dev.residue_granularity = DMA_RESIDUE_GRANULARITY_BURST;
  
@@ -90,7 +90,7 @@ index cc9b2126739c6..5ab2163da3b8c 100644
  	ret = dmaenginem_async_device_register(&tdma->dma_dev);
  	if (ret < 0) {
  		dev_err_probe(&pdev->dev, ret,
-@@ -1491,6 +1495,37 @@ static int tegra_dma_probe(struct platform_device *pdev)
+@@ -1498,6 +1502,37 @@ static int tegra_dma_probe(struct platform_device *pdev)
  		return ret;
  	}
  
@@ -129,5 +129,5 @@ index cc9b2126739c6..5ab2163da3b8c 100644
  					      tegra_dma_of_xlate, tdma);
  	if (ret < 0) {
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/platform/patches/0015-dmaengine-tegra-Add-Tegra264-support.patch b/features/tegra/platform/patches/0013-dmaengine-tegra-Add-Tegra264-support.patch
similarity index 85%
rename from features/tegra/platform/patches/0015-dmaengine-tegra-Add-Tegra264-support.patch
rename to features/tegra/platform/patches/0013-dmaengine-tegra-Add-Tegra264-support.patch
index ae4481d..c3e4596 100644
--- a/features/tegra/platform/patches/0015-dmaengine-tegra-Add-Tegra264-support.patch
+++ b/features/tegra/platform/patches/0013-dmaengine-tegra-Add-Tegra264-support.patch
@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Akhil R <akhilrajeev@nvidia.com>
 Date: Tue, 31 Mar 2026 15:53:02 +0530
-Subject: [PATCH 015/196] dmaengine: tegra: Add Tegra264 support
+Subject: [PATCH 013/184] dmaengine: tegra: Add Tegra264 support
 
 Add compatible and chip data to support GPCDMA in Tegra264, which has
 differences in register layout and address bits compared to previous
@@ -12,10 +12,10 @@ Reviewed-by: Frank Li <Frank.Li@nxp.com>
 Reviewed-by: Jon Hunter <jonathanh@nvidia.com>
 
 diff --git a/drivers/dma/tegra186-gpc-dma.c b/drivers/dma/tegra186-gpc-dma.c
-index 5ab2163da3b8c..7cefad3fe1b7c 100644
+index 19568aed3698..90a10198c74b 100644
 --- a/drivers/dma/tegra186-gpc-dma.c
 +++ b/drivers/dma/tegra186-gpc-dma.c
-@@ -1320,6 +1320,23 @@ static const struct tegra_dma_channel_regs tegra186_reg_offsets = {
+@@ -1327,6 +1327,23 @@ static const struct tegra_dma_channel_regs tegra186_reg_offsets = {
  	.fixed_pattern = 0x34,
  };
  
@@ -39,7 +39,7 @@ index 5ab2163da3b8c..7cefad3fe1b7c 100644
  static const struct tegra_dma_chip_data tegra186_dma_chip_data = {
  	.nr_channels = 32,
  	.addr_bits = 39,
-@@ -1350,6 +1367,16 @@ static const struct tegra_dma_chip_data tegra234_dma_chip_data = {
+@@ -1357,6 +1374,16 @@ static const struct tegra_dma_chip_data tegra234_dma_chip_data = {
  	.terminate = tegra_dma_pause_noerr,
  };
  
@@ -56,7 +56,7 @@ index 5ab2163da3b8c..7cefad3fe1b7c 100644
  static const struct of_device_id tegra_dma_of_match[] = {
  	{
  		.compatible = "nvidia,tegra186-gpcdma",
-@@ -1360,6 +1387,9 @@ static const struct of_device_id tegra_dma_of_match[] = {
+@@ -1367,6 +1394,9 @@ static const struct of_device_id tegra_dma_of_match[] = {
  	}, {
  		.compatible = "nvidia,tegra234-gpcdma",
  		.data = &tegra234_dma_chip_data,
@@ -67,5 +67,5 @@ index 5ab2163da3b8c..7cefad3fe1b7c 100644
  	},
  };
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/platform/patches/0016-arm64-tegra-Enable-GPCDMA-in-Tegra264-and-add-iommu-.patch b/features/tegra/platform/patches/0014-arm64-tegra-Enable-GPCDMA-in-Tegra264-and-add-iommu-.patch
similarity index 88%
rename from features/tegra/platform/patches/0016-arm64-tegra-Enable-GPCDMA-in-Tegra264-and-add-iommu-.patch
rename to features/tegra/platform/patches/0014-arm64-tegra-Enable-GPCDMA-in-Tegra264-and-add-iommu-.patch
index 24ba78c..54eb058 100644
--- a/features/tegra/platform/patches/0016-arm64-tegra-Enable-GPCDMA-in-Tegra264-and-add-iommu-.patch
+++ b/features/tegra/platform/patches/0014-arm64-tegra-Enable-GPCDMA-in-Tegra264-and-add-iommu-.patch
@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Akhil R <akhilrajeev@nvidia.com>
 Date: Tue, 31 Mar 2026 15:53:03 +0530
-Subject: [PATCH 016/196] arm64: tegra: Enable GPCDMA in Tegra264 and add
+Subject: [PATCH 014/184] arm64: tegra: Enable GPCDMA in Tegra264 and add
  iommu-map
 
 Enable GPCDMA in Tegra264 and add the iommu-map property so that each
@@ -12,7 +12,7 @@ Signed-off-by: Akhil R <akhilrajeev@nvidia.com>
 Reviewed-by: Jon Hunter <jonathanh@nvidia.com>
 
 diff --git a/arch/arm64/boot/dts/nvidia/tegra264-p3834.dtsi b/arch/arm64/boot/dts/nvidia/tegra264-p3834.dtsi
-index 06795c82427ad..19aa923ffdac7 100644
+index 06795c82427a..19aa923ffdac 100644
 --- a/arch/arm64/boot/dts/nvidia/tegra264-p3834.dtsi
 +++ b/arch/arm64/boot/dts/nvidia/tegra264-p3834.dtsi
 @@ -9,6 +9,10 @@ aliases {
@@ -27,7 +27,7 @@ index 06795c82427ad..19aa923ffdac7 100644
  			status = "okay";
  		};
 diff --git a/arch/arm64/boot/dts/nvidia/tegra264.dtsi b/arch/arm64/boot/dts/nvidia/tegra264.dtsi
-index b16d380209a50..54aa57748e7c8 100644
+index b16d380209a5..54aa57748e7c 100644
 --- a/arch/arm64/boot/dts/nvidia/tegra264.dtsi
 +++ b/arch/arm64/boot/dts/nvidia/tegra264.dtsi
 @@ -86,6 +86,7 @@ gpcdma: dma-controller@8400000 {
@@ -39,5 +39,5 @@ index b16d380209a50..54aa57748e7c8 100644
  			dma-channel-mask = <0xfffffffe>;
  			status = "disabled";
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/platform/patches/0017-dt-bindings-dma-Update-ADMA-bindings-for-tegra264.patch b/features/tegra/platform/patches/0015-dt-bindings-dma-Update-ADMA-bindings-for-tegra264.patch
similarity index 95%
rename from features/tegra/platform/patches/0017-dt-bindings-dma-Update-ADMA-bindings-for-tegra264.patch
rename to features/tegra/platform/patches/0015-dt-bindings-dma-Update-ADMA-bindings-for-tegra264.patch
index b074085..9b91b5b 100644
--- a/features/tegra/platform/patches/0017-dt-bindings-dma-Update-ADMA-bindings-for-tegra264.patch
+++ b/features/tegra/platform/patches/0015-dt-bindings-dma-Update-ADMA-bindings-for-tegra264.patch
@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: sheetal <sheetal@nvidia.com>
 Date: Mon, 29 Sep 2025 16:29:27 +0530
-Subject: [PATCH 017/196] dt-bindings: dma: Update ADMA bindings for tegra264
+Subject: [PATCH 015/184] dt-bindings: dma: Update ADMA bindings for tegra264
 
 - Update ADMA device tree bindings for tegra264 to support up to 64
   interrupt channels by setting 'interrupts' property maxItems to 64.
@@ -25,7 +25,7 @@ Reviewed-by: Mohan kumar <mkumard@nvidia.com>
 (cherry picked from commit 4f249ddc3a5ef486d688f8067658cb00e459b607)
 
 diff --git a/Documentation/devicetree/bindings/dma/nvidia,tegra210-adma.yaml b/Documentation/devicetree/bindings/dma/nvidia,tegra210-adma.yaml
-index da0235e451d68..269a1f7ebdbb0 100644
+index da0235e451d6..269a1f7ebdbb 100644
 --- a/Documentation/devicetree/bindings/dma/nvidia,tegra210-adma.yaml
 +++ b/Documentation/devicetree/bindings/dma/nvidia,tegra210-adma.yaml
 @@ -46,7 +46,7 @@ properties:
@@ -58,5 +58,5 @@ index da0235e451d68..269a1f7ebdbb0 100644
    - if:
        properties:
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/platform/patches/0018-NVIDIA-SAUCE-dmaengine-tegra210-adma-Update-Virtual-.patch b/features/tegra/platform/patches/0016-NVIDIA-SAUCE-dmaengine-tegra210-adma-Update-Virtual-.patch
similarity index 91%
rename from features/tegra/platform/patches/0018-NVIDIA-SAUCE-dmaengine-tegra210-adma-Update-Virtual-.patch
rename to features/tegra/platform/patches/0016-NVIDIA-SAUCE-dmaengine-tegra210-adma-Update-Virtual-.patch
index 7afb5d6..569019c 100644
--- a/features/tegra/platform/patches/0018-NVIDIA-SAUCE-dmaengine-tegra210-adma-Update-Virtual-.patch
+++ b/features/tegra/platform/patches/0016-NVIDIA-SAUCE-dmaengine-tegra210-adma-Update-Virtual-.patch
@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Jon Hunter <jonathanh@nvidia.com>
 Date: Mon, 7 Nov 2022 14:24:59 +0000
-Subject: [PATCH 018/196] NVIDIA: SAUCE: dmaengine: tegra210-adma: Update
+Subject: [PATCH 016/184] NVIDIA: SAUCE: dmaengine: tegra210-adma: Update
  Virtual support
 
 For RT kernels, request_irq() by default uses threaded IRQs and so for
@@ -17,7 +17,7 @@ Signed-off-by: Jon Hunter <jonathanh@nvidia.com>
 Change-Id: I41ec50b7763709edffef0ca805100ab78a9838a8
 
 diff --git a/drivers/dma/tegra210-adma.c b/drivers/dma/tegra210-adma.c
-index 812f64569e6d8..e2ddf24d3744f 100644
+index 812f64569e6d..e2ddf24d3744 100644
 --- a/drivers/dma/tegra210-adma.c
 +++ b/drivers/dma/tegra210-adma.c
 @@ -774,9 +774,10 @@ static struct dma_async_tx_descriptor *tegra_adma_prep_dma_cyclic(
@@ -34,5 +34,5 @@ index 812f64569e6d8..e2ddf24d3744f 100644
  		dev_err(tdc2dev(tdc), "failed to get interrupt for %s\n",
  			dma_chan_name(dc));
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/platform/patches/0019-NVIDIA-SAUCE-dmaengine-tegra210-adma-Fix-system-hang.patch b/features/tegra/platform/patches/0017-NVIDIA-SAUCE-dmaengine-tegra210-adma-Fix-system-hang.patch
similarity index 98%
rename from features/tegra/platform/patches/0019-NVIDIA-SAUCE-dmaengine-tegra210-adma-Fix-system-hang.patch
rename to features/tegra/platform/patches/0017-NVIDIA-SAUCE-dmaengine-tegra210-adma-Fix-system-hang.patch
index 4f1af39..49b7914 100644
--- a/features/tegra/platform/patches/0019-NVIDIA-SAUCE-dmaengine-tegra210-adma-Fix-system-hang.patch
+++ b/features/tegra/platform/patches/0017-NVIDIA-SAUCE-dmaengine-tegra210-adma-Fix-system-hang.patch
@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Hirak Biswas <hbiswas@nvidia.com>
 Date: Wed, 10 Apr 2024 10:47:48 +0000
-Subject: [PATCH 019/196] NVIDIA: SAUCE: dmaengine: tegra210-adma: Fix system
+Subject: [PATCH 017/184] NVIDIA: SAUCE: dmaengine: tegra210-adma: Fix system
  hang on PREEMPT_RT kernel
 
 On RT kernel spin_lock() behavior changes. It becomes a sleeping lock
@@ -27,7 +27,7 @@ Reviewed-by: Laxman Dewangan <ldewangan@nvidia.com>
 (cherry picked from commit 52261efad6438661c49c2d22f63745830a50d674)
 
 diff --git a/drivers/dma/tegra210-adma.c b/drivers/dma/tegra210-adma.c
-index e2ddf24d3744f..2c4572495137a 100644
+index e2ddf24d3744..2c4572495137 100644
 --- a/drivers/dma/tegra210-adma.c
 +++ b/drivers/dma/tegra210-adma.c
 @@ -512,17 +512,17 @@ static irqreturn_t tegra_adma_isr(int irq, void *dev_id)
@@ -116,7 +116,7 @@ index e2ddf24d3744f..2c4572495137a 100644
  		tdc->vc.desc_free = tegra_adma_desc_free;
  		tdc->tdma = tdma;
 diff --git a/drivers/dma/virt-dma.c b/drivers/dma/virt-dma.c
-index 7961172a780dd..b3fe59629533f 100644
+index 7961172a780d..b3fe59629533 100644
 --- a/drivers/dma/virt-dma.c
 +++ b/drivers/dma/virt-dma.c
 @@ -23,11 +23,11 @@ dma_cookie_t vchan_tx_submit(struct dma_async_tx_descriptor *tx)
@@ -173,7 +173,7 @@ index 7961172a780dd..b3fe59629533f 100644
  	INIT_LIST_HEAD(&vc->desc_submitted);
  	INIT_LIST_HEAD(&vc->desc_issued);
 diff --git a/drivers/dma/virt-dma.h b/drivers/dma/virt-dma.h
-index 59d9eabc8b674..534d6a84952b5 100644
+index 59d9eabc8b67..534d6a84952b 100644
 --- a/drivers/dma/virt-dma.h
 +++ b/drivers/dma/virt-dma.h
 @@ -34,13 +34,75 @@ struct virt_dma_chan {
@@ -305,5 +305,5 @@ index 59d9eabc8b674..534d6a84952b5 100644
  	vchan_dma_desc_free_list(vc, &head);
  }
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/platform/patches/0020-dmaengine-tegra210-adma-Add-error-logging-on-failure.patch b/features/tegra/platform/patches/0018-dmaengine-tegra210-adma-Add-error-logging-on-failure.patch
similarity index 98%
rename from features/tegra/platform/patches/0020-dmaengine-tegra210-adma-Add-error-logging-on-failure.patch
rename to features/tegra/platform/patches/0018-dmaengine-tegra210-adma-Add-error-logging-on-failure.patch
index 50c4fc5..1060fff 100644
--- a/features/tegra/platform/patches/0020-dmaengine-tegra210-adma-Add-error-logging-on-failure.patch
+++ b/features/tegra/platform/patches/0018-dmaengine-tegra210-adma-Add-error-logging-on-failure.patch
@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Sheetal <sheetal@nvidia.com>
 Date: Sun, 17 May 2026 16:30:45 +0000
-Subject: [PATCH 020/196] dmaengine: tegra210-adma: Add error logging on
+Subject: [PATCH 018/184] dmaengine: tegra210-adma: Add error logging on
  failure paths
 
 Add dev_err/dev_err_probe logging across failure paths to improve
@@ -26,7 +26,7 @@ Signed-off-by: Vinod Koul <vkoul@kernel.org>
 (cherry picked from commit b55bfcc677dd58d808a53173e0574b466dc27b9f)
 
 diff --git a/drivers/dma/tegra210-adma.c b/drivers/dma/tegra210-adma.c
-index 2c4572495137a..1da6c08cfa0ae 100644
+index 2c4572495137..1da6c08cfa0a 100644
 --- a/drivers/dma/tegra210-adma.c
 +++ b/drivers/dma/tegra210-adma.c
 @@ -335,8 +335,16 @@ static int tegra_adma_request_alloc(struct tegra_adma_chan *tdc,
@@ -183,5 +183,5 @@ index 2c4572495137a..1da6c08cfa0ae 100644
  	}
  
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/platform/patches/0021-NVIDIA-SAUCE-firmware-psci-Set-pm_set_resume-suspend.patch b/features/tegra/platform/patches/0019-NVIDIA-SAUCE-firmware-psci-Set-pm_set_resume-suspend.patch
similarity index 95%
rename from features/tegra/platform/patches/0021-NVIDIA-SAUCE-firmware-psci-Set-pm_set_resume-suspend.patch
rename to features/tegra/platform/patches/0019-NVIDIA-SAUCE-firmware-psci-Set-pm_set_resume-suspend.patch
index 78c901a..37d675c 100644
--- a/features/tegra/platform/patches/0021-NVIDIA-SAUCE-firmware-psci-Set-pm_set_resume-suspend.patch
+++ b/features/tegra/platform/patches/0019-NVIDIA-SAUCE-firmware-psci-Set-pm_set_resume-suspend.patch
@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Konrad Dybcio <konradybcio@kernel.org>
 Date: Wed, 31 Dec 2025 21:51:26 +0530
-Subject: [PATCH 021/196] NVIDIA: SAUCE: firmware: psci: Set
+Subject: [PATCH 019/184] NVIDIA: SAUCE: firmware: psci: Set
  pm_set_resume/suspend_via_firmware() for SYSTEM_SUSPEND
 
 PSCI specification defines the SYSTEM_SUSPEND feature which enables the
@@ -31,7 +31,7 @@ Signed-off-by: Jon Hunter <jonathanh@nvidia.com>
 Change-Id: Idfeff61cf1757e53c9b18899b203dbf041f8a79f
 
 diff --git a/drivers/firmware/psci/psci.c b/drivers/firmware/psci/psci.c
-index 38ca190d4a22d..e73bae6cb23a3 100644
+index 38ca190d4a22..e73bae6cb23a 100644
 --- a/drivers/firmware/psci/psci.c
 +++ b/drivers/firmware/psci/psci.c
 @@ -539,12 +539,22 @@ static int psci_system_suspend(unsigned long unused)
@@ -58,5 +58,5 @@ index 38ca190d4a22d..e73bae6cb23a3 100644
  
  static void __init psci_init_system_reset2(void)
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/platform/patches/0022-NVIDIA-SAUCE-firmware-tegra-bpmp-Propagate-debugfs-e.patch b/features/tegra/platform/patches/0020-NVIDIA-SAUCE-firmware-tegra-bpmp-Propagate-debugfs-e.patch
similarity index 95%
rename from features/tegra/platform/patches/0022-NVIDIA-SAUCE-firmware-tegra-bpmp-Propagate-debugfs-e.patch
rename to features/tegra/platform/patches/0020-NVIDIA-SAUCE-firmware-tegra-bpmp-Propagate-debugfs-e.patch
index ea9aaf0..10ff7c2 100644
--- a/features/tegra/platform/patches/0022-NVIDIA-SAUCE-firmware-tegra-bpmp-Propagate-debugfs-e.patch
+++ b/features/tegra/platform/patches/0020-NVIDIA-SAUCE-firmware-tegra-bpmp-Propagate-debugfs-e.patch
@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Jon Hunter <jonathanh@nvidia.com>
 Date: Fri, 29 May 2026 18:33:36 +0100
-Subject: [PATCH 022/196] NVIDIA: SAUCE: firmware: tegra: bpmp: Propagate
+Subject: [PATCH 020/184] NVIDIA: SAUCE: firmware: tegra: bpmp: Propagate
  debugfs errors
 
 The Tegra BPMP debugfs code returns -ENOMEM for most cases where calls
@@ -23,7 +23,7 @@ Reviewed-by: Laxman Dewangan <ldewangan@nvidia.com>
 (cherry picked from commit b0b7c6748c2a50b660ae13632387422bb5bd553b)
 
 diff --git a/drivers/firmware/tegra/bpmp-debugfs.c b/drivers/firmware/tegra/bpmp-debugfs.c
-index 4221fed70ad48..29037e2b31585 100644
+index 4221fed70ad4..29037e2b3158 100644
 --- a/drivers/firmware/tegra/bpmp-debugfs.c
 +++ b/drivers/firmware/tegra/bpmp-debugfs.c
 @@ -468,7 +468,7 @@ static int bpmp_populate_debugfs_inband(struct tegra_bpmp *bpmp,
@@ -68,5 +68,5 @@ index 4221fed70ad48..29037e2b31585 100644
  	}
  
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/platform/patches/0023-NVIDIA-SAUCE-firmware-tegra-bpmp-Add-support-for-mul.patch b/features/tegra/platform/patches/0021-NVIDIA-SAUCE-firmware-tegra-bpmp-Add-support-for-mul.patch
similarity index 96%
rename from features/tegra/platform/patches/0023-NVIDIA-SAUCE-firmware-tegra-bpmp-Add-support-for-mul.patch
rename to features/tegra/platform/patches/0021-NVIDIA-SAUCE-firmware-tegra-bpmp-Add-support-for-mul.patch
index d71933a..c5ce093 100644
--- a/features/tegra/platform/patches/0023-NVIDIA-SAUCE-firmware-tegra-bpmp-Add-support-for-mul.patch
+++ b/features/tegra/platform/patches/0021-NVIDIA-SAUCE-firmware-tegra-bpmp-Add-support-for-mul.patch
@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Jon Hunter <jonathanh@nvidia.com>
 Date: Fri, 29 May 2026 18:33:37 +0100
-Subject: [PATCH 023/196] NVIDIA: SAUCE: firmware: tegra: bpmp: Add support for
+Subject: [PATCH 021/184] NVIDIA: SAUCE: firmware: tegra: bpmp: Add support for
  multi-socket platforms
 
 On multi-socket platforms each socket has its own BPMP that is
@@ -32,7 +32,7 @@ APS-Inflight: svcenomis <svcenomis@nvidia.com>
 (cherry picked from commit 698d27de4875bc8481c7551e2ccabb818cccee65)
 
 diff --git a/drivers/firmware/tegra/bpmp-debugfs.c b/drivers/firmware/tegra/bpmp-debugfs.c
-index 29037e2b31585..c05adba87869f 100644
+index 29037e2b3158..c05adba87869 100644
 --- a/drivers/firmware/tegra/bpmp-debugfs.c
 +++ b/drivers/firmware/tegra/bpmp-debugfs.c
 @@ -2,6 +2,7 @@
@@ -113,5 +113,5 @@ index 29037e2b31585..c05adba87869f 100644
  	return err;
  }
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/platform/patches/0024-gpio-tegra186-Use-generic-macro-for-port-definitions.patch b/features/tegra/platform/patches/0022-gpio-tegra186-Use-generic-macro-for-port-definitions.patch
similarity index 98%
rename from features/tegra/platform/patches/0024-gpio-tegra186-Use-generic-macro-for-port-definitions.patch
rename to features/tegra/platform/patches/0022-gpio-tegra186-Use-generic-macro-for-port-definitions.patch
index 09e6165..a38b5e3 100644
--- a/features/tegra/platform/patches/0024-gpio-tegra186-Use-generic-macro-for-port-definitions.patch
+++ b/features/tegra/platform/patches/0022-gpio-tegra186-Use-generic-macro-for-port-definitions.patch
@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Kartik Rajput <kkartik@nvidia.com>
 Date: Fri, 10 Oct 2025 15:43:30 +0530
-Subject: [PATCH 024/196] gpio: tegra186: Use generic macro for port
+Subject: [PATCH 022/184] gpio: tegra186: Use generic macro for port
  definitions
 
 Introduce a generic macro TEGRA_GPIO_PORT to define SoC specific
@@ -16,7 +16,7 @@ Signed-off-by: Bartosz Golaszewski <bartosz.golaszewski@linaro.org>
 (cherry picked from commit f75db6f7f907c10bf4d45a6cfdae03bb1b631841)
 
 diff --git a/drivers/gpio/gpio-tegra186.c b/drivers/gpio/gpio-tegra186.c
-index 4d3db6e06eeb2..7ea541d6d5377 100644
+index 4d3db6e06eeb..7ea541d6d537 100644
 --- a/drivers/gpio/gpio-tegra186.c
 +++ b/drivers/gpio/gpio-tegra186.c
 @@ -1002,14 +1002,17 @@ static int tegra186_gpio_probe(struct platform_device *pdev)
@@ -172,5 +172,5 @@ index 4d3db6e06eeb2..7ea541d6d5377 100644
  static const struct tegra_gpio_port tegra256_main_ports[] = {
  	TEGRA256_MAIN_GPIO_PORT(A, 0, 0, 8),
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/platform/patches/0025-gpio-tegra186-Add-support-for-Tegra410.patch b/features/tegra/platform/patches/0023-gpio-tegra186-Add-support-for-Tegra410.patch
similarity index 97%
rename from features/tegra/platform/patches/0025-gpio-tegra186-Add-support-for-Tegra410.patch
rename to features/tegra/platform/patches/0023-gpio-tegra186-Add-support-for-Tegra410.patch
index 5da5a90..e962c8b 100644
--- a/features/tegra/platform/patches/0025-gpio-tegra186-Add-support-for-Tegra410.patch
+++ b/features/tegra/platform/patches/0023-gpio-tegra186-Add-support-for-Tegra410.patch
@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Prathamesh Shete <pshete@nvidia.com>
 Date: Fri, 10 Oct 2025 15:43:31 +0530
-Subject: [PATCH 025/196] gpio: tegra186: Add support for Tegra410
+Subject: [PATCH 023/184] gpio: tegra186: Add support for Tegra410
 
 Extend the existing Tegra186 GPIO controller driver with support for
 the GPIO controller found on Tegra410. Tegra410 supports two GPIO
@@ -17,7 +17,7 @@ Signed-off-by: Bartosz Golaszewski <bartosz.golaszewski@linaro.org>
 (cherry picked from commit 9631a10083d843b57b371d406235e2f2a3e49285)
 
 diff --git a/drivers/gpio/gpio-tegra186.c b/drivers/gpio/gpio-tegra186.c
-index 7ea541d6d5377..83ecdc8769856 100644
+index 7ea541d6d537..83ecdc876985 100644
 --- a/drivers/gpio/gpio-tegra186.c
 +++ b/drivers/gpio/gpio-tegra186.c
 @@ -1,6 +1,6 @@
@@ -124,5 +124,5 @@ index 7ea541d6d5377..83ecdc8769856 100644
  };
  MODULE_DEVICE_TABLE(acpi, tegra186_gpio_acpi_match);
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/platform/patches/0026-gpio-tegra186-Fix-GPIO-name-collisions-for-Tegra410.patch b/features/tegra/platform/patches/0024-gpio-tegra186-Fix-GPIO-name-collisions-for-Tegra410.patch
similarity index 96%
rename from features/tegra/platform/patches/0026-gpio-tegra186-Fix-GPIO-name-collisions-for-Tegra410.patch
rename to features/tegra/platform/patches/0024-gpio-tegra186-Fix-GPIO-name-collisions-for-Tegra410.patch
index 73b6a77..8446c8d 100644
--- a/features/tegra/platform/patches/0026-gpio-tegra186-Fix-GPIO-name-collisions-for-Tegra410.patch
+++ b/features/tegra/platform/patches/0024-gpio-tegra186-Fix-GPIO-name-collisions-for-Tegra410.patch
@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Kartik Rajput <kkartik@nvidia.com>
 Date: Thu, 13 Nov 2025 22:01:12 +0530
-Subject: [PATCH 026/196] gpio: tegra186: Fix GPIO name collisions for Tegra410
+Subject: [PATCH 024/184] gpio: tegra186: Fix GPIO name collisions for Tegra410
 
 On Tegra410, Compute and System GPIOs have same port names. This
 results in the same GPIO names for both Compute and System GPIOs
@@ -31,7 +31,7 @@ Signed-off-by: Bartosz Golaszewski <bartosz.golaszewski@linaro.org>
 (cherry picked from commit 67f9b828d4e5e47caf3472a399c25c3c0ddc824a)
 
 diff --git a/drivers/gpio/gpio-tegra186.c b/drivers/gpio/gpio-tegra186.c
-index 83ecdc8769856..b1498b59a9211 100644
+index 83ecdc876985..b1498b59a921 100644
 --- a/drivers/gpio/gpio-tegra186.c
 +++ b/drivers/gpio/gpio-tegra186.c
 @@ -109,6 +109,7 @@ struct tegra_gpio_soc {
@@ -74,5 +74,5 @@ index 83ecdc8769856..b1498b59a9211 100644
  	.instance = 0,
  };
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/platform/patches/0027-dt-bindings-gpio-Add-Tegra264-support.patch b/features/tegra/platform/patches/0025-dt-bindings-gpio-Add-Tegra264-support.patch
similarity index 97%
rename from features/tegra/platform/patches/0027-dt-bindings-gpio-Add-Tegra264-support.patch
rename to features/tegra/platform/patches/0025-dt-bindings-gpio-Add-Tegra264-support.patch
index 703b233..fee70c7 100644
--- a/features/tegra/platform/patches/0027-dt-bindings-gpio-Add-Tegra264-support.patch
+++ b/features/tegra/platform/patches/0025-dt-bindings-gpio-Add-Tegra264-support.patch
@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Prathamesh Shete <pshete@nvidia.com>
 Date: Wed, 28 Jan 2026 08:51:12 +0000
-Subject: [PATCH 027/196] dt-bindings: gpio: Add Tegra264 support
+Subject: [PATCH 025/184] dt-bindings: gpio: Add Tegra264 support
 
 Extend the existing Tegra186 GPIO controller device tree bindings with
 support for the GPIO controller found on Tegra264. The number of pins
@@ -27,7 +27,7 @@ Signed-off-by: Bartosz Golaszewski <bartosz.golaszewski@oss.qualcomm.com>
 (cherry picked from commit b565717e1d50078b8f13f3f796e707d24a6f3fdc)
 
 diff --git a/Documentation/devicetree/bindings/gpio/nvidia,tegra186-gpio.yaml b/Documentation/devicetree/bindings/gpio/nvidia,tegra186-gpio.yaml
-index 2bd620a1099b9..17748dd1015d7 100644
+index 2bd620a1099b..17748dd1015d 100644
 --- a/Documentation/devicetree/bindings/gpio/nvidia,tegra186-gpio.yaml
 +++ b/Documentation/devicetree/bindings/gpio/nvidia,tegra186-gpio.yaml
 @@ -86,6 +86,9 @@ properties:
@@ -88,7 +88,7 @@ index 2bd620a1099b9..17748dd1015d7 100644
    - reg
 diff --git a/include/dt-bindings/gpio/nvidia,tegra264-gpio.h b/include/dt-bindings/gpio/nvidia,tegra264-gpio.h
 new file mode 100644
-index 0000000000000..25fb66f9710a4
+index 000000000000..25fb66f9710a
 --- /dev/null
 +++ b/include/dt-bindings/gpio/nvidia,tegra264-gpio.h
 @@ -0,0 +1,61 @@
@@ -154,5 +154,5 @@ index 0000000000000..25fb66f9710a4
 +
 +#endif
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/platform/patches/0028-gpio-tegra186-Add-support-for-Tegra264.patch b/features/tegra/platform/patches/0026-gpio-tegra186-Add-support-for-Tegra264.patch
similarity index 97%
rename from features/tegra/platform/patches/0028-gpio-tegra186-Add-support-for-Tegra264.patch
rename to features/tegra/platform/patches/0026-gpio-tegra186-Add-support-for-Tegra264.patch
index fc61ef5..ac16314 100644
--- a/features/tegra/platform/patches/0028-gpio-tegra186-Add-support-for-Tegra264.patch
+++ b/features/tegra/platform/patches/0026-gpio-tegra186-Add-support-for-Tegra264.patch
@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Prathamesh Shete <pshete@nvidia.com>
 Date: Wed, 28 Jan 2026 08:51:13 +0000
-Subject: [PATCH 028/196] gpio: tegra186: Add support for Tegra264
+Subject: [PATCH 026/184] gpio: tegra186: Add support for Tegra264
 
 Extend the existing Tegra186 GPIO controller driver with support for the
 GPIO controller found on Tegra264.
@@ -20,7 +20,7 @@ Signed-off-by: Bartosz Golaszewski <bartosz.golaszewski@oss.qualcomm.com>
 (cherry picked from commit af9b4a56f0000fb11057e204ddfb05d72ba4dba0)
 
 diff --git a/drivers/gpio/gpio-tegra186.c b/drivers/gpio/gpio-tegra186.c
-index b1498b59a9211..9c874f07be755 100644
+index b1498b59a921..9c874f07be75 100644
 --- a/drivers/gpio/gpio-tegra186.c
 +++ b/drivers/gpio/gpio-tegra186.c
 @@ -1,6 +1,6 @@
@@ -148,5 +148,5 @@ index b1498b59a9211..9c874f07be755 100644
  		/* sentinel */
  	}
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/platform/patches/0029-gpio-tegra186-Simplify-GPIO-line-name-prefix-handlin.patch b/features/tegra/platform/patches/0027-gpio-tegra186-Simplify-GPIO-line-name-prefix-handlin.patch
similarity index 95%
rename from features/tegra/platform/patches/0029-gpio-tegra186-Simplify-GPIO-line-name-prefix-handlin.patch
rename to features/tegra/platform/patches/0027-gpio-tegra186-Simplify-GPIO-line-name-prefix-handlin.patch
index f569ae0..025dd3a 100644
--- a/features/tegra/platform/patches/0029-gpio-tegra186-Simplify-GPIO-line-name-prefix-handlin.patch
+++ b/features/tegra/platform/patches/0027-gpio-tegra186-Simplify-GPIO-line-name-prefix-handlin.patch
@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Prathamesh Shete <pshete@nvidia.com>
 Date: Tue, 17 Feb 2026 08:14:30 +0000
-Subject: [PATCH 029/196] gpio: tegra186: Simplify GPIO line name prefix
+Subject: [PATCH 027/184] gpio: tegra186: Simplify GPIO line name prefix
  handling
 
 Introduce TEGRA_GPIO_PREFIX() to define the Tegra SoC GPIO name
@@ -16,7 +16,7 @@ Signed-off-by: Bartosz Golaszewski <bartosz.golaszewski@oss.qualcomm.com>
 (cherry picked from commit 2423e336d94868f0d2fcd81a87b90c5ea59736e0)
 
 diff --git a/drivers/gpio/gpio-tegra186.c b/drivers/gpio/gpio-tegra186.c
-index 9c874f07be755..f04cc240b5ec5 100644
+index 9c874f07be75..f04cc240b5ec 100644
 --- a/drivers/gpio/gpio-tegra186.c
 +++ b/drivers/gpio/gpio-tegra186.c
 @@ -942,12 +942,8 @@ static int tegra186_gpio_probe(struct platform_device *pdev)
@@ -63,5 +63,5 @@ index 9c874f07be755..f04cc240b5ec5 100644
  	.instance = 0,
  };
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/platform/patches/0030-gpio-tegra186-Support-multi-socket-devices.patch b/features/tegra/platform/patches/0028-gpio-tegra186-Support-multi-socket-devices.patch
similarity index 94%
rename from features/tegra/platform/patches/0030-gpio-tegra186-Support-multi-socket-devices.patch
rename to features/tegra/platform/patches/0028-gpio-tegra186-Support-multi-socket-devices.patch
index b623609..a2162cc 100644
--- a/features/tegra/platform/patches/0030-gpio-tegra186-Support-multi-socket-devices.patch
+++ b/features/tegra/platform/patches/0028-gpio-tegra186-Support-multi-socket-devices.patch
@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Prathamesh Shete <pshete@nvidia.com>
 Date: Tue, 17 Feb 2026 08:14:31 +0000
-Subject: [PATCH 030/196] gpio: tegra186: Support multi-socket devices
+Subject: [PATCH 028/184] gpio: tegra186: Support multi-socket devices
 
 On Tegra platforms, multiple SoC instances may be present with each
 defining the same GPIO name. For such devices, this results in
@@ -19,7 +19,7 @@ Signed-off-by: Bartosz Golaszewski <bartosz.golaszewski@oss.qualcomm.com>
 (cherry picked from commit 2c299030c6813eaa9ef95773c64d65c50fa706ac)
 
 diff --git a/drivers/gpio/gpio-tegra186.c b/drivers/gpio/gpio-tegra186.c
-index f04cc240b5ec5..fb26402b6c473 100644
+index f04cc240b5ec..fb26402b6c47 100644
 --- a/drivers/gpio/gpio-tegra186.c
 +++ b/drivers/gpio/gpio-tegra186.c
 @@ -857,7 +857,7 @@ static int tegra186_gpio_probe(struct platform_device *pdev)
@@ -58,5 +58,5 @@ index f04cc240b5ec5..fb26402b6c473 100644
  				return -ENOMEM;
  
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/platform/patches/0031-NVIDIA-SAUCE-gpio-tegra186-Add-suspend-resume-suppor.patch b/features/tegra/platform/patches/0029-NVIDIA-SAUCE-gpio-tegra186-Add-suspend-resume-suppor.patch
similarity index 97%
rename from features/tegra/platform/patches/0031-NVIDIA-SAUCE-gpio-tegra186-Add-suspend-resume-suppor.patch
rename to features/tegra/platform/patches/0029-NVIDIA-SAUCE-gpio-tegra186-Add-suspend-resume-suppor.patch
index fe16e3a..e09164e 100644
--- a/features/tegra/platform/patches/0031-NVIDIA-SAUCE-gpio-tegra186-Add-suspend-resume-suppor.patch
+++ b/features/tegra/platform/patches/0029-NVIDIA-SAUCE-gpio-tegra186-Add-suspend-resume-suppor.patch
@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Prathamesh Shete <pshete@nvidia.com>
 Date: Fri, 18 Oct 2024 06:14:21 +0000
-Subject: [PATCH 031/196] NVIDIA: SAUCE: gpio: tegra186: Add suspend resume
+Subject: [PATCH 029/184] NVIDIA: SAUCE: gpio: tegra186: Add suspend resume
  support
 
 Squash following 2 commits needed for suspend resume support in GPIO
@@ -21,7 +21,7 @@ Reviewed-by: Laxman Dewangan <ldewangan@nvidia.com>
 (cherry picked from commit 342d475fbd30f1e16aadce938b462b2854a84b61)
 
 diff --git a/drivers/gpio/gpio-tegra186.c b/drivers/gpio/gpio-tegra186.c
-index fb26402b6c473..eeaee6cb44b8a 100644
+index fb26402b6c47..eeaee6cb44b8 100644
 --- a/drivers/gpio/gpio-tegra186.c
 +++ b/drivers/gpio/gpio-tegra186.c
 @@ -122,6 +122,13 @@ struct tegra_gpio_soc {
@@ -136,5 +136,5 @@ index fb26402b6c473..eeaee6cb44b8a 100644
  	.probe = tegra186_gpio_probe,
  };
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/platform/patches/0032-NVIDIA-SAUCE-gpio-tegra186-Add-pinmux-support-for-PC.patch b/features/tegra/platform/patches/0030-NVIDIA-SAUCE-gpio-tegra186-Add-pinmux-support-for-PC.patch
similarity index 94%
rename from features/tegra/platform/patches/0032-NVIDIA-SAUCE-gpio-tegra186-Add-pinmux-support-for-PC.patch
rename to features/tegra/platform/patches/0030-NVIDIA-SAUCE-gpio-tegra186-Add-pinmux-support-for-PC.patch
index da9792b..d2e7b16 100644
--- a/features/tegra/platform/patches/0032-NVIDIA-SAUCE-gpio-tegra186-Add-pinmux-support-for-PC.patch
+++ b/features/tegra/platform/patches/0030-NVIDIA-SAUCE-gpio-tegra186-Add-pinmux-support-for-PC.patch
@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Prathamesh Shete <pshete@nvidia.com>
 Date: Mon, 22 Apr 2024 05:49:56 +0000
-Subject: [PATCH 032/196] NVIDIA: SAUCE: gpio: tegra186: Add pinmux support for
+Subject: [PATCH 030/184] NVIDIA: SAUCE: gpio: tegra186: Add pinmux support for
  PCIe
 
 Add dynamic pinmuxing support for PCIe pins. As the GPIO generic DT is
@@ -14,7 +14,7 @@ Signed-off-by: Prathamesh Shete <pshete@nvidia.com>
 Change-Id: I58ce112669e33a69ce100f4f5c7f1fe84b837607
 
 diff --git a/drivers/gpio/gpio-tegra186.c b/drivers/gpio/gpio-tegra186.c
-index eeaee6cb44b8a..e6eda415d0a6a 100644
+index eeaee6cb44b8..e6eda415d0a6 100644
 --- a/drivers/gpio/gpio-tegra186.c
 +++ b/drivers/gpio/gpio-tegra186.c
 @@ -1423,11 +1423,27 @@ static const struct tegra_gpio_port tegra264_uphy_ports[] = {
@@ -46,5 +46,5 @@ index eeaee6cb44b8a..e6eda415d0a6a 100644
  	.has_vm_support = true,
  };
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/platform/patches/0033-NVIDIA-SAUCE-gpio-tegra186-Enable-GTE-for-Tegra264.patch b/features/tegra/platform/patches/0031-NVIDIA-SAUCE-gpio-tegra186-Enable-GTE-for-Tegra264.patch
similarity index 86%
rename from features/tegra/platform/patches/0033-NVIDIA-SAUCE-gpio-tegra186-Enable-GTE-for-Tegra264.patch
rename to features/tegra/platform/patches/0031-NVIDIA-SAUCE-gpio-tegra186-Enable-GTE-for-Tegra264.patch
index 3ec2b96..19b4aa9 100644
--- a/features/tegra/platform/patches/0033-NVIDIA-SAUCE-gpio-tegra186-Enable-GTE-for-Tegra264.patch
+++ b/features/tegra/platform/patches/0031-NVIDIA-SAUCE-gpio-tegra186-Enable-GTE-for-Tegra264.patch
@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Gautham Srinivasan <gauthams@nvidia.com>
 Date: Wed, 17 Jul 2024 10:22:32 +0000
-Subject: [PATCH 033/196] NVIDIA: SAUCE: gpio: tegra186: Enable GTE for
+Subject: [PATCH 031/184] NVIDIA: SAUCE: gpio: tegra186: Enable GTE for
  Tegra264
 
 Set has_gte flag to enable GTE for Tegra264 AON pins.
@@ -10,7 +10,7 @@ Change-Id: I29c644e076c05d8b2ba3f33091599c19474e9eb5
 Signed-off-by: Gautham Srinivasan <gauthams@nvidia.com>
 
 diff --git a/drivers/gpio/gpio-tegra186.c b/drivers/gpio/gpio-tegra186.c
-index e6eda415d0a6a..d1eed00e7bbe4 100644
+index e6eda415d0a6..d1eed00e7bbe 100644
 --- a/drivers/gpio/gpio-tegra186.c
 +++ b/drivers/gpio/gpio-tegra186.c
 @@ -1410,6 +1410,7 @@ static const struct tegra_gpio_soc tegra264_aon_soc = {
@@ -22,5 +22,5 @@ index e6eda415d0a6a..d1eed00e7bbe4 100644
  
  #define TEGRA264_UPHY_GPIO_PORT(_name, _bank, _port, _pins) \
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/platform/patches/0034-hte-replace-use-of-system_unbound_wq-with-system_dfl.patch b/features/tegra/platform/patches/0032-hte-replace-use-of-system_unbound_wq-with-system_dfl.patch
similarity index 93%
rename from features/tegra/platform/patches/0034-hte-replace-use-of-system_unbound_wq-with-system_dfl.patch
rename to features/tegra/platform/patches/0032-hte-replace-use-of-system_unbound_wq-with-system_dfl.patch
index 96359b8..d17c798 100644
--- a/features/tegra/platform/patches/0034-hte-replace-use-of-system_unbound_wq-with-system_dfl.patch
+++ b/features/tegra/platform/patches/0032-hte-replace-use-of-system_unbound_wq-with-system_dfl.patch
@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Marco Crivellari <marco.crivellari@suse.com>
 Date: Wed, 24 Dec 2025 15:32:34 +0100
-Subject: [PATCH 034/196] hte: replace use of system_unbound_wq with
+Subject: [PATCH 032/184] hte: replace use of system_unbound_wq with
  system_dfl_wq
 
 This patch continues the effort to refactor workqueue APIs, which has begun
@@ -30,7 +30,7 @@ Signed-off-by: Dipen Patel <dipenp@nvidia.com>
 (cherry picked from commit 52bc3daed226a01f2b4895792a55e23f7c6be509)
 
 diff --git a/drivers/hte/hte.c b/drivers/hte/hte.c
-index 23a6eeb8c506c..e2804636f2bd9 100644
+index 23a6eeb8c506..e2804636f2bd 100644
 --- a/drivers/hte/hte.c
 +++ b/drivers/hte/hte.c
 @@ -826,7 +826,7 @@ int hte_push_ts_ns(const struct hte_chip *chip, u32 xlated_id,
@@ -43,5 +43,5 @@ index 23a6eeb8c506c..e2804636f2bd9 100644
  	}
  
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/platform/patches/0035-hte-tegra194-Add-Tegra264-GTE-support.patch b/features/tegra/platform/patches/0033-hte-tegra194-Add-Tegra264-GTE-support.patch
similarity index 98%
rename from features/tegra/platform/patches/0035-hte-tegra194-Add-Tegra264-GTE-support.patch
rename to features/tegra/platform/patches/0033-hte-tegra194-Add-Tegra264-GTE-support.patch
index 32b1303..b3f75a8 100644
--- a/features/tegra/platform/patches/0035-hte-tegra194-Add-Tegra264-GTE-support.patch
+++ b/features/tegra/platform/patches/0033-hte-tegra194-Add-Tegra264-GTE-support.patch
@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Suneel Garapati <suneelg@nvidia.com>
 Date: Wed, 8 Apr 2026 21:24:12 +0000
-Subject: [PATCH 035/196] hte: tegra194: Add Tegra264 GTE support
+Subject: [PATCH 033/184] hte: tegra194: Add Tegra264 GTE support
 
 Add AON-GTE mapping and LIC GTE instance support for the Tegra264.
 Move TSC clock parameters from macros to members of SoC data
@@ -13,7 +13,7 @@ Signed-off-by: Dipen Patel <dipenp@nvidia.com>
 (cherry picked from commit 005b25ad11717139ca5c14c9f06c2a60855c2afd)
 
 diff --git a/drivers/hte/hte-tegra194.c b/drivers/hte/hte-tegra194.c
-index 690eb9be30fb8..4a7702b32b24f 100644
+index 690eb9be30fb..4a7702b32b24 100644
 --- a/drivers/hte/hte-tegra194.c
 +++ b/drivers/hte/hte-tegra194.c
 @@ -20,10 +20,11 @@
@@ -235,5 +235,5 @@ index 690eb9be30fb8..4a7702b32b24f 100644
  };
  MODULE_DEVICE_TABLE(of, tegra_hte_of_match);
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/platform/patches/0036-i2c-tegra-Do-not-configure-DMA-if-not-supported.patch b/features/tegra/platform/patches/0034-i2c-tegra-Do-not-configure-DMA-if-not-supported.patch
similarity index 92%
rename from features/tegra/platform/patches/0036-i2c-tegra-Do-not-configure-DMA-if-not-supported.patch
rename to features/tegra/platform/patches/0034-i2c-tegra-Do-not-configure-DMA-if-not-supported.patch
index 11523c2..a5ea084 100644
--- a/features/tegra/platform/patches/0036-i2c-tegra-Do-not-configure-DMA-if-not-supported.patch
+++ b/features/tegra/platform/patches/0034-i2c-tegra-Do-not-configure-DMA-if-not-supported.patch
@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Kartik Rajput <kkartik@nvidia.com>
 Date: Tue, 18 Nov 2025 19:36:15 +0530
-Subject: [PATCH 036/196] i2c: tegra: Do not configure DMA if not supported
+Subject: [PATCH 034/184] i2c: tegra: Do not configure DMA if not supported
 
 On Tegra264, not all I2C controllers have the necessary interface to
 GPC DMA, this causes failures when function tegra_i2c_init_dma()
@@ -19,7 +19,7 @@ Signed-off-by: Jon Hunter <jonathanh@nvidia.com>
 Change-Id: I6881b0f9cdc050e7232defdf1fb75cb0ff39980d
 
 diff --git a/drivers/i2c/busses/i2c-tegra.c b/drivers/i2c/busses/i2c-tegra.c
-index 07e16a379d128..2498383533188 100644
+index 07e16a379d12..249838353318 100644
 --- a/drivers/i2c/busses/i2c-tegra.c
 +++ b/drivers/i2c/busses/i2c-tegra.c
 @@ -449,6 +449,11 @@ static int tegra_i2c_init_dma(struct tegra_i2c_dev *i2c_dev)
@@ -35,5 +35,5 @@ index 07e16a379d128..2498383533188 100644
  		if (!IS_ENABLED(CONFIG_TEGRA20_APB_DMA)) {
  			dev_dbg(i2c_dev->dev, "APB DMA support not enabled\n");
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/platform/patches/0037-i2c-tegra-Use-separate-variables-for-fast-and-fastpl.patch b/features/tegra/platform/patches/0035-i2c-tegra-Use-separate-variables-for-fast-and-fastpl.patch
similarity index 98%
rename from features/tegra/platform/patches/0037-i2c-tegra-Use-separate-variables-for-fast-and-fastpl.patch
rename to features/tegra/platform/patches/0035-i2c-tegra-Use-separate-variables-for-fast-and-fastpl.patch
index e375106..2b7b855 100644
--- a/features/tegra/platform/patches/0037-i2c-tegra-Use-separate-variables-for-fast-and-fastpl.patch
+++ b/features/tegra/platform/patches/0035-i2c-tegra-Use-separate-variables-for-fast-and-fastpl.patch
@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Akhil R <akhilrajeev@nvidia.com>
 Date: Tue, 18 Nov 2025 19:36:16 +0530
-Subject: [PATCH 037/196] i2c: tegra: Use separate variables for fast and
+Subject: [PATCH 035/184] i2c: tegra: Use separate variables for fast and
  fastplus
 
 The current implementation uses a single value of THIGH, TLOW and setup
@@ -18,7 +18,7 @@ Signed-off-by: Jon Hunter <jonathanh@nvidia.com>
 Change-Id: Ief378935f25f35cdbdeef7ac31a2d9a30ac288bf
 
 diff --git a/drivers/i2c/busses/i2c-tegra.c b/drivers/i2c/busses/i2c-tegra.c
-index 2498383533188..d1bd40638a176 100644
+index 249838353318..d1bd40638a17 100644
 --- a/drivers/i2c/busses/i2c-tegra.c
 +++ b/drivers/i2c/busses/i2c-tegra.c
 @@ -196,12 +196,16 @@ enum msg_end_type {
@@ -233,5 +233,5 @@ index 2498383533188..d1bd40638a176 100644
  	.has_interface_timing_reg = true,
  };
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/platform/patches/0038-i2c-tegra-Update-Tegra256-timing-parameters.patch b/features/tegra/platform/patches/0036-i2c-tegra-Update-Tegra256-timing-parameters.patch
similarity index 94%
rename from features/tegra/platform/patches/0038-i2c-tegra-Update-Tegra256-timing-parameters.patch
rename to features/tegra/platform/patches/0036-i2c-tegra-Update-Tegra256-timing-parameters.patch
index 050b7ad..1076ad3 100644
--- a/features/tegra/platform/patches/0038-i2c-tegra-Update-Tegra256-timing-parameters.patch
+++ b/features/tegra/platform/patches/0036-i2c-tegra-Update-Tegra256-timing-parameters.patch
@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Akhil R <akhilrajeev@nvidia.com>
 Date: Tue, 18 Nov 2025 19:36:17 +0530
-Subject: [PATCH 038/196] i2c: tegra: Update Tegra256 timing parameters
+Subject: [PATCH 036/184] i2c: tegra: Update Tegra256 timing parameters
 
 Update the timing parameters of Tegra256 so that the signals are complaint
 with the I2C specification for SCL low time.
@@ -15,7 +15,7 @@ Signed-off-by: Jon Hunter <jonathanh@nvidia.com>
 Change-Id: I8c941024f7c6d2d33b52eca9093c2ef7a6b2954e
 
 diff --git a/drivers/i2c/busses/i2c-tegra.c b/drivers/i2c/busses/i2c-tegra.c
-index d1bd40638a176..e8c2e0df8953f 100644
+index d1bd40638a17..e8c2e0df8953 100644
 --- a/drivers/i2c/busses/i2c-tegra.c
 +++ b/drivers/i2c/busses/i2c-tegra.c
 @@ -1684,7 +1684,7 @@ static const struct tegra_i2c_hw_feature tegra256_i2c_hw = {
@@ -49,5 +49,5 @@ index d1bd40638a176..e8c2e0df8953f 100644
  };
  
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/platform/patches/0039-i2c-tegra-Add-HS-mode-support.patch b/features/tegra/platform/patches/0037-i2c-tegra-Add-HS-mode-support.patch
similarity index 98%
rename from features/tegra/platform/patches/0039-i2c-tegra-Add-HS-mode-support.patch
rename to features/tegra/platform/patches/0037-i2c-tegra-Add-HS-mode-support.patch
index efd526c..7ca745e 100644
--- a/features/tegra/platform/patches/0039-i2c-tegra-Add-HS-mode-support.patch
+++ b/features/tegra/platform/patches/0037-i2c-tegra-Add-HS-mode-support.patch
@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Akhil R <akhilrajeev@nvidia.com>
 Date: Tue, 18 Nov 2025 19:36:18 +0530
-Subject: [PATCH 039/196] i2c: tegra: Add HS mode support
+Subject: [PATCH 037/184] i2c: tegra: Add HS mode support
 
 Add support for High Speed (HS) mode transfers for Tegra194 and later
 chips. While HS mode has been documented in the technical reference
@@ -20,7 +20,7 @@ Signed-off-by: Jon Hunter <jonathanh@nvidia.com>
 Change-Id: I25f445593e0a37b3991cb726012cbe6089d0c916
 
 diff --git a/drivers/i2c/busses/i2c-tegra.c b/drivers/i2c/busses/i2c-tegra.c
-index e8c2e0df8953f..a031b032ce051 100644
+index e8c2e0df8953..a031b032ce05 100644
 --- a/drivers/i2c/busses/i2c-tegra.c
 +++ b/drivers/i2c/busses/i2c-tegra.c
 @@ -85,6 +85,7 @@
@@ -225,5 +225,5 @@ index e8c2e0df8953f..a031b032ce051 100644
  
  static const struct of_device_id tegra_i2c_of_match[] = {
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/platform/patches/0040-i2c-tegra-Add-support-for-SW-mutex-register.patch b/features/tegra/platform/patches/0038-i2c-tegra-Add-support-for-SW-mutex-register.patch
similarity index 98%
rename from features/tegra/platform/patches/0040-i2c-tegra-Add-support-for-SW-mutex-register.patch
rename to features/tegra/platform/patches/0038-i2c-tegra-Add-support-for-SW-mutex-register.patch
index 3b05d64..5b749ab 100644
--- a/features/tegra/platform/patches/0040-i2c-tegra-Add-support-for-SW-mutex-register.patch
+++ b/features/tegra/platform/patches/0038-i2c-tegra-Add-support-for-SW-mutex-register.patch
@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Kartik Rajput <kkartik@nvidia.com>
 Date: Tue, 18 Nov 2025 19:36:19 +0530
-Subject: [PATCH 040/196] i2c: tegra: Add support for SW mutex register
+Subject: [PATCH 038/184] i2c: tegra: Add support for SW mutex register
 
 Add support for SW mutex register introduced in Tegra264 to provide
 an option to share the interface between multiple firmwares and/or
@@ -28,7 +28,7 @@ Signed-off-by: Jon Hunter <jonathanh@nvidia.com>
 Change-Id: I8db39f8a9a2461adcb197e51f908529a71e89c13
 
 diff --git a/drivers/i2c/busses/i2c-tegra.c b/drivers/i2c/busses/i2c-tegra.c
-index a031b032ce051..ebfc25ebd81fb 100644
+index a031b032ce05..ebfc25ebd81f 100644
 --- a/drivers/i2c/busses/i2c-tegra.c
 +++ b/drivers/i2c/busses/i2c-tegra.c
 @@ -137,6 +137,14 @@
@@ -223,5 +223,5 @@ index a031b032ce051..ebfc25ebd81fb 100644
  
  static const struct of_device_id tegra_i2c_of_match[] = {
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/platform/patches/0041-i2c-tegra-Add-Tegra264-support.patch b/features/tegra/platform/patches/0039-i2c-tegra-Add-Tegra264-support.patch
similarity index 95%
rename from features/tegra/platform/patches/0041-i2c-tegra-Add-Tegra264-support.patch
rename to features/tegra/platform/patches/0039-i2c-tegra-Add-Tegra264-support.patch
index 8bcd76a..f1126ce 100644
--- a/features/tegra/platform/patches/0041-i2c-tegra-Add-Tegra264-support.patch
+++ b/features/tegra/platform/patches/0039-i2c-tegra-Add-Tegra264-support.patch
@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Akhil R <akhilrajeev@nvidia.com>
 Date: Tue, 18 Nov 2025 19:36:20 +0530
-Subject: [PATCH 041/196] i2c: tegra: Add Tegra264 support
+Subject: [PATCH 039/184] i2c: tegra: Add Tegra264 support
 
 Add support for Tegra264 SoC which supports 17 generic I2C controllers,
 two of which are in the AON (always-on) partition of the SoC. In
@@ -19,7 +19,7 @@ Signed-off-by: Jon Hunter <jonathanh@nvidia.com>
 Change-Id: I28fd7db892912c14a1112966b20569c7a9a571e6
 
 diff --git a/drivers/i2c/busses/i2c-tegra.c b/drivers/i2c/busses/i2c-tegra.c
-index ebfc25ebd81fb..2e03648fc0a38 100644
+index ebfc25ebd81f..2e03648fc0a3 100644
 --- a/drivers/i2c/busses/i2c-tegra.c
 +++ b/drivers/i2c/busses/i2c-tegra.c
 @@ -1853,7 +1853,40 @@ static const struct tegra_i2c_hw_feature tegra256_i2c_hw = {
@@ -64,5 +64,5 @@ index ebfc25ebd81fb..2e03648fc0a38 100644
  	{ .compatible = "nvidia,tegra194-i2c", .data = &tegra194_i2c_hw, },
  	{ .compatible = "nvidia,tegra186-i2c", .data = &tegra186_i2c_hw, },
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/platform/patches/0042-i2c-tegra-remove-unused-rst.patch b/features/tegra/platform/patches/0040-i2c-tegra-remove-unused-rst.patch
similarity index 93%
rename from features/tegra/platform/patches/0042-i2c-tegra-remove-unused-rst.patch
rename to features/tegra/platform/patches/0040-i2c-tegra-remove-unused-rst.patch
index eb8f559..aae564a 100644
--- a/features/tegra/platform/patches/0042-i2c-tegra-remove-unused-rst.patch
+++ b/features/tegra/platform/patches/0040-i2c-tegra-remove-unused-rst.patch
@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Guixin Liu <kanie@linux.alibaba.com>
 Date: Wed, 17 Dec 2025 16:16:01 +0800
-Subject: [PATCH 042/196] i2c: tegra: remove unused rst
+Subject: [PATCH 040/184] i2c: tegra: remove unused rst
 
 Since commit 56344e241c54 ("i2c: tegra: Fix reset error handling with
 ACPI") replace reset_control_reset() with device_reset(), the rst
@@ -15,7 +15,7 @@ Signed-off-by: Jon Hunter <jonathanh@nvidia.com>
 Change-Id: I6adc88068e1c7fd42535695b1108a0a2f1bf82bb
 
 diff --git a/drivers/i2c/busses/i2c-tegra.c b/drivers/i2c/busses/i2c-tegra.c
-index 2e03648fc0a38..1ada54581e383 100644
+index 2e03648fc0a3..1ada54581e38 100644
 --- a/drivers/i2c/busses/i2c-tegra.c
 +++ b/drivers/i2c/busses/i2c-tegra.c
 @@ -264,7 +264,6 @@ struct tegra_i2c_hw_feature {
@@ -35,5 +35,5 @@ index 2e03648fc0a38..1ada54581e383 100644
  	unsigned int irq;
  
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/platform/patches/0043-NVIDIA-SAUCE-i2c-tegra-use-dmaengine_get_dma_device-.patch b/features/tegra/platform/patches/0041-NVIDIA-SAUCE-i2c-tegra-use-dmaengine_get_dma_device-.patch
similarity index 93%
rename from features/tegra/platform/patches/0043-NVIDIA-SAUCE-i2c-tegra-use-dmaengine_get_dma_device-.patch
rename to features/tegra/platform/patches/0041-NVIDIA-SAUCE-i2c-tegra-use-dmaengine_get_dma_device-.patch
index d10c7e1..da6b811 100644
--- a/features/tegra/platform/patches/0043-NVIDIA-SAUCE-i2c-tegra-use-dmaengine_get_dma_device-.patch
+++ b/features/tegra/platform/patches/0041-NVIDIA-SAUCE-i2c-tegra-use-dmaengine_get_dma_device-.patch
@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Akhil R <akhilrajeev@nvidia.com>
 Date: Mon, 20 Apr 2026 19:05:57 +0530
-Subject: [PATCH 043/196] NVIDIA: SAUCE: i2c: tegra: use
+Subject: [PATCH 041/184] NVIDIA: SAUCE: i2c: tegra: use
  dmaengine_get_dma_device() for DMA buffer allocation
 
 Use dmaengine_get_dma_device() to obtain the correct struct device
@@ -26,7 +26,7 @@ Signed-off-by: Jon Hunter <jonathanh@nvidia.com>
 Change-Id: Ide19231a5f6894d553e6ba77edda0b5fb1b9261f
 
 diff --git a/drivers/i2c/busses/i2c-tegra.c b/drivers/i2c/busses/i2c-tegra.c
-index 1ada54581e383..f9fd81a37a4be 100644
+index 1ada54581e38..f9fd81a37a4b 100644
 --- a/drivers/i2c/busses/i2c-tegra.c
 +++ b/drivers/i2c/busses/i2c-tegra.c
 @@ -568,7 +568,7 @@ static int tegra_i2c_init_dma(struct tegra_i2c_dev *i2c_dev)
@@ -39,5 +39,5 @@ index 1ada54581e383..f9fd81a37a4be 100644
  				I2C_PACKET_HEADER_SIZE;
  
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/platform/patches/0044-NVIDIA-SAUCE-i2c-tegra-resume-explicitly-if-pm_runti.patch b/features/tegra/platform/patches/0042-NVIDIA-SAUCE-i2c-tegra-resume-explicitly-if-pm_runti.patch
similarity index 95%
rename from features/tegra/platform/patches/0044-NVIDIA-SAUCE-i2c-tegra-resume-explicitly-if-pm_runti.patch
rename to features/tegra/platform/patches/0042-NVIDIA-SAUCE-i2c-tegra-resume-explicitly-if-pm_runti.patch
index c9b7ddc..9a6ea26 100644
--- a/features/tegra/platform/patches/0044-NVIDIA-SAUCE-i2c-tegra-resume-explicitly-if-pm_runti.patch
+++ b/features/tegra/platform/patches/0042-NVIDIA-SAUCE-i2c-tegra-resume-explicitly-if-pm_runti.patch
@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Akhil R <akhilrajeev@nvidia.com>
 Date: Fri, 9 Aug 2024 10:37:13 +0530
-Subject: [PATCH 044/196] NVIDIA: SAUCE: i2c: tegra: resume explicitly if
+Subject: [PATCH 042/184] NVIDIA: SAUCE: i2c: tegra: resume explicitly if
  pm_runtime is disabled
 
 This is a WAR to handle NOIRQ suspend/resume in I2C client devices.
@@ -22,7 +22,7 @@ Reviewed-by: Laxman Dewangan <ldewangan@nvidia.com>
 GVS: buildbot_gerritrpt <buildbot_gerritrpt@nvidia.com>
 
 diff --git a/drivers/i2c/busses/i2c-tegra.c b/drivers/i2c/busses/i2c-tegra.c
-index f9fd81a37a4be..7ee6a5c02acd7 100644
+index f9fd81a37a4b..7ee6a5c02acd 100644
 --- a/drivers/i2c/busses/i2c-tegra.c
 +++ b/drivers/i2c/busses/i2c-tegra.c
 @@ -339,6 +339,9 @@ static u32 dvc_readl(struct tegra_i2c_dev *i2c_dev, unsigned int reg)
@@ -68,5 +68,5 @@ index f9fd81a37a4be..7ee6a5c02acd7 100644
  	return ret ?: i;
  }
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/platform/patches/0045-NVIDIA-SAUCE-i2c-tegra-Do-not-mark-ACPI-devices-and-.patch b/features/tegra/platform/patches/0043-NVIDIA-SAUCE-i2c-tegra-Do-not-mark-ACPI-devices-and-.patch
similarity index 96%
rename from features/tegra/platform/patches/0045-NVIDIA-SAUCE-i2c-tegra-Do-not-mark-ACPI-devices-and-.patch
rename to features/tegra/platform/patches/0043-NVIDIA-SAUCE-i2c-tegra-Do-not-mark-ACPI-devices-and-.patch
index 37e8a9f..5fdf92d 100644
--- a/features/tegra/platform/patches/0045-NVIDIA-SAUCE-i2c-tegra-Do-not-mark-ACPI-devices-and-.patch
+++ b/features/tegra/platform/patches/0043-NVIDIA-SAUCE-i2c-tegra-Do-not-mark-ACPI-devices-and-.patch
@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: "Wayne Wang(SW-TEGRA)" <waywang@nvidia.com>
 Date: Tue, 29 Jul 2025 16:09:20 +0800
-Subject: [PATCH 045/196] NVIDIA: SAUCE: i2c: tegra: Do not mark ACPI devices
+Subject: [PATCH 043/184] NVIDIA: SAUCE: i2c: tegra: Do not mark ACPI devices
  and PREEMPT_RT as irq safe
 
 That patch includes commit 14d069d92951a3e150c0a81f2ca3b93e54da913b upstream.
@@ -60,7 +60,7 @@ GVS: buildbot_gerritrpt <buildbot_gerritrpt@nvidia.com>
 (cherry picked from commit e432fa341891cd2a230f593a20b57da257c26d86)
 
 diff --git a/drivers/i2c/busses/i2c-tegra.c b/drivers/i2c/busses/i2c-tegra.c
-index 7ee6a5c02acd7..97ac0e216ee91 100644
+index 7ee6a5c02acd..97ac0e216ee9 100644
 --- a/drivers/i2c/busses/i2c-tegra.c
 +++ b/drivers/i2c/busses/i2c-tegra.c
 @@ -2063,8 +2063,11 @@ static int tegra_i2c_probe(struct platform_device *pdev)
@@ -77,5 +77,5 @@ index 7ee6a5c02acd7..97ac0e216ee91 100644
  
  	pm_runtime_enable(i2c_dev->dev);
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/platform/patches/0046-NVIDIA-SAUCE-i2c-tegra-Disable-fairness-arbitration.patch b/features/tegra/platform/patches/0044-NVIDIA-SAUCE-i2c-tegra-Disable-fairness-arbitration.patch
similarity index 97%
rename from features/tegra/platform/patches/0046-NVIDIA-SAUCE-i2c-tegra-Disable-fairness-arbitration.patch
rename to features/tegra/platform/patches/0044-NVIDIA-SAUCE-i2c-tegra-Disable-fairness-arbitration.patch
index 62722fc..efb57eb 100644
--- a/features/tegra/platform/patches/0046-NVIDIA-SAUCE-i2c-tegra-Disable-fairness-arbitration.patch
+++ b/features/tegra/platform/patches/0044-NVIDIA-SAUCE-i2c-tegra-Disable-fairness-arbitration.patch
@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Akhil R <akhilrajeev@nvidia.com>
 Date: Wed, 7 May 2025 21:24:45 +0530
-Subject: [PATCH 046/196] NVIDIA: SAUCE: i2c: tegra: Disable fairness
+Subject: [PATCH 044/184] NVIDIA: SAUCE: i2c: tegra: Disable fairness
  arbitration
 
 Disable fairness arbitration for T264. Fairness arbitration only applies
@@ -14,7 +14,7 @@ Signed-off-by: Akhil R <akhilrajeev@nvidia.com>
 Change-Id: I4fc282849627a4849ce4e9a6c54f1e0cb58566ac
 
 diff --git a/drivers/i2c/busses/i2c-tegra.c b/drivers/i2c/busses/i2c-tegra.c
-index 97ac0e216ee91..4428343d58d1e 100644
+index 97ac0e216ee9..4428343d58d1 100644
 --- a/drivers/i2c/busses/i2c-tegra.c
 +++ b/drivers/i2c/busses/i2c-tegra.c
 @@ -136,6 +136,7 @@
@@ -117,5 +117,5 @@ index 97ac0e216ee91..4428343d58d1e 100644
  
  static const struct of_device_id tegra_i2c_of_match[] = {
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/platform/patches/0047-iommu-tegra241-cmdqv-Decouple-driver-from-ACPI.patch b/features/tegra/platform/patches/0045-iommu-tegra241-cmdqv-Decouple-driver-from-ACPI.patch
similarity index 96%
rename from features/tegra/platform/patches/0047-iommu-tegra241-cmdqv-Decouple-driver-from-ACPI.patch
rename to features/tegra/platform/patches/0045-iommu-tegra241-cmdqv-Decouple-driver-from-ACPI.patch
index 851e0ae..4cf83b0 100644
--- a/features/tegra/platform/patches/0047-iommu-tegra241-cmdqv-Decouple-driver-from-ACPI.patch
+++ b/features/tegra/platform/patches/0045-iommu-tegra241-cmdqv-Decouple-driver-from-ACPI.patch
@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Nicolin Chen <nicolinc@nvidia.com>
 Date: Tue, 13 Jan 2026 05:49:32 +0000
-Subject: [PATCH 047/196] iommu/tegra241-cmdqv: Decouple driver from ACPI
+Subject: [PATCH 045/184] iommu/tegra241-cmdqv: Decouple driver from ACPI
 
 A platform device is created by acpi_create_platform_device() per CMDQV's
 adev. That means there is no point in going through _CRS of ACPI.
@@ -15,7 +15,7 @@ Signed-off-by: Will Deacon <will@kernel.org>
 (cherry picked from commit eb20758f86723bb94d30747fca7b65ed2e6846b8)
 
 diff --git a/drivers/iommu/arm/Kconfig b/drivers/iommu/arm/Kconfig
-index ef42bbe07dbef..5fac08b89deea 100644
+index ef42bbe07dbe..5fac08b89dee 100644
 --- a/drivers/iommu/arm/Kconfig
 +++ b/drivers/iommu/arm/Kconfig
 @@ -121,7 +121,6 @@ config ARM_SMMU_V3_KUNIT_TEST
@@ -27,7 +27,7 @@ index ef42bbe07dbef..5fac08b89deea 100644
  	  Support for NVIDIA CMDQ-Virtualization extension for ARM SMMUv3. The
  	  CMDQ-V extension is similar to v3.3 ECMDQ for multi command queues
 diff --git a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c
-index 10c8a29db8028..d72cf9eca0fc9 100644
+index 10c8a29db802..d72cf9eca0fc 100644
 --- a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c
 +++ b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c
 @@ -4609,10 +4609,11 @@ static void acpi_smmu_dsdt_probe_tegra241_cmdqv(struct acpi_iort_node *node,
@@ -44,7 +44,7 @@ index 10c8a29db8028..d72cf9eca0fc9 100644
  	kfree(uid);
  }
 diff --git a/drivers/iommu/arm/arm-smmu-v3/tegra241-cmdqv.c b/drivers/iommu/arm/arm-smmu-v3/tegra241-cmdqv.c
-index 17591d8eb64b8..80713977085aa 100644
+index 17591d8eb64b..80713977085a 100644
 --- a/drivers/iommu/arm/arm-smmu-v3/tegra241-cmdqv.c
 +++ b/drivers/iommu/arm/arm-smmu-v3/tegra241-cmdqv.c
 @@ -3,17 +3,15 @@
@@ -167,5 +167,5 @@ index 17591d8eb64b8..80713977085aa 100644
  		return new_smmu;
  
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/platform/patches/0048-iommu-arm-smmu-v3-Add-device-tree-support-for-CMDQV-.patch b/features/tegra/platform/patches/0046-iommu-arm-smmu-v3-Add-device-tree-support-for-CMDQV-.patch
similarity index 95%
rename from features/tegra/platform/patches/0048-iommu-arm-smmu-v3-Add-device-tree-support-for-CMDQV-.patch
rename to features/tegra/platform/patches/0046-iommu-arm-smmu-v3-Add-device-tree-support-for-CMDQV-.patch
index c204f44..05f97a1 100644
--- a/features/tegra/platform/patches/0048-iommu-arm-smmu-v3-Add-device-tree-support-for-CMDQV-.patch
+++ b/features/tegra/platform/patches/0046-iommu-arm-smmu-v3-Add-device-tree-support-for-CMDQV-.patch
@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Ashish Mhetre <amhetre@nvidia.com>
 Date: Tue, 13 Jan 2026 05:49:33 +0000
-Subject: [PATCH 048/196] iommu/arm-smmu-v3: Add device-tree support for CMDQV
+Subject: [PATCH 046/184] iommu/arm-smmu-v3: Add device-tree support for CMDQV
  driver
 
 Add device tree support to the CMDQV driver to enable usage on Tegra264
@@ -16,7 +16,7 @@ Signed-off-by: Will Deacon <will@kernel.org>
 (cherry picked from commit ea69dc4e207b09fb9adb6dab1901739d64853090)
 
 diff --git a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c
-index d72cf9eca0fc9..991377419ee34 100644
+index d72cf9eca0fc..991377419ee3 100644
 --- a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c
 +++ b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c
 @@ -4597,6 +4597,35 @@ static int arm_smmu_device_hw_probe(struct arm_smmu_device *smmu)
@@ -66,5 +66,5 @@ index d72cf9eca0fc9..991377419ee34 100644
  }
  
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/platform/patches/0049-NVIDIA-SAUCE-iommu-arm-smmu-v3-add-suspend-resume-su.patch b/features/tegra/platform/patches/0047-NVIDIA-SAUCE-iommu-arm-smmu-v3-add-suspend-resume-su.patch
similarity index 95%
rename from features/tegra/platform/patches/0049-NVIDIA-SAUCE-iommu-arm-smmu-v3-add-suspend-resume-su.patch
rename to features/tegra/platform/patches/0047-NVIDIA-SAUCE-iommu-arm-smmu-v3-add-suspend-resume-su.patch
index 2217aca..2d73c7d 100644
--- a/features/tegra/platform/patches/0049-NVIDIA-SAUCE-iommu-arm-smmu-v3-add-suspend-resume-su.patch
+++ b/features/tegra/platform/patches/0047-NVIDIA-SAUCE-iommu-arm-smmu-v3-add-suspend-resume-su.patch
@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Pritesh Raithatha <praithatha@nvidia.com>
 Date: Mon, 1 Apr 2024 13:54:08 +0000
-Subject: [PATCH 049/196] NVIDIA: SAUCE: iommu/arm-smmu-v3: add suspend/resume
+Subject: [PATCH 047/184] NVIDIA: SAUCE: iommu/arm-smmu-v3: add suspend/resume
  support
 
 Add suspend/resume support for arm-smmu-v3. Move irq initialization
@@ -19,7 +19,7 @@ GVS: buildbot_gerritrpt <buildbot_gerritrpt@nvidia.com>
 (cherry picked from commit 69677a732a7de255ba8171aa86411a16352f60f2)
 
 diff --git a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c
-index 991377419ee34..4be9ac8ca665a 100644
+index 991377419ee3..4be9ac8ca665 100644
 --- a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c
 +++ b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c
 @@ -4283,12 +4283,6 @@ static int arm_smmu_device_reset(struct arm_smmu_device *smmu)
@@ -74,5 +74,5 @@ index 991377419ee34..4be9ac8ca665a 100644
  	},
  	.probe	= arm_smmu_device_probe,
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/platform/patches/0050-NVIDIA-SAUCE-iommu-arm-smmu-v3-Add-pm-suspend-op.patch b/features/tegra/platform/patches/0048-NVIDIA-SAUCE-iommu-arm-smmu-v3-Add-pm-suspend-op.patch
similarity index 94%
rename from features/tegra/platform/patches/0050-NVIDIA-SAUCE-iommu-arm-smmu-v3-Add-pm-suspend-op.patch
rename to features/tegra/platform/patches/0048-NVIDIA-SAUCE-iommu-arm-smmu-v3-Add-pm-suspend-op.patch
index 13006c3..1dd2fe8 100644
--- a/features/tegra/platform/patches/0050-NVIDIA-SAUCE-iommu-arm-smmu-v3-Add-pm-suspend-op.patch
+++ b/features/tegra/platform/patches/0048-NVIDIA-SAUCE-iommu-arm-smmu-v3-Add-pm-suspend-op.patch
@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Ashish Mhetre <amhetre@nvidia.com>
 Date: Tue, 8 Apr 2025 14:57:44 +0000
-Subject: [PATCH 050/196] NVIDIA: SAUCE: iommu/arm-smmu-v3: Add pm suspend op
+Subject: [PATCH 048/184] NVIDIA: SAUCE: iommu/arm-smmu-v3: Add pm suspend op
 
 - Issue CMD_OP_CFGI and CMD_OP_TBI_ALL to ensure all pending
 transactions are complete before going into suspend and then disable
@@ -22,7 +22,7 @@ Reviewed-by: Pritesh Raithatha <praithatha@nvidia.com>
 (cherry picked from commit d4303ed2cb0d467bf1446a9dd6a5f35b1c9450d8)
 
 diff --git a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c
-index 4be9ac8ca665a..94aa75edc74ac 100644
+index 4be9ac8ca665..94aa75edc74a 100644
 --- a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c
 +++ b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c
 @@ -4981,13 +4981,32 @@ static int __maybe_unused arm_smmu_runtime_resume(struct device *dev)
@@ -60,5 +60,5 @@ index 4be9ac8ca665a..94aa75edc74ac 100644
  
  static struct platform_driver arm_smmu_driver = {
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/platform/patches/0051-NVIDIA-SAUCE-iommu-arm-smmu-v3-Retain-prod-and-cons-.patch b/features/tegra/platform/patches/0049-NVIDIA-SAUCE-iommu-arm-smmu-v3-Retain-prod-and-cons-.patch
similarity index 91%
rename from features/tegra/platform/patches/0051-NVIDIA-SAUCE-iommu-arm-smmu-v3-Retain-prod-and-cons-.patch
rename to features/tegra/platform/patches/0049-NVIDIA-SAUCE-iommu-arm-smmu-v3-Retain-prod-and-cons-.patch
index 4401c4a..df92813 100644
--- a/features/tegra/platform/patches/0051-NVIDIA-SAUCE-iommu-arm-smmu-v3-Retain-prod-and-cons-.patch
+++ b/features/tegra/platform/patches/0049-NVIDIA-SAUCE-iommu-arm-smmu-v3-Retain-prod-and-cons-.patch
@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Ashish Mhetre <amhetre@nvidia.com>
 Date: Wed, 19 Feb 2025 17:24:37 +0000
-Subject: [PATCH 051/196] NVIDIA: SAUCE: iommu/arm-smmu-v3: Retain prod and
+Subject: [PATCH 049/184] NVIDIA: SAUCE: iommu/arm-smmu-v3: Retain prod and
  cons after resume
 
 Set PROD and CONS registers of VCMDQs with retained values from
@@ -17,7 +17,7 @@ GVS: buildbot_gerritrpt <buildbot_gerritrpt@nvidia.com>
 (cherry picked from commit 75436e3f13e4a01b75b0ac4156adf94cdff09696)
 
 diff --git a/drivers/iommu/arm/arm-smmu-v3/tegra241-cmdqv.c b/drivers/iommu/arm/arm-smmu-v3/tegra241-cmdqv.c
-index 80713977085aa..37ab88cb75fdf 100644
+index 80713977085a..37ab88cb75fd 100644
 --- a/drivers/iommu/arm/arm-smmu-v3/tegra241-cmdqv.c
 +++ b/drivers/iommu/arm/arm-smmu-v3/tegra241-cmdqv.c
 @@ -485,6 +485,8 @@ static int tegra241_vcmdq_hw_init(struct tegra241_vcmdq *vcmdq)
@@ -30,5 +30,5 @@ index 80713977085aa..37ab88cb75fdf 100644
  	ret = vcmdq_write_config(vcmdq, VCMDQ_EN);
  	if (ret) {
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/platform/patches/0052-NVIDIA-SAUCE-iommu-arm-smmu-v3-Restore-IRQs-on-resum.patch b/features/tegra/platform/patches/0050-NVIDIA-SAUCE-iommu-arm-smmu-v3-Restore-IRQs-on-resum.patch
similarity index 96%
rename from features/tegra/platform/patches/0052-NVIDIA-SAUCE-iommu-arm-smmu-v3-Restore-IRQs-on-resum.patch
rename to features/tegra/platform/patches/0050-NVIDIA-SAUCE-iommu-arm-smmu-v3-Restore-IRQs-on-resum.patch
index 439392a..f060db5 100644
--- a/features/tegra/platform/patches/0052-NVIDIA-SAUCE-iommu-arm-smmu-v3-Restore-IRQs-on-resum.patch
+++ b/features/tegra/platform/patches/0050-NVIDIA-SAUCE-iommu-arm-smmu-v3-Restore-IRQs-on-resum.patch
@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Ashish Mhetre <amhetre@nvidia.com>
 Date: Fri, 21 Nov 2025 08:31:36 +0000
-Subject: [PATCH 052/196] NVIDIA: SAUCE: iommu/arm-smmu-v3: Restore IRQs on
+Subject: [PATCH 050/184] NVIDIA: SAUCE: iommu/arm-smmu-v3: Restore IRQs on
  resume
 
 The ARM SMMU v3 driver was not restoring interrupt configuration after
@@ -31,7 +31,7 @@ Reviewed-by: svcacv <svcacv@nvidia.com>
 (cherry picked from commit bd85e3c4db26954c06cd73c9452a73a17a6d8ae5)
 
 diff --git a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c
-index 94aa75edc74ac..4f6e9d16b9ded 100644
+index 94aa75edc74a..4f6e9d16b9de 100644
 --- a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c
 +++ b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c
 @@ -4103,10 +4103,26 @@ static void arm_smmu_setup_unique_irqs(struct arm_smmu_device *smmu)
@@ -101,5 +101,5 @@ index 94aa75edc74ac..4f6e9d16b9ded 100644
  	return 0;
  }
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/platform/patches/0053-NVIDIA-SAUCE-iommu-arm-smmu-v3-Implement-WAR-for-Teg.patch b/features/tegra/platform/patches/0051-NVIDIA-SAUCE-iommu-arm-smmu-v3-Implement-WAR-for-Teg.patch
similarity index 97%
rename from features/tegra/platform/patches/0053-NVIDIA-SAUCE-iommu-arm-smmu-v3-Implement-WAR-for-Teg.patch
rename to features/tegra/platform/patches/0051-NVIDIA-SAUCE-iommu-arm-smmu-v3-Implement-WAR-for-Teg.patch
index 7550a00..a848661 100644
--- a/features/tegra/platform/patches/0053-NVIDIA-SAUCE-iommu-arm-smmu-v3-Implement-WAR-for-Teg.patch
+++ b/features/tegra/platform/patches/0051-NVIDIA-SAUCE-iommu-arm-smmu-v3-Implement-WAR-for-Teg.patch
@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Ashish Mhetre <amhetre@nvidia.com>
 Date: Tue, 12 Aug 2025 06:32:27 +0000
-Subject: [PATCH 053/196] NVIDIA: SAUCE: iommu/arm-smmu-v3: Implement WAR for
+Subject: [PATCH 051/184] NVIDIA: SAUCE: iommu/arm-smmu-v3: Implement WAR for
  Tegra264 Errata T264-SMMU-3
 
 If there is active traffic on a page while it is being invalidated, it
@@ -26,7 +26,7 @@ Reviewed-by: Pritesh Raithatha <praithatha@nvidia.com>
 (cherry picked from commit 82f92000e9f39443713157dd1f34935e93fff932)
 
 diff --git a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3-sva.c b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3-sva.c
-index 59a480974d80f..f2fd2089e0517 100644
+index 59a480974d80..f2fd2089e051 100644
 --- a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3-sva.c
 +++ b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3-sva.c
 @@ -161,6 +161,19 @@ static void arm_smmu_mm_arch_invalidate_secondary_tlbs(struct mmu_notifier *mn,
@@ -59,7 +59,7 @@ index 59a480974d80f..f2fd2089e0517 100644
  
  static void arm_smmu_mmu_notifier_free(struct mmu_notifier *mn)
 diff --git a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c
-index 4f6e9d16b9ded..da73d6738f669 100644
+index 4f6e9d16b9de..da73d6738f66 100644
 --- a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c
 +++ b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c
 @@ -81,6 +81,7 @@ DEFINE_MUTEX(arm_smmu_asid_lock);
@@ -150,7 +150,7 @@ index 4f6e9d16b9ded..da73d6738f669 100644
  	dev_dbg(dev, "Disabling\n");
  	arm_smmu_device_disable(smmu);
 diff --git a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.h b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.h
-index 287e223c054d1..5cfbe53bf05fe 100644
+index 287e223c054d..5cfbe53bf05f 100644
 --- a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.h
 +++ b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.h
 @@ -775,6 +775,7 @@ struct arm_smmu_device {
@@ -162,5 +162,5 @@ index 287e223c054d1..5cfbe53bf05fe 100644
  
  	struct arm_smmu_cmdq		cmdq;
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/platform/patches/0054-memory-tegra186-emc-Do-not-print-error-on-icc_node_c.patch b/features/tegra/platform/patches/0052-memory-tegra186-emc-Do-not-print-error-on-icc_node_c.patch
similarity index 92%
rename from features/tegra/platform/patches/0054-memory-tegra186-emc-Do-not-print-error-on-icc_node_c.patch
rename to features/tegra/platform/patches/0052-memory-tegra186-emc-Do-not-print-error-on-icc_node_c.patch
index 0c69b94..c8bf3e6 100644
--- a/features/tegra/platform/patches/0054-memory-tegra186-emc-Do-not-print-error-on-icc_node_c.patch
+++ b/features/tegra/platform/patches/0052-memory-tegra186-emc-Do-not-print-error-on-icc_node_c.patch
@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
 Date: Thu, 11 Sep 2025 11:43:14 +0200
-Subject: [PATCH 054/196] memory: tegra186-emc: Do not print error on
+Subject: [PATCH 052/184] memory: tegra186-emc: Do not print error on
  icc_node_create() failure
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
@@ -16,7 +16,7 @@ Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
 (cherry picked from commit 515498a3f58485321a1fa03b4eb5e6208a816e06)
 
 diff --git a/drivers/memory/tegra/tegra186-emc.c b/drivers/memory/tegra/tegra186-emc.c
-index d6cd90c7ad538..00baa7ab89214 100644
+index d6cd90c7ad53..00baa7ab8921 100644
 --- a/drivers/memory/tegra/tegra186-emc.c
 +++ b/drivers/memory/tegra/tegra186-emc.c
 @@ -273,10 +273,8 @@ static int tegra_emc_interconnect_init(struct tegra186_emc *emc)
@@ -41,5 +41,5 @@ index d6cd90c7ad538..00baa7ab89214 100644
  
  	return err;
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/platform/patches/0055-memory-tegra186-emc-Simplify-and-handle-deferred-pro.patch b/features/tegra/platform/patches/0053-memory-tegra186-emc-Simplify-and-handle-deferred-pro.patch
similarity index 94%
rename from features/tegra/platform/patches/0055-memory-tegra186-emc-Simplify-and-handle-deferred-pro.patch
rename to features/tegra/platform/patches/0053-memory-tegra186-emc-Simplify-and-handle-deferred-pro.patch
index d6868c6..63b7bc8 100644
--- a/features/tegra/platform/patches/0055-memory-tegra186-emc-Simplify-and-handle-deferred-pro.patch
+++ b/features/tegra/platform/patches/0053-memory-tegra186-emc-Simplify-and-handle-deferred-pro.patch
@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
 Date: Thu, 11 Sep 2025 11:43:19 +0200
-Subject: [PATCH 055/196] memory: tegra186-emc: Simplify and handle deferred
+Subject: [PATCH 053/184] memory: tegra186-emc: Simplify and handle deferred
  probe with dev_err_probe()
 
 Certain calls, like clk_get, can cause probe deferral and driver should
@@ -13,7 +13,7 @@ Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
 (cherry picked from commit a52ddb98a674b01b6b5f2da1ed70a9f30d539f6b)
 
 diff --git a/drivers/memory/tegra/tegra186-emc.c b/drivers/memory/tegra/tegra186-emc.c
-index 00baa7ab89214..a0de80afe3e90 100644
+index 00baa7ab8921..a0de80afe3e9 100644
 --- a/drivers/memory/tegra/tegra186-emc.c
 +++ b/drivers/memory/tegra/tegra186-emc.c
 @@ -302,9 +302,8 @@ static int tegra_emc_interconnect_init(struct tegra186_emc *emc)
@@ -48,5 +48,5 @@ index 00baa7ab89214..a0de80afe3e90 100644
  	platform_set_drvdata(pdev, emc);
  	emc->dev = &pdev->dev;
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/platform/patches/0056-memory-tegra186-emc-Add-the-SoC-model-prefix-to-func.patch b/features/tegra/platform/patches/0054-memory-tegra186-emc-Add-the-SoC-model-prefix-to-func.patch
similarity index 96%
rename from features/tegra/platform/patches/0056-memory-tegra186-emc-Add-the-SoC-model-prefix-to-func.patch
rename to features/tegra/platform/patches/0054-memory-tegra186-emc-Add-the-SoC-model-prefix-to-func.patch
index 682011e..92239b2 100644
--- a/features/tegra/platform/patches/0056-memory-tegra186-emc-Add-the-SoC-model-prefix-to-func.patch
+++ b/features/tegra/platform/patches/0054-memory-tegra186-emc-Add-the-SoC-model-prefix-to-func.patch
@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
 Date: Thu, 11 Sep 2025 11:43:22 +0200
-Subject: [PATCH 056/196] memory: tegra186-emc: Add the SoC model prefix to
+Subject: [PATCH 054/184] memory: tegra186-emc: Add the SoC model prefix to
  functions
 
 Replace "tegra_emc" with "tegra186_emc" in all functions to:
@@ -18,7 +18,7 @@ Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
 (cherry picked from commit 4ebcacbb4447cd3b05289e1e0e199a5e8ea0c6de)
 
 diff --git a/drivers/memory/tegra/tegra186-emc.c b/drivers/memory/tegra/tegra186-emc.c
-index a0de80afe3e90..9959ad5804b44 100644
+index a0de80afe3e9..9959ad5804b4 100644
 --- a/drivers/memory/tegra/tegra186-emc.c
 +++ b/drivers/memory/tegra/tegra186-emc.c
 @@ -218,20 +218,20 @@ static int tegra186_emc_get_emc_dvfs_latency(struct tegra186_emc *emc)
@@ -88,5 +88,5 @@ index a0de80afe3e90..9959ad5804b44 100644
  			mc->bpmp = NULL;
  			goto put_bpmp;
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/platform/patches/0057-memory-tegra186-emc-Fix-missing-put_bpmp.patch b/features/tegra/platform/patches/0055-memory-tegra186-emc-Fix-missing-put_bpmp.patch
similarity index 92%
rename from features/tegra/platform/patches/0057-memory-tegra186-emc-Fix-missing-put_bpmp.patch
rename to features/tegra/platform/patches/0055-memory-tegra186-emc-Fix-missing-put_bpmp.patch
index f396dfb..5387d65 100644
--- a/features/tegra/platform/patches/0057-memory-tegra186-emc-Fix-missing-put_bpmp.patch
+++ b/features/tegra/platform/patches/0055-memory-tegra186-emc-Fix-missing-put_bpmp.patch
@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Jon Hunter <jonathanh@nvidia.com>
 Date: Thu, 6 Nov 2025 19:05:50 +0000
-Subject: [PATCH 057/196] memory: tegra186-emc: Fix missing put_bpmp
+Subject: [PATCH 055/184] memory: tegra186-emc: Fix missing put_bpmp
 
 Commit a52ddb98a674 ("memory: tegra186-emc: Simplify and handle deferred
 probe with dev_err_probe()") accidently dropped a call to 'put_bpmp' to
@@ -15,7 +15,7 @@ Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
 (cherry picked from commit 1463299a227d02b40c842a5d91d989cb26da5bbb)
 
 diff --git a/drivers/memory/tegra/tegra186-emc.c b/drivers/memory/tegra/tegra186-emc.c
-index 9959ad5804b44..dfddceecdd1aa 100644
+index 9959ad5804b4..dfddceecdd1a 100644
 --- a/drivers/memory/tegra/tegra186-emc.c
 +++ b/drivers/memory/tegra/tegra186-emc.c
 @@ -322,9 +322,11 @@ static int tegra186_emc_probe(struct platform_device *pdev)
@@ -34,5 +34,5 @@ index 9959ad5804b44..dfddceecdd1aa 100644
  	platform_set_drvdata(pdev, emc);
  	emc->dev = &pdev->dev;
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/platform/patches/0058-memory-tegra-Add-support-for-DBB-clock-on-Tegra264.patch b/features/tegra/platform/patches/0056-memory-tegra-Add-support-for-DBB-clock-on-Tegra264.patch
similarity index 93%
rename from features/tegra/platform/patches/0058-memory-tegra-Add-support-for-DBB-clock-on-Tegra264.patch
rename to features/tegra/platform/patches/0056-memory-tegra-Add-support-for-DBB-clock-on-Tegra264.patch
index f25661a..68e0083 100644
--- a/features/tegra/platform/patches/0058-memory-tegra-Add-support-for-DBB-clock-on-Tegra264.patch
+++ b/features/tegra/platform/patches/0056-memory-tegra-Add-support-for-DBB-clock-on-Tegra264.patch
@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Thierry Reding <treding@nvidia.com>
 Date: Fri, 16 Jan 2026 13:37:32 +0100
-Subject: [PATCH 058/196] memory: tegra: Add support for DBB clock on Tegra264
+Subject: [PATCH 056/184] memory: tegra: Add support for DBB clock on Tegra264
 
 The DBB clock is needed by many IP blocks in order to access system
 memory via the data backbone. The memory controller and external memory
@@ -20,7 +20,7 @@ Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org>
 (cherry picked from commit ef4d7b9975d6d87a21574f98473945c8e499a0d2)
 
 diff --git a/drivers/memory/tegra/tegra186-emc.c b/drivers/memory/tegra/tegra186-emc.c
-index dfddceecdd1aa..03ebab6fbe68f 100644
+index dfddceecdd1a..03ebab6fbe68 100644
 --- a/drivers/memory/tegra/tegra186-emc.c
 +++ b/drivers/memory/tegra/tegra186-emc.c
 @@ -22,6 +22,7 @@ struct tegra186_emc {
@@ -46,5 +46,5 @@ index dfddceecdd1aa..03ebab6fbe68f 100644
  	emc->dev = &pdev->dev;
  
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/platform/patches/0059-memory-tegra-Group-error-handling-related-registers.patch b/features/tegra/platform/patches/0057-memory-tegra-Group-error-handling-related-registers.patch
similarity index 93%
rename from features/tegra/platform/patches/0059-memory-tegra-Group-error-handling-related-registers.patch
rename to features/tegra/platform/patches/0057-memory-tegra-Group-error-handling-related-registers.patch
index 8c33bf8..ea798bd 100644
--- a/features/tegra/platform/patches/0059-memory-tegra-Group-error-handling-related-registers.patch
+++ b/features/tegra/platform/patches/0057-memory-tegra-Group-error-handling-related-registers.patch
@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Ketan Patil <ketanp@nvidia.com>
 Date: Thu, 26 Feb 2026 16:31:10 +0000
-Subject: [PATCH 059/196] memory: tegra: Group error handling related registers
+Subject: [PATCH 057/184] memory: tegra: Group error handling related registers
 
 Group MC error related registers into a struct as they could have SoC
 specific values. Tegra264 has different register offsets than the
@@ -16,7 +16,7 @@ Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org>
 (cherry picked from commit b8a177f18df1b439aac708da2d8bd9fcd68bb1eb)
 
 diff --git a/drivers/memory/tegra/mc.c b/drivers/memory/tegra/mc.c
-index 6edb210287dca..1dacbe2aba4e9 100644
+index c29df29920f4..40b2b803f800 100644
 --- a/drivers/memory/tegra/mc.c
 +++ b/drivers/memory/tegra/mc.c
 @@ -1,6 +1,6 @@
@@ -27,7 +27,7 @@ index 6edb210287dca..1dacbe2aba4e9 100644
   */
  
  #include <linux/clk.h>
-@@ -56,6 +56,23 @@ static const struct of_device_id tegra_mc_of_match[] = {
+@@ -57,6 +57,23 @@ static const struct of_device_id tegra_mc_of_match[] = {
  };
  MODULE_DEVICE_TABLE(of, tegra_mc_of_match);
  
@@ -51,7 +51,7 @@ index 6edb210287dca..1dacbe2aba4e9 100644
  static void tegra_mc_devm_action_put_device(void *data)
  {
  	struct tegra_mc *mc = data;
-@@ -600,37 +617,37 @@ irqreturn_t tegra30_mc_handle_irq(int irq, void *data)
+@@ -601,37 +618,37 @@ irqreturn_t tegra30_mc_handle_irq(int irq, void *data)
  
  		switch (intmask) {
  		case MC_INT_DECERR_VPR:
@@ -102,7 +102,7 @@ index 6edb210287dca..1dacbe2aba4e9 100644
  #endif
  			break;
  		}
-@@ -883,7 +900,7 @@ static void tegra_mc_num_channel_enabled(struct tegra_mc *mc)
+@@ -884,7 +901,7 @@ static void tegra_mc_num_channel_enabled(struct tegra_mc *mc)
  	unsigned int i;
  	u32 value;
  
@@ -112,7 +112,7 @@ index 6edb210287dca..1dacbe2aba4e9 100644
  		mc->num_channels = mc->soc->num_channels;
  		return;
 diff --git a/drivers/memory/tegra/mc.h b/drivers/memory/tegra/mc.h
-index 1d97cf4d3a944..bbe3e2690c647 100644
+index 1d97cf4d3a94..bbe3e2690c64 100644
 --- a/drivers/memory/tegra/mc.h
 +++ b/drivers/memory/tegra/mc.h
 @@ -1,6 +1,6 @@
@@ -153,7 +153,7 @@ index 1d97cf4d3a944..bbe3e2690c647 100644
  #define MC_INT_DECERR_ROUTE_SANITY			BIT(20)
  #define MC_INT_DECERR_GENERALIZED_CARVEOUT		BIT(17)
 diff --git a/drivers/memory/tegra/tegra114.c b/drivers/memory/tegra/tegra114.c
-index 41350570c815c..ea7e4c7bb5f83 100644
+index 41350570c815..ea7e4c7bb5f8 100644
 --- a/drivers/memory/tegra/tegra114.c
 +++ b/drivers/memory/tegra/tegra114.c
 @@ -1,6 +1,6 @@
@@ -171,7 +171,7 @@ index 41350570c815c..ea7e4c7bb5f83 100644
 +	.regs = &tegra20_mc_regs,
  };
 diff --git a/drivers/memory/tegra/tegra124.c b/drivers/memory/tegra/tegra124.c
-index 9d7393e19f125..c5529f79fbb42 100644
+index 9d7393e19f12..c5529f79fbb4 100644
 --- a/drivers/memory/tegra/tegra124.c
 +++ b/drivers/memory/tegra/tegra124.c
 @@ -1,6 +1,6 @@
@@ -198,7 +198,7 @@ index 9d7393e19f125..c5529f79fbb42 100644
  };
  #endif /* CONFIG_ARCH_TEGRA_132_SOC */
 diff --git a/drivers/memory/tegra/tegra186.c b/drivers/memory/tegra/tegra186.c
-index aee11457bf8e0..51e2dd628fb47 100644
+index aee11457bf8e..51e2dd628fb4 100644
 --- a/drivers/memory/tegra/tegra186.c
 +++ b/drivers/memory/tegra/tegra186.c
 @@ -1,6 +1,6 @@
@@ -217,7 +217,7 @@ index aee11457bf8e0..51e2dd628fb47 100644
  };
  #endif
 diff --git a/drivers/memory/tegra/tegra194.c b/drivers/memory/tegra/tegra194.c
-index 26035ac3a1eb5..5b7ff2dd68122 100644
+index 26035ac3a1eb..5b7ff2dd6812 100644
 --- a/drivers/memory/tegra/tegra194.c
 +++ b/drivers/memory/tegra/tegra194.c
 @@ -1,6 +1,6 @@
@@ -235,7 +235,7 @@ index 26035ac3a1eb5..5b7ff2dd68122 100644
 +	.regs = &tegra20_mc_regs,
  };
 diff --git a/drivers/memory/tegra/tegra20.c b/drivers/memory/tegra/tegra20.c
-index a3022e715deef..227c3336974de 100644
+index a3022e715dee..227c3336974d 100644
 --- a/drivers/memory/tegra/tegra20.c
 +++ b/drivers/memory/tegra/tegra20.c
 @@ -1,6 +1,6 @@
@@ -253,7 +253,7 @@ index a3022e715deef..227c3336974de 100644
 +	.regs = &tegra20_mc_regs,
  };
 diff --git a/drivers/memory/tegra/tegra210.c b/drivers/memory/tegra/tegra210.c
-index 3c2949c16fdef..e166b33848e95 100644
+index 3c2949c16fde..e166b33848e9 100644
 --- a/drivers/memory/tegra/tegra210.c
 +++ b/drivers/memory/tegra/tegra210.c
 @@ -1,6 +1,6 @@
@@ -271,7 +271,7 @@ index 3c2949c16fdef..e166b33848e95 100644
 +	.regs = &tegra20_mc_regs,
  };
 diff --git a/drivers/memory/tegra/tegra234.c b/drivers/memory/tegra/tegra234.c
-index 5f57cea48b629..512d054d75924 100644
+index 5f57cea48b62..512d054d7592 100644
 --- a/drivers/memory/tegra/tegra234.c
 +++ b/drivers/memory/tegra/tegra234.c
 @@ -1,6 +1,6 @@
@@ -289,7 +289,7 @@ index 5f57cea48b629..512d054d75924 100644
 +	.regs = &tegra20_mc_regs,
  };
 diff --git a/drivers/memory/tegra/tegra30.c b/drivers/memory/tegra/tegra30.c
-index d3e685c8431ff..3f3c7d996b49b 100644
+index d3e685c8431f..3f3c7d996b49 100644
 --- a/drivers/memory/tegra/tegra30.c
 +++ b/drivers/memory/tegra/tegra30.c
 @@ -1,6 +1,6 @@
@@ -307,7 +307,7 @@ index d3e685c8431ff..3f3c7d996b49b 100644
 +	.regs = &tegra20_mc_regs,
  };
 diff --git a/include/soc/tegra/mc.h b/include/soc/tegra/mc.h
-index 6ee4c59db6201..372f47e824d53 100644
+index 6ee4c59db620..372f47e824d5 100644
 --- a/include/soc/tegra/mc.h
 +++ b/include/soc/tegra/mc.h
 @@ -1,6 +1,6 @@
@@ -358,5 +358,5 @@ index 6ee4c59db6201..372f47e824d53 100644
 +
  #endif /* __SOC_TEGRA_MC_H__ */
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/platform/patches/0060-memory-tegra-Group-register-and-fields.patch b/features/tegra/platform/patches/0058-memory-tegra-Group-register-and-fields.patch
similarity index 97%
rename from features/tegra/platform/patches/0060-memory-tegra-Group-register-and-fields.patch
rename to features/tegra/platform/patches/0058-memory-tegra-Group-register-and-fields.patch
index 897e038..c3648e6 100644
--- a/features/tegra/platform/patches/0060-memory-tegra-Group-register-and-fields.patch
+++ b/features/tegra/platform/patches/0058-memory-tegra-Group-register-and-fields.patch
@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Ketan Patil <ketanp@nvidia.com>
 Date: Thu, 26 Feb 2026 16:31:11 +0000
-Subject: [PATCH 060/196] memory: tegra: Group register and fields
+Subject: [PATCH 058/184] memory: tegra: Group register and fields
 
 The current register definitions are not in sorted order. Sort these
 registers according to their address. Put bit fields and masks of the
@@ -16,7 +16,7 @@ Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org>
 (cherry picked from commit 95b714bd8c39d65b241aa1c346625b9c942af403)
 
 diff --git a/drivers/memory/tegra/mc.h b/drivers/memory/tegra/mc.h
-index bbe3e2690c647..5f816d703d815 100644
+index bbe3e2690c64..5f816d703d81 100644
 --- a/drivers/memory/tegra/mc.h
 +++ b/drivers/memory/tegra/mc.h
 @@ -13,13 +13,35 @@
@@ -113,5 +113,5 @@ index bbe3e2690c647..5f816d703d815 100644
  #define MC_BROADCAST_CHANNEL				~0
  
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/platform/patches/0061-memory-tegra-Add-support-for-multiple-IRQs.patch b/features/tegra/platform/patches/0059-memory-tegra-Add-support-for-multiple-IRQs.patch
similarity index 91%
rename from features/tegra/platform/patches/0061-memory-tegra-Add-support-for-multiple-IRQs.patch
rename to features/tegra/platform/patches/0059-memory-tegra-Add-support-for-multiple-IRQs.patch
index 0cd423a..6f349c7 100644
--- a/features/tegra/platform/patches/0061-memory-tegra-Add-support-for-multiple-IRQs.patch
+++ b/features/tegra/platform/patches/0059-memory-tegra-Add-support-for-multiple-IRQs.patch
@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Ketan Patil <ketanp@nvidia.com>
 Date: Thu, 26 Feb 2026 16:31:12 +0000
-Subject: [PATCH 061/196] memory: tegra: Add support for multiple IRQs
+Subject: [PATCH 059/184] memory: tegra: Add support for multiple IRQs
 
 Add support to handle multiple MC interrupts lines, as supported by
 Tegra264. Turn the single IRQ handler callback into a counted array to
@@ -17,10 +17,10 @@ Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org>
 (cherry picked from commit 4d865a2374037d2d0842f88822fd753f0918b370)
 
 diff --git a/drivers/memory/tegra/mc.c b/drivers/memory/tegra/mc.c
-index 1dacbe2aba4e9..de988c3123427 100644
+index 40b2b803f800..1f376b4fdf89 100644
 --- a/drivers/memory/tegra/mc.c
 +++ b/drivers/memory/tegra/mc.c
-@@ -398,6 +398,10 @@ unsigned int tegra_mc_get_emem_device_count(struct tegra_mc *mc)
+@@ -399,6 +399,10 @@ unsigned int tegra_mc_get_emem_device_count(struct tegra_mc *mc)
  }
  EXPORT_SYMBOL_GPL(tegra_mc_get_emem_device_count);
  
@@ -31,7 +31,7 @@ index 1dacbe2aba4e9..de988c3123427 100644
  #if defined(CONFIG_ARCH_TEGRA_3x_SOC) || \
      defined(CONFIG_ARCH_TEGRA_114_SOC) || \
      defined(CONFIG_ARCH_TEGRA_124_SOC) || \
-@@ -551,7 +555,6 @@ int tegra30_mc_probe(struct tegra_mc *mc)
+@@ -552,7 +556,6 @@ int tegra30_mc_probe(struct tegra_mc *mc)
  
  const struct tegra_mc_ops tegra30_mc_ops = {
  	.probe = tegra30_mc_probe,
@@ -39,7 +39,7 @@ index 1dacbe2aba4e9..de988c3123427 100644
  };
  #endif
  
-@@ -952,26 +955,31 @@ static int tegra_mc_probe(struct platform_device *pdev)
+@@ -953,26 +956,31 @@ static int tegra_mc_probe(struct platform_device *pdev)
  
  	tegra_mc_num_channel_enabled(mc);
  
@@ -84,7 +84,7 @@ index 1dacbe2aba4e9..de988c3123427 100644
  
  	if (mc->soc->reset_ops) {
 diff --git a/drivers/memory/tegra/mc.h b/drivers/memory/tegra/mc.h
-index 5f816d703d815..34ce03ebc51ca 100644
+index 5f816d703d81..34ce03ebc51c 100644
 --- a/drivers/memory/tegra/mc.h
 +++ b/drivers/memory/tegra/mc.h
 @@ -193,6 +193,7 @@ extern const struct tegra_mc_ops tegra186_mc_ops;
@@ -96,7 +96,7 @@ index 5f816d703d815..34ce03ebc51ca 100644
  extern const char * const tegra_mc_error_names[8];
  
 diff --git a/drivers/memory/tegra/tegra114.c b/drivers/memory/tegra/tegra114.c
-index ea7e4c7bb5f83..fffb28eea57f0 100644
+index ea7e4c7bb5f8..fffb28eea57f 100644
 --- a/drivers/memory/tegra/tegra114.c
 +++ b/drivers/memory/tegra/tegra114.c
 @@ -1115,4 +1115,6 @@ const struct tegra_mc_soc tegra114_mc_soc = {
@@ -107,7 +107,7 @@ index ea7e4c7bb5f83..fffb28eea57f0 100644
 +	.num_interrupts = ARRAY_SIZE(tegra30_mc_irq_handlers),
  };
 diff --git a/drivers/memory/tegra/tegra124.c b/drivers/memory/tegra/tegra124.c
-index c5529f79fbb42..d8d9fd2414436 100644
+index c5529f79fbb4..d8d9fd241443 100644
 --- a/drivers/memory/tegra/tegra124.c
 +++ b/drivers/memory/tegra/tegra124.c
 @@ -1276,6 +1276,8 @@ const struct tegra_mc_soc tegra124_mc_soc = {
@@ -128,7 +128,7 @@ index c5529f79fbb42..d8d9fd2414436 100644
  };
  #endif /* CONFIG_ARCH_TEGRA_132_SOC */
 diff --git a/drivers/memory/tegra/tegra186.c b/drivers/memory/tegra/tegra186.c
-index 51e2dd628fb47..eb1eaaffc79a8 100644
+index 51e2dd628fb4..eb1eaaffc79a 100644
 --- a/drivers/memory/tegra/tegra186.c
 +++ b/drivers/memory/tegra/tegra186.c
 @@ -174,7 +174,6 @@ const struct tegra_mc_ops tegra186_mc_ops = {
@@ -148,7 +148,7 @@ index 51e2dd628fb47..eb1eaaffc79a8 100644
  };
  #endif
 diff --git a/drivers/memory/tegra/tegra194.c b/drivers/memory/tegra/tegra194.c
-index 5b7ff2dd68122..cb0e7886857d9 100644
+index 5b7ff2dd6812..cb0e7886857d 100644
 --- a/drivers/memory/tegra/tegra194.c
 +++ b/drivers/memory/tegra/tegra194.c
 @@ -1359,4 +1359,6 @@ const struct tegra_mc_soc tegra194_mc_soc = {
@@ -159,7 +159,7 @@ index 5b7ff2dd68122..cb0e7886857d9 100644
 +	.num_interrupts = ARRAY_SIZE(tegra30_mc_irq_handlers),
  };
 diff --git a/drivers/memory/tegra/tegra20.c b/drivers/memory/tegra/tegra20.c
-index 227c3336974de..9bce1c0561ce8 100644
+index 227c3336974d..9bce1c0561ce 100644
 --- a/drivers/memory/tegra/tegra20.c
 +++ b/drivers/memory/tegra/tegra20.c
 @@ -761,9 +761,12 @@ static irqreturn_t tegra20_mc_handle_irq(int irq, void *data)
@@ -184,7 +184,7 @@ index 227c3336974de..9bce1c0561ce8 100644
 +	.num_interrupts = ARRAY_SIZE(tegra20_mc_irq_handlers),
  };
 diff --git a/drivers/memory/tegra/tegra210.c b/drivers/memory/tegra/tegra210.c
-index e166b33848e95..8283601ab52cd 100644
+index e166b33848e9..8283601ab52c 100644
 --- a/drivers/memory/tegra/tegra210.c
 +++ b/drivers/memory/tegra/tegra210.c
 @@ -1288,4 +1288,6 @@ const struct tegra_mc_soc tegra210_mc_soc = {
@@ -195,7 +195,7 @@ index e166b33848e95..8283601ab52cd 100644
 +	.num_interrupts = ARRAY_SIZE(tegra30_mc_irq_handlers),
  };
 diff --git a/drivers/memory/tegra/tegra234.c b/drivers/memory/tegra/tegra234.c
-index 512d054d75924..9586d7528fb70 100644
+index 512d054d7592..9586d7528fb7 100644
 --- a/drivers/memory/tegra/tegra234.c
 +++ b/drivers/memory/tegra/tegra234.c
 @@ -1153,4 +1153,6 @@ const struct tegra_mc_soc tegra234_mc_soc = {
@@ -206,7 +206,7 @@ index 512d054d75924..9586d7528fb70 100644
 +	.num_interrupts = ARRAY_SIZE(tegra30_mc_irq_handlers),
  };
 diff --git a/drivers/memory/tegra/tegra30.c b/drivers/memory/tegra/tegra30.c
-index 3f3c7d996b49b..21b5f902276b3 100644
+index 3f3c7d996b49..21b5f902276b 100644
 --- a/drivers/memory/tegra/tegra30.c
 +++ b/drivers/memory/tegra/tegra30.c
 @@ -1401,4 +1401,6 @@ const struct tegra_mc_soc tegra30_mc_soc = {
@@ -217,7 +217,7 @@ index 3f3c7d996b49b..21b5f902276b3 100644
 +	.num_interrupts = ARRAY_SIZE(tegra30_mc_irq_handlers),
  };
 diff --git a/include/soc/tegra/mc.h b/include/soc/tegra/mc.h
-index 372f47e824d53..d07de04c0f337 100644
+index 372f47e824d5..d07de04c0f33 100644
 --- a/include/soc/tegra/mc.h
 +++ b/include/soc/tegra/mc.h
 @@ -10,10 +10,11 @@
@@ -260,5 +260,5 @@ index 372f47e824d53..d07de04c0f337 100644
  	const struct tegra_mc_soc *soc;
  	unsigned long tick;
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/platform/patches/0062-memory-tegra-Group-SoC-specific-fields.patch b/features/tegra/platform/patches/0060-memory-tegra-Group-SoC-specific-fields.patch
similarity index 90%
rename from features/tegra/platform/patches/0062-memory-tegra-Group-SoC-specific-fields.patch
rename to features/tegra/platform/patches/0060-memory-tegra-Group-SoC-specific-fields.patch
index 3a3b6ef..fb88910 100644
--- a/features/tegra/platform/patches/0062-memory-tegra-Group-SoC-specific-fields.patch
+++ b/features/tegra/platform/patches/0060-memory-tegra-Group-SoC-specific-fields.patch
@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Ketan Patil <ketanp@nvidia.com>
 Date: Thu, 26 Feb 2026 16:31:13 +0000
-Subject: [PATCH 062/196] memory: tegra: Group SoC specific fields
+Subject: [PATCH 060/184] memory: tegra: Group SoC specific fields
 
 Introduce new SoC specific fields in tegra_mc_soc struct for high
 address mask and error status type mask because Tegra264 has different
@@ -23,10 +23,10 @@ Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org>
 (cherry picked from commit 2e4cfaa78eb98d2623367818c859225c6b6bf701)
 
 diff --git a/drivers/memory/tegra/mc.c b/drivers/memory/tegra/mc.c
-index de988c3123427..213184ebdfcf6 100644
+index 1f376b4fdf89..8d0f41793921 100644
 --- a/drivers/memory/tegra/mc.c
 +++ b/drivers/memory/tegra/mc.c
-@@ -667,9 +667,12 @@ irqreturn_t tegra30_mc_handle_irq(int irq, void *data)
+@@ -668,9 +668,12 @@ irqreturn_t tegra30_mc_handle_irq(int irq, void *data)
  					addr = mc_ch_readl(mc, channel, addr_hi_reg);
  				else
  					addr = mc_readl(mc, addr_hi_reg);
@@ -41,7 +41,7 @@ index de988c3123427..213184ebdfcf6 100644
  			}
  			addr <<= 32;
  		}
-@@ -694,11 +697,11 @@ irqreturn_t tegra30_mc_handle_irq(int irq, void *data)
+@@ -695,11 +698,11 @@ irqreturn_t tegra30_mc_handle_irq(int irq, void *data)
  			}
  		}
  
@@ -56,7 +56,7 @@ index de988c3123427..213184ebdfcf6 100644
  			perm[0] = ' ';
  			perm[1] = '[';
 diff --git a/drivers/memory/tegra/mc.h b/drivers/memory/tegra/mc.h
-index 34ce03ebc51ca..b286c2558fd52 100644
+index 34ce03ebc51c..b286c2558fd5 100644
 --- a/drivers/memory/tegra/mc.h
 +++ b/drivers/memory/tegra/mc.h
 @@ -78,10 +78,8 @@
@@ -71,7 +71,7 @@ index 34ce03ebc51ca..b286c2558fd52 100644
  #define MC_BROADCAST_CHANNEL				~0
  
 diff --git a/drivers/memory/tegra/tegra114.c b/drivers/memory/tegra/tegra114.c
-index fffb28eea57f0..3a061a2d881ea 100644
+index fffb28eea57f..3a061a2d881e 100644
 --- a/drivers/memory/tegra/tegra114.c
 +++ b/drivers/memory/tegra/tegra114.c
 @@ -1117,4 +1117,5 @@ const struct tegra_mc_soc tegra114_mc_soc = {
@@ -81,7 +81,7 @@ index fffb28eea57f0..3a061a2d881ea 100644
 +	.mc_err_status_type_mask = (0x7 << 28),
  };
 diff --git a/drivers/memory/tegra/tegra124.c b/drivers/memory/tegra/tegra124.c
-index d8d9fd2414436..51bf844bee0bf 100644
+index d8d9fd241443..51bf844bee0b 100644
 --- a/drivers/memory/tegra/tegra124.c
 +++ b/drivers/memory/tegra/tegra124.c
 @@ -1278,6 +1278,8 @@ const struct tegra_mc_soc tegra124_mc_soc = {
@@ -102,7 +102,7 @@ index d8d9fd2414436..51bf844bee0bf 100644
  };
  #endif /* CONFIG_ARCH_TEGRA_132_SOC */
 diff --git a/drivers/memory/tegra/tegra186.c b/drivers/memory/tegra/tegra186.c
-index eb1eaaffc79a8..94cad76c52ac8 100644
+index eb1eaaffc79a..94cad76c52ac 100644
 --- a/drivers/memory/tegra/tegra186.c
 +++ b/drivers/memory/tegra/tegra186.c
 @@ -916,5 +916,7 @@ const struct tegra_mc_soc tegra186_mc_soc = {
@@ -114,7 +114,7 @@ index eb1eaaffc79a8..94cad76c52ac8 100644
  };
  #endif
 diff --git a/drivers/memory/tegra/tegra194.c b/drivers/memory/tegra/tegra194.c
-index cb0e7886857d9..38852b2a0f448 100644
+index cb0e7886857d..38852b2a0f44 100644
 --- a/drivers/memory/tegra/tegra194.c
 +++ b/drivers/memory/tegra/tegra194.c
 @@ -1361,4 +1361,6 @@ const struct tegra_mc_soc tegra194_mc_soc = {
@@ -125,7 +125,7 @@ index cb0e7886857d9..38852b2a0f448 100644
 +	.mc_err_status_type_mask = (0x7 << 28),
  };
 diff --git a/drivers/memory/tegra/tegra20.c b/drivers/memory/tegra/tegra20.c
-index 9bce1c0561ce8..59a9a2fdc401c 100644
+index 9bce1c0561ce..59a9a2fdc401 100644
 --- a/drivers/memory/tegra/tegra20.c
 +++ b/drivers/memory/tegra/tegra20.c
 @@ -784,4 +784,5 @@ const struct tegra_mc_soc tegra20_mc_soc = {
@@ -135,7 +135,7 @@ index 9bce1c0561ce8..59a9a2fdc401c 100644
 +	.mc_err_status_type_mask = (0x7 << 28),
  };
 diff --git a/drivers/memory/tegra/tegra210.c b/drivers/memory/tegra/tegra210.c
-index 8283601ab52cd..aa606df8a6798 100644
+index 8283601ab52c..aa606df8a679 100644
 --- a/drivers/memory/tegra/tegra210.c
 +++ b/drivers/memory/tegra/tegra210.c
 @@ -1290,4 +1290,6 @@ const struct tegra_mc_soc tegra210_mc_soc = {
@@ -146,7 +146,7 @@ index 8283601ab52cd..aa606df8a6798 100644
 +	.mc_err_status_type_mask = (0x7 << 28),
  };
 diff --git a/drivers/memory/tegra/tegra234.c b/drivers/memory/tegra/tegra234.c
-index 9586d7528fb70..67d5d4e01a65b 100644
+index 9586d7528fb7..67d5d4e01a65 100644
 --- a/drivers/memory/tegra/tegra234.c
 +++ b/drivers/memory/tegra/tegra234.c
 @@ -1155,4 +1155,6 @@ const struct tegra_mc_soc tegra234_mc_soc = {
@@ -157,7 +157,7 @@ index 9586d7528fb70..67d5d4e01a65b 100644
 +	.mc_err_status_type_mask = (0x7 << 28),
  };
 diff --git a/drivers/memory/tegra/tegra30.c b/drivers/memory/tegra/tegra30.c
-index 21b5f902276b3..66897c09c789a 100644
+index 21b5f902276b..66897c09c789 100644
 --- a/drivers/memory/tegra/tegra30.c
 +++ b/drivers/memory/tegra/tegra30.c
 @@ -1403,4 +1403,5 @@ const struct tegra_mc_soc tegra30_mc_soc = {
@@ -167,7 +167,7 @@ index 21b5f902276b3..66897c09c789a 100644
 +	.mc_err_status_type_mask = (0x7 << 28),
  };
 diff --git a/include/soc/tegra/mc.h b/include/soc/tegra/mc.h
-index d07de04c0f337..b9b1763b10b5f 100644
+index d07de04c0f33..b9b1763b10b5 100644
 --- a/include/soc/tegra/mc.h
 +++ b/include/soc/tegra/mc.h
 @@ -217,6 +217,8 @@ struct tegra_mc_soc {
@@ -180,5 +180,5 @@ index d07de04c0f337..b9b1763b10b5f 100644
  
  struct tegra_mc {
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/platform/patches/0063-memory-tegra-Prepare-for-supporting-multiple-intmask.patch b/features/tegra/platform/patches/0061-memory-tegra-Prepare-for-supporting-multiple-intmask.patch
similarity index 95%
rename from features/tegra/platform/patches/0063-memory-tegra-Prepare-for-supporting-multiple-intmask.patch
rename to features/tegra/platform/patches/0061-memory-tegra-Prepare-for-supporting-multiple-intmask.patch
index 4a930af..ba4e153 100644
--- a/features/tegra/platform/patches/0063-memory-tegra-Prepare-for-supporting-multiple-intmask.patch
+++ b/features/tegra/platform/patches/0061-memory-tegra-Prepare-for-supporting-multiple-intmask.patch
@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Ketan Patil <ketanp@nvidia.com>
 Date: Thu, 26 Feb 2026 16:31:14 +0000
-Subject: [PATCH 063/196] memory: tegra: Prepare for supporting multiple
+Subject: [PATCH 061/184] memory: tegra: Prepare for supporting multiple
  intmask registers
 
 Add a new structure for the intmask register e.g. MC_INTMASK_0 and
@@ -18,10 +18,10 @@ Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org>
 (cherry picked from commit 9f2614510960f0761144d14e1b4c4d82e0c098e9)
 
 diff --git a/drivers/memory/tegra/mc.c b/drivers/memory/tegra/mc.c
-index 213184ebdfcf6..2bad614cf605c 100644
+index 8d0f41793921..abd11aa9141c 100644
 --- a/drivers/memory/tegra/mc.c
 +++ b/drivers/memory/tegra/mc.c
-@@ -595,9 +595,9 @@ irqreturn_t tegra30_mc_handle_irq(int irq, void *data)
+@@ -596,9 +596,9 @@ irqreturn_t tegra30_mc_handle_irq(int irq, void *data)
  		}
  
  		/* mask all interrupts to avoid flooding */
@@ -33,7 +33,7 @@ index 213184ebdfcf6..2bad614cf605c 100644
  	}
  
  	if (!status)
-@@ -978,11 +978,13 @@ static int tegra_mc_probe(struct platform_device *pdev)
+@@ -979,11 +979,13 @@ static int tegra_mc_probe(struct platform_device *pdev)
  			}
  		}
  
@@ -53,7 +53,7 @@ index 213184ebdfcf6..2bad614cf605c 100644
  
  	if (mc->soc->reset_ops) {
 diff --git a/drivers/memory/tegra/tegra114.c b/drivers/memory/tegra/tegra114.c
-index 3a061a2d881ea..02dd4e26288a1 100644
+index 3a061a2d881e..02dd4e26288a 100644
 --- a/drivers/memory/tegra/tegra114.c
 +++ b/drivers/memory/tegra/tegra114.c
 @@ -1101,6 +1101,14 @@ static const struct tegra_mc_reset tegra114_mc_resets[] = {
@@ -83,7 +83,7 @@ index 3a061a2d881ea..02dd4e26288a1 100644
  	.resets = tegra114_mc_resets,
  	.num_resets = ARRAY_SIZE(tegra114_mc_resets),
 diff --git a/drivers/memory/tegra/tegra124.c b/drivers/memory/tegra/tegra124.c
-index 51bf844bee0bf..0a77f50a28769 100644
+index 51bf844bee0b..0a77f50a2876 100644
 --- a/drivers/memory/tegra/tegra124.c
 +++ b/drivers/memory/tegra/tegra124.c
 @@ -1258,6 +1258,15 @@ static const struct tegra_smmu_soc tegra124_smmu_soc = {
@@ -143,7 +143,7 @@ index 51bf844bee0bf..0a77f50a28769 100644
  	.resets = tegra124_mc_resets,
  	.num_resets = ARRAY_SIZE(tegra124_mc_resets),
 diff --git a/drivers/memory/tegra/tegra186.c b/drivers/memory/tegra/tegra186.c
-index 94cad76c52ac8..91d56165605f6 100644
+index 94cad76c52ac..91d56165605f 100644
 --- a/drivers/memory/tegra/tegra186.c
 +++ b/drivers/memory/tegra/tegra186.c
 @@ -901,15 +901,23 @@ static const struct tegra_mc_client tegra186_mc_clients[] = {
@@ -174,7 +174,7 @@ index 94cad76c52ac8..91d56165605f6 100644
  	.ch_intmask = 0x0000000f,
  	.global_intstatus_channel_shift = 0,
 diff --git a/drivers/memory/tegra/tegra194.c b/drivers/memory/tegra/tegra194.c
-index 38852b2a0f448..a8cc57690696d 100644
+index 38852b2a0f44..a8cc57690696 100644
 --- a/drivers/memory/tegra/tegra194.c
 +++ b/drivers/memory/tegra/tegra194.c
 @@ -1343,16 +1343,23 @@ static const struct tegra_mc_client tegra194_mc_clients[] = {
@@ -206,7 +206,7 @@ index 38852b2a0f448..a8cc57690696d 100644
  	.ops = &tegra186_mc_ops,
  	.icc_ops = &tegra_mc_icc_ops,
 diff --git a/drivers/memory/tegra/tegra20.c b/drivers/memory/tegra/tegra20.c
-index 59a9a2fdc401c..f7eb9e53c9fab 100644
+index 59a9a2fdc401..f7eb9e53c9fa 100644
 --- a/drivers/memory/tegra/tegra20.c
 +++ b/drivers/memory/tegra/tegra20.c
 @@ -695,7 +695,7 @@ static irqreturn_t tegra20_mc_handle_irq(int irq, void *data)
@@ -243,7 +243,7 @@ index 59a9a2fdc401c..f7eb9e53c9fab 100644
  	.resets = tegra20_mc_resets,
  	.num_resets = ARRAY_SIZE(tegra20_mc_resets),
 diff --git a/drivers/memory/tegra/tegra210.c b/drivers/memory/tegra/tegra210.c
-index aa606df8a6798..f58f3ef6f6819 100644
+index aa606df8a679..f58f3ef6f681 100644
 --- a/drivers/memory/tegra/tegra210.c
 +++ b/drivers/memory/tegra/tegra210.c
 @@ -1273,6 +1273,15 @@ static const struct tegra_mc_reset tegra210_mc_resets[] = {
@@ -275,7 +275,7 @@ index aa606df8a6798..f58f3ef6f6819 100644
  	.resets = tegra210_mc_resets,
  	.num_resets = ARRAY_SIZE(tegra210_mc_resets),
 diff --git a/drivers/memory/tegra/tegra234.c b/drivers/memory/tegra/tegra234.c
-index 67d5d4e01a65b..87b22038a5fbf 100644
+index 67d5d4e01a65..87b22038a5fb 100644
 --- a/drivers/memory/tegra/tegra234.c
 +++ b/drivers/memory/tegra/tegra234.c
 @@ -1132,16 +1132,23 @@ static const struct tegra_mc_icc_ops tegra234_mc_icc_ops = {
@@ -307,7 +307,7 @@ index 67d5d4e01a65b..87b22038a5fbf 100644
  	.ops = &tegra186_mc_ops,
  	.icc_ops = &tegra234_mc_icc_ops,
 diff --git a/drivers/memory/tegra/tegra264.c b/drivers/memory/tegra/tegra264.c
-index 5203e6c113727..172a48b56484a 100644
+index 5203e6c11372..172a48b56484 100644
 --- a/drivers/memory/tegra/tegra264.c
 +++ b/drivers/memory/tegra/tegra264.c
 @@ -1,6 +1,6 @@
@@ -347,7 +347,7 @@ index 5203e6c113727..172a48b56484a 100644
  	.ops = &tegra186_mc_ops,
  	.icc_ops = &tegra264_mc_icc_ops,
 diff --git a/drivers/memory/tegra/tegra30.c b/drivers/memory/tegra/tegra30.c
-index 66897c09c789a..b07f6ede86a62 100644
+index 66897c09c789..b07f6ede86a6 100644
 --- a/drivers/memory/tegra/tegra30.c
 +++ b/drivers/memory/tegra/tegra30.c
 @@ -1384,6 +1384,14 @@ static const struct tegra_mc_icc_ops tegra30_mc_icc_ops = {
@@ -377,7 +377,7 @@ index 66897c09c789a..b07f6ede86a62 100644
  	.resets = tegra30_mc_resets,
  	.num_resets = ARRAY_SIZE(tegra30_mc_resets),
 diff --git a/include/soc/tegra/mc.h b/include/soc/tegra/mc.h
-index b9b1763b10b5f..e6da035d1306d 100644
+index b9b1763b10b5..e6da035d1306 100644
 --- a/include/soc/tegra/mc.h
 +++ b/include/soc/tegra/mc.h
 @@ -185,6 +185,11 @@ struct tegra_mc_regs {
@@ -410,5 +410,5 @@ index b9b1763b10b5f..e6da035d1306d 100644
  
  struct tegra_mc {
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/platform/patches/0064-memory-tegra-Add-MC-error-logging-support-for-Tegra2.patch b/features/tegra/platform/patches/0062-memory-tegra-Add-MC-error-logging-support-for-Tegra2.patch
similarity index 98%
rename from features/tegra/platform/patches/0064-memory-tegra-Add-MC-error-logging-support-for-Tegra2.patch
rename to features/tegra/platform/patches/0062-memory-tegra-Add-MC-error-logging-support-for-Tegra2.patch
index f835cb2..0cc8099 100644
--- a/features/tegra/platform/patches/0064-memory-tegra-Add-MC-error-logging-support-for-Tegra2.patch
+++ b/features/tegra/platform/patches/0062-memory-tegra-Add-MC-error-logging-support-for-Tegra2.patch
@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Ketan Patil <ketanp@nvidia.com>
 Date: Thu, 26 Feb 2026 16:31:15 +0000
-Subject: [PATCH 064/196] memory: tegra: Add MC error logging support for
+Subject: [PATCH 062/184] memory: tegra: Add MC error logging support for
  Tegra264
 
 In Tegra264, different components from memory subsystems like Memory
@@ -28,10 +28,10 @@ Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org>
 (cherry picked from commit 82169065ffb07577075a5088b313d78673ded331)
 
 diff --git a/drivers/memory/tegra/mc.c b/drivers/memory/tegra/mc.c
-index 2bad614cf605c..5fed2c54bee55 100644
+index abd11aa9141c..b736e79d6c08 100644
 --- a/drivers/memory/tegra/mc.c
 +++ b/drivers/memory/tegra/mc.c
-@@ -699,7 +699,7 @@ irqreturn_t tegra30_mc_handle_irq(int irq, void *data)
+@@ -700,7 +700,7 @@ irqreturn_t tegra30_mc_handle_irq(int irq, void *data)
  
  		type = (value & mc->soc->mc_err_status_type_mask) >>
  		       MC_ERR_STATUS_TYPE_SHIFT;
@@ -40,7 +40,7 @@ index 2bad614cf605c..5fed2c54bee55 100644
  
  		switch (value & mc->soc->mc_err_status_type_mask) {
  		case MC_ERR_STATUS_TYPE_INVALID_SMMU_PAGE:
-@@ -767,9 +767,10 @@ const char *const tegra_mc_status_names[32] = {
+@@ -768,9 +768,10 @@ const char *const tegra_mc_status_names[32] = {
  	[16] = "MTS carveout violation",
  	[17] = "Generalized carveout violation",
  	[20] = "Route Sanity error",
@@ -53,7 +53,7 @@ index 2bad614cf605c..5fed2c54bee55 100644
  	[3] = "TrustZone violation",
  	[4] = "Carveout violation",
 diff --git a/drivers/memory/tegra/mc.h b/drivers/memory/tegra/mc.h
-index b286c2558fd52..649b54369263a 100644
+index b286c2558fd5..649b54369263 100644
 --- a/drivers/memory/tegra/mc.h
 +++ b/drivers/memory/tegra/mc.h
 @@ -25,6 +25,7 @@
@@ -157,7 +157,7 @@ index b286c2558fd52..649b54369263a 100644
  /*
   * These IDs are for internal use of Tegra ICC drivers. The ID numbers are
 diff --git a/drivers/memory/tegra/tegra20.c b/drivers/memory/tegra/tegra20.c
-index f7eb9e53c9fab..e352c370727e3 100644
+index f7eb9e53c9fa..e352c370727e 100644
 --- a/drivers/memory/tegra/tegra20.c
 +++ b/drivers/memory/tegra/tegra20.c
 @@ -713,7 +713,7 @@ static irqreturn_t tegra20_mc_handle_irq(int irq, void *data)
@@ -188,7 +188,7 @@ index f7eb9e53c9fab..e352c370727e3 100644
  
  			if (value & BIT(31))
 diff --git a/drivers/memory/tegra/tegra264.c b/drivers/memory/tegra/tegra264.c
-index 172a48b56484a..e43ef14da1ee7 100644
+index 172a48b56484..e43ef14da1ee 100644
 --- a/drivers/memory/tegra/tegra264.c
 +++ b/drivers/memory/tegra/tegra264.c
 @@ -188,6 +188,41 @@ static const struct tegra_mc_client tegra264_mc_clients[] = {
@@ -632,5 +632,5 @@ index 172a48b56484a..e43ef14da1ee7 100644
 +	.num_interrupts = ARRAY_SIZE(tegra264_mc_irq_handlers),
  };
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/platform/patches/0065-memory-tegra-Make-resume-callback-return-void.patch b/features/tegra/platform/patches/0063-memory-tegra-Make-resume-callback-return-void.patch
similarity index 92%
rename from features/tegra/platform/patches/0065-memory-tegra-Make-resume-callback-return-void.patch
rename to features/tegra/platform/patches/0063-memory-tegra-Make-resume-callback-return-void.patch
index 165a57a..0d2ba65 100644
--- a/features/tegra/platform/patches/0065-memory-tegra-Make-resume-callback-return-void.patch
+++ b/features/tegra/platform/patches/0063-memory-tegra-Make-resume-callback-return-void.patch
@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Ashish Mhetre <amhetre@nvidia.com>
 Date: Thu, 30 Apr 2026 09:52:00 +0000
-Subject: [PATCH 065/196] memory: tegra: Make ->resume() callback return void
+Subject: [PATCH 063/184] memory: tegra: Make ->resume() callback return void
 
 tegra186_mc_resume() is the only implementation of the SoC ->resume()
 op in struct tegra_mc_ops, and it can never fail as the SID override
@@ -18,7 +18,7 @@ Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org>
 (cherry picked from commit 4f42beeb9796e24e8009c46d1a2d676803e5ab24)
 
 diff --git a/drivers/memory/tegra/tegra186.c b/drivers/memory/tegra/tegra186.c
-index 91d56165605f6..579d058da220c 100644
+index 91d56165605f..579d058da220 100644
 --- a/drivers/memory/tegra/tegra186.c
 +++ b/drivers/memory/tegra/tegra186.c
 @@ -154,7 +154,7 @@ static int tegra186_mc_probe_device(struct tegra_mc *mc, struct device *dev)
@@ -40,7 +40,7 @@ index 91d56165605f6..579d058da220c 100644
  
  const struct tegra_mc_ops tegra186_mc_ops = {
 diff --git a/include/soc/tegra/mc.h b/include/soc/tegra/mc.h
-index e6da035d1306d..25d465d704938 100644
+index e6da035d1306..25d465d70493 100644
 --- a/include/soc/tegra/mc.h
 +++ b/include/soc/tegra/mc.h
 @@ -164,7 +164,7 @@ struct tegra_mc_ops {
@@ -53,5 +53,5 @@ index e6da035d1306d..25d465d704938 100644
  };
  
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/platform/patches/0067-memory-tegra-Restore-MC-interrupt-masks-on-resume.patch b/features/tegra/platform/patches/0064-memory-tegra-Restore-MC-interrupt-masks-on-resume.patch
similarity index 95%
rename from features/tegra/platform/patches/0067-memory-tegra-Restore-MC-interrupt-masks-on-resume.patch
rename to features/tegra/platform/patches/0064-memory-tegra-Restore-MC-interrupt-masks-on-resume.patch
index 6d3164e..615f063 100644
--- a/features/tegra/platform/patches/0067-memory-tegra-Restore-MC-interrupt-masks-on-resume.patch
+++ b/features/tegra/platform/patches/0064-memory-tegra-Restore-MC-interrupt-masks-on-resume.patch
@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Ashish Mhetre <amhetre@nvidia.com>
 Date: Thu, 30 Apr 2026 09:52:02 +0000
-Subject: [PATCH 067/196] memory: tegra: Restore MC interrupt masks on resume
+Subject: [PATCH 064/184] memory: tegra: Restore MC interrupt masks on resume
 
 The MC interrupt mask registers lose their state across Tegra low power
 suspend state (aka. SC7). Without re-applying them on resume, MC
@@ -19,7 +19,7 @@ Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org>
 (cherry picked from commit 35934fd08d17071c5ae0e99b95258f61f0cff763)
 
 diff --git a/drivers/memory/tegra/mc.c b/drivers/memory/tegra/mc.c
-index b736e79d6c087..627d259b64931 100644
+index b736e79d6c08..627d259b6493 100644
 --- a/drivers/memory/tegra/mc.c
 +++ b/drivers/memory/tegra/mc.c
 @@ -920,6 +920,19 @@ static void tegra_mc_num_channel_enabled(struct tegra_mc *mc)
@@ -67,5 +67,5 @@ index b736e79d6c087..627d259b64931 100644
  }
  
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/platform/patches/0068-dt-bindings-memory-tegra-Add-nvidia-tegra238-mc-comp.patch b/features/tegra/platform/patches/0065-dt-bindings-memory-tegra-Add-nvidia-tegra238-mc-comp.patch
similarity index 96%
rename from features/tegra/platform/patches/0068-dt-bindings-memory-tegra-Add-nvidia-tegra238-mc-comp.patch
rename to features/tegra/platform/patches/0065-dt-bindings-memory-tegra-Add-nvidia-tegra238-mc-comp.patch
index fd24df3..501aad9 100644
--- a/features/tegra/platform/patches/0068-dt-bindings-memory-tegra-Add-nvidia-tegra238-mc-comp.patch
+++ b/features/tegra/platform/patches/0065-dt-bindings-memory-tegra-Add-nvidia-tegra238-mc-comp.patch
@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Ashish Mhetre <amhetre@nvidia.com>
 Date: Mon, 27 Apr 2026 07:34:18 +0000
-Subject: [PATCH 068/196] dt-bindings: memory: tegra: Add nvidia,tegra238-mc
+Subject: [PATCH 065/184] dt-bindings: memory: tegra: Add nvidia,tegra238-mc
  compatible
 
 Document the device tree binding for the Tegra238 memory controller.
@@ -18,7 +18,7 @@ Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org>
 (cherry picked from commit bf7cf25d4245fe49c71eba0e3b09b6260a336999)
 
 diff --git a/Documentation/devicetree/bindings/memory-controllers/nvidia,tegra186-mc.yaml b/Documentation/devicetree/bindings/memory-controllers/nvidia,tegra186-mc.yaml
-index b901f1b3e0fc3..edf613af49ec6 100644
+index b901f1b3e0fc..edf613af49ec 100644
 --- a/Documentation/devicetree/bindings/memory-controllers/nvidia,tegra186-mc.yaml
 +++ b/Documentation/devicetree/bindings/memory-controllers/nvidia,tegra186-mc.yaml
 @@ -32,6 +32,7 @@ properties:
@@ -68,7 +68,7 @@ index b901f1b3e0fc3..edf613af49ec6 100644
          compatible:
 diff --git a/include/dt-bindings/memory/nvidia,tegra238-mc.h b/include/dt-bindings/memory/nvidia,tegra238-mc.h
 new file mode 100644
-index 0000000000000..be24c0eb3f15e
+index 000000000000..be24c0eb3f15
 --- /dev/null
 +++ b/include/dt-bindings/memory/nvidia,tegra238-mc.h
 @@ -0,0 +1,74 @@
@@ -147,5 +147,5 @@ index 0000000000000..be24c0eb3f15e
 +
 +#endif
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/platform/patches/0069-memory-tegra-Add-Tegra238-MC-support.patch b/features/tegra/platform/patches/0066-memory-tegra-Add-Tegra238-MC-support.patch
similarity index 97%
rename from features/tegra/platform/patches/0069-memory-tegra-Add-Tegra238-MC-support.patch
rename to features/tegra/platform/patches/0066-memory-tegra-Add-Tegra238-MC-support.patch
index 9ac13a2..12efa8e 100644
--- a/features/tegra/platform/patches/0069-memory-tegra-Add-Tegra238-MC-support.patch
+++ b/features/tegra/platform/patches/0066-memory-tegra-Add-Tegra238-MC-support.patch
@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Ashish Mhetre <amhetre@nvidia.com>
 Date: Mon, 27 Apr 2026 07:34:19 +0000
-Subject: [PATCH 069/196] memory: tegra: Add Tegra238 MC support
+Subject: [PATCH 066/184] memory: tegra: Add Tegra238 MC support
 
 Add Memory Controller driver support for Tegra238 SOC, including:
 - MC client definitions with Tegra238-specific stream IDs
@@ -19,7 +19,7 @@ Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org>
 (cherry picked from commit 907ef6a1baf0ad61f64d31a3f5040feb82f48929)
 
 diff --git a/drivers/memory/tegra/Makefile b/drivers/memory/tegra/Makefile
-index 6334601e6120d..7c2fca12076b9 100644
+index 6334601e6120..7c2fca12076b 100644
 --- a/drivers/memory/tegra/Makefile
 +++ b/drivers/memory/tegra/Makefile
 @@ -10,6 +10,7 @@ tegra-mc-$(CONFIG_ARCH_TEGRA_210_SOC) += tegra210.o
@@ -31,7 +31,7 @@ index 6334601e6120d..7c2fca12076b9 100644
  
  obj-$(CONFIG_TEGRA_MC) += tegra-mc.o
 diff --git a/drivers/memory/tegra/mc.c b/drivers/memory/tegra/mc.c
-index 627d259b64931..d96c71c780c43 100644
+index 627d259b6493..d96c71c780c4 100644
 --- a/drivers/memory/tegra/mc.c
 +++ b/drivers/memory/tegra/mc.c
 @@ -50,6 +50,9 @@ static const struct of_device_id tegra_mc_of_match[] = {
@@ -45,7 +45,7 @@ index 627d259b64931..d96c71c780c43 100644
  	{ .compatible = "nvidia,tegra264-mc", .data = &tegra264_mc_soc },
  #endif
 diff --git a/drivers/memory/tegra/mc.h b/drivers/memory/tegra/mc.h
-index 649b54369263a..e94d265d7b678 100644
+index 649b54369263..e94d265d7b67 100644
 --- a/drivers/memory/tegra/mc.h
 +++ b/drivers/memory/tegra/mc.h
 @@ -240,6 +240,14 @@ extern const struct tegra_mc_soc tegra194_mc_soc;
@@ -72,7 +72,7 @@ index 649b54369263a..e94d265d7b678 100644
  extern const struct tegra_mc_ops tegra186_mc_ops;
  #endif
 diff --git a/drivers/memory/tegra/tegra234.c b/drivers/memory/tegra/tegra234.c
-index 87b22038a5fbf..9fbd34d4abe04 100644
+index 87b22038a5fb..9fbd34d4abe0 100644
 --- a/drivers/memory/tegra/tegra234.c
 +++ b/drivers/memory/tegra/tegra234.c
 @@ -1125,7 +1125,7 @@ static int tegra234_mc_icc_get_init_bw(struct icc_node *node, u32 *avg, u32 *pea
@@ -86,7 +86,7 @@ index 87b22038a5fbf..9fbd34d4abe04 100644
  	.get_bw = tegra234_mc_icc_get_init_bw,
 diff --git a/drivers/memory/tegra/tegra238.c b/drivers/memory/tegra/tegra238.c
 new file mode 100644
-index 0000000000000..938c8985600e6
+index 000000000000..938c8985600e
 --- /dev/null
 +++ b/drivers/memory/tegra/tegra238.c
 @@ -0,0 +1,391 @@
@@ -482,5 +482,5 @@ index 0000000000000..938c8985600e6
 +	.mc_err_status_type_mask = (0x7 << 28),
 +};
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/platform/patches/0066-memory-tegra-Wire-up-system-sleep-PM-ops.patch b/features/tegra/platform/patches/0066-memory-tegra-Wire-up-system-sleep-PM-ops.patch
deleted file mode 100644
index 160ed63..0000000
--- a/features/tegra/platform/patches/0066-memory-tegra-Wire-up-system-sleep-PM-ops.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Ashish Mhetre <amhetre@nvidia.com>
-Date: Thu, 30 Apr 2026 09:52:01 +0000
-Subject: [PATCH 066/196] memory: tegra: Wire up system sleep PM ops
-
-The tegra-mc platform driver does not register any dev_pm_ops, so the
-SoC-specific ->resume() is never invoked (e.g. tegra186_mc_resume) on
-system wake. On Tegra186 and later this means MC client Stream-ID
-override registers are not reprogrammed, and clients behind the ARM
-SMMU fault on the first DMA after resume.
-
-Register a dev_pm_ops on the tegra-mc driver and route the system
-resume callback into mc->soc->ops->resume() so the existing SID
-restore path runs again on wake.
-
-No suspend callback is needed as the resume path reprograms all MC
-state from the static SoC tables, so there is nothing to save.
-
-Fixes: fe3b082a6eb8 ("memory: tegra: Add SID override programming for MC clients")
-Signed-off-by: Ashish Mhetre <amhetre@nvidia.com>
-Reviewed-by: Jon Hunter <jonathanh@nvidia.com>
-Link: https://patch.msgid.link/20260430095202.1167651-3-amhetre@nvidia.com
-Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org>
-(cherry picked from commit 2411c8d1e3e09910e94bab0d0a2c071fbc8a9e7b)
-
-diff --git a/drivers/memory/tegra/mc.c b/drivers/memory/tegra/mc.c
-index 5fed2c54bee55..b736e79d6c087 100644
---- a/drivers/memory/tegra/mc.c
-+++ b/drivers/memory/tegra/mc.c
-@@ -13,6 +13,7 @@
- #include <linux/of.h>
- #include <linux/of_platform.h>
- #include <linux/platform_device.h>
-+#include <linux/pm.h>
- #include <linux/slab.h>
- #include <linux/sort.h>
- #include <linux/tegra-icc.h>
-@@ -1020,10 +1021,23 @@ static void tegra_mc_sync_state(struct device *dev)
- 		icc_sync_state(dev);
- }
- 
-+static int tegra_mc_resume(struct device *dev)
-+{
-+	struct tegra_mc *mc = dev_get_drvdata(dev);
-+
-+	if (mc->soc->ops && mc->soc->ops->resume)
-+		mc->soc->ops->resume(mc);
-+
-+	return 0;
-+}
-+
-+static DEFINE_SIMPLE_DEV_PM_OPS(tegra_mc_pm_ops, NULL, tegra_mc_resume);
-+
- static struct platform_driver tegra_mc_driver = {
- 	.driver = {
- 		.name = "tegra-mc",
- 		.of_match_table = tegra_mc_of_match,
-+		.pm = pm_sleep_ptr(&tegra_mc_pm_ops),
- 		.suppress_bind_attrs = true,
- 		.sync_state = tegra_mc_sync_state,
- 	},
--- 
-2.43.0
-
diff --git a/features/tegra/platform/patches/0070-dt-bindings-memory-tegra264-Add-full-set-of-MC-clien.patch b/features/tegra/platform/patches/0067-dt-bindings-memory-tegra264-Add-full-set-of-MC-clien.patch
similarity index 99%
rename from features/tegra/platform/patches/0070-dt-bindings-memory-tegra264-Add-full-set-of-MC-clien.patch
rename to features/tegra/platform/patches/0067-dt-bindings-memory-tegra264-Add-full-set-of-MC-clien.patch
index 947433a..8168258 100644
--- a/features/tegra/platform/patches/0070-dt-bindings-memory-tegra264-Add-full-set-of-MC-clien.patch
+++ b/features/tegra/platform/patches/0067-dt-bindings-memory-tegra264-Add-full-set-of-MC-clien.patch
@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Sumit Gupta <sumitg@nvidia.com>
 Date: Mon, 18 May 2026 18:13:05 +0530
-Subject: [PATCH 070/196] dt-bindings: memory: tegra264: Add full set of MC
+Subject: [PATCH 067/184] dt-bindings: memory: tegra264: Add full set of MC
  client IDs
 
 Add the complete set of TEGRA264_MEMORY_CLIENT_* IDs exposed by the
@@ -13,7 +13,7 @@ Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org>
 (cherry picked from commit 16868fd4b7ecf241b74123e1bb23fd08d05a2e09)
 
 diff --git a/include/dt-bindings/memory/nvidia,tegra264.h b/include/dt-bindings/memory/nvidia,tegra264.h
-index 521405c01f84c..c65403a764134 100644
+index 521405c01f84..c65403a76413 100644
 --- a/include/dt-bindings/memory/nvidia,tegra264.h
 +++ b/include/dt-bindings/memory/nvidia,tegra264.h
 @@ -58,24 +58,108 @@
@@ -363,5 +363,5 @@ index 521405c01f84c..c65403a764134 100644
  
  #endif /* DT_BINDINGS_MEMORY_NVIDIA_TEGRA264_H */
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/platform/patches/0071-memory-tegra264-Skip-clients-without-bpmp_id-or-type.patch b/features/tegra/platform/patches/0068-memory-tegra264-Skip-clients-without-bpmp_id-or-type.patch
similarity index 91%
rename from features/tegra/platform/patches/0071-memory-tegra264-Skip-clients-without-bpmp_id-or-type.patch
rename to features/tegra/platform/patches/0068-memory-tegra264-Skip-clients-without-bpmp_id-or-type.patch
index 5257013..253c9ff 100644
--- a/features/tegra/platform/patches/0071-memory-tegra264-Skip-clients-without-bpmp_id-or-type.patch
+++ b/features/tegra/platform/patches/0068-memory-tegra264-Skip-clients-without-bpmp_id-or-type.patch
@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Sumit Gupta <sumitg@nvidia.com>
 Date: Mon, 18 May 2026 18:13:04 +0530
-Subject: [PATCH 071/196] memory: tegra264: Skip clients without bpmp_id or
+Subject: [PATCH 068/184] memory: tegra264: Skip clients without bpmp_id or
  type
 
 Some MC clients are present in tegra264_mc_clients[] only for
@@ -15,7 +15,7 @@ Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org>
 (cherry picked from commit c3ce114d81e39cd83f7bf9c5c46020bb7695b017)
 
 diff --git a/drivers/memory/tegra/tegra264.c b/drivers/memory/tegra/tegra264.c
-index e43ef14da1ee7..e628908417255 100644
+index e43ef14da1ee..e62890841725 100644
 --- a/drivers/memory/tegra/tegra264.c
 +++ b/drivers/memory/tegra/tegra264.c
 @@ -262,6 +262,10 @@ static int tegra264_mc_icc_set(struct icc_node *src, struct icc_node *dst)
@@ -30,5 +30,5 @@ index e43ef14da1ee7..e628908417255 100644
  		bwmgr_req.bwmgr_calc_set_req.niso_bw = src->avg_bw;
  	else
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/platform/patches/0072-memory-tegra264-Add-full-set-of-MC-clients.patch b/features/tegra/platform/patches/0069-memory-tegra264-Add-full-set-of-MC-clients.patch
similarity index 99%
rename from features/tegra/platform/patches/0072-memory-tegra264-Add-full-set-of-MC-clients.patch
rename to features/tegra/platform/patches/0069-memory-tegra264-Add-full-set-of-MC-clients.patch
index 59ff8e8..ec8450b 100644
--- a/features/tegra/platform/patches/0072-memory-tegra264-Add-full-set-of-MC-clients.patch
+++ b/features/tegra/platform/patches/0069-memory-tegra264-Add-full-set-of-MC-clients.patch
@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Sumit Gupta <sumitg@nvidia.com>
 Date: Mon, 18 May 2026 18:13:06 +0530
-Subject: [PATCH 072/196] memory: tegra264: Add full set of MC clients
+Subject: [PATCH 069/184] memory: tegra264: Add full set of MC clients
 
 Extend the tegra264_mc_clients table to cover the full set of memory
 clients exposed by the SoC. The client name is used for MC fault
@@ -17,7 +17,7 @@ Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org>
 (cherry picked from commit d530ed059dac445dc5b81d564adf1952b5c4adba)
 
 diff --git a/drivers/memory/tegra/tegra264.c b/drivers/memory/tegra/tegra264.c
-index e628908417255..b8d6c4ce48369 100644
+index e62890841725..b8d6c4ce4836 100644
 --- a/drivers/memory/tegra/tegra264.c
 +++ b/drivers/memory/tegra/tegra264.c
 @@ -21,45 +21,62 @@
@@ -634,5 +634,5 @@ index e628908417255..b8d6c4ce48369 100644
  };
  
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/platform/patches/0073-memory-tegra186-emc-stop-borrowing-MC-aggregate-hook.patch b/features/tegra/platform/patches/0070-memory-tegra186-emc-stop-borrowing-MC-aggregate-hook.patch
similarity index 95%
rename from features/tegra/platform/patches/0073-memory-tegra186-emc-stop-borrowing-MC-aggregate-hook.patch
rename to features/tegra/platform/patches/0070-memory-tegra186-emc-stop-borrowing-MC-aggregate-hook.patch
index e1ff068..8a286d3 100644
--- a/features/tegra/platform/patches/0073-memory-tegra186-emc-stop-borrowing-MC-aggregate-hook.patch
+++ b/features/tegra/platform/patches/0070-memory-tegra186-emc-stop-borrowing-MC-aggregate-hook.patch
@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Sumit Gupta <sumitg@nvidia.com>
 Date: Wed, 27 May 2026 19:31:25 +0530
-Subject: [PATCH 073/196] memory: tegra186-emc: stop borrowing MC aggregate
+Subject: [PATCH 070/184] memory: tegra186-emc: stop borrowing MC aggregate
  hook for EMC
 
 tegra186_emc_interconnect_init() copies the MC's ICC aggregate hook
@@ -33,7 +33,7 @@ Fixes: 9a38cb27668e ("memory: tegra: Add interconnect support for DRAM scaling i
 Signed-off-by: Sumit Gupta <sumitg@nvidia.com>
 
 diff --git a/drivers/memory/tegra/tegra186-emc.c b/drivers/memory/tegra/tegra186-emc.c
-index 03ebab6fbe68f..f71265b303b97 100644
+index 03ebab6fbe68..f71265b303b9 100644
 --- a/drivers/memory/tegra/tegra186-emc.c
 +++ b/drivers/memory/tegra/tegra186-emc.c
 @@ -258,15 +258,13 @@ static int tegra186_emc_icc_get_init_bw(struct icc_node *node, u32 *avg, u32 *pe
@@ -54,5 +54,5 @@ index 03ebab6fbe68f..f71265b303b97 100644
  	emc->provider.get_bw = tegra186_emc_icc_get_init_bw;
  
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/platform/patches/0074-memory-tegra264-drop-redundant-tegra264_mc_icc_aggre.patch b/features/tegra/platform/patches/0071-memory-tegra264-drop-redundant-tegra264_mc_icc_aggre.patch
similarity index 94%
rename from features/tegra/platform/patches/0074-memory-tegra264-drop-redundant-tegra264_mc_icc_aggre.patch
rename to features/tegra/platform/patches/0071-memory-tegra264-drop-redundant-tegra264_mc_icc_aggre.patch
index 190867f..f54bfe9 100644
--- a/features/tegra/platform/patches/0074-memory-tegra264-drop-redundant-tegra264_mc_icc_aggre.patch
+++ b/features/tegra/platform/patches/0071-memory-tegra264-drop-redundant-tegra264_mc_icc_aggre.patch
@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Sumit Gupta <sumitg@nvidia.com>
 Date: Wed, 27 May 2026 19:31:26 +0530
-Subject: [PATCH 074/196] memory: tegra264: drop redundant
+Subject: [PATCH 071/184] memory: tegra264: drop redundant
  tegra264_mc_icc_aggregate()
 
 tegra264_mc_icc_aggregate() does nothing on top of icc_std_aggregate
@@ -16,7 +16,7 @@ Reported-by: Jon Hunter <jonathanh@nvidia.com>
 Signed-off-by: Sumit Gupta <sumitg@nvidia.com>
 
 diff --git a/drivers/memory/tegra/tegra264.c b/drivers/memory/tegra/tegra264.c
-index b8d6c4ce48369..790349295dcc1 100644
+index b8d6c4ce4836..790349295dcc 100644
 --- a/drivers/memory/tegra/tegra264.c
 +++ b/drivers/memory/tegra/tegra264.c
 @@ -799,21 +799,6 @@ static int tegra264_mc_icc_set(struct icc_node *src, struct icc_node *dst)
@@ -51,5 +51,5 @@ index b8d6c4ce48369..790349295dcc1 100644
  	.set = tegra264_mc_icc_set,
  };
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/platform/patches/0075-memory-tegra234-drop-dead-NULL-check-in-tegra234_mc_.patch b/features/tegra/platform/patches/0072-memory-tegra234-drop-dead-NULL-check-in-tegra234_mc_.patch
similarity index 91%
rename from features/tegra/platform/patches/0075-memory-tegra234-drop-dead-NULL-check-in-tegra234_mc_.patch
rename to features/tegra/platform/patches/0072-memory-tegra234-drop-dead-NULL-check-in-tegra234_mc_.patch
index f6a8ef8..d7c2734 100644
--- a/features/tegra/platform/patches/0075-memory-tegra234-drop-dead-NULL-check-in-tegra234_mc_.patch
+++ b/features/tegra/platform/patches/0072-memory-tegra234-drop-dead-NULL-check-in-tegra234_mc_.patch
@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Sumit Gupta <sumitg@nvidia.com>
 Date: Wed, 27 May 2026 19:31:27 +0530
-Subject: [PATCH 075/196] memory: tegra234: drop dead NULL check in
+Subject: [PATCH 072/184] memory: tegra234: drop dead NULL check in
  tegra234_mc_icc_aggregate()
 
 In tegra234_mc_icc_aggregate(), the 'if (mc)' check inside the
@@ -13,7 +13,7 @@ Reported-by: Jon Hunter <jonathanh@nvidia.com>
 Signed-off-by: Sumit Gupta <sumitg@nvidia.com>
 
 diff --git a/drivers/memory/tegra/tegra234.c b/drivers/memory/tegra/tegra234.c
-index 9fbd34d4abe04..982476b67d5af 100644
+index 9fbd34d4abe0..982476b67d5a 100644
 --- a/drivers/memory/tegra/tegra234.c
 +++ b/drivers/memory/tegra/tegra234.c
 @@ -1106,10 +1106,8 @@ static int tegra234_mc_icc_aggregate(struct icc_node *node, u32 tag, u32 avg_bw,
@@ -30,5 +30,5 @@ index 9fbd34d4abe04..982476b67d5af 100644
  	*agg_avg += avg_bw;
  	*agg_peak = max(*agg_peak, peak_bw);
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/platform/patches/0076-memory-tegra-add-multi-socket-support-to-the-memory-.patch b/features/tegra/platform/patches/0073-memory-tegra-add-multi-socket-support-to-the-memory-.patch
similarity index 98%
rename from features/tegra/platform/patches/0076-memory-tegra-add-multi-socket-support-to-the-memory-.patch
rename to features/tegra/platform/patches/0073-memory-tegra-add-multi-socket-support-to-the-memory-.patch
index 7bac0bc..0c61402 100644
--- a/features/tegra/platform/patches/0076-memory-tegra-add-multi-socket-support-to-the-memory-.patch
+++ b/features/tegra/platform/patches/0073-memory-tegra-add-multi-socket-support-to-the-memory-.patch
@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Sumit Gupta <sumitg@nvidia.com>
 Date: Fri, 26 Jun 2026 18:44:23 +0530
-Subject: [PATCH 076/196] memory: tegra: add multi-socket support to the memory
+Subject: [PATCH 073/184] memory: tegra: add multi-socket support to the memory
  interconnect
 
 Add support for representing each memory-controller instance (one
@@ -26,7 +26,7 @@ that socket's local BPMP.
 Signed-off-by: Sumit Gupta <sumitg@nvidia.com>
 
 diff --git a/drivers/memory/tegra/mc.c b/drivers/memory/tegra/mc.c
-index d96c71c780c43..d6321af51d575 100644
+index d96c71c780c4..d6321af51d57 100644
 --- a/drivers/memory/tegra/mc.c
 +++ b/drivers/memory/tegra/mc.c
 @@ -3,6 +3,7 @@
@@ -138,7 +138,7 @@ index d96c71c780c43..d6321af51d575 100644
  	if (mc->soc->ops && mc->soc->ops->probe) {
  		err = mc->soc->ops->probe(mc);
 diff --git a/drivers/memory/tegra/mc.h b/drivers/memory/tegra/mc.h
-index e94d265d7b678..01499292dd5f6 100644
+index e94d265d7b67..01499292dd5f 100644
 --- a/drivers/memory/tegra/mc.h
 +++ b/drivers/memory/tegra/mc.h
 @@ -8,6 +8,7 @@
@@ -193,7 +193,7 @@ index e94d265d7b678..01499292dd5f6 100644
  			      unsigned long offset)
  {
 diff --git a/drivers/memory/tegra/tegra186-emc.c b/drivers/memory/tegra/tegra186-emc.c
-index f71265b303b97..e25f485e136e3 100644
+index f71265b303b9..e25f485e136e 100644
 --- a/drivers/memory/tegra/tegra186-emc.c
 +++ b/drivers/memory/tegra/tegra186-emc.c
 @@ -3,16 +3,22 @@
@@ -317,5 +317,5 @@ index f71265b303b97..e25f485e136e3 100644
  	tegra_bpmp_put(emc->bpmp);
  }
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/platform/patches/0077-PCI-Add-ASPEED-vendor-ID-to-pci_ids.h.patch b/features/tegra/platform/patches/0074-PCI-Add-ASPEED-vendor-ID-to-pci_ids.h.patch
similarity index 90%
rename from features/tegra/platform/patches/0077-PCI-Add-ASPEED-vendor-ID-to-pci_ids.h.patch
rename to features/tegra/platform/patches/0074-PCI-Add-ASPEED-vendor-ID-to-pci_ids.h.patch
index ffebb84..25959b1 100644
--- a/features/tegra/platform/patches/0077-PCI-Add-ASPEED-vendor-ID-to-pci_ids.h.patch
+++ b/features/tegra/platform/patches/0074-PCI-Add-ASPEED-vendor-ID-to-pci_ids.h.patch
@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Nirmoy Das <nirmoyd@nvidia.com>
 Date: Wed, 17 Dec 2025 07:45:28 -0800
-Subject: [PATCH 077/196] PCI: Add ASPEED vendor ID to pci_ids.h
+Subject: [PATCH 074/184] PCI: Add ASPEED vendor ID to pci_ids.h
 
 Add PCI_VENDOR_ID_ASPEED to the shared pci_ids.h header and remove the
 duplicate local definition from ehci-pci.c.
@@ -15,7 +15,7 @@ Link: https://patch.msgid.link/20251217154529.377586-1-nirmoyd@nvidia.com
 (cherry picked from commit eeb95c07d5fcaafb1829d5307ce4290cf1dc3190)
 
 diff --git a/drivers/usb/host/ehci-pci.c b/drivers/usb/host/ehci-pci.c
-index 889dc44262711..bd3a635555942 100644
+index 889dc4426271..bd3a63555594 100644
 --- a/drivers/usb/host/ehci-pci.c
 +++ b/drivers/usb/host/ehci-pci.c
 @@ -21,7 +21,6 @@ static const char hcd_name[] = "ehci-pci";
@@ -27,7 +27,7 @@ index 889dc44262711..bd3a635555942 100644
  
  /*-------------------------------------------------------------------------*/
 diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
-index 03b7c0380f71c..2b6692a5005f5 100644
+index 03b7c0380f71..2b6692a5005f 100644
 --- a/include/linux/pci_ids.h
 +++ b/include/linux/pci_ids.h
 @@ -2583,6 +2583,8 @@
@@ -40,5 +40,5 @@ index 03b7c0380f71c..2b6692a5005f5 100644
  
  #define PCI_VENDOR_ID_AZWAVE		0x1a3b
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/platform/patches/0078-PCI-Add-PCI_BRIDGE_NO_ALIAS-quirk-for-ASPEED-AST1150.patch b/features/tegra/platform/patches/0075-PCI-Add-PCI_BRIDGE_NO_ALIAS-quirk-for-ASPEED-AST1150.patch
similarity index 93%
rename from features/tegra/platform/patches/0078-PCI-Add-PCI_BRIDGE_NO_ALIAS-quirk-for-ASPEED-AST1150.patch
rename to features/tegra/platform/patches/0075-PCI-Add-PCI_BRIDGE_NO_ALIAS-quirk-for-ASPEED-AST1150.patch
index 85d5545..80ba59d 100644
--- a/features/tegra/platform/patches/0078-PCI-Add-PCI_BRIDGE_NO_ALIAS-quirk-for-ASPEED-AST1150.patch
+++ b/features/tegra/platform/patches/0075-PCI-Add-PCI_BRIDGE_NO_ALIAS-quirk-for-ASPEED-AST1150.patch
@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Nirmoy Das <nirmoyd@nvidia.com>
 Date: Wed, 17 Dec 2025 07:45:29 -0800
-Subject: [PATCH 078/196] PCI: Add PCI_BRIDGE_NO_ALIAS quirk for ASPEED AST1150
+Subject: [PATCH 075/184] PCI: Add PCI_BRIDGE_NO_ALIAS quirk for ASPEED AST1150
 
 ASPEED BMC controllers have VGA and USB functions behind a PCIe-to-PCI
 bridge that causes them to share the same StreamID:
@@ -28,7 +28,7 @@ Link: https://patch.msgid.link/20251217154529.377586-2-nirmoyd@nvidia.com
 (cherry picked from commit 550a190494a0d3e933dd6f3b2e9c430f94a30a8c)
 
 diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c
-index f6001be94955e..fb529b7034ffe 100644
+index f6001be94955..fb529b7034ff 100644
 --- a/drivers/pci/quirks.c
 +++ b/drivers/pci/quirks.c
 @@ -4466,6 +4466,16 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_BROADCOM, 0x9000,
@@ -49,7 +49,7 @@ index f6001be94955e..fb529b7034ffe 100644
   * Intersil/Techwell TW686[4589]-based video capture cards have an empty (zero)
   * class code.  Fix it.
 diff --git a/drivers/pci/search.c b/drivers/pci/search.c
-index 53840634fbfc2..b3c9e3d82201f 100644
+index 53840634fbfc..b3c9e3d82201 100644
 --- a/drivers/pci/search.c
 +++ b/drivers/pci/search.c
 @@ -86,6 +86,8 @@ int pci_for_each_dma_alias(struct pci_dev *pdev,
@@ -62,7 +62,7 @@ index 53840634fbfc2..b3c9e3d82201f 100644
  					 PCI_DEVID(tmp->subordinate->number,
  						   PCI_DEVFN(0, 0)), data);
 diff --git a/include/linux/pci.h b/include/linux/pci.h
-index 89f5a4290b6e2..aa03a13f13020 100644
+index 505bf6e009b1..3a928646faa5 100644
 --- a/include/linux/pci.h
 +++ b/include/linux/pci.h
 @@ -248,6 +248,11 @@ enum pci_dev_flags {
@@ -78,5 +78,5 @@ index 89f5a4290b6e2..aa03a13f13020 100644
  
  enum pci_irq_reroute_variant {
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/platform/patches/0079-PCI-dwc-tegra194-Broaden-architecture-dependency.patch b/features/tegra/platform/patches/0076-PCI-dwc-tegra194-Broaden-architecture-dependency.patch
similarity index 94%
rename from features/tegra/platform/patches/0079-PCI-dwc-tegra194-Broaden-architecture-dependency.patch
rename to features/tegra/platform/patches/0076-PCI-dwc-tegra194-Broaden-architecture-dependency.patch
index 305a4bf..2c907af 100644
--- a/features/tegra/platform/patches/0079-PCI-dwc-tegra194-Broaden-architecture-dependency.patch
+++ b/features/tegra/platform/patches/0076-PCI-dwc-tegra194-Broaden-architecture-dependency.patch
@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Vidya Sagar <vidyas@nvidia.com>
 Date: Thu, 8 May 2025 10:49:22 +0530
-Subject: [PATCH 079/196] PCI: dwc: tegra194: Broaden architecture dependency
+Subject: [PATCH 076/184] PCI: dwc: tegra194: Broaden architecture dependency
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
@@ -25,7 +25,7 @@ Signed-off-by: Jon Hunter <jonathanh@nvidia.com>
 Change-Id: I96cd3f53e12ee67630c60a2edc8a9f6203dde11f
 
 diff --git a/drivers/pci/controller/dwc/Kconfig b/drivers/pci/controller/dwc/Kconfig
-index 349d4657393c9..8375373322e4b 100644
+index 349d4657393c..8375373322e4 100644
 --- a/drivers/pci/controller/dwc/Kconfig
 +++ b/drivers/pci/controller/dwc/Kconfig
 @@ -228,7 +228,7 @@ config PCIE_TEGRA194
@@ -47,5 +47,5 @@ index 349d4657393c9..8375373322e4b 100644
  	select PCIE_DW_EP
  	select PHY_TEGRA194_P2U
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/platform/patches/0080-PCI-endpoint-Do-not-mark-the-BAR-succeeding-a-64-bit.patch b/features/tegra/platform/patches/0077-PCI-endpoint-Do-not-mark-the-BAR-succeeding-a-64-bit.patch
similarity index 94%
rename from features/tegra/platform/patches/0080-PCI-endpoint-Do-not-mark-the-BAR-succeeding-a-64-bit.patch
rename to features/tegra/platform/patches/0077-PCI-endpoint-Do-not-mark-the-BAR-succeeding-a-64-bit.patch
index 7133520..0bc2acf 100644
--- a/features/tegra/platform/patches/0080-PCI-endpoint-Do-not-mark-the-BAR-succeeding-a-64-bit.patch
+++ b/features/tegra/platform/patches/0077-PCI-endpoint-Do-not-mark-the-BAR-succeeding-a-64-bit.patch
@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Niklas Cassel <cassel@kernel.org>
 Date: Thu, 12 Mar 2026 14:02:29 +0100
-Subject: [PATCH 080/196] PCI: endpoint: Do not mark the BAR succeeding a
+Subject: [PATCH 077/184] PCI: endpoint: Do not mark the BAR succeeding a
  64-bit BAR as BAR_RESERVED
 
 A BAR that can only be configured as a 64-bit BAR by an EPC driver is
@@ -28,7 +28,7 @@ Signed-off-by: Jon Hunter <jonathanh@nvidia.com>
 Change-Id: I4b7bccec28e65384d1aa7744902140d028d015e0
 
 diff --git a/drivers/pci/controller/dwc/pci-layerscape-ep.c b/drivers/pci/controller/dwc/pci-layerscape-ep.c
-index a4a800699f898..79d226e0cc804 100644
+index a4a800699f89..79d226e0cc80 100644
 --- a/drivers/pci/controller/dwc/pci-layerscape-ep.c
 +++ b/drivers/pci/controller/dwc/pci-layerscape-ep.c
 @@ -251,9 +251,7 @@ static int __init ls_pcie_ep_probe(struct platform_device *pdev)
@@ -42,7 +42,7 @@ index a4a800699f898..79d226e0cc804 100644
  
  	pcie->pci = pci;
 diff --git a/drivers/pci/controller/dwc/pcie-keembay.c b/drivers/pci/controller/dwc/pcie-keembay.c
-index 60e74ac782af3..00dc169d33125 100644
+index 60e74ac782af..00dc169d3312 100644
 --- a/drivers/pci/controller/dwc/pcie-keembay.c
 +++ b/drivers/pci/controller/dwc/pcie-keembay.c
 @@ -312,11 +312,8 @@ static const struct pci_epc_features keembay_pcie_epc_features = {
@@ -58,7 +58,7 @@ index 60e74ac782af3..00dc169d33125 100644
  };
  
 diff --git a/drivers/pci/controller/dwc/pcie-qcom-ep.c b/drivers/pci/controller/dwc/pcie-qcom-ep.c
-index f1bc0ac81a928..f461087871fe3 100644
+index f1bc0ac81a92..f461087871fe 100644
 --- a/drivers/pci/controller/dwc/pcie-qcom-ep.c
 +++ b/drivers/pci/controller/dwc/pcie-qcom-ep.c
 @@ -824,9 +824,7 @@ static const struct pci_epc_features qcom_pcie_epc_features = {
@@ -72,7 +72,7 @@ index f1bc0ac81a928..f461087871fe3 100644
  
  static const struct pci_epc_features *
 diff --git a/drivers/pci/controller/dwc/pcie-tegra194.c b/drivers/pci/controller/dwc/pcie-tegra194.c
-index fdbf440fb3819..62ed63099b5c4 100644
+index fdbf440fb381..62ed63099b5c 100644
 --- a/drivers/pci/controller/dwc/pcie-tegra194.c
 +++ b/drivers/pci/controller/dwc/pcie-tegra194.c
 @@ -1984,7 +1984,6 @@ static const struct pci_epc_features tegra_pcie_epc_features = {
@@ -84,7 +84,7 @@ index fdbf440fb3819..62ed63099b5c4 100644
  	.bar[BAR_3] = { .type = BAR_RESERVED, },
  	.bar[BAR_4] = { .type = BAR_RESERVED, },
 diff --git a/drivers/pci/controller/dwc/pcie-uniphier-ep.c b/drivers/pci/controller/dwc/pcie-uniphier-ep.c
-index d6e73811216e2..b15c087693a73 100644
+index d6e73811216e..b15c087693a7 100644
 --- a/drivers/pci/controller/dwc/pcie-uniphier-ep.c
 +++ b/drivers/pci/controller/dwc/pcie-uniphier-ep.c
 @@ -425,9 +425,7 @@ static const struct uniphier_pcie_ep_soc_data uniphier_pro5_data = {
@@ -110,7 +110,7 @@ index d6e73811216e2..b15c087693a73 100644
  };
  
 diff --git a/drivers/pci/controller/pcie-rcar-ep.c b/drivers/pci/controller/pcie-rcar-ep.c
-index 657875ef4657f..c2da8ac1f2e85 100644
+index 657875ef4657..c2da8ac1f2e8 100644
 --- a/drivers/pci/controller/pcie-rcar-ep.c
 +++ b/drivers/pci/controller/pcie-rcar-ep.c
 @@ -440,13 +440,10 @@ static const struct pci_epc_features rcar_pcie_epc_features = {
@@ -128,7 +128,7 @@ index 657875ef4657f..c2da8ac1f2e85 100644
  
  static const struct pci_epc_features*
 diff --git a/include/linux/pci-epc.h b/include/linux/pci-epc.h
-index 4286bfdbfdfad..39d44ab85ecda 100644
+index 4286bfdbfdfa..39d44ab85ecd 100644
 --- a/include/linux/pci-epc.h
 +++ b/include/linux/pci-epc.h
 @@ -206,8 +206,7 @@ enum pci_epc_bar_type {
@@ -142,5 +142,5 @@ index 4286bfdbfdfad..39d44ab85ecda 100644
   *		only_64bit should not be set on a BAR of type BAR_RESERVED.
   *		(If BARx is a 64-bit BAR that an EPF driver is not allowed to
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/platform/patches/0081-PCI-endpoint-Allow-only_64bit-on-BAR_RESERVED.patch b/features/tegra/platform/patches/0078-PCI-endpoint-Allow-only_64bit-on-BAR_RESERVED.patch
similarity index 93%
rename from features/tegra/platform/patches/0081-PCI-endpoint-Allow-only_64bit-on-BAR_RESERVED.patch
rename to features/tegra/platform/patches/0078-PCI-endpoint-Allow-only_64bit-on-BAR_RESERVED.patch
index cfe7d9a..1ec6e3b 100644
--- a/features/tegra/platform/patches/0081-PCI-endpoint-Allow-only_64bit-on-BAR_RESERVED.patch
+++ b/features/tegra/platform/patches/0078-PCI-endpoint-Allow-only_64bit-on-BAR_RESERVED.patch
@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Manikanta Maddireddy <mmaddireddy@nvidia.com>
 Date: Thu, 12 Mar 2026 14:02:30 +0100
-Subject: [PATCH 081/196] PCI: endpoint: Allow only_64bit on BAR_RESERVED
+Subject: [PATCH 078/184] PCI: endpoint: Allow only_64bit on BAR_RESERVED
 
 Remove the documentation that forbids setting only_64bit on a BAR of type
 BAR_RESERVED.
@@ -19,7 +19,7 @@ Link: https://patch.msgid.link/20260312130229.2282001-14-cassel@kernel.org
 (cherry picked from commit 27ce1d8ecb9b9ae025b9e9e199845624bc950998)
 
 diff --git a/include/linux/pci-epc.h b/include/linux/pci-epc.h
-index 39d44ab85ecda..aaaee1b492c81 100644
+index 39d44ab85ecd..aaaee1b492c8 100644
 --- a/include/linux/pci-epc.h
 +++ b/include/linux/pci-epc.h
 @@ -207,11 +207,6 @@ enum pci_epc_bar_type {
@@ -35,5 +35,5 @@ index 39d44ab85ecda..aaaee1b492c81 100644
  struct pci_epc_bar_desc {
  	enum pci_epc_bar_type type;
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/platform/patches/0082-PCI-endpoint-Describe-reserved-subregions-within-BAR.patch b/features/tegra/platform/patches/0079-PCI-endpoint-Describe-reserved-subregions-within-BAR.patch
similarity index 96%
rename from features/tegra/platform/patches/0082-PCI-endpoint-Describe-reserved-subregions-within-BAR.patch
rename to features/tegra/platform/patches/0079-PCI-endpoint-Describe-reserved-subregions-within-BAR.patch
index 00739fc..503ac3c 100644
--- a/features/tegra/platform/patches/0082-PCI-endpoint-Describe-reserved-subregions-within-BAR.patch
+++ b/features/tegra/platform/patches/0079-PCI-endpoint-Describe-reserved-subregions-within-BAR.patch
@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Koichiro Den <den@valinux.co.jp>
 Date: Thu, 12 Mar 2026 14:02:31 +0100
-Subject: [PATCH 082/196] PCI: endpoint: Describe reserved subregions within
+Subject: [PATCH 079/184] PCI: endpoint: Describe reserved subregions within
  BARs
 
 Some endpoint controllers expose platform-owned, fixed register windows
@@ -26,7 +26,7 @@ Link: https://patch.msgid.link/20260312130229.2282001-15-cassel@kernel.org
 (cherry picked from commit f51644eb40a73677fcd0c92d8174eddde5d0be0e)
 
 diff --git a/include/linux/pci-epc.h b/include/linux/pci-epc.h
-index aaaee1b492c81..ab9107222e002 100644
+index aaaee1b492c8..ab9107222e00 100644
 --- a/include/linux/pci-epc.h
 +++ b/include/linux/pci-epc.h
 @@ -200,6 +200,30 @@ enum pci_epc_bar_type {
@@ -77,5 +77,5 @@ index aaaee1b492c81..ab9107222e002 100644
  
  /**
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/platform/patches/0083-PCI-endpoint-Introduce-pci_epc_bar_type-BAR_DISABLED.patch b/features/tegra/platform/patches/0080-PCI-endpoint-Introduce-pci_epc_bar_type-BAR_DISABLED.patch
similarity index 94%
rename from features/tegra/platform/patches/0083-PCI-endpoint-Introduce-pci_epc_bar_type-BAR_DISABLED.patch
rename to features/tegra/platform/patches/0080-PCI-endpoint-Introduce-pci_epc_bar_type-BAR_DISABLED.patch
index 7bc4a92..61bd31d 100644
--- a/features/tegra/platform/patches/0083-PCI-endpoint-Introduce-pci_epc_bar_type-BAR_DISABLED.patch
+++ b/features/tegra/platform/patches/0080-PCI-endpoint-Introduce-pci_epc_bar_type-BAR_DISABLED.patch
@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Niklas Cassel <cassel@kernel.org>
 Date: Thu, 12 Mar 2026 14:02:33 +0100
-Subject: [PATCH 083/196] PCI: endpoint: Introduce pci_epc_bar_type
+Subject: [PATCH 080/184] PCI: endpoint: Introduce pci_epc_bar_type
  BAR_DISABLED
 
 Add a pci_epc_bar_type BAR_DISABLED to more clearly differentiate from
@@ -24,7 +24,7 @@ Link: https://patch.msgid.link/20260312130229.2282001-17-cassel@kernel.org
 (cherry picked from commit 33642e9e36dc084e4fc9245a266c9843bc8303b9)
 
 diff --git a/drivers/pci/endpoint/pci-epc-core.c b/drivers/pci/endpoint/pci-epc-core.c
-index ca7f19cc973a4..1d6b04ac4fc58 100644
+index ca7f19cc973a..1d6b04ac4fc5 100644
 --- a/drivers/pci/endpoint/pci-epc-core.c
 +++ b/drivers/pci/endpoint/pci-epc-core.c
 @@ -103,8 +103,9 @@ enum pci_barno pci_epc_get_next_free_bar(const struct pci_epc_features
@@ -40,7 +40,7 @@ index ca7f19cc973a4..1d6b04ac4fc58 100644
  	}
  
 diff --git a/include/linux/pci-epc.h b/include/linux/pci-epc.h
-index ab9107222e002..66cf46f159b3e 100644
+index ab9107222e00..66cf46f159b3 100644
 --- a/include/linux/pci-epc.h
 +++ b/include/linux/pci-epc.h
 @@ -191,13 +191,21 @@ struct pci_epc {
@@ -67,5 +67,5 @@ index ab9107222e002..66cf46f159b3e 100644
  
  /**
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/platform/patches/0084-PCI-dwc-Replace-certain-BAR_RESERVED-with-BAR_DISABL.patch b/features/tegra/platform/patches/0081-PCI-dwc-Replace-certain-BAR_RESERVED-with-BAR_DISABL.patch
similarity index 94%
rename from features/tegra/platform/patches/0084-PCI-dwc-Replace-certain-BAR_RESERVED-with-BAR_DISABL.patch
rename to features/tegra/platform/patches/0081-PCI-dwc-Replace-certain-BAR_RESERVED-with-BAR_DISABL.patch
index f1d9036..cf01911 100644
--- a/features/tegra/platform/patches/0084-PCI-dwc-Replace-certain-BAR_RESERVED-with-BAR_DISABL.patch
+++ b/features/tegra/platform/patches/0081-PCI-dwc-Replace-certain-BAR_RESERVED-with-BAR_DISABL.patch
@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Niklas Cassel <cassel@kernel.org>
 Date: Thu, 12 Mar 2026 14:02:34 +0100
-Subject: [PATCH 084/196] PCI: dwc: Replace certain BAR_RESERVED with
+Subject: [PATCH 081/184] PCI: dwc: Replace certain BAR_RESERVED with
  BAR_DISABLED in glue drivers
 
 Most DWC based EPC glue drivers that have BARs marked as BAR_RESERVED in
@@ -31,10 +31,10 @@ Signed-off-by: Jon Hunter <jonathanh@nvidia.com>
 Change-Id: I7ef92658f89e505015a52009504a9d1579a1321c
 
 diff --git a/drivers/pci/controller/dwc/pci-imx6.c b/drivers/pci/controller/dwc/pci-imx6.c
-index d7de9790fe9fd..e465faf676a38 100644
+index de09cc2a6311..76fb7a53dcf2 100644
 --- a/drivers/pci/controller/dwc/pci-imx6.c
 +++ b/drivers/pci/controller/dwc/pci-imx6.c
-@@ -1402,18 +1402,18 @@ static int imx_pcie_ep_raise_irq(struct dw_pcie_ep *ep, u8 func_no,
+@@ -1423,18 +1423,18 @@ static int imx_pcie_ep_raise_irq(struct dw_pcie_ep *ep, u8 func_no,
  
  static const struct pci_epc_features imx8m_pcie_epc_features = {
  	.msi_capable = true,
@@ -60,7 +60,7 @@ index d7de9790fe9fd..e465faf676a38 100644
  };
  
 diff --git a/drivers/pci/controller/dwc/pci-keystone.c b/drivers/pci/controller/dwc/pci-keystone.c
-index 25b8193ffbcf1..ca6527ea5562b 100644
+index 25b8193ffbcf..ca6527ea5562 100644
 --- a/drivers/pci/controller/dwc/pci-keystone.c
 +++ b/drivers/pci/controller/dwc/pci-keystone.c
 @@ -962,6 +962,18 @@ static int ks_pcie_am654_raise_irq(struct dw_pcie_ep *ep, u8 func_no,
@@ -83,7 +83,7 @@ index 25b8193ffbcf1..ca6527ea5562b 100644
  	.bar[BAR_1] = { .type = BAR_RESERVED, },
  	.bar[BAR_2] = { .type = BAR_RESIZABLE, },
 diff --git a/drivers/pci/controller/dwc/pcie-rcar-gen4.c b/drivers/pci/controller/dwc/pcie-rcar-gen4.c
-index 7e171526b1ded..858a5599f22ae 100644
+index 7e171526b1de..858a5599f22a 100644
 --- a/drivers/pci/controller/dwc/pcie-rcar-gen4.c
 +++ b/drivers/pci/controller/dwc/pcie-rcar-gen4.c
 @@ -421,10 +421,10 @@ static int rcar_gen4_pcie_ep_raise_irq(struct dw_pcie_ep *ep, u8 func_no,
@@ -101,7 +101,7 @@ index 7e171526b1ded..858a5599f22ae 100644
  };
  
 diff --git a/drivers/pci/controller/dwc/pcie-tegra194.c b/drivers/pci/controller/dwc/pcie-tegra194.c
-index 62ed63099b5c4..225471bb0d698 100644
+index 62ed63099b5c..225471bb0d69 100644
 --- a/drivers/pci/controller/dwc/pcie-tegra194.c
 +++ b/drivers/pci/controller/dwc/pcie-tegra194.c
 @@ -1984,10 +1984,10 @@ static const struct pci_epc_features tegra_pcie_epc_features = {
@@ -120,7 +120,7 @@ index 62ed63099b5c4..225471bb0d698 100644
  };
  
 diff --git a/drivers/pci/controller/dwc/pcie-uniphier-ep.c b/drivers/pci/controller/dwc/pcie-uniphier-ep.c
-index b15c087693a73..dbdadfecd6a32 100644
+index b15c087693a7..dbdadfecd6a3 100644
 --- a/drivers/pci/controller/dwc/pcie-uniphier-ep.c
 +++ b/drivers/pci/controller/dwc/pcie-uniphier-ep.c
 @@ -426,8 +426,8 @@ static const struct uniphier_pcie_ep_soc_data uniphier_pro5_data = {
@@ -135,5 +135,5 @@ index b15c087693a73..dbdadfecd6a32 100644
  };
  
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/platform/patches/0085-PCI-endpoint-Add-reserved-region-type-for-MSI-X-Tabl.patch b/features/tegra/platform/patches/0082-PCI-endpoint-Add-reserved-region-type-for-MSI-X-Tabl.patch
similarity index 93%
rename from features/tegra/platform/patches/0085-PCI-endpoint-Add-reserved-region-type-for-MSI-X-Tabl.patch
rename to features/tegra/platform/patches/0082-PCI-endpoint-Add-reserved-region-type-for-MSI-X-Tabl.patch
index ddfbbe5..f4845c7 100644
--- a/features/tegra/platform/patches/0085-PCI-endpoint-Add-reserved-region-type-for-MSI-X-Tabl.patch
+++ b/features/tegra/platform/patches/0082-PCI-endpoint-Add-reserved-region-type-for-MSI-X-Tabl.patch
@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Manikanta Maddireddy <mmaddireddy@nvidia.com>
 Date: Tue, 24 Mar 2026 13:38:54 +0530
-Subject: [PATCH 085/196] PCI: endpoint: Add reserved region type for MSI-X
+Subject: [PATCH 082/184] PCI: endpoint: Add reserved region type for MSI-X
  Table and PBA
 
 Add PCI_EPC_BAR_RSVD_MSIX_TBL_RAM and PCI_EPC_BAR_RSVD_MSIX_PBA_RAM to
@@ -16,7 +16,7 @@ Link: https://patch.msgid.link/20260324080857.916263-2-mmaddireddy@nvidia.com
 (cherry picked from commit 5f352433ea39171e19fbb3a7e18d983510176854)
 
 diff --git a/include/linux/pci-epc.h b/include/linux/pci-epc.h
-index 66cf46f159b3e..073c9900dfe6e 100644
+index 66cf46f159b3..073c9900dfe6 100644
 --- a/include/linux/pci-epc.h
 +++ b/include/linux/pci-epc.h
 @@ -211,6 +211,8 @@ enum pci_epc_bar_type {
@@ -38,5 +38,5 @@ index 66cf46f159b3e..073c9900dfe6e 100644
  
  /**
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/platform/patches/0086-PCI-tegra194-Make-BAR0-programmable-and-remove-1MB-s.patch b/features/tegra/platform/patches/0083-PCI-tegra194-Make-BAR0-programmable-and-remove-1MB-s.patch
similarity index 93%
rename from features/tegra/platform/patches/0086-PCI-tegra194-Make-BAR0-programmable-and-remove-1MB-s.patch
rename to features/tegra/platform/patches/0083-PCI-tegra194-Make-BAR0-programmable-and-remove-1MB-s.patch
index 75f0f64..a9ce056 100644
--- a/features/tegra/platform/patches/0086-PCI-tegra194-Make-BAR0-programmable-and-remove-1MB-s.patch
+++ b/features/tegra/platform/patches/0083-PCI-tegra194-Make-BAR0-programmable-and-remove-1MB-s.patch
@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Manikanta Maddireddy <mmaddireddy@nvidia.com>
 Date: Tue, 24 Mar 2026 13:38:55 +0530
-Subject: [PATCH 086/196] PCI: tegra194: Make BAR0 programmable and remove 1MB
+Subject: [PATCH 083/184] PCI: tegra194: Make BAR0 programmable and remove 1MB
  size limit
 
 The Tegra194/234 Endpoint does not support the Resizable BAR capability,
@@ -21,7 +21,7 @@ Signed-off-by: Jon Hunter <jonathanh@nvidia.com>
 Change-Id: I5c025bc6eb4cba271ffcaefd228ac5735888ff2a
 
 diff --git a/drivers/pci/controller/dwc/pcie-tegra194.c b/drivers/pci/controller/dwc/pcie-tegra194.c
-index 225471bb0d698..99b948f0c1f63 100644
+index 225471bb0d69..99b948f0c1f6 100644
 --- a/drivers/pci/controller/dwc/pcie-tegra194.c
 +++ b/drivers/pci/controller/dwc/pcie-tegra194.c
 @@ -1979,11 +1979,11 @@ static int tegra_pcie_ep_raise_irq(struct dw_pcie_ep *ep, u8 func_no,
@@ -39,5 +39,5 @@ index 225471bb0d698..99b948f0c1f63 100644
  	.bar[BAR_3] = { .type = BAR_DISABLED, },
  	.bar[BAR_4] = { .type = BAR_DISABLED, },
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/platform/patches/0087-PCI-tegra194-Expose-BAR2-MSI-X-and-BAR4-DMA-as-64-bi.patch b/features/tegra/platform/patches/0084-PCI-tegra194-Expose-BAR2-MSI-X-and-BAR4-DMA-as-64-bi.patch
similarity index 96%
rename from features/tegra/platform/patches/0087-PCI-tegra194-Expose-BAR2-MSI-X-and-BAR4-DMA-as-64-bi.patch
rename to features/tegra/platform/patches/0084-PCI-tegra194-Expose-BAR2-MSI-X-and-BAR4-DMA-as-64-bi.patch
index adfcf71..d869839 100644
--- a/features/tegra/platform/patches/0087-PCI-tegra194-Expose-BAR2-MSI-X-and-BAR4-DMA-as-64-bi.patch
+++ b/features/tegra/platform/patches/0084-PCI-tegra194-Expose-BAR2-MSI-X-and-BAR4-DMA-as-64-bi.patch
@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Manikanta Maddireddy <mmaddireddy@nvidia.com>
 Date: Tue, 24 Mar 2026 13:38:56 +0530
-Subject: [PATCH 087/196] PCI: tegra194: Expose BAR2 (MSI-X) and BAR4 (DMA) as
+Subject: [PATCH 084/184] PCI: tegra194: Expose BAR2 (MSI-X) and BAR4 (DMA) as
  64-bit BAR_RESERVED
 
 Tegra Endpoint exposes three 64-bit BARs at indices 0, 2, and 4:
@@ -24,7 +24,7 @@ Signed-off-by: Jon Hunter <jonathanh@nvidia.com>
 Change-Id: Idf09fd0dbaf67991c66ca8abd5d56e74665288f6
 
 diff --git a/drivers/pci/controller/dwc/pcie-tegra194.c b/drivers/pci/controller/dwc/pcie-tegra194.c
-index 99b948f0c1f63..ed116c0d09b1a 100644
+index 99b948f0c1f6..ed116c0d09b1 100644
 --- a/drivers/pci/controller/dwc/pcie-tegra194.c
 +++ b/drivers/pci/controller/dwc/pcie-tegra194.c
 @@ -1979,15 +1979,47 @@ static int tegra_pcie_ep_raise_irq(struct dw_pcie_ep *ep, u8 func_no,
@@ -81,5 +81,5 @@ index 99b948f0c1f63..ed116c0d09b1a 100644
  };
  
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/platform/patches/0088-PCI-tegra194-Assert-CLKREQ-explicitly-by-default.patch b/features/tegra/platform/patches/0085-PCI-tegra194-Assert-CLKREQ-explicitly-by-default.patch
similarity index 95%
rename from features/tegra/platform/patches/0088-PCI-tegra194-Assert-CLKREQ-explicitly-by-default.patch
rename to features/tegra/platform/patches/0085-PCI-tegra194-Assert-CLKREQ-explicitly-by-default.patch
index 65fd7b7..1f6985f 100644
--- a/features/tegra/platform/patches/0088-PCI-tegra194-Assert-CLKREQ-explicitly-by-default.patch
+++ b/features/tegra/platform/patches/0085-PCI-tegra194-Assert-CLKREQ-explicitly-by-default.patch
@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Vidya Sagar <vidyas@nvidia.com>
 Date: Wed, 25 Mar 2026 00:39:52 +0530
-Subject: [PATCH 088/196] PCI: tegra194: Assert CLKREQ# explicitly by default
+Subject: [PATCH 085/184] PCI: tegra194: Assert CLKREQ# explicitly by default
 
 The Root Port's CLKREQ# signal is shared with a downstream PCIe switch and
 the endpoints behind it. By default, APPL_PINMUX_CLKREQ_OVERRIDE only
@@ -29,7 +29,7 @@ Signed-off-by: Jon Hunter <jonathanh@nvidia.com>
 Change-Id: I5b7d75a33616f0ccdd7c995b3eb9c71d0a740de0
 
 diff --git a/drivers/pci/controller/dwc/pcie-tegra194.c b/drivers/pci/controller/dwc/pcie-tegra194.c
-index ed116c0d09b1a..5e88158f7f15b 100644
+index ed116c0d09b1..5e88158f7f15 100644
 --- a/drivers/pci/controller/dwc/pcie-tegra194.c
 +++ b/drivers/pci/controller/dwc/pcie-tegra194.c
 @@ -44,6 +44,7 @@
@@ -49,5 +49,5 @@ index ed116c0d09b1a..5e88158f7f15b 100644
  	}
  
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/platform/patches/0089-PCI-tegra194-Calibrate-pipe-to-UPHY-for-Endpoint-mod.patch b/features/tegra/platform/patches/0086-PCI-tegra194-Calibrate-pipe-to-UPHY-for-Endpoint-mod.patch
similarity index 92%
rename from features/tegra/platform/patches/0089-PCI-tegra194-Calibrate-pipe-to-UPHY-for-Endpoint-mod.patch
rename to features/tegra/platform/patches/0086-PCI-tegra194-Calibrate-pipe-to-UPHY-for-Endpoint-mod.patch
index 0bd1df7..db20d60 100644
--- a/features/tegra/platform/patches/0089-PCI-tegra194-Calibrate-pipe-to-UPHY-for-Endpoint-mod.patch
+++ b/features/tegra/platform/patches/0086-PCI-tegra194-Calibrate-pipe-to-UPHY-for-Endpoint-mod.patch
@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Vidya Sagar <vidyas@nvidia.com>
 Date: Wed, 25 Mar 2026 00:39:53 +0530
-Subject: [PATCH 089/196] PCI: tegra194: Calibrate pipe to UPHY for Endpoint
+Subject: [PATCH 086/184] PCI: tegra194: Calibrate pipe to UPHY for Endpoint
  mode
 
 Calibrate 'Pipe to Universal PHY(UPHY)' (P2U) for the Endpoint controller
@@ -21,7 +21,7 @@ Signed-off-by: Jon Hunter <jonathanh@nvidia.com>
 Change-Id: Ifb6e0515fe6365a160db9157863e32fa7cfcdfdd
 
 diff --git a/drivers/pci/controller/dwc/pcie-tegra194.c b/drivers/pci/controller/dwc/pcie-tegra194.c
-index 5e88158f7f15b..cb0b1490d45eb 100644
+index 5e88158f7f15..cb0b1490d45e 100644
 --- a/drivers/pci/controller/dwc/pcie-tegra194.c
 +++ b/drivers/pci/controller/dwc/pcie-tegra194.c
 @@ -1072,6 +1072,9 @@ static int tegra_pcie_enable_phy(struct tegra_pcie_dw *pcie)
@@ -35,5 +35,5 @@ index 5e88158f7f15b..cb0b1490d45eb 100644
  
  	return 0;
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/platform/patches/0090-PCI-tegra194-Remove-IRQF_ONESHOT-flag-during-Endpoin.patch b/features/tegra/platform/patches/0087-PCI-tegra194-Remove-IRQF_ONESHOT-flag-during-Endpoin.patch
similarity index 96%
rename from features/tegra/platform/patches/0090-PCI-tegra194-Remove-IRQF_ONESHOT-flag-during-Endpoin.patch
rename to features/tegra/platform/patches/0087-PCI-tegra194-Remove-IRQF_ONESHOT-flag-during-Endpoin.patch
index 4a17f31..0a07636 100644
--- a/features/tegra/platform/patches/0090-PCI-tegra194-Remove-IRQF_ONESHOT-flag-during-Endpoin.patch
+++ b/features/tegra/platform/patches/0087-PCI-tegra194-Remove-IRQF_ONESHOT-flag-during-Endpoin.patch
@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Vidya Sagar <vidyas@nvidia.com>
 Date: Wed, 25 Mar 2026 00:39:54 +0530
-Subject: [PATCH 090/196] PCI: tegra194: Remove IRQF_ONESHOT flag during
+Subject: [PATCH 087/184] PCI: tegra194: Remove IRQF_ONESHOT flag during
  Endpoint interrupt registration
 
 The Tegra PCIe Endpoint controller has a single interrupt line that is
@@ -49,7 +49,7 @@ Signed-off-by: Jon Hunter <jonathanh@nvidia.com>
 Change-Id: I39952a3fac403269fb28e4983f9ab8052b8f3d19
 
 diff --git a/drivers/pci/controller/dwc/pcie-tegra194.c b/drivers/pci/controller/dwc/pcie-tegra194.c
-index cb0b1490d45eb..dc4fd75a51679 100644
+index cb0b1490d45e..dc4fd75a5167 100644
 --- a/drivers/pci/controller/dwc/pcie-tegra194.c
 +++ b/drivers/pci/controller/dwc/pcie-tegra194.c
 @@ -2275,7 +2275,7 @@ static int tegra_pcie_dw_probe(struct platform_device *pdev)
@@ -62,5 +62,5 @@ index cb0b1490d45eb..dc4fd75a51679 100644
  		if (ret) {
  			dev_err(dev, "Failed to request IRQ %d: %d\n", pp->irq,
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/platform/patches/0091-PCI-tegra194-Enable-DMA-interrupt.patch b/features/tegra/platform/patches/0088-PCI-tegra194-Enable-DMA-interrupt.patch
similarity index 96%
rename from features/tegra/platform/patches/0091-PCI-tegra194-Enable-DMA-interrupt.patch
rename to features/tegra/platform/patches/0088-PCI-tegra194-Enable-DMA-interrupt.patch
index d73bbca..3e032ad 100644
--- a/features/tegra/platform/patches/0091-PCI-tegra194-Enable-DMA-interrupt.patch
+++ b/features/tegra/platform/patches/0088-PCI-tegra194-Enable-DMA-interrupt.patch
@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Vidya Sagar <vidyas@nvidia.com>
 Date: Wed, 25 Mar 2026 00:39:55 +0530
-Subject: [PATCH 091/196] PCI: tegra194: Enable DMA interrupt
+Subject: [PATCH 088/184] PCI: tegra194: Enable DMA interrupt
 
 Enable DMA interrupt to support Tegra PCIe DMA in both Root Port and
 Endpoint modes.
@@ -18,7 +18,7 @@ Signed-off-by: Jon Hunter <jonathanh@nvidia.com>
 Change-Id: Ia0eda7d953f02e6e7a35a984a9cfda85bb856f79
 
 diff --git a/drivers/pci/controller/dwc/pcie-tegra194.c b/drivers/pci/controller/dwc/pcie-tegra194.c
-index dc4fd75a51679..c1f1f6a930922 100644
+index dc4fd75a5167..c1f1f6a93092 100644
 --- a/drivers/pci/controller/dwc/pcie-tegra194.c
 +++ b/drivers/pci/controller/dwc/pcie-tegra194.c
 @@ -91,6 +91,7 @@
@@ -75,5 +75,5 @@ index dc4fd75a51679..c1f1f6a930922 100644
  	val = FIELD_PREP(PCI_LTR_VALUE_MASK, 110) |
  	      FIELD_PREP(PCI_LTR_SCALE_MASK, 2) |
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/platform/patches/0092-PCI-tegra194-Enable-hardware-hot-reset-mode-in-Endpo.patch b/features/tegra/platform/patches/0089-PCI-tegra194-Enable-hardware-hot-reset-mode-in-Endpo.patch
similarity index 93%
rename from features/tegra/platform/patches/0092-PCI-tegra194-Enable-hardware-hot-reset-mode-in-Endpo.patch
rename to features/tegra/platform/patches/0089-PCI-tegra194-Enable-hardware-hot-reset-mode-in-Endpo.patch
index 252bbfa..faa29fe 100644
--- a/features/tegra/platform/patches/0092-PCI-tegra194-Enable-hardware-hot-reset-mode-in-Endpo.patch
+++ b/features/tegra/platform/patches/0089-PCI-tegra194-Enable-hardware-hot-reset-mode-in-Endpo.patch
@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Vidya Sagar <vidyas@nvidia.com>
 Date: Wed, 25 Mar 2026 00:39:56 +0530
-Subject: [PATCH 092/196] PCI: tegra194: Enable hardware hot reset mode in
+Subject: [PATCH 089/184] PCI: tegra194: Enable hardware hot reset mode in
  Endpoint mode
 
 When PCIe link goes down, hardware can retrain the link and try to link up.
@@ -23,7 +23,7 @@ Signed-off-by: Jon Hunter <jonathanh@nvidia.com>
 Change-Id: I241ac17248a8e487dfb974a270467082754d66b2
 
 diff --git a/drivers/pci/controller/dwc/pcie-tegra194.c b/drivers/pci/controller/dwc/pcie-tegra194.c
-index c1f1f6a930922..3fcbca0d883aa 100644
+index c1f1f6a93092..3fcbca0d883a 100644
 --- a/drivers/pci/controller/dwc/pcie-tegra194.c
 +++ b/drivers/pci/controller/dwc/pcie-tegra194.c
 @@ -1796,6 +1796,8 @@ static void pex_ep_event_pex_rst_deassert(struct tegra_pcie_dw *pcie)
@@ -36,5 +36,5 @@ index c1f1f6a930922..3fcbca0d883aa 100644
  
  	val = appl_readl(pcie, APPL_CFG_MISC);
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/platform/patches/0093-PCI-tegra194-Add-core-monitor-clock-support.patch b/features/tegra/platform/patches/0090-PCI-tegra194-Add-core-monitor-clock-support.patch
similarity index 96%
rename from features/tegra/platform/patches/0093-PCI-tegra194-Add-core-monitor-clock-support.patch
rename to features/tegra/platform/patches/0090-PCI-tegra194-Add-core-monitor-clock-support.patch
index 324f1eb..978e80c 100644
--- a/features/tegra/platform/patches/0093-PCI-tegra194-Add-core-monitor-clock-support.patch
+++ b/features/tegra/platform/patches/0090-PCI-tegra194-Add-core-monitor-clock-support.patch
@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Vidya Sagar <vidyas@nvidia.com>
 Date: Wed, 25 Mar 2026 00:39:58 +0530
-Subject: [PATCH 093/196] PCI: tegra194: Add core monitor clock support
+Subject: [PATCH 090/184] PCI: tegra194: Add core monitor clock support
 
 Add support for Tegra PCIe core clock monitoring. Monitoring tracks rate
 changes that may occur due to link speed changes and is useful for
@@ -20,7 +20,7 @@ Signed-off-by: Jon Hunter <jonathanh@nvidia.com>
 Change-Id: I65ec0eea3cf4424d82d3abd6a01208f5ce2862b9
 
 diff --git a/drivers/pci/controller/dwc/pcie-tegra194.c b/drivers/pci/controller/dwc/pcie-tegra194.c
-index 3fcbca0d883aa..b05301533d3a8 100644
+index 3fcbca0d883a..b05301533d3a 100644
 --- a/drivers/pci/controller/dwc/pcie-tegra194.c
 +++ b/drivers/pci/controller/dwc/pcie-tegra194.c
 @@ -249,6 +249,7 @@ struct tegra_pcie_dw {
@@ -82,5 +82,5 @@ index 3fcbca0d883aa..b05301533d3a8 100644
  	tegra_pcie_unconfig_controller(pcie);
  
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/platform/patches/0094-NVIDIA-SAUCE-pinctrl-tegra-Export-tegra_pinctrl_prob.patch b/features/tegra/platform/patches/0091-NVIDIA-SAUCE-pinctrl-tegra-Export-tegra_pinctrl_prob.patch
similarity index 89%
rename from features/tegra/platform/patches/0094-NVIDIA-SAUCE-pinctrl-tegra-Export-tegra_pinctrl_prob.patch
rename to features/tegra/platform/patches/0091-NVIDIA-SAUCE-pinctrl-tegra-Export-tegra_pinctrl_prob.patch
index a65708c..ad3dad6 100644
--- a/features/tegra/platform/patches/0094-NVIDIA-SAUCE-pinctrl-tegra-Export-tegra_pinctrl_prob.patch
+++ b/features/tegra/platform/patches/0091-NVIDIA-SAUCE-pinctrl-tegra-Export-tegra_pinctrl_prob.patch
@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Prathamesh Shete <pshete@nvidia.com>
 Date: Mon, 20 Apr 2026 10:05:56 +0000
-Subject: [PATCH 094/196] NVIDIA: SAUCE: pinctrl: tegra: Export
+Subject: [PATCH 091/184] NVIDIA: SAUCE: pinctrl: tegra: Export
  tegra_pinctrl_probe()
 
 Export tegra_pinctrl_probe() to allow SoC-specific Tegra pinctrl
@@ -15,7 +15,7 @@ Signed-off-by: Jon Hunter <jonathanh@nvidia.com>
 Change-Id: I22c3e96093e78e1cbc2e4e801c7adffb7a147c16
 
 diff --git a/drivers/pinctrl/tegra/pinctrl-tegra.c b/drivers/pinctrl/tegra/pinctrl-tegra.c
-index 11ecbd6a9b2a1..0cb7a705a5243 100644
+index 11ecbd6a9b2a..0cb7a705a524 100644
 --- a/drivers/pinctrl/tegra/pinctrl-tegra.c
 +++ b/drivers/pinctrl/tegra/pinctrl-tegra.c
 @@ -13,6 +13,7 @@
@@ -32,5 +32,5 @@ index 11ecbd6a9b2a1..0cb7a705a5243 100644
  }
 +EXPORT_SYMBOL_GPL(tegra_pinctrl_probe);
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/platform/patches/0095-NVIDIA-SAUCE-pinctrl-tegra-Add-Tegra238-pinmux-drive.patch b/features/tegra/platform/patches/0092-NVIDIA-SAUCE-pinctrl-tegra-Add-Tegra238-pinmux-drive.patch
similarity index 99%
rename from features/tegra/platform/patches/0095-NVIDIA-SAUCE-pinctrl-tegra-Add-Tegra238-pinmux-drive.patch
rename to features/tegra/platform/patches/0092-NVIDIA-SAUCE-pinctrl-tegra-Add-Tegra238-pinmux-drive.patch
index 1375a85..7cb3f98 100644
--- a/features/tegra/platform/patches/0095-NVIDIA-SAUCE-pinctrl-tegra-Add-Tegra238-pinmux-drive.patch
+++ b/features/tegra/platform/patches/0092-NVIDIA-SAUCE-pinctrl-tegra-Add-Tegra238-pinmux-drive.patch
@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Prathamesh Shete <pshete@nvidia.com>
 Date: Mon, 20 Apr 2026 10:05:58 +0000
-Subject: [PATCH 095/196] NVIDIA: SAUCE: pinctrl: tegra: Add Tegra238 pinmux
+Subject: [PATCH 092/184] NVIDIA: SAUCE: pinctrl: tegra: Add Tegra238 pinmux
  driver
 
 Add support for the two pin controllers (MAIN and AON)
@@ -15,7 +15,7 @@ Signed-off-by: Jon Hunter <jonathanh@nvidia.com>
 Change-Id: I0428a394ed8da8008703418eecd5211095d08e15
 
 diff --git a/drivers/pinctrl/tegra/Kconfig b/drivers/pinctrl/tegra/Kconfig
-index 660d101ea3679..cb3a7ab02e722 100644
+index 660d101ea367..cb3a7ab02e72 100644
 --- a/drivers/pinctrl/tegra/Kconfig
 +++ b/drivers/pinctrl/tegra/Kconfig
 @@ -36,6 +36,16 @@ config PINCTRL_TEGRA234
@@ -36,7 +36,7 @@ index 660d101ea3679..cb3a7ab02e722 100644
  	def_bool y if ARCH_TEGRA
  	select GENERIC_PHY
 diff --git a/drivers/pinctrl/tegra/Makefile b/drivers/pinctrl/tegra/Makefile
-index 82176526549e7..ce700bbcbf6ec 100644
+index 82176526549e..ce700bbcbf6e 100644
 --- a/drivers/pinctrl/tegra/Makefile
 +++ b/drivers/pinctrl/tegra/Makefile
 @@ -8,4 +8,5 @@ obj-$(CONFIG_PINCTRL_TEGRA210)		+= pinctrl-tegra210.o
@@ -47,7 +47,7 @@ index 82176526549e7..ce700bbcbf6ec 100644
  obj-$(CONFIG_PINCTRL_TEGRA_XUSB)	+= pinctrl-tegra-xusb.o
 diff --git a/drivers/pinctrl/tegra/pinctrl-tegra238.c b/drivers/pinctrl/tegra/pinctrl-tegra238.c
 new file mode 100644
-index 0000000000000..421da334151c1
+index 000000000000..421da334151c
 --- /dev/null
 +++ b/drivers/pinctrl/tegra/pinctrl-tegra238.c
 @@ -0,0 +1,2056 @@
@@ -2108,5 +2108,5 @@ index 0000000000000..421da334151c1
 +MODULE_AUTHOR("NVIDIA Corporation");
 +MODULE_DESCRIPTION("NVIDIA Tegra238 pinctrl driver");
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/platform/patches/0096-NVIDIA-SAUCE-pinctrl-tegra-Add-Tegra264-pinmux-drive.patch b/features/tegra/platform/patches/0093-NVIDIA-SAUCE-pinctrl-tegra-Add-Tegra264-pinmux-drive.patch
similarity index 99%
rename from features/tegra/platform/patches/0096-NVIDIA-SAUCE-pinctrl-tegra-Add-Tegra264-pinmux-drive.patch
rename to features/tegra/platform/patches/0093-NVIDIA-SAUCE-pinctrl-tegra-Add-Tegra264-pinmux-drive.patch
index afec89c..6442763 100644
--- a/features/tegra/platform/patches/0096-NVIDIA-SAUCE-pinctrl-tegra-Add-Tegra264-pinmux-drive.patch
+++ b/features/tegra/platform/patches/0093-NVIDIA-SAUCE-pinctrl-tegra-Add-Tegra264-pinmux-drive.patch
@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Prathamesh Shete <pshete@nvidia.com>
 Date: Mon, 20 Apr 2026 10:06:00 +0000
-Subject: [PATCH 096/196] NVIDIA: SAUCE: pinctrl: tegra: Add Tegra264 pinmux
+Subject: [PATCH 093/184] NVIDIA: SAUCE: pinctrl: tegra: Add Tegra264 pinmux
  driver
 
 Add support for the three pin controllers
@@ -15,7 +15,7 @@ Signed-off-by: Jon Hunter <jonathanh@nvidia.com>
 Change-Id: I3447de9d1a6b8748161fce87c5f6ec3723466994
 
 diff --git a/drivers/pinctrl/tegra/Kconfig b/drivers/pinctrl/tegra/Kconfig
-index cb3a7ab02e722..54263b4554c07 100644
+index cb3a7ab02e72..54263b4554c0 100644
 --- a/drivers/pinctrl/tegra/Kconfig
 +++ b/drivers/pinctrl/tegra/Kconfig
 @@ -46,6 +46,16 @@ config PINCTRL_TEGRA238
@@ -36,7 +36,7 @@ index cb3a7ab02e722..54263b4554c07 100644
  	def_bool y if ARCH_TEGRA
  	select GENERIC_PHY
 diff --git a/drivers/pinctrl/tegra/Makefile b/drivers/pinctrl/tegra/Makefile
-index ce700bbcbf6ec..71ade768bf9c4 100644
+index ce700bbcbf6e..71ade768bf9c 100644
 --- a/drivers/pinctrl/tegra/Makefile
 +++ b/drivers/pinctrl/tegra/Makefile
 @@ -9,4 +9,5 @@ obj-$(CONFIG_PINCTRL_TEGRA186)		+= pinctrl-tegra186.o
@@ -47,7 +47,7 @@ index ce700bbcbf6ec..71ade768bf9c4 100644
  obj-$(CONFIG_PINCTRL_TEGRA_XUSB)	+= pinctrl-tegra-xusb.o
 diff --git a/drivers/pinctrl/tegra/pinctrl-tegra264.c b/drivers/pinctrl/tegra/pinctrl-tegra264.c
 new file mode 100644
-index 0000000000000..5a0c91aaba3a8
+index 000000000000..5a0c91aaba3a
 --- /dev/null
 +++ b/drivers/pinctrl/tegra/pinctrl-tegra264.c
 @@ -0,0 +1,2216 @@
@@ -2268,5 +2268,5 @@ index 0000000000000..5a0c91aaba3a8
 +MODULE_AUTHOR("NVIDIA Corporation");
 +MODULE_DESCRIPTION("NVIDIA Tegra264 pinctrl driver");
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/platform/patches/0097-NVIDIA-SAUCE-pmdomain-tegra-Add-support-for-multi-so.patch b/features/tegra/platform/patches/0094-NVIDIA-SAUCE-pmdomain-tegra-Add-support-for-multi-so.patch
similarity index 95%
rename from features/tegra/platform/patches/0097-NVIDIA-SAUCE-pmdomain-tegra-Add-support-for-multi-so.patch
rename to features/tegra/platform/patches/0094-NVIDIA-SAUCE-pmdomain-tegra-Add-support-for-multi-so.patch
index cb470db..be5fe5a 100644
--- a/features/tegra/platform/patches/0097-NVIDIA-SAUCE-pmdomain-tegra-Add-support-for-multi-so.patch
+++ b/features/tegra/platform/patches/0094-NVIDIA-SAUCE-pmdomain-tegra-Add-support-for-multi-so.patch
@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Jon Hunter <jonathanh@nvidia.com>
 Date: Tue, 2 Jun 2026 20:32:48 +0100
-Subject: [PATCH 097/196] NVIDIA: SAUCE: pmdomain: tegra: Add support for
+Subject: [PATCH 094/184] NVIDIA: SAUCE: pmdomain: tegra: Add support for
  multi-socket platforms
 
 On multi-socket platforms each socket has its own BPMP that is
@@ -29,7 +29,7 @@ GVS: buildbot_gerritrpt <buildbot_gerritrpt@nvidia.com>
 (cherry picked from commit 67da752ea6fb70b7a262d14b54355c4c148d4812)
 
 diff --git a/drivers/pmdomain/tegra/powergate-bpmp.c b/drivers/pmdomain/tegra/powergate-bpmp.c
-index 9f4366250bfd4..53056e776491c 100644
+index 9f4366250bfd..53056e776491 100644
 --- a/drivers/pmdomain/tegra/powergate-bpmp.c
 +++ b/drivers/pmdomain/tegra/powergate-bpmp.c
 @@ -137,6 +137,13 @@ static char *tegra_bpmp_powergate_get_name(struct tegra_bpmp *bpmp,
@@ -56,5 +56,5 @@ index 9f4366250bfd4..53056e776491c 100644
  			continue;
  		}
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/platform/patches/0098-dt-bindings-pwm-Document-Tegra264-controller.patch b/features/tegra/platform/patches/0095-dt-bindings-pwm-Document-Tegra264-controller.patch
similarity index 89%
rename from features/tegra/platform/patches/0098-dt-bindings-pwm-Document-Tegra264-controller.patch
rename to features/tegra/platform/patches/0095-dt-bindings-pwm-Document-Tegra264-controller.patch
index 3d79045..cb77b49 100644
--- a/features/tegra/platform/patches/0098-dt-bindings-pwm-Document-Tegra264-controller.patch
+++ b/features/tegra/platform/patches/0095-dt-bindings-pwm-Document-Tegra264-controller.patch
@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Thierry Reding <treding@nvidia.com>
 Date: Tue, 31 Mar 2026 11:12:13 +0900
-Subject: [PATCH 098/196] dt-bindings: pwm: Document Tegra264 controller
+Subject: [PATCH 095/184] dt-bindings: pwm: Document Tegra264 controller
 
 Add a new compatible string for the PWM controller found on Tegra264.
 The controller is similar to earlier generations but not compatible
@@ -13,7 +13,7 @@ Signed-off-by: Mikko Perttunen <mperttunen@nvidia.com>
 Acked-by: Rob Herring (Arm) <robh@kernel.org>
 
 diff --git a/Documentation/devicetree/bindings/pwm/nvidia,tegra20-pwm.yaml b/Documentation/devicetree/bindings/pwm/nvidia,tegra20-pwm.yaml
-index 41cea4979132f..cb2f36e7b5d67 100644
+index 41cea4979132..cb2f36e7b5d6 100644
 --- a/Documentation/devicetree/bindings/pwm/nvidia,tegra20-pwm.yaml
 +++ b/Documentation/devicetree/bindings/pwm/nvidia,tegra20-pwm.yaml
 @@ -16,6 +16,7 @@ properties:
@@ -25,5 +25,5 @@ index 41cea4979132f..cb2f36e7b5d67 100644
        - items:
            - enum:
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/platform/patches/0099-pwm-tegra-Avoid-hard-coded-max-clock-frequency.patch b/features/tegra/platform/patches/0096-pwm-tegra-Avoid-hard-coded-max-clock-frequency.patch
similarity index 95%
rename from features/tegra/platform/patches/0099-pwm-tegra-Avoid-hard-coded-max-clock-frequency.patch
rename to features/tegra/platform/patches/0096-pwm-tegra-Avoid-hard-coded-max-clock-frequency.patch
index d446fed..3014437 100644
--- a/features/tegra/platform/patches/0099-pwm-tegra-Avoid-hard-coded-max-clock-frequency.patch
+++ b/features/tegra/platform/patches/0096-pwm-tegra-Avoid-hard-coded-max-clock-frequency.patch
@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Yi-Wei Wang <yiweiw@nvidia.com>
 Date: Tue, 31 Mar 2026 11:12:14 +0900
-Subject: [PATCH 099/196] pwm: tegra: Avoid hard-coded max clock frequency
+Subject: [PATCH 096/184] pwm: tegra: Avoid hard-coded max clock frequency
 
 The clock driving the Tegra PWM IP can be sourced from different parent
 clocks. Hence, let dev_pm_opp_set_rate() set the max clock rate based
@@ -15,7 +15,7 @@ Signed-off-by: Mikko Perttunen <mperttunen@nvidia.com>
 Reviewed-by: Thierry Reding <treding@nvidia.com>
 
 diff --git a/drivers/pwm/pwm-tegra.c b/drivers/pwm/pwm-tegra.c
-index 172063b51d442..8a330169d5311 100644
+index 172063b51d44..8a330169d531 100644
 --- a/drivers/pwm/pwm-tegra.c
 +++ b/drivers/pwm/pwm-tegra.c
 @@ -59,9 +59,6 @@
@@ -72,5 +72,5 @@ index 172063b51d442..8a330169d5311 100644
  };
  MODULE_DEVICE_TABLE(of, tegra_pwm_of_match);
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/platform/patches/0100-pwm-tegra-Modify-read-write-accessors-for-multi-regi.patch b/features/tegra/platform/patches/0097-pwm-tegra-Modify-read-write-accessors-for-multi-regi.patch
similarity index 96%
rename from features/tegra/platform/patches/0100-pwm-tegra-Modify-read-write-accessors-for-multi-regi.patch
rename to features/tegra/platform/patches/0097-pwm-tegra-Modify-read-write-accessors-for-multi-regi.patch
index ff4e920..c81d8a9 100644
--- a/features/tegra/platform/patches/0100-pwm-tegra-Modify-read-write-accessors-for-multi-regi.patch
+++ b/features/tegra/platform/patches/0097-pwm-tegra-Modify-read-write-accessors-for-multi-regi.patch
@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Mikko Perttunen <mperttunen@nvidia.com>
 Date: Tue, 31 Mar 2026 11:12:15 +0900
-Subject: [PATCH 100/196] pwm: tegra: Modify read/write accessors for
+Subject: [PATCH 097/184] pwm: tegra: Modify read/write accessors for
  multi-register channel
 
 On Tegra264, each PWM instance has two registers (per channel, of which
@@ -12,7 +12,7 @@ Reviewed-by: Thierry Reding <treding@nvidia.com>
 Signed-off-by: Mikko Perttunen <mperttunen@nvidia.com>
 
 diff --git a/drivers/pwm/pwm-tegra.c b/drivers/pwm/pwm-tegra.c
-index 8a330169d5311..358c81cea05bd 100644
+index 8a330169d531..358c81cea05b 100644
 --- a/drivers/pwm/pwm-tegra.c
 +++ b/drivers/pwm/pwm-tegra.c
 @@ -57,6 +57,8 @@
@@ -91,5 +91,5 @@ index 8a330169d5311..358c81cea05bd 100644
  	pm_runtime_put_sync(pwmchip_parent(chip));
  }
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/platform/patches/0101-pwm-tegra-Parametrize-enable-register-offset.patch b/features/tegra/platform/patches/0098-pwm-tegra-Parametrize-enable-register-offset.patch
similarity index 95%
rename from features/tegra/platform/patches/0101-pwm-tegra-Parametrize-enable-register-offset.patch
rename to features/tegra/platform/patches/0098-pwm-tegra-Parametrize-enable-register-offset.patch
index b202823..71a55c6 100644
--- a/features/tegra/platform/patches/0101-pwm-tegra-Parametrize-enable-register-offset.patch
+++ b/features/tegra/platform/patches/0098-pwm-tegra-Parametrize-enable-register-offset.patch
@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Mikko Perttunen <mperttunen@nvidia.com>
 Date: Tue, 31 Mar 2026 11:12:16 +0900
-Subject: [PATCH 101/196] pwm: tegra: Parametrize enable register offset
+Subject: [PATCH 098/184] pwm: tegra: Parametrize enable register offset
 
 On Tegra264, the PWM enablement bit is not located at the base address
 of the PWM controller. Hence, introduce an enablement offset field in
@@ -13,7 +13,7 @@ Signed-off-by: Mikko Perttunen <mperttunen@nvidia.com>
 Reviewed-by: Thierry Reding <treding@nvidia.com>
 
 diff --git a/drivers/pwm/pwm-tegra.c b/drivers/pwm/pwm-tegra.c
-index 358c81cea05bd..b925ef9144110 100644
+index 358c81cea05b..b925ef914411 100644
 --- a/drivers/pwm/pwm-tegra.c
 +++ b/drivers/pwm/pwm-tegra.c
 @@ -61,6 +61,7 @@
@@ -84,5 +84,5 @@ index 358c81cea05bd..b925ef9144110 100644
  
  static const struct of_device_id tegra_pwm_of_match[] = {
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/platform/patches/0102-pwm-tegra-Parametrize-duty-and-scale-field-widths.patch b/features/tegra/platform/patches/0099-pwm-tegra-Parametrize-duty-and-scale-field-widths.patch
similarity index 97%
rename from features/tegra/platform/patches/0102-pwm-tegra-Parametrize-duty-and-scale-field-widths.patch
rename to features/tegra/platform/patches/0099-pwm-tegra-Parametrize-duty-and-scale-field-widths.patch
index 379964d..23dc0c8 100644
--- a/features/tegra/platform/patches/0102-pwm-tegra-Parametrize-duty-and-scale-field-widths.patch
+++ b/features/tegra/platform/patches/0099-pwm-tegra-Parametrize-duty-and-scale-field-widths.patch
@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Mikko Perttunen <mperttunen@nvidia.com>
 Date: Tue, 31 Mar 2026 11:12:17 +0900
-Subject: [PATCH 102/196] pwm: tegra: Parametrize duty and scale field widths
+Subject: [PATCH 099/184] pwm: tegra: Parametrize duty and scale field widths
 
 Tegra264 has wider fields for the duty and scale register fields.
 Parameterize the driver in preparation. The depth value also
@@ -14,7 +14,7 @@ Reviewed-by: Thierry Reding <treding@nvidia.com>
 Signed-off-by: Mikko Perttunen <mperttunen@nvidia.com>
 
 diff --git a/drivers/pwm/pwm-tegra.c b/drivers/pwm/pwm-tegra.c
-index b925ef9144110..d7968521fbfd0 100644
+index b925ef914411..d7968521fbfd 100644
 --- a/drivers/pwm/pwm-tegra.c
 +++ b/drivers/pwm/pwm-tegra.c
 @@ -52,16 +52,19 @@
@@ -128,5 +128,5 @@ index b925ef9144110..d7968521fbfd0 100644
  
  static const struct of_device_id tegra_pwm_of_match[] = {
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/platform/patches/0103-pwm-tegra-Add-support-for-Tegra264.patch b/features/tegra/platform/patches/0100-pwm-tegra-Add-support-for-Tegra264.patch
similarity index 98%
rename from features/tegra/platform/patches/0103-pwm-tegra-Add-support-for-Tegra264.patch
rename to features/tegra/platform/patches/0100-pwm-tegra-Add-support-for-Tegra264.patch
index b810076..a47946a 100644
--- a/features/tegra/platform/patches/0103-pwm-tegra-Add-support-for-Tegra264.patch
+++ b/features/tegra/platform/patches/0100-pwm-tegra-Add-support-for-Tegra264.patch
@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Mikko Perttunen <mperttunen@nvidia.com>
 Date: Tue, 31 Mar 2026 11:12:18 +0900
-Subject: [PATCH 103/196] pwm: tegra: Add support for Tegra264
+Subject: [PATCH 100/184] pwm: tegra: Add support for Tegra264
 
 Tegra264 changes the register layout to accommodate wider fields
 for duty and scale, and adds configurable depth which will be
@@ -16,7 +16,7 @@ Signed-off-by: Mikko Perttunen <mperttunen@nvidia.com>
 Reviewed-by: Thierry Reding <treding@nvidia.com>
 
 diff --git a/drivers/pwm/pwm-tegra.c b/drivers/pwm/pwm-tegra.c
-index d7968521fbfd0..c9d30724e3399 100644
+index d7968521fbfd..c9d30724e339 100644
 --- a/drivers/pwm/pwm-tegra.c
 +++ b/drivers/pwm/pwm-tegra.c
 @@ -7,22 +7,60 @@
@@ -122,5 +122,5 @@ index d7968521fbfd0..c9d30724e3399 100644
  };
  MODULE_DEVICE_TABLE(of, tegra_pwm_of_match);
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/platform/patches/0104-syscore-Pass-context-data-to-callbacks.patch b/features/tegra/platform/patches/0101-syscore-Pass-context-data-to-callbacks.patch
similarity index 95%
rename from features/tegra/platform/patches/0104-syscore-Pass-context-data-to-callbacks.patch
rename to features/tegra/platform/patches/0101-syscore-Pass-context-data-to-callbacks.patch
index a46231e..8c167ea 100644
--- a/features/tegra/platform/patches/0104-syscore-Pass-context-data-to-callbacks.patch
+++ b/features/tegra/platform/patches/0101-syscore-Pass-context-data-to-callbacks.patch
@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Thierry Reding <treding@nvidia.com>
 Date: Wed, 29 Oct 2025 17:33:30 +0100
-Subject: [PATCH 104/196] syscore: Pass context data to callbacks
+Subject: [PATCH 101/184] syscore: Pass context data to callbacks
 
 Several drivers can benefit from registering per-instance data along
 with the syscore operations. To achieve this, move the modifiable fields
@@ -14,7 +14,7 @@ Signed-off-by: Thierry Reding <treding@nvidia.com>
 (cherry picked from commit a97fbc3ee3e2a536fafaff04f21f45472db71769)
 
 diff --git a/arch/arm/mach-exynos/mcpm-exynos.c b/arch/arm/mach-exynos/mcpm-exynos.c
-index fd0dbeb93357d..cb7d8a7b14e0d 100644
+index fd0dbeb93357..cb7d8a7b14e0 100644
 --- a/arch/arm/mach-exynos/mcpm-exynos.c
 +++ b/arch/arm/mach-exynos/mcpm-exynos.c
 @@ -215,7 +215,7 @@ static const struct of_device_id exynos_dt_mcpm_match[] = {
@@ -55,7 +55,7 @@ index fd0dbeb93357d..cb7d8a7b14e0d 100644
  	return ret;
  }
 diff --git a/arch/arm/mach-exynos/suspend.c b/arch/arm/mach-exynos/suspend.c
-index 150a1e56dcae9..22d723553f627 100644
+index 150a1e56dcae..22d723553f62 100644
 --- a/arch/arm/mach-exynos/suspend.c
 +++ b/arch/arm/mach-exynos/suspend.c
 @@ -53,9 +53,9 @@ struct exynos_pm_data {
@@ -199,7 +199,7 @@ index 150a1e56dcae9..22d723553f627 100644
  
  	/*
 diff --git a/arch/arm/mach-pxa/generic.h b/arch/arm/mach-pxa/generic.h
-index c9c2c46ecead0..caad4fca8de3e 100644
+index c9c2c46ecead..caad4fca8de3 100644
 --- a/arch/arm/mach-pxa/generic.h
 +++ b/arch/arm/mach-pxa/generic.h
 @@ -34,9 +34,9 @@ extern void __init pxa27x_map_io(void);
@@ -216,7 +216,7 @@ index c9c2c46ecead0..caad4fca8de3e 100644
  void __init pxa_set_ffuart_info(void *info);
  void __init pxa_set_btuart_info(void *info);
 diff --git a/arch/arm/mach-pxa/irq.c b/arch/arm/mach-pxa/irq.c
-index 5bfce8aa4102d..99acebbbf0653 100644
+index 5bfce8aa4102..99acebbbf065 100644
 --- a/arch/arm/mach-pxa/irq.c
 +++ b/arch/arm/mach-pxa/irq.c
 @@ -178,7 +178,7 @@ void __init pxa_init_irq(int irq_nr, int (*fn)(struct irq_data *, unsigned int))
@@ -255,7 +255,7 @@ index 5bfce8aa4102d..99acebbbf0653 100644
  static const struct of_device_id intc_ids[] __initconst = {
  	{ .compatible = "marvell,pxa-intc", },
 diff --git a/arch/arm/mach-pxa/mfp-pxa2xx.c b/arch/arm/mach-pxa/mfp-pxa2xx.c
-index f5a3d890f682e..d1347055fbe4f 100644
+index f5a3d890f682..d1347055fbe4 100644
 --- a/arch/arm/mach-pxa/mfp-pxa2xx.c
 +++ b/arch/arm/mach-pxa/mfp-pxa2xx.c
 @@ -346,7 +346,7 @@ static unsigned long saved_gpdr[4];
@@ -294,7 +294,7 @@ index f5a3d890f682e..d1347055fbe4f 100644
  {
  	int i;
 diff --git a/arch/arm/mach-pxa/mfp-pxa3xx.c b/arch/arm/mach-pxa/mfp-pxa3xx.c
-index d16ab7451efef..fe7498fbb62b3 100644
+index d16ab7451efe..fe7498fbb62b 100644
 --- a/arch/arm/mach-pxa/mfp-pxa3xx.c
 +++ b/arch/arm/mach-pxa/mfp-pxa3xx.c
 @@ -27,13 +27,13 @@
@@ -327,7 +327,7 @@ index d16ab7451efef..fe7498fbb62b3 100644
 +	.ops = &pxa3xx_mfp_syscore_ops,
 +};
 diff --git a/arch/arm/mach-pxa/pxa25x.c b/arch/arm/mach-pxa/pxa25x.c
-index 03e34841fc004..70509a5998142 100644
+index 03e34841fc00..70509a599814 100644
 --- a/arch/arm/mach-pxa/pxa25x.c
 +++ b/arch/arm/mach-pxa/pxa25x.c
 @@ -235,8 +235,8 @@ static int __init pxa25x_init(void)
@@ -342,7 +342,7 @@ index 03e34841fc004..70509a5998142 100644
  		if (!of_have_populated_dt()) {
  			software_node_register(&pxa2xx_gpiochip_node);
 diff --git a/arch/arm/mach-pxa/pxa27x.c b/arch/arm/mach-pxa/pxa27x.c
-index f8382477d629e..ff63619790383 100644
+index f8382477d629..ff6361979038 100644
 --- a/arch/arm/mach-pxa/pxa27x.c
 +++ b/arch/arm/mach-pxa/pxa27x.c
 @@ -337,8 +337,8 @@ static int __init pxa27x_init(void)
@@ -357,7 +357,7 @@ index f8382477d629e..ff63619790383 100644
  		if (!of_have_populated_dt()) {
  			software_node_register(&pxa2xx_gpiochip_node);
 diff --git a/arch/arm/mach-pxa/pxa3xx.c b/arch/arm/mach-pxa/pxa3xx.c
-index 1d1e5713464dc..06c578ea658e3 100644
+index 1d1e5713464d..06c578ea658e 100644
 --- a/arch/arm/mach-pxa/pxa3xx.c
 +++ b/arch/arm/mach-pxa/pxa3xx.c
 @@ -424,8 +424,8 @@ static int __init pxa3xx_init(void)
@@ -372,7 +372,7 @@ index 1d1e5713464dc..06c578ea658e3 100644
  
  	return ret;
 diff --git a/arch/arm/mach-pxa/smemc.c b/arch/arm/mach-pxa/smemc.c
-index 2d2a321d82f81..fb93a8f28356e 100644
+index 2d2a321d82f8..fb93a8f28356 100644
 --- a/arch/arm/mach-pxa/smemc.c
 +++ b/arch/arm/mach-pxa/smemc.c
 @@ -18,7 +18,7 @@ static unsigned long msc[2];
@@ -420,7 +420,7 @@ index 2d2a321d82f81..fb93a8f28356e 100644
  
  	return 0;
 diff --git a/arch/arm/mach-s3c/irq-pm-s3c64xx.c b/arch/arm/mach-s3c/irq-pm-s3c64xx.c
-index 4a1e935bada19..ab726c595001d 100644
+index 4a1e935bada1..ab726c595001 100644
 --- a/arch/arm/mach-s3c/irq-pm-s3c64xx.c
 +++ b/arch/arm/mach-s3c/irq-pm-s3c64xx.c
 @@ -58,7 +58,7 @@ static struct irq_grp_save {
@@ -467,7 +467,7 @@ index 4a1e935bada19..ab726c595001d 100644
  	return 0;
  }
 diff --git a/arch/arm/mach-s5pv210/pm.c b/arch/arm/mach-s5pv210/pm.c
-index 6fa70f787df4e..fa270750364cf 100644
+index 6fa70f787df4..fa270750364c 100644
 --- a/arch/arm/mach-s5pv210/pm.c
 +++ b/arch/arm/mach-s5pv210/pm.c
 @@ -195,20 +195,24 @@ static const struct platform_suspend_ops s5pv210_suspend_ops = {
@@ -499,7 +499,7 @@ index 6fa70f787df4e..fa270750364cf 100644
  	suspend_set_ops(&s5pv210_suspend_ops);
  }
 diff --git a/arch/arm/mach-versatile/integrator_ap.c b/arch/arm/mach-versatile/integrator_ap.c
-index 4bd6712e9f525..ee90d6619d0db 100644
+index 4bd6712e9f52..ee90d6619d0d 100644
 --- a/arch/arm/mach-versatile/integrator_ap.c
 +++ b/arch/arm/mach-versatile/integrator_ap.c
 @@ -63,13 +63,13 @@ static void __init ap_map_io(void)
@@ -540,7 +540,7 @@ index 4bd6712e9f525..ee90d6619d0db 100644
  	return 0;
  }
 diff --git a/arch/arm/mm/cache-b15-rac.c b/arch/arm/mm/cache-b15-rac.c
-index 6f63b90f9e1ac..e7807356dfab0 100644
+index 6f63b90f9e1a..e7807356dfab 100644
 --- a/arch/arm/mm/cache-b15-rac.c
 +++ b/arch/arm/mm/cache-b15-rac.c
 @@ -256,7 +256,7 @@ static int b15_rac_dead_cpu(unsigned int cpu)
@@ -588,7 +588,7 @@ index 6f63b90f9e1ac..e7807356dfab0 100644
  	spin_lock(&rac_lock);
  	reg = __raw_readl(b15_rac_base + RAC_CONFIG0_REG);
 diff --git a/arch/loongarch/kernel/smp.c b/arch/loongarch/kernel/smp.c
-index 5d6a60294fb2d..24f947e4b219c 100644
+index fc3817bd1919..4e3d79c38c46 100644
 --- a/arch/loongarch/kernel/smp.c
 +++ b/arch/loongarch/kernel/smp.c
 @@ -535,28 +535,32 @@ int hibernate_resume_nonboot_cpu_disable(void)
@@ -629,7 +629,7 @@ index 5d6a60294fb2d..24f947e4b219c 100644
  }
  
 diff --git a/arch/mips/alchemy/common/dbdma.c b/arch/mips/alchemy/common/dbdma.c
-index 6a3c890f7bbfe..6c2c2010bbaee 100644
+index 6a3c890f7bbf..6c2c2010bbae 100644
 --- a/arch/mips/alchemy/common/dbdma.c
 +++ b/arch/mips/alchemy/common/dbdma.c
 @@ -982,7 +982,7 @@ u32 au1xxx_dbdma_put_dscr(u32 chanid, au1x_ddma_desc_t *dscr)
@@ -677,7 +677,7 @@ index 6a3c890f7bbfe..6c2c2010bbaee 100644
  
  	return ret;
 diff --git a/arch/mips/alchemy/common/irq.c b/arch/mips/alchemy/common/irq.c
-index da9f9220048fc..2403afcd2fb95 100644
+index da9f9220048f..2403afcd2fb9 100644
 --- a/arch/mips/alchemy/common/irq.c
 +++ b/arch/mips/alchemy/common/irq.c
 @@ -758,7 +758,7 @@ static inline void alchemy_ic_resume_one(void __iomem *base, unsigned long *d)
@@ -762,7 +762,7 @@ index da9f9220048fc..2403afcd2fb95 100644
  
  	/* disable & ack all possible interrupt sources */
 diff --git a/arch/mips/alchemy/common/usb.c b/arch/mips/alchemy/common/usb.c
-index 5d618547ebf01..a55f32bf517cd 100644
+index 5d618547ebf0..a55f32bf517c 100644
 --- a/arch/mips/alchemy/common/usb.c
 +++ b/arch/mips/alchemy/common/usb.c
 @@ -580,22 +580,26 @@ static void alchemy_usb_pm(int susp)
@@ -805,7 +805,7 @@ index 5d618547ebf01..a55f32bf517cd 100644
  	return ret;
  }
 diff --git a/arch/mips/pci/pci-alchemy.c b/arch/mips/pci/pci-alchemy.c
-index 58625d1b64658..6bfee0f71803e 100644
+index 58625d1b6465..6bfee0f71803 100644
 --- a/arch/mips/pci/pci-alchemy.c
 +++ b/arch/mips/pci/pci-alchemy.c
 @@ -304,7 +304,7 @@ static int alchemy_pci_def_idsel(unsigned int devsel, int assert)
@@ -853,7 +853,7 @@ index 58625d1b64658..6bfee0f71803e 100644
  
  	dev_info(&pdev->dev, "PCI controller at %ld MHz\n",
 diff --git a/arch/powerpc/platforms/cell/spu_base.c b/arch/powerpc/platforms/cell/spu_base.c
-index 2c07387201d0d..2ddb93df4817f 100644
+index 2c07387201d0..2ddb93df4817 100644
 --- a/arch/powerpc/platforms/cell/spu_base.c
 +++ b/arch/powerpc/platforms/cell/spu_base.c
 @@ -726,7 +726,7 @@ static inline void crash_register_spus(struct list_head *list)
@@ -891,7 +891,7 @@ index 2c07387201d0d..2ddb93df4817f 100644
  	spu_init_affinity();
  
 diff --git a/arch/powerpc/platforms/powermac/pic.c b/arch/powerpc/platforms/powermac/pic.c
-index c37783a03d254..1959cc13438f5 100644
+index c37783a03d25..1959cc13438f 100644
 --- a/arch/powerpc/platforms/powermac/pic.c
 +++ b/arch/powerpc/platforms/powermac/pic.c
 @@ -600,7 +600,7 @@ static int pmacpic_find_viaint(void)
@@ -935,7 +935,7 @@ index c37783a03d254..1959cc13438f5 100644
  }
  
 diff --git a/arch/powerpc/sysdev/fsl_lbc.c b/arch/powerpc/sysdev/fsl_lbc.c
-index 217cea150987d..7ed07232a69a4 100644
+index 217cea150987..7ed07232a69a 100644
 --- a/arch/powerpc/sysdev/fsl_lbc.c
 +++ b/arch/powerpc/sysdev/fsl_lbc.c
 @@ -350,7 +350,7 @@ static int fsl_lbc_ctrl_probe(struct platform_device *dev)
@@ -982,7 +982,7 @@ index 217cea150987d..7ed07232a69a4 100644
  	return platform_driver_register(&fsl_lbc_ctrl_driver);
  }
 diff --git a/arch/powerpc/sysdev/fsl_pci.c b/arch/powerpc/sysdev/fsl_pci.c
-index ef7707ea0db7b..4e501654cb41b 100644
+index ef7707ea0db7..4e501654cb41 100644
 --- a/arch/powerpc/sysdev/fsl_pci.c
 +++ b/arch/powerpc/sysdev/fsl_pci.c
 @@ -1258,7 +1258,7 @@ static void fsl_pci_syscore_do_suspend(struct pci_controller *hose)
@@ -1029,7 +1029,7 @@ index ef7707ea0db7b..4e501654cb41b 100644
  	return platform_driver_register(&fsl_pci_driver);
  }
 diff --git a/arch/powerpc/sysdev/ipic.c b/arch/powerpc/sysdev/ipic.c
-index 70be2105865db..290ba8427239f 100644
+index 70be2105865d..290ba8427239 100644
 --- a/arch/powerpc/sysdev/ipic.c
 +++ b/arch/powerpc/sysdev/ipic.c
 @@ -817,7 +817,7 @@ static struct {
@@ -1076,7 +1076,7 @@ index 70be2105865db..290ba8427239f 100644
  	return 0;
  }
 diff --git a/arch/powerpc/sysdev/mpic.c b/arch/powerpc/sysdev/mpic.c
-index ad7310bba00bc..67e51998d1aea 100644
+index ad7310bba00b..67e51998d1ae 100644
 --- a/arch/powerpc/sysdev/mpic.c
 +++ b/arch/powerpc/sysdev/mpic.c
 @@ -1944,7 +1944,7 @@ static void mpic_suspend_one(struct mpic *mpic)
@@ -1125,7 +1125,7 @@ index ad7310bba00bc..67e51998d1aea 100644
  		return rc;
  	}
 diff --git a/arch/powerpc/sysdev/mpic_timer.c b/arch/powerpc/sysdev/mpic_timer.c
-index 7166e2e0baaf6..60f5b3934b511 100644
+index 7166e2e0baaf..60f5b3934b51 100644
 --- a/arch/powerpc/sysdev/mpic_timer.c
 +++ b/arch/powerpc/sysdev/mpic_timer.c
 @@ -519,7 +519,7 @@ static void __init timer_group_init(struct device_node *np)
@@ -1163,7 +1163,7 @@ index 7166e2e0baaf6..60f5b3934b511 100644
  	if (list_empty(&timer_group_list))
  		return -ENODEV;
 diff --git a/arch/sh/mm/pmb.c b/arch/sh/mm/pmb.c
-index 68eb7cc6e5643..482eec50f404e 100644
+index 68eb7cc6e564..482eec50f404 100644
 --- a/arch/sh/mm/pmb.c
 +++ b/arch/sh/mm/pmb.c
 @@ -857,7 +857,7 @@ static int __init pmb_debugfs_init(void)
@@ -1196,7 +1196,7 @@ index 68eb7cc6e5643..482eec50f404e 100644
  }
  subsys_initcall(pmb_sysdev_init);
 diff --git a/arch/x86/events/amd/ibs.c b/arch/x86/events/amd/ibs.c
-index 56918cd91115c..23d834e7b565e 100644
+index 56918cd91115..23d834e7b565 100644
 --- a/arch/x86/events/amd/ibs.c
 +++ b/arch/x86/events/amd/ibs.c
 @@ -1719,26 +1719,30 @@ static int x86_pmu_amd_ibs_starting_cpu(unsigned int cpu)
@@ -1235,7 +1235,7 @@ index 56918cd91115c..23d834e7b565e 100644
  
  #else
 diff --git a/arch/x86/hyperv/hv_init.c b/arch/x86/hyperv/hv_init.c
-index e890fd37e9c2d..085ef4f2e73a9 100644
+index e890fd37e9c2..085ef4f2e73a 100644
 --- a/arch/x86/hyperv/hv_init.c
 +++ b/arch/x86/hyperv/hv_init.c
 @@ -351,7 +351,7 @@ static int __init hv_pci_init(void)
@@ -1283,7 +1283,7 @@ index e890fd37e9c2d..085ef4f2e73a9 100644
  	if (ms_hyperv.priv_high & HV_ACCESS_PARTITION_ID)
  		hv_get_partition_id();
 diff --git a/arch/x86/kernel/amd_gart_64.c b/arch/x86/kernel/amd_gart_64.c
-index 3485d419c2f5e..e6e68a31634cb 100644
+index 3485d419c2f5..e6e68a31634c 100644
 --- a/arch/x86/kernel/amd_gart_64.c
 +++ b/arch/x86/kernel/amd_gart_64.c
 @@ -591,7 +591,7 @@ static void gart_fixup_northbridges(void)
@@ -1322,7 +1322,7 @@ index 3485d419c2f5e..e6e68a31634cb 100644
  	flush_gart();
  
 diff --git a/arch/x86/kernel/apic/apic.c b/arch/x86/kernel/apic/apic.c
-index aa1b0ef5e9314..a4431f0d25805 100644
+index aa1b0ef5e931..a4431f0d2580 100644
 --- a/arch/x86/kernel/apic/apic.c
 +++ b/arch/x86/kernel/apic/apic.c
 @@ -2382,7 +2382,7 @@ static struct {
@@ -1370,7 +1370,7 @@ index aa1b0ef5e9314..a4431f0d25805 100644
  	return 0;
  }
 diff --git a/arch/x86/kernel/apic/io_apic.c b/arch/x86/kernel/apic/io_apic.c
-index 5ba2feb2c04c6..84e200662ce6a 100644
+index 5ba2feb2c04c..84e200662ce6 100644
 --- a/arch/x86/kernel/apic/io_apic.c
 +++ b/arch/x86/kernel/apic/io_apic.c
 @@ -2308,7 +2308,12 @@ static void resume_ioapic_id(int ioapic_idx)
@@ -1410,7 +1410,7 @@ index 5ba2feb2c04c6..84e200662ce6a 100644
  	return 0;
  }
 diff --git a/arch/x86/kernel/cpu/aperfmperf.c b/arch/x86/kernel/cpu/aperfmperf.c
-index a315b0627dfb1..7ffc78d5ebf21 100644
+index a315b0627dfb..7ffc78d5ebf2 100644
 --- a/arch/x86/kernel/cpu/aperfmperf.c
 +++ b/arch/x86/kernel/cpu/aperfmperf.c
 @@ -37,7 +37,7 @@ static DEFINE_PER_CPU_SHARED_ALIGNED(struct aperfmperf, cpu_samples) = {
@@ -1473,7 +1473,7 @@ index a315b0627dfb1..7ffc78d5ebf21 100644
 +		init_counter_refs(NULL);
  }
 diff --git a/arch/x86/kernel/cpu/intel_epb.c b/arch/x86/kernel/cpu/intel_epb.c
-index bc7671f920a7e..2c56f8730f596 100644
+index bc7671f920a7..2c56f8730f59 100644
 --- a/arch/x86/kernel/cpu/intel_epb.c
 +++ b/arch/x86/kernel/cpu/intel_epb.c
 @@ -75,7 +75,7 @@ static u8 energ_perf_values[] = {
@@ -1539,7 +1539,7 @@ index bc7671f920a7e..2c56f8730f596 100644
  
  err_out_online:
 diff --git a/arch/x86/kernel/cpu/mce/core.c b/arch/x86/kernel/cpu/mce/core.c
-index c8b112c6c5492..26c98d9002bc9 100644
+index c8b112c6c549..26c98d9002bc 100644
 --- a/arch/x86/kernel/cpu/mce/core.c
 +++ b/arch/x86/kernel/cpu/mce/core.c
 @@ -2387,13 +2387,13 @@ static void vendor_disable_error_reporting(void)
@@ -1595,7 +1595,7 @@ index c8b112c6c5492..26c98d9002bc9 100644
  	return 0;
  
 diff --git a/arch/x86/kernel/cpu/microcode/core.c b/arch/x86/kernel/cpu/microcode/core.c
-index 539edd6d6dc8c..81aa079fad269 100644
+index 539edd6d6dc8..81aa079fad26 100644
 --- a/arch/x86/kernel/cpu/microcode/core.c
 +++ b/arch/x86/kernel/cpu/microcode/core.c
 @@ -812,8 +812,17 @@ void microcode_bsp_resume(void)
@@ -1628,7 +1628,7 @@ index 539edd6d6dc8c..81aa079fad269 100644
  			  mc_cpu_online, mc_cpu_down_prep);
  
 diff --git a/arch/x86/kernel/cpu/mtrr/legacy.c b/arch/x86/kernel/cpu/mtrr/legacy.c
-index d25882fcf181d..2415ffaaf02c0 100644
+index d25882fcf181..2415ffaaf02c 100644
 --- a/arch/x86/kernel/cpu/mtrr/legacy.c
 +++ b/arch/x86/kernel/cpu/mtrr/legacy.c
 @@ -41,7 +41,7 @@ struct mtrr_value {
@@ -1674,7 +1674,7 @@ index d25882fcf181d..2415ffaaf02c0 100644
 +	register_syscore(&mtrr_syscore);
  }
 diff --git a/arch/x86/kernel/cpu/umwait.c b/arch/x86/kernel/cpu/umwait.c
-index 933fcd7ff2502..e4a31c5366427 100644
+index 933fcd7ff250..e4a31c536642 100644
 --- a/arch/x86/kernel/cpu/umwait.c
 +++ b/arch/x86/kernel/cpu/umwait.c
 @@ -86,15 +86,19 @@ static int umwait_cpu_offline(unsigned int cpu)
@@ -1709,7 +1709,7 @@ index 933fcd7ff2502..e4a31c5366427 100644
  	/*
  	 * Add umwait control interface. Ignore failure, so at least the
 diff --git a/arch/x86/kernel/i8237.c b/arch/x86/kernel/i8237.c
-index 2cd124ad9380c..896d46b442848 100644
+index 2cd124ad9380..896d46b44284 100644
 --- a/arch/x86/kernel/i8237.c
 +++ b/arch/x86/kernel/i8237.c
 @@ -19,7 +19,7 @@
@@ -1747,7 +1747,7 @@ index 2cd124ad9380c..896d46b442848 100644
  }
  device_initcall(i8237A_init_ops);
 diff --git a/arch/x86/kernel/i8259.c b/arch/x86/kernel/i8259.c
-index 2bade73f49e33..f67063df67235 100644
+index 2bade73f49e3..f67063df6723 100644
 --- a/arch/x86/kernel/i8259.c
 +++ b/arch/x86/kernel/i8259.c
 @@ -247,19 +247,19 @@ static void save_ELCR(char *trigger)
@@ -1801,7 +1801,7 @@ index 2bade73f49e33..f67063df67235 100644
  	return 0;
  }
 diff --git a/arch/x86/kernel/kvm.c b/arch/x86/kernel/kvm.c
-index b67d7c59dca0b..1500852ba03ca 100644
+index b67d7c59dca0..1500852ba03c 100644
 --- a/arch/x86/kernel/kvm.c
 +++ b/arch/x86/kernel/kvm.c
 @@ -720,7 +720,7 @@ static int kvm_cpu_down_prepare(unsigned int cpu)
@@ -1849,7 +1849,7 @@ index b67d7c59dca0b..1500852ba03ca 100644
  	/*
  	 * Hard lockup detection is enabled by default. Disable it, as guests
 diff --git a/drivers/acpi/pci_link.c b/drivers/acpi/pci_link.c
-index e4560b33b8ad1..bed7dc85612e3 100644
+index e4560b33b8ad..bed7dc85612e 100644
 --- a/drivers/acpi/pci_link.c
 +++ b/drivers/acpi/pci_link.c
 @@ -761,7 +761,7 @@ static int acpi_pci_link_resume(struct acpi_pci_link *link)
@@ -1886,7 +1886,7 @@ index e4560b33b8ad1..bed7dc85612e3 100644
  	acpi_scan_add_handler(&pci_link_handler);
  }
 diff --git a/drivers/acpi/sleep.c b/drivers/acpi/sleep.c
-index 0b7fa4a8c379c..1b9579bb97c27 100644
+index 0b7fa4a8c379..1b9579bb97c2 100644
 --- a/drivers/acpi/sleep.c
 +++ b/drivers/acpi/sleep.c
 @@ -892,13 +892,13 @@ bool acpi_s2idle_wakeup(void)
@@ -1927,10 +1927,10 @@ index 0b7fa4a8c379c..1b9579bb97c27 100644
  #else
  static inline void acpi_sleep_syscore_init(void) {}
 diff --git a/drivers/base/firmware_loader/main.c b/drivers/base/firmware_loader/main.c
-index 6942c62fa59d1..8191dbab92c49 100644
+index 0f3e1779d1e8..214cdd909666 100644
 --- a/drivers/base/firmware_loader/main.c
 +++ b/drivers/base/firmware_loader/main.c
-@@ -1585,16 +1585,20 @@ static int fw_pm_notify(struct notifier_block *notify_block,
+@@ -1646,16 +1646,20 @@ static int fw_pm_notify(struct notifier_block *notify_block,
  }
  
  /* stop caching firmware once syscore_suspend is reached */
@@ -1953,7 +1953,7 @@ index 6942c62fa59d1..8191dbab92c49 100644
  static int __init register_fw_pm_ops(void)
  {
  	int ret;
-@@ -1610,14 +1614,14 @@ static int __init register_fw_pm_ops(void)
+@@ -1671,14 +1675,14 @@ static int __init register_fw_pm_ops(void)
  	if (ret)
  		return ret;
  
@@ -1971,7 +1971,7 @@ index 6942c62fa59d1..8191dbab92c49 100644
  }
  #else
 diff --git a/drivers/base/syscore.c b/drivers/base/syscore.c
-index 13db1f78d2ce9..483adb796654f 100644
+index 13db1f78d2ce..483adb796654 100644
 --- a/drivers/base/syscore.c
 +++ b/drivers/base/syscore.c
 @@ -11,32 +11,32 @@
@@ -2121,7 +2121,7 @@ index 13db1f78d2ce9..483adb796654f 100644
 +	mutex_unlock(&syscore_lock);
  }
 diff --git a/drivers/bus/mvebu-mbus.c b/drivers/bus/mvebu-mbus.c
-index 00cb792bda18b..dd94145c9b222 100644
+index 00cb792bda18..dd94145c9b22 100644
 --- a/drivers/bus/mvebu-mbus.c
 +++ b/drivers/bus/mvebu-mbus.c
 @@ -1006,7 +1006,7 @@ static __init int mvebu_mbus_debugfs_init(void)
@@ -2169,7 +2169,7 @@ index 00cb792bda18b..dd94145c9b222 100644
  	return 0;
  }
 diff --git a/drivers/clk/at91/pmc.c b/drivers/clk/at91/pmc.c
-index acf780a815890..2310f6f731627 100644
+index 4ef4f7b9d0bd..073b2d506f78 100644
 --- a/drivers/clk/at91/pmc.c
 +++ b/drivers/clk/at91/pmc.c
 @@ -115,7 +115,7 @@ struct pmc_data *pmc_data_allocate(unsigned int ncore, unsigned int nsystem,
@@ -2217,7 +2217,7 @@ index acf780a815890..2310f6f731627 100644
  	return 0;
  }
 diff --git a/drivers/clk/imx/clk-vf610.c b/drivers/clk/imx/clk-vf610.c
-index 9e11f1c7c397e..41eb38552a9c7 100644
+index 9e11f1c7c397..41eb38552a9c 100644
 --- a/drivers/clk/imx/clk-vf610.c
 +++ b/drivers/clk/imx/clk-vf610.c
 @@ -139,7 +139,7 @@ static struct clk * __init vf610_get_fixed_clock(
@@ -2265,7 +2265,7 @@ index 9e11f1c7c397e..41eb38552a9c7 100644
  	/* Add the clocks to provider list */
  	clk_data.clks = clk;
 diff --git a/drivers/clk/ingenic/jz4725b-cgu.c b/drivers/clk/ingenic/jz4725b-cgu.c
-index 590e9c85cb25b..94cee44c854f9 100644
+index 590e9c85cb25..94cee44c854f 100644
 --- a/drivers/clk/ingenic/jz4725b-cgu.c
 +++ b/drivers/clk/ingenic/jz4725b-cgu.c
 @@ -268,6 +268,6 @@ static void __init jz4725b_cgu_init(struct device_node *np)
@@ -2277,7 +2277,7 @@ index 590e9c85cb25b..94cee44c854f9 100644
  }
  CLK_OF_DECLARE_DRIVER(jz4725b_cgu, "ingenic,jz4725b-cgu", jz4725b_cgu_init);
 diff --git a/drivers/clk/ingenic/jz4740-cgu.c b/drivers/clk/ingenic/jz4740-cgu.c
-index 3e0a30574ebb3..2def3aedc8dd2 100644
+index 3e0a30574ebb..2def3aedc8dd 100644
 --- a/drivers/clk/ingenic/jz4740-cgu.c
 +++ b/drivers/clk/ingenic/jz4740-cgu.c
 @@ -266,6 +266,6 @@ static void __init jz4740_cgu_init(struct device_node *np)
@@ -2289,7 +2289,7 @@ index 3e0a30574ebb3..2def3aedc8dd2 100644
  }
  CLK_OF_DECLARE_DRIVER(jz4740_cgu, "ingenic,jz4740-cgu", jz4740_cgu_init);
 diff --git a/drivers/clk/ingenic/jz4755-cgu.c b/drivers/clk/ingenic/jz4755-cgu.c
-index f2c2d848dab7a..17cf5dcaece99 100644
+index f2c2d848dab7..17cf5dcaece9 100644
 --- a/drivers/clk/ingenic/jz4755-cgu.c
 +++ b/drivers/clk/ingenic/jz4755-cgu.c
 @@ -337,7 +337,7 @@ static void __init jz4755_cgu_init(struct device_node *np)
@@ -2302,7 +2302,7 @@ index f2c2d848dab7a..17cf5dcaece99 100644
  /*
   * CGU has some children devices, this is useful for probing children devices
 diff --git a/drivers/clk/ingenic/jz4760-cgu.c b/drivers/clk/ingenic/jz4760-cgu.c
-index e407f00bd5942..372fe4b079927 100644
+index e407f00bd594..372fe4b07992 100644
 --- a/drivers/clk/ingenic/jz4760-cgu.c
 +++ b/drivers/clk/ingenic/jz4760-cgu.c
 @@ -436,7 +436,7 @@ static void __init jz4760_cgu_init(struct device_node *np)
@@ -2315,7 +2315,7 @@ index e407f00bd5942..372fe4b079927 100644
  
  /* We only probe via devicetree, no need for a platform driver */
 diff --git a/drivers/clk/ingenic/jz4770-cgu.c b/drivers/clk/ingenic/jz4770-cgu.c
-index 6ae1740367f9e..58f1d3bad6774 100644
+index 6ae1740367f9..58f1d3bad677 100644
 --- a/drivers/clk/ingenic/jz4770-cgu.c
 +++ b/drivers/clk/ingenic/jz4770-cgu.c
 @@ -456,7 +456,7 @@ static void __init jz4770_cgu_init(struct device_node *np)
@@ -2328,7 +2328,7 @@ index 6ae1740367f9e..58f1d3bad6774 100644
  
  /* We only probe via devicetree, no need for a platform driver */
 diff --git a/drivers/clk/ingenic/jz4780-cgu.c b/drivers/clk/ingenic/jz4780-cgu.c
-index 07e2f3c5c4549..1e88aef7ac0f3 100644
+index 07e2f3c5c454..1e88aef7ac0f 100644
 --- a/drivers/clk/ingenic/jz4780-cgu.c
 +++ b/drivers/clk/ingenic/jz4780-cgu.c
 @@ -803,6 +803,6 @@ static void __init jz4780_cgu_init(struct device_node *np)
@@ -2340,7 +2340,7 @@ index 07e2f3c5c4549..1e88aef7ac0f3 100644
  }
  CLK_OF_DECLARE_DRIVER(jz4780_cgu, "ingenic,jz4780-cgu", jz4780_cgu_init);
 diff --git a/drivers/clk/ingenic/pm.c b/drivers/clk/ingenic/pm.c
-index 341752b640d2b..206d5cf2872f6 100644
+index 341752b640d2..206d5cf2872f 100644
 --- a/drivers/clk/ingenic/pm.c
 +++ b/drivers/clk/ingenic/pm.c
 @@ -15,7 +15,7 @@
@@ -2384,7 +2384,7 @@ index 341752b640d2b..206d5cf2872f6 100644
  	}
  }
 diff --git a/drivers/clk/ingenic/pm.h b/drivers/clk/ingenic/pm.h
-index fa7540407b6b7..0dcb57dc64cb4 100644
+index fa7540407b6b..0dcb57dc64cb 100644
 --- a/drivers/clk/ingenic/pm.h
 +++ b/drivers/clk/ingenic/pm.h
 @@ -7,6 +7,6 @@
@@ -2396,7 +2396,7 @@ index fa7540407b6b7..0dcb57dc64cb4 100644
  
  #endif /* DRIVERS_CLK_INGENIC_PM_H */
 diff --git a/drivers/clk/ingenic/tcu.c b/drivers/clk/ingenic/tcu.c
-index 7d04ef40b7cf9..bc6a51da20725 100644
+index 7d04ef40b7cf..bc6a51da2072 100644
 --- a/drivers/clk/ingenic/tcu.c
 +++ b/drivers/clk/ingenic/tcu.c
 @@ -455,7 +455,7 @@ static int __init ingenic_tcu_probe(struct device_node *np)
@@ -2444,7 +2444,7 @@ index 7d04ef40b7cf9..bc6a51da20725 100644
  
  CLK_OF_DECLARE_DRIVER(jz4740_cgu, "ingenic,jz4740-tcu", ingenic_tcu_init);
 diff --git a/drivers/clk/ingenic/x1000-cgu.c b/drivers/clk/ingenic/x1000-cgu.c
-index d80886caf3933..d89bdfb7c219a 100644
+index d80886caf393..d89bdfb7c219 100644
 --- a/drivers/clk/ingenic/x1000-cgu.c
 +++ b/drivers/clk/ingenic/x1000-cgu.c
 @@ -556,7 +556,7 @@ static void __init x1000_cgu_init(struct device_node *np)
@@ -2457,7 +2457,7 @@ index d80886caf3933..d89bdfb7c219a 100644
  /*
   * CGU has some children devices, this is useful for probing children devices
 diff --git a/drivers/clk/ingenic/x1830-cgu.c b/drivers/clk/ingenic/x1830-cgu.c
-index 0fd46e50a513f..acf856e5009e0 100644
+index 0fd46e50a513..acf856e5009e 100644
 --- a/drivers/clk/ingenic/x1830-cgu.c
 +++ b/drivers/clk/ingenic/x1830-cgu.c
 @@ -463,7 +463,7 @@ static void __init x1830_cgu_init(struct device_node *np)
@@ -2470,7 +2470,7 @@ index 0fd46e50a513f..acf856e5009e0 100644
  /*
   * CGU has some children devices, this is useful for probing children devices
 diff --git a/drivers/clk/mvebu/common.c b/drivers/clk/mvebu/common.c
-index 785dbede48354..5adbbd91a6db3 100644
+index 785dbede4835..5adbbd91a6db 100644
 --- a/drivers/clk/mvebu/common.c
 +++ b/drivers/clk/mvebu/common.c
 @@ -215,22 +215,26 @@ static struct clk *clk_gating_get_src(
@@ -2513,7 +2513,7 @@ index 785dbede48354..5adbbd91a6db3 100644
  	return;
  gates_out:
 diff --git a/drivers/clk/rockchip/clk-rk3288.c b/drivers/clk/rockchip/clk-rk3288.c
-index 0a1e017df7c66..9cf3e1e43b781 100644
+index 0a1e017df7c6..9cf3e1e43b78 100644
 --- a/drivers/clk/rockchip/clk-rk3288.c
 +++ b/drivers/clk/rockchip/clk-rk3288.c
 @@ -871,7 +871,7 @@ static const int rk3288_saved_cru_reg_ids[] = {
@@ -2561,7 +2561,7 @@ index 0a1e017df7c66..9cf3e1e43b781 100644
  	rockchip_clk_of_add_provider(np, ctx);
  }
 diff --git a/drivers/clk/samsung/clk-s5pv210-audss.c b/drivers/clk/samsung/clk-s5pv210-audss.c
-index b1fd8fac3a4c0..c9fcb23de183e 100644
+index b1fd8fac3a4c..c9fcb23de183 100644
 --- a/drivers/clk/samsung/clk-s5pv210-audss.c
 +++ b/drivers/clk/samsung/clk-s5pv210-audss.c
 @@ -36,7 +36,7 @@ static unsigned long reg_save[][2] = {
@@ -2608,7 +2608,7 @@ index b1fd8fac3a4c0..c9fcb23de183e 100644
  
  	return 0;
 diff --git a/drivers/clk/samsung/clk.c b/drivers/clk/samsung/clk.c
-index dbc9925ca8f46..c149ca6c22172 100644
+index dbc9925ca8f4..c149ca6c2217 100644
 --- a/drivers/clk/samsung/clk.c
 +++ b/drivers/clk/samsung/clk.c
 @@ -271,7 +271,7 @@ void __init samsung_clk_of_register_fixed_ext(struct samsung_clk_provider *ctx,
@@ -2656,7 +2656,7 @@ index dbc9925ca8f46..c149ca6c22172 100644
  	reg_cache->reg_base = reg_base;
  	reg_cache->rd_num = nr_rdump;
 diff --git a/drivers/clk/tegra/clk-tegra210.c b/drivers/clk/tegra/clk-tegra210.c
-index 412902f573b54..504d0ea997a51 100644
+index 412902f573b5..504d0ea997a5 100644
 --- a/drivers/clk/tegra/clk-tegra210.c
 +++ b/drivers/clk/tegra/clk-tegra210.c
 @@ -3444,7 +3444,7 @@ static void tegra210_disable_cpu_clock(u32 cpu)
@@ -2705,7 +2705,7 @@ index 412902f573b54..504d0ea997a51 100644
  }
  CLK_OF_DECLARE(tegra210, "nvidia,tegra210-car", tegra210_clock_init);
 diff --git a/drivers/clocksource/timer-armada-370-xp.c b/drivers/clocksource/timer-armada-370-xp.c
-index 54284c1c06514..f2b4cc40db93a 100644
+index 54284c1c0651..f2b4cc40db93 100644
 --- a/drivers/clocksource/timer-armada-370-xp.c
 +++ b/drivers/clocksource/timer-armada-370-xp.c
 @@ -207,14 +207,14 @@ static int armada_370_xp_timer_dying_cpu(unsigned int cpu)
@@ -2752,7 +2752,7 @@ index 54284c1c06514..f2b4cc40db93a 100644
  	return 0;
  }
 diff --git a/drivers/cpuidle/cpuidle-psci.c b/drivers/cpuidle/cpuidle-psci.c
-index b19bc60cc627b..3372e1f90561a 100644
+index b19bc60cc627..3372e1f90561 100644
 --- a/drivers/cpuidle/cpuidle-psci.c
 +++ b/drivers/cpuidle/cpuidle-psci.c
 @@ -177,26 +177,30 @@ static void psci_idle_syscore_switch(bool suspend)
@@ -2791,7 +2791,7 @@ index b19bc60cc627b..3372e1f90561a 100644
  
  static void psci_idle_init_cpuhp(void)
 diff --git a/drivers/gpio/gpio-mxc.c b/drivers/gpio/gpio-mxc.c
-index dbdf0f41b6bb9..12f11a6c96653 100644
+index dbdf0f41b6bb..12f11a6c9665 100644
 --- a/drivers/gpio/gpio-mxc.c
 +++ b/drivers/gpio/gpio-mxc.c
 @@ -675,7 +675,7 @@ static const struct dev_pm_ops mxc_gpio_dev_pm_ops = {
@@ -2839,7 +2839,7 @@ index dbdf0f41b6bb9..12f11a6c96653 100644
  	return platform_driver_register(&mxc_gpio_driver);
  }
 diff --git a/drivers/gpio/gpio-pxa.c b/drivers/gpio/gpio-pxa.c
-index fa22f3faa163c..664cf1eef494c 100644
+index fa22f3faa163..664cf1eef494 100644
 --- a/drivers/gpio/gpio-pxa.c
 +++ b/drivers/gpio/gpio-pxa.c
 @@ -747,7 +747,7 @@ static int __init pxa_gpio_dt_init(void)
@@ -2882,7 +2882,7 @@ index fa22f3faa163c..664cf1eef494c 100644
  }
  postcore_initcall(pxa_gpio_sysinit);
 diff --git a/drivers/gpio/gpio-sa1100.c b/drivers/gpio/gpio-sa1100.c
-index 7f6a62f5d1eeb..1938ffa2f4f33 100644
+index 7f6a62f5d1ee..1938ffa2f4f3 100644
 --- a/drivers/gpio/gpio-sa1100.c
 +++ b/drivers/gpio/gpio-sa1100.c
 @@ -256,7 +256,7 @@ static void sa1100_gpio_handler(struct irq_desc *desc)
@@ -2922,10 +2922,10 @@ index 7f6a62f5d1eeb..1938ffa2f4f33 100644
  }
  
 diff --git a/drivers/hv/vmbus_drv.c b/drivers/hv/vmbus_drv.c
-index 137cf82e2292e..40646ddaf3fe0 100644
+index 1a0e350c1940..2a694b0ba5ea 100644
 --- a/drivers/hv/vmbus_drv.c
 +++ b/drivers/hv/vmbus_drv.c
-@@ -2907,7 +2907,7 @@ static void hv_crash_handler(struct pt_regs *regs)
+@@ -2884,7 +2884,7 @@ static void hv_crash_handler(struct pt_regs *regs)
  	hv_synic_disable_regs(cpu);
  };
  
@@ -2934,7 +2934,7 @@ index 137cf82e2292e..40646ddaf3fe0 100644
  {
  	/*
  	 * When we reach here, all the non-boot CPUs have been offlined.
-@@ -2934,7 +2934,7 @@ static int hv_synic_suspend(void)
+@@ -2911,7 +2911,7 @@ static int hv_synic_suspend(void)
  	return 0;
  }
  
@@ -2943,7 +2943,7 @@ index 137cf82e2292e..40646ddaf3fe0 100644
  {
  	hv_synic_enable_regs(0);
  
-@@ -2946,11 +2946,15 @@ static void hv_synic_resume(void)
+@@ -2923,11 +2923,15 @@ static void hv_synic_resume(void)
  }
  
  /* The callbacks run only on CPU0, with irqs_disabled. */
@@ -2960,7 +2960,7 @@ index 137cf82e2292e..40646ddaf3fe0 100644
  static int __init hv_acpi_init(void)
  {
  	int ret;
-@@ -2993,7 +2997,7 @@ static int __init hv_acpi_init(void)
+@@ -2970,7 +2974,7 @@ static int __init hv_acpi_init(void)
  	hv_setup_kexec_handler(hv_kexec_handler);
  	hv_setup_crash_handler(hv_crash_handler);
  
@@ -2969,7 +2969,7 @@ index 137cf82e2292e..40646ddaf3fe0 100644
  
  	return 0;
  
-@@ -3007,7 +3011,7 @@ static void __exit vmbus_exit(void)
+@@ -2984,7 +2988,7 @@ static void __exit vmbus_exit(void)
  {
  	int cpu;
  
@@ -2979,10 +2979,10 @@ index 137cf82e2292e..40646ddaf3fe0 100644
  	hv_remove_kexec_handler();
  	hv_remove_crash_handler();
 diff --git a/drivers/iommu/amd/init.c b/drivers/iommu/amd/init.c
-index 76efd74124b33..4aa09660804b9 100644
+index 69170146d442..73910424d83a 100644
 --- a/drivers/iommu/amd/init.c
 +++ b/drivers/iommu/amd/init.c
-@@ -3050,7 +3050,7 @@ static void disable_iommus(void)
+@@ -3059,7 +3059,7 @@ static void disable_iommus(void)
   * disable suspend until real resume implemented
   */
  
@@ -2991,7 +2991,7 @@ index 76efd74124b33..4aa09660804b9 100644
  {
  	struct amd_iommu *iommu;
  
-@@ -3064,7 +3064,7 @@ static void amd_iommu_resume(void)
+@@ -3074,7 +3074,7 @@ static void amd_iommu_resume(void)
  	amd_iommu_enable_interrupts();
  }
  
@@ -3000,7 +3000,7 @@ index 76efd74124b33..4aa09660804b9 100644
  {
  	/* disable IOMMUs to go out of the way for BIOS */
  	disable_iommus();
-@@ -3072,11 +3072,15 @@ static int amd_iommu_suspend(void)
+@@ -3082,11 +3082,15 @@ static int amd_iommu_suspend(void)
  	return 0;
  }
  
@@ -3017,16 +3017,16 @@ index 76efd74124b33..4aa09660804b9 100644
  static void __init free_iommu_resources(void)
  {
  	free_iommu_all();
-@@ -3421,7 +3425,7 @@ static int __init state_next(void)
+@@ -3458,7 +3462,7 @@ static int __init state_next(void)
  		init_state = IOMMU_ENABLED;
  		break;
  	case IOMMU_ENABLED:
 -		register_syscore_ops(&amd_iommu_syscore_ops);
 +		register_syscore(&amd_iommu_syscore);
  		iommu_snp_enable();
- 		ret = amd_iommu_init_pci();
- 		init_state = ret ? IOMMU_INIT_ERROR : IOMMU_PCI_INIT;
-@@ -3524,12 +3528,12 @@ int __init amd_iommu_enable(void)
+ 
+ 		amd_iommu_apply_erratum_snp();
+@@ -3576,12 +3580,12 @@ int __init amd_iommu_enable(void)
  
  void amd_iommu_disable(void)
  {
@@ -3042,10 +3042,10 @@ index 76efd74124b33..4aa09660804b9 100644
  	return 0;
  }
 diff --git a/drivers/iommu/intel/iommu.c b/drivers/iommu/intel/iommu.c
-index db0cf436c8395..69dd172b5ffda 100644
+index cee1851b6924..8fbf4d434aeb 100644
 --- a/drivers/iommu/intel/iommu.c
 +++ b/drivers/iommu/intel/iommu.c
-@@ -2300,7 +2300,7 @@ static void iommu_flush_all(void)
+@@ -2303,7 +2303,7 @@ static void iommu_flush_all(void)
  	}
  }
  
@@ -3054,7 +3054,7 @@ index db0cf436c8395..69dd172b5ffda 100644
  {
  	struct dmar_drhd_unit *drhd;
  	struct intel_iommu *iommu = NULL;
-@@ -2327,7 +2327,7 @@ static int iommu_suspend(void)
+@@ -2330,7 +2330,7 @@ static int iommu_suspend(void)
  	return 0;
  }
  
@@ -3063,7 +3063,7 @@ index db0cf436c8395..69dd172b5ffda 100644
  {
  	struct dmar_drhd_unit *drhd;
  	struct intel_iommu *iommu = NULL;
-@@ -2358,14 +2358,18 @@ static void iommu_resume(void)
+@@ -2361,14 +2361,18 @@ static void iommu_resume(void)
  	}
  }
  
@@ -3085,7 +3085,7 @@ index db0cf436c8395..69dd172b5ffda 100644
  
  #else
 diff --git a/drivers/irqchip/exynos-combiner.c b/drivers/irqchip/exynos-combiner.c
-index e7dfcf0cda438..495848442b355 100644
+index e7dfcf0cda43..495848442b35 100644
 --- a/drivers/irqchip/exynos-combiner.c
 +++ b/drivers/irqchip/exynos-combiner.c
 @@ -200,12 +200,13 @@ static void __init combiner_init(void __iomem *combiner_base,
@@ -3145,7 +3145,7 @@ index e7dfcf0cda438..495848442b355 100644
  	return 0;
  }
 diff --git a/drivers/irqchip/irq-armada-370-xp.c b/drivers/irqchip/irq-armada-370-xp.c
-index a44c49e985b75..a4d03a2d15699 100644
+index a44c49e985b7..a4d03a2d1569 100644
 --- a/drivers/irqchip/irq-armada-370-xp.c
 +++ b/drivers/irqchip/irq-armada-370-xp.c
 @@ -726,7 +726,7 @@ static void __exception_irq_entry mpic_handle_irq(struct pt_regs *regs)
@@ -3193,7 +3193,7 @@ index a44c49e985b75..a4d03a2d15699 100644
  	return 0;
  }
 diff --git a/drivers/irqchip/irq-bcm7038-l1.c b/drivers/irqchip/irq-bcm7038-l1.c
-index 821b288587cab..674138668f1c6 100644
+index 821b288587ca..674138668f1c 100644
 --- a/drivers/irqchip/irq-bcm7038-l1.c
 +++ b/drivers/irqchip/irq-bcm7038-l1.c
 @@ -291,7 +291,7 @@ static int bcm7038_l1_init_one(struct device_node *dn, unsigned int idx,
@@ -3241,10 +3241,10 @@ index 821b288587cab..674138668f1c6 100644
  
  	pr_info("registered BCM7038 L1 intc (%pOF, IRQs: %d)\n",
 diff --git a/drivers/irqchip/irq-gic-v3-its.c b/drivers/irqchip/irq-gic-v3-its.c
-index 23158fc8d3921..a51e8e6a81819 100644
+index a1661657391d..f7697072e0b9 100644
 --- a/drivers/irqchip/irq-gic-v3-its.c
 +++ b/drivers/irqchip/irq-gic-v3-its.c
-@@ -4996,7 +4996,7 @@ static void its_enable_quirks(struct its_node *its)
+@@ -4994,7 +4994,7 @@ static void its_enable_quirks(struct its_node *its)
  				     its_quirks, its);
  }
  
@@ -3253,7 +3253,7 @@ index 23158fc8d3921..a51e8e6a81819 100644
  {
  	struct its_node *its;
  	int err = 0;
-@@ -5032,7 +5032,7 @@ static int its_save_disable(void)
+@@ -5030,7 +5030,7 @@ static int its_save_disable(void)
  	return err;
  }
  
@@ -3262,7 +3262,7 @@ index 23158fc8d3921..a51e8e6a81819 100644
  {
  	struct its_node *its;
  	int ret;
-@@ -5092,11 +5092,15 @@ static void its_restore_enable(void)
+@@ -5090,11 +5090,15 @@ static void its_restore_enable(void)
  	raw_spin_unlock(&its_lock);
  }
  
@@ -3279,7 +3279,7 @@ index 23158fc8d3921..a51e8e6a81819 100644
  static void __init __iomem *its_map_one(struct resource *res, int *err)
  {
  	void __iomem *its_base;
-@@ -5868,7 +5872,7 @@ int __init its_init(struct fwnode_handle *handle, struct rdists *rdists,
+@@ -5866,7 +5870,7 @@ int __init its_init(struct fwnode_handle *handle, struct rdists *rdists,
  		}
  	}
  
@@ -3289,7 +3289,7 @@ index 23158fc8d3921..a51e8e6a81819 100644
  	return 0;
  }
 diff --git a/drivers/irqchip/irq-i8259.c b/drivers/irqchip/irq-i8259.c
-index 91b2f587119ce..cca77f9948a38 100644
+index 91b2f587119c..cca77f9948a3 100644
 --- a/drivers/irqchip/irq-i8259.c
 +++ b/drivers/irqchip/irq-i8259.c
 @@ -202,13 +202,13 @@ static void mask_and_ack_8259A(struct irq_data *d)
@@ -3335,7 +3335,7 @@ index 91b2f587119ce..cca77f9948a38 100644
  }
  
 diff --git a/drivers/irqchip/irq-imx-gpcv2.c b/drivers/irqchip/irq-imx-gpcv2.c
-index b91f5c14b4057..04f7ba0657be7 100644
+index b91f5c14b405..04f7ba0657be 100644
 --- a/drivers/irqchip/irq-imx-gpcv2.c
 +++ b/drivers/irqchip/irq-imx-gpcv2.c
 @@ -33,7 +33,7 @@ static void __iomem *gpcv2_idx_to_reg(struct gpcv2_irqchip_data *cd, int i)
@@ -3383,7 +3383,7 @@ index b91f5c14b4057..04f7ba0657be7 100644
  	/*
  	 * Clear the OF_POPULATED flag set in of_irq_init so that
 diff --git a/drivers/irqchip/irq-loongson-eiointc.c b/drivers/irqchip/irq-loongson-eiointc.c
-index 39e5a72ccd3c8..ad2105685b48b 100644
+index 39e5a72ccd3c..ad2105685b48 100644
 --- a/drivers/irqchip/irq-loongson-eiointc.c
 +++ b/drivers/irqchip/irq-loongson-eiointc.c
 @@ -407,21 +407,25 @@ static struct irq_domain *acpi_get_vec_parent(int node, struct acpi_vector_group
@@ -3425,7 +3425,7 @@ index 39e5a72ccd3c8..ad2105685b48b 100644
  					  "irqchip/loongarch/eiointc:starting",
  					  eiointc_router_init, NULL);
 diff --git a/drivers/irqchip/irq-loongson-htpic.c b/drivers/irqchip/irq-loongson-htpic.c
-index f4abdf156de71..1c691c4be9894 100644
+index f4abdf156de7..1c691c4be989 100644
 --- a/drivers/irqchip/irq-loongson-htpic.c
 +++ b/drivers/irqchip/irq-loongson-htpic.c
 @@ -71,15 +71,19 @@ static void htpic_reg_init(void)
@@ -3460,7 +3460,7 @@ index f4abdf156de71..1c691c4be9894 100644
  	return 0;
  
 diff --git a/drivers/irqchip/irq-loongson-htvec.c b/drivers/irqchip/irq-loongson-htvec.c
-index d8558eb350445..d2be8e954e92f 100644
+index d8558eb35044..d2be8e954e92 100644
 --- a/drivers/irqchip/irq-loongson-htvec.c
 +++ b/drivers/irqchip/irq-loongson-htvec.c
 @@ -159,7 +159,7 @@ static void htvec_reset(struct htvec *priv)
@@ -3508,7 +3508,7 @@ index d8558eb350445..d2be8e954e92f 100644
  	return 0;
  
 diff --git a/drivers/irqchip/irq-loongson-pch-lpc.c b/drivers/irqchip/irq-loongson-pch-lpc.c
-index 912bf50a5c7ca..3a125f3e42873 100644
+index 912bf50a5c7c..3a125f3e4287 100644
 --- a/drivers/irqchip/irq-loongson-pch-lpc.c
 +++ b/drivers/irqchip/irq-loongson-pch-lpc.c
 @@ -151,7 +151,7 @@ static int pch_lpc_disabled(struct pch_lpc *priv)
@@ -3555,7 +3555,7 @@ index 912bf50a5c7ca..3a125f3e42873 100644
  	return 0;
  
 diff --git a/drivers/irqchip/irq-loongson-pch-pic.c b/drivers/irqchip/irq-loongson-pch-pic.c
-index 62e6bf3a0611a..c6b369a974a7d 100644
+index 62e6bf3a0611..c6b369a974a7 100644
 --- a/drivers/irqchip/irq-loongson-pch-pic.c
 +++ b/drivers/irqchip/irq-loongson-pch-pic.c
 @@ -278,7 +278,7 @@ static void pch_pic_reset(struct pch_pic *priv)
@@ -3603,7 +3603,7 @@ index 62e6bf3a0611a..c6b369a974a7d 100644
  	return 0;
  
 diff --git a/drivers/irqchip/irq-mchp-eic.c b/drivers/irqchip/irq-mchp-eic.c
-index 979bb86929f8e..31093a8ab67c3 100644
+index 979bb86929f8..31093a8ab67c 100644
 --- a/drivers/irqchip/irq-mchp-eic.c
 +++ b/drivers/irqchip/irq-mchp-eic.c
 @@ -109,7 +109,7 @@ static int mchp_eic_irq_set_wake(struct irq_data *d, unsigned int on)
@@ -3651,7 +3651,7 @@ index 979bb86929f8e..31093a8ab67c3 100644
  	pr_info("%pOF: EIC registered, nr_irqs %u\n", node, MCHP_EIC_NIRQ);
  
 diff --git a/drivers/irqchip/irq-mst-intc.c b/drivers/irqchip/irq-mst-intc.c
-index 9643cc3a77d77..7f760f555a76a 100644
+index 9643cc3a77d7..7f760f555a76 100644
 --- a/drivers/irqchip/irq-mst-intc.c
 +++ b/drivers/irqchip/irq-mst-intc.c
 @@ -143,7 +143,7 @@ static void mst_intc_polarity_restore(struct mst_intc_chip_data *cd)
@@ -3694,7 +3694,7 @@ index 9643cc3a77d77..7f760f555a76a 100644
  }
  late_initcall(mst_irq_pm_init);
 diff --git a/drivers/irqchip/irq-mtk-cirq.c b/drivers/irqchip/irq-mtk-cirq.c
-index de481ba340f83..9571f622774e3 100644
+index de481ba340f8..9571f622774e 100644
 --- a/drivers/irqchip/irq-mtk-cirq.c
 +++ b/drivers/irqchip/irq-mtk-cirq.c
 @@ -199,7 +199,7 @@ static const struct irq_domain_ops cirq_domain_ops = {
@@ -3737,7 +3737,7 @@ index de481ba340f83..9571f622774e3 100644
  #else
  static inline void mtk_cirq_syscore_init(void) {}
 diff --git a/drivers/irqchip/irq-renesas-rzg2l.c b/drivers/irqchip/irq-renesas-rzg2l.c
-index c938ab1592895..eb01d4c5aca75 100644
+index c938ab159289..eb01d4c5aca7 100644
 --- a/drivers/irqchip/irq-renesas-rzg2l.c
 +++ b/drivers/irqchip/irq-renesas-rzg2l.c
 @@ -398,7 +398,7 @@ static int rzg2l_irqc_set_type(struct irq_data *d, unsigned int type)
@@ -3785,7 +3785,7 @@ index c938ab1592895..eb01d4c5aca75 100644
  	return 0;
  }
 diff --git a/drivers/irqchip/irq-sa11x0.c b/drivers/irqchip/irq-sa11x0.c
-index d8d4dff16276b..e5f24c5f3f416 100644
+index d8d4dff16276..e5f24c5f3f41 100644
 --- a/drivers/irqchip/irq-sa11x0.c
 +++ b/drivers/irqchip/irq-sa11x0.c
 @@ -85,7 +85,7 @@ static struct sa1100irq_state {
@@ -3828,7 +3828,7 @@ index d8d4dff16276b..e5f24c5f3f416 100644
  }
  
 diff --git a/drivers/irqchip/irq-sifive-plic.c b/drivers/irqchip/irq-sifive-plic.c
-index 0799c15c745d4..ca70641982ed6 100644
+index 0799c15c745d..ca70641982ed 100644
 --- a/drivers/irqchip/irq-sifive-plic.c
 +++ b/drivers/irqchip/irq-sifive-plic.c
 @@ -250,7 +250,7 @@ static int plic_irq_set_type(struct irq_data *d, unsigned int type)
@@ -3876,7 +3876,7 @@ index 0799c15c745d4..ca70641982ed6 100644
  		}
  	}
 diff --git a/drivers/irqchip/irq-sun6i-r.c b/drivers/irqchip/irq-sun6i-r.c
-index 37d4b29763bc4..23251831c06e2 100644
+index 37d4b29763bc..23251831c06e 100644
 --- a/drivers/irqchip/irq-sun6i-r.c
 +++ b/drivers/irqchip/irq-sun6i-r.c
 @@ -268,7 +268,7 @@ static const struct irq_domain_ops sun6i_r_intc_domain_ops = {
@@ -3936,7 +3936,7 @@ index 37d4b29763bc4..23251831c06e2 100644
  	return 0;
  }
 diff --git a/drivers/irqchip/irq-tegra.c b/drivers/irqchip/irq-tegra.c
-index 66cbb9f77ff30..b6382cf6359ad 100644
+index 66cbb9f77ff3..b6382cf6359a 100644
 --- a/drivers/irqchip/irq-tegra.c
 +++ b/drivers/irqchip/irq-tegra.c
 @@ -132,7 +132,7 @@ static int tegra_set_wake(struct irq_data *d, unsigned int enable)
@@ -3979,7 +3979,7 @@ index 66cbb9f77ff30..b6382cf6359ad 100644
  #else
  #define tegra_set_wake	NULL
 diff --git a/drivers/irqchip/irq-vic.c b/drivers/irqchip/irq-vic.c
-index 2bcdf216a0003..e38104c5064e6 100644
+index 2bcdf216a000..e38104c5064e 100644
 --- a/drivers/irqchip/irq-vic.c
 +++ b/drivers/irqchip/irq-vic.c
 @@ -120,7 +120,7 @@ static void resume_one_vic(struct vic_device *vic)
@@ -4027,7 +4027,7 @@ index 2bcdf216a0003..e38104c5064e6 100644
  	return 0;
  }
 diff --git a/drivers/leds/trigger/ledtrig-cpu.c b/drivers/leds/trigger/ledtrig-cpu.c
-index 05848a2fecff6..679323c2ccda0 100644
+index 05848a2fecff..679323c2ccda 100644
 --- a/drivers/leds/trigger/ledtrig-cpu.c
 +++ b/drivers/leds/trigger/ledtrig-cpu.c
 @@ -94,28 +94,32 @@ void ledtrig_cpu(enum cpu_led_event ledevt)
@@ -4077,7 +4077,7 @@ index 05848a2fecff6..679323c2ccda0 100644
  	ret = cpuhp_setup_state(CPUHP_AP_ONLINE_DYN, "leds/trigger:starting",
  				ledtrig_online_cpu, ledtrig_prepare_down_cpu);
 diff --git a/drivers/macintosh/via-pmu.c b/drivers/macintosh/via-pmu.c
-index b0f09c70f1ff8..5fe47e784d437 100644
+index b0f09c70f1ff..5fe47e784d43 100644
 --- a/drivers/macintosh/via-pmu.c
 +++ b/drivers/macintosh/via-pmu.c
 @@ -2600,7 +2600,7 @@ void pmu_blink(int n)
@@ -4120,7 +4120,7 @@ index b0f09c70f1ff8..5fe47e784d437 100644
  	return 0;
  }
 diff --git a/drivers/power/reset/sc27xx-poweroff.c b/drivers/power/reset/sc27xx-poweroff.c
-index 90287c31992c4..393bd1c33b73b 100644
+index 90287c31992c..393bd1c33b73 100644
 --- a/drivers/power/reset/sc27xx-poweroff.c
 +++ b/drivers/power/reset/sc27xx-poweroff.c
 @@ -28,7 +28,7 @@ static struct regmap *regmap;
@@ -4158,7 +4158,7 @@ index 90287c31992c4..393bd1c33b73b 100644
  }
  
 diff --git a/drivers/sh/clk/core.c b/drivers/sh/clk/core.c
-index 7a73f5e4a1fc7..f02e12dfa5f64 100644
+index 7a73f5e4a1fc..f02e12dfa5f6 100644
 --- a/drivers/sh/clk/core.c
 +++ b/drivers/sh/clk/core.c
 @@ -569,7 +569,7 @@ long clk_round_rate(struct clk *clk, unsigned long rate)
@@ -4191,7 +4191,7 @@ index 7a73f5e4a1fc7..f02e12dfa5f64 100644
  	return 0;
  }
 diff --git a/drivers/sh/intc/core.c b/drivers/sh/intc/core.c
-index ea571eeb30787..3dde703b77668 100644
+index ea571eeb3078..3dde703b7766 100644
 --- a/drivers/sh/intc/core.c
 +++ b/drivers/sh/intc/core.c
 @@ -394,7 +394,7 @@ int __init register_intc_controller(struct intc_desc *desc)
@@ -4239,7 +4239,7 @@ index ea571eeb30787..3dde703b77668 100644
  	error = subsys_system_register(&intc_subsys, NULL);
  	if (!error) {
 diff --git a/drivers/soc/bcm/brcmstb/biuctrl.c b/drivers/soc/bcm/brcmstb/biuctrl.c
-index 364ddbe365c24..bd830649b60dd 100644
+index 364ddbe365c2..bd830649b60d 100644
 --- a/drivers/soc/bcm/brcmstb/biuctrl.c
 +++ b/drivers/soc/bcm/brcmstb/biuctrl.c
 @@ -298,7 +298,7 @@ static int __init setup_hifcpubiuctrl_regs(struct device_node *np)
@@ -4286,7 +4286,7 @@ index 364ddbe365c24..bd830649b60dd 100644
  	ret = 0;
  out_put:
 diff --git a/drivers/soc/tegra/pmc.c b/drivers/soc/tegra/pmc.c
-index 034a2a535a1e1..93bbebd680017 100644
+index 034a2a535a1e..93bbebd68001 100644
 --- a/drivers/soc/tegra/pmc.c
 +++ b/drivers/soc/tegra/pmc.c
 @@ -466,7 +466,7 @@ struct tegra_pmc {
@@ -4342,7 +4342,7 @@ index 034a2a535a1e1..93bbebd680017 100644
  
  static void tegra186_pmc_setup_irq_polarity(struct tegra_pmc *pmc,
 diff --git a/drivers/thermal/intel/intel_hfi.c b/drivers/thermal/intel/intel_hfi.c
-index bd2fca7dc0176..8a2f441cd2ecf 100644
+index bd2fca7dc017..8a2f441cd2ec 100644
 --- a/drivers/thermal/intel/intel_hfi.c
 +++ b/drivers/thermal/intel/intel_hfi.c
 @@ -592,7 +592,7 @@ static void hfi_disable_instance(void *ptr)
@@ -4390,7 +4390,7 @@ index bd2fca7dc0176..8a2f441cd2ecf 100644
  	return;
  
 diff --git a/drivers/xen/xen-acpi-processor.c b/drivers/xen/xen-acpi-processor.c
-index 520756159d3d3..8d1860bd5d578 100644
+index 520756159d3d..8d1860bd5d57 100644
 --- a/drivers/xen/xen-acpi-processor.c
 +++ b/drivers/xen/xen-acpi-processor.c
 @@ -492,7 +492,7 @@ static void xen_acpi_processor_resume_worker(struct work_struct *dummy)
@@ -4437,7 +4437,7 @@ index 520756159d3d3..8d1860bd5d578 100644
  	bitmap_free(acpi_id_present);
  	bitmap_free(acpi_id_cst_present);
 diff --git a/include/linux/syscore_ops.h b/include/linux/syscore_ops.h
-index ae4d48e4c970a..ac6d71be5c382 100644
+index ae4d48e4c970..ac6d71be5c38 100644
 --- a/include/linux/syscore_ops.h
 +++ b/include/linux/syscore_ops.h
 @@ -11,14 +11,19 @@
@@ -4466,7 +4466,7 @@ index ae4d48e4c970a..ac6d71be5c382 100644
  extern int syscore_suspend(void);
  extern void syscore_resume(void);
 diff --git a/kernel/cpu_pm.c b/kernel/cpu_pm.c
-index b0f0d15085db1..7481fbb947d32 100644
+index b0f0d15085db..7481fbb947d3 100644
 --- a/kernel/cpu_pm.c
 +++ b/kernel/cpu_pm.c
 @@ -173,7 +173,7 @@ int cpu_cluster_pm_exit(void)
@@ -4507,7 +4507,7 @@ index b0f0d15085db1..7481fbb947d32 100644
  }
  core_initcall(cpu_pm_init);
 diff --git a/kernel/irq/generic-chip.c b/kernel/irq/generic-chip.c
-index bf59e37d650ad..3cd0c40282c0d 100644
+index bf59e37d650a..3cd0c40282c0 100644
 --- a/kernel/irq/generic-chip.c
 +++ b/kernel/irq/generic-chip.c
 @@ -650,7 +650,7 @@ static struct irq_data *irq_gc_get_irq_data(struct irq_chip_generic *gc)
@@ -4560,7 +4560,7 @@ index bf59e37d650ad..3cd0c40282c0d 100644
  }
  device_initcall(irq_gc_init_ops);
 diff --git a/kernel/irq/pm.c b/kernel/irq/pm.c
-index f7394729cedc3..99ff65466d871 100644
+index f7394729cedc..99ff65466d87 100644
 --- a/kernel/irq/pm.c
 +++ b/kernel/irq/pm.c
 @@ -211,21 +211,26 @@ void rearm_wake_irq(unsigned int irq)
@@ -4594,7 +4594,7 @@ index f7394729cedc3..99ff65466d871 100644
  }
  
 diff --git a/kernel/printk/printk.c b/kernel/printk/printk.c
-index c27fc7fc64eb5..70a97290ad90b 100644
+index c27fc7fc64eb..70a97290ad90 100644
 --- a/kernel/printk/printk.c
 +++ b/kernel/printk/printk.c
 @@ -3660,12 +3660,13 @@ static bool legacy_kthread_create(void)
@@ -4638,7 +4638,7 @@ index c27fc7fc64eb5..70a97290ad90b 100644
  	console_list_lock();
  	printk_kthreads_ready = true;
 diff --git a/kernel/time/sched_clock.c b/kernel/time/sched_clock.c
-index 425d429906d0d..f3aaef695b8cd 100644
+index 425d429906d0..f3aaef695b8c 100644
 --- a/kernel/time/sched_clock.c
 +++ b/kernel/time/sched_clock.c
 @@ -296,6 +296,11 @@ int sched_clock_suspend(void)
@@ -4682,7 +4682,7 @@ index 425d429906d0d..f3aaef695b8cd 100644
  	return 0;
  }
 diff --git a/kernel/time/timekeeping.c b/kernel/time/timekeeping.c
-index 889a8de3fc204..0127c255a9606 100644
+index 889a8de3fc20..0127c255a960 100644
 --- a/kernel/time/timekeeping.c
 +++ b/kernel/time/timekeeping.c
 @@ -1995,6 +1995,11 @@ void timekeeping_resume(void)
@@ -4727,7 +4727,7 @@ index 889a8de3fc204..0127c255a9606 100644
  }
  device_initcall(timekeeping_init_ops);
 diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c
-index 8d55bbc6f34a7..c75fea0c9bad6 100644
+index bec634ac68cb..c16115a06b55 100644
 --- a/virt/kvm/kvm_main.c
 +++ b/virt/kvm/kvm_main.c
 @@ -5630,7 +5630,7 @@ static int kvm_offline_cpu(unsigned int cpu)
@@ -4803,5 +4803,5 @@ index 8d55bbc6f34a7..c75fea0c9bad6 100644
  	kvm_arch_disable_virtualization();
  }
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/platform/patches/0105-soc-tegra-pmc-Don-t-fail-if-aotag-is-not-present.patch b/features/tegra/platform/patches/0102-soc-tegra-pmc-Don-t-fail-if-aotag-is-not-present.patch
similarity index 93%
rename from features/tegra/platform/patches/0105-soc-tegra-pmc-Don-t-fail-if-aotag-is-not-present.patch
rename to features/tegra/platform/patches/0102-soc-tegra-pmc-Don-t-fail-if-aotag-is-not-present.patch
index 463a940..427aa08 100644
--- a/features/tegra/platform/patches/0105-soc-tegra-pmc-Don-t-fail-if-aotag-is-not-present.patch
+++ b/features/tegra/platform/patches/0102-soc-tegra-pmc-Don-t-fail-if-aotag-is-not-present.patch
@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Prathamesh Shete <pshete@nvidia.com>
 Date: Fri, 14 Nov 2025 16:17:11 +0000
-Subject: [PATCH 105/196] soc/tegra: pmc: Don't fail if "aotag" is not present
+Subject: [PATCH 102/184] soc/tegra: pmc: Don't fail if "aotag" is not present
 
 The "aotog" is an optional aperture, so if that aperture is not defined
 for a given device, then initialise the 'aotag' pointer to NULL instead
@@ -16,7 +16,7 @@ Signed-off-by: Thierry Reding <treding@nvidia.com>
 (cherry picked from commit 1c458bbe4b335d1675c47d64df0c8cd34961d2bf)
 
 diff --git a/drivers/soc/tegra/pmc.c b/drivers/soc/tegra/pmc.c
-index 93bbebd680017..ac6b3fac98515 100644
+index 93bbebd68001..ac6b3fac9851 100644
 --- a/drivers/soc/tegra/pmc.c
 +++ b/drivers/soc/tegra/pmc.c
 @@ -2897,9 +2897,16 @@ static int tegra_pmc_probe(struct platform_device *pdev)
@@ -40,5 +40,5 @@ index 93bbebd680017..ac6b3fac98515 100644
  		/* "scratch" is an optional aperture */
  		res = platform_get_resource_byname(pdev, IORESOURCE_MEM,
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/platform/patches/0106-soc-tegra-pmc-Document-tegra_pmc.syscore-field.patch b/features/tegra/platform/patches/0103-soc-tegra-pmc-Document-tegra_pmc.syscore-field.patch
similarity index 88%
rename from features/tegra/platform/patches/0106-soc-tegra-pmc-Document-tegra_pmc.syscore-field.patch
rename to features/tegra/platform/patches/0103-soc-tegra-pmc-Document-tegra_pmc.syscore-field.patch
index 990f076..0affdc6 100644
--- a/features/tegra/platform/patches/0106-soc-tegra-pmc-Document-tegra_pmc.syscore-field.patch
+++ b/features/tegra/platform/patches/0103-soc-tegra-pmc-Document-tegra_pmc.syscore-field.patch
@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Thierry Reding <treding@nvidia.com>
 Date: Wed, 29 Oct 2025 16:10:33 +0100
-Subject: [PATCH 106/196] soc/tegra: pmc: Document tegra_pmc.syscore field
+Subject: [PATCH 103/184] soc/tegra: pmc: Document tegra_pmc.syscore field
 
 This eliminates a warning from the documentation build targets.
 
@@ -9,7 +9,7 @@ Signed-off-by: Thierry Reding <treding@nvidia.com>
 (cherry picked from commit aaca2e9933a362bcd89ec563b3e89de18460335f)
 
 diff --git a/drivers/soc/tegra/pmc.c b/drivers/soc/tegra/pmc.c
-index ac6b3fac98515..af65cc409694f 100644
+index ac6b3fac9851..af65cc409694 100644
 --- a/drivers/soc/tegra/pmc.c
 +++ b/drivers/soc/tegra/pmc.c
 @@ -423,6 +423,7 @@ struct tegra_pmc_soc {
@@ -21,5 +21,5 @@ index ac6b3fac98515..af65cc409694f 100644
  struct tegra_pmc {
  	struct device *dev;
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/platform/patches/0107-soc-tegra-pmc-Add-USB-wake-events-for-Tegra234.patch b/features/tegra/platform/patches/0104-soc-tegra-pmc-Add-USB-wake-events-for-Tegra234.patch
similarity index 91%
rename from features/tegra/platform/patches/0107-soc-tegra-pmc-Add-USB-wake-events-for-Tegra234.patch
rename to features/tegra/platform/patches/0104-soc-tegra-pmc-Add-USB-wake-events-for-Tegra234.patch
index da54fd5..d5c1728 100644
--- a/features/tegra/platform/patches/0107-soc-tegra-pmc-Add-USB-wake-events-for-Tegra234.patch
+++ b/features/tegra/platform/patches/0104-soc-tegra-pmc-Add-USB-wake-events-for-Tegra234.patch
@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Haotien Hsu <haotienh@nvidia.com>
 Date: Mon, 11 Aug 2025 15:45:57 +0800
-Subject: [PATCH 107/196] soc/tegra: pmc: Add USB wake events for Tegra234
+Subject: [PATCH 104/184] soc/tegra: pmc: Add USB wake events for Tegra234
 
 Add USB wake events for Tegra234 so that system can be woken up from
 suspend when USB devices hot-plug/unplug event is detected.
@@ -11,7 +11,7 @@ Signed-off-by: Thierry Reding <treding@nvidia.com>
 (cherry picked from commit dd03d34d6d8e7a3f62450fb7a1408d86fb35487c)
 
 diff --git a/drivers/soc/tegra/pmc.c b/drivers/soc/tegra/pmc.c
-index af65cc409694f..f3760a3b3026d 100644
+index af65cc409694..f3760a3b3026 100644
 --- a/drivers/soc/tegra/pmc.c
 +++ b/drivers/soc/tegra/pmc.c
 @@ -4225,6 +4225,13 @@ static const struct tegra_wake_event tegra234_wake_events[] = {
@@ -29,5 +29,5 @@ index af65cc409694f..f3760a3b3026d 100644
  };
  
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/platform/patches/0108-soc-tegra-pmc-Fix-unsafe-generic_handle_irq-call.patch b/features/tegra/platform/patches/0105-soc-tegra-pmc-Fix-unsafe-generic_handle_irq-call.patch
similarity index 98%
rename from features/tegra/platform/patches/0108-soc-tegra-pmc-Fix-unsafe-generic_handle_irq-call.patch
rename to features/tegra/platform/patches/0105-soc-tegra-pmc-Fix-unsafe-generic_handle_irq-call.patch
index f428844..1af86c7 100644
--- a/features/tegra/platform/patches/0108-soc-tegra-pmc-Fix-unsafe-generic_handle_irq-call.patch
+++ b/features/tegra/platform/patches/0105-soc-tegra-pmc-Fix-unsafe-generic_handle_irq-call.patch
@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Prathamesh Shete <pshete@nvidia.com>
 Date: Thu, 8 Jan 2026 05:01:03 +0000
-Subject: [PATCH 108/196] soc/tegra: pmc: Fix unsafe generic_handle_irq() call
+Subject: [PATCH 105/184] soc/tegra: pmc: Fix unsafe generic_handle_irq() call
 
 Currently, when resuming from system suspend on Tegra platforms,
 the following warning is observed:
@@ -41,7 +41,7 @@ Signed-off-by: Thierry Reding <treding@nvidia.com>
 (cherry picked from commit e6d96073af681780820c94079b978474a8a44413)
 
 diff --git a/drivers/soc/tegra/pmc.c b/drivers/soc/tegra/pmc.c
-index f3760a3b3026d..407fa840814c3 100644
+index f3760a3b3026..407fa840814c 100644
 --- a/drivers/soc/tegra/pmc.c
 +++ b/drivers/soc/tegra/pmc.c
 @@ -28,6 +28,7 @@
@@ -195,5 +195,5 @@ index f3760a3b3026d..407fa840814c3 100644
  
  	/* flip the wakeup trigger for dual-edge triggered pads
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/platform/patches/0109-soc-tegra-pmc-Use-contextual-data-instead-of-global-.patch b/features/tegra/platform/patches/0106-soc-tegra-pmc-Use-contextual-data-instead-of-global-.patch
similarity index 92%
rename from features/tegra/platform/patches/0109-soc-tegra-pmc-Use-contextual-data-instead-of-global-.patch
rename to features/tegra/platform/patches/0106-soc-tegra-pmc-Use-contextual-data-instead-of-global-.patch
index 5c7bf02..7c442b2 100644
--- a/features/tegra/platform/patches/0109-soc-tegra-pmc-Use-contextual-data-instead-of-global-.patch
+++ b/features/tegra/platform/patches/0106-soc-tegra-pmc-Use-contextual-data-instead-of-global-.patch
@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Thierry Reding <treding@nvidia.com>
 Date: Mon, 3 Feb 2025 18:17:37 +0100
-Subject: [PATCH 109/196] soc/tegra: pmc: Use contextual data instead of global
+Subject: [PATCH 106/184] soc/tegra: pmc: Use contextual data instead of global
  variable
 
 Pass the driver-specific data via the syscore struct and use it in the
@@ -11,7 +11,7 @@ Signed-off-by: Thierry Reding <treding@nvidia.com>
 (cherry picked from commit f59dbd0c9388321336b0f5c57644fd8b0ee94aa9)
 
 diff --git a/drivers/soc/tegra/pmc.c b/drivers/soc/tegra/pmc.c
-index 407fa840814c3..2f283fc1c6c56 100644
+index 407fa840814c..2f283fc1c6c5 100644
 --- a/drivers/soc/tegra/pmc.c
 +++ b/drivers/soc/tegra/pmc.c
 @@ -3192,6 +3192,7 @@ static void wke_clear_wake_status(struct tegra_pmc *pmc)
@@ -47,5 +47,5 @@ index 407fa840814c3..2f283fc1c6c56 100644
  }
  
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/platform/patches/0110-soc-tegra-pmc-Pass-struct-tegra_pmc-to-tegra_powerga.patch b/features/tegra/platform/patches/0107-soc-tegra-pmc-Pass-struct-tegra_pmc-to-tegra_powerga.patch
similarity index 95%
rename from features/tegra/platform/patches/0110-soc-tegra-pmc-Pass-struct-tegra_pmc-to-tegra_powerga.patch
rename to features/tegra/platform/patches/0107-soc-tegra-pmc-Pass-struct-tegra_pmc-to-tegra_powerga.patch
index 6c845c5..8f4521e 100644
--- a/features/tegra/platform/patches/0110-soc-tegra-pmc-Pass-struct-tegra_pmc-to-tegra_powerga.patch
+++ b/features/tegra/platform/patches/0107-soc-tegra-pmc-Pass-struct-tegra_pmc-to-tegra_powerga.patch
@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Thierry Reding <treding@nvidia.com>
 Date: Mon, 3 Feb 2025 14:27:21 +0100
-Subject: [PATCH 110/196] soc/tegra: pmc: Pass struct tegra_pmc to
+Subject: [PATCH 107/184] soc/tegra: pmc: Pass struct tegra_pmc to
  tegra_powergate_state()
 
 By using the generic read_poll_timeout() instead of readx_poll_timeout()
@@ -12,7 +12,7 @@ Signed-off-by: Thierry Reding <treding@nvidia.com>
 (cherry picked from commit 1c672945ceb4ba55feb2ba9d6816be395a6e32d7)
 
 diff --git a/drivers/soc/tegra/pmc.c b/drivers/soc/tegra/pmc.c
-index 2f283fc1c6c56..8f29a35a8e01a 100644
+index 2f283fc1c6c5..8f29a35a8e01 100644
 --- a/drivers/soc/tegra/pmc.c
 +++ b/drivers/soc/tegra/pmc.c
 @@ -546,12 +546,7 @@ static void tegra_pmc_scratch_writel(struct tegra_pmc *pmc, u32 value,
@@ -72,5 +72,5 @@ index 2f283fc1c6c56..8f29a35a8e01a 100644
  
  /**
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/platform/patches/0111-soc-tegra-pmc-Store-PMC-context-in-clocks.patch b/features/tegra/platform/patches/0108-soc-tegra-pmc-Store-PMC-context-in-clocks.patch
similarity index 97%
rename from features/tegra/platform/patches/0111-soc-tegra-pmc-Store-PMC-context-in-clocks.patch
rename to features/tegra/platform/patches/0108-soc-tegra-pmc-Store-PMC-context-in-clocks.patch
index 9f6a75b..d27cbaa 100644
--- a/features/tegra/platform/patches/0111-soc-tegra-pmc-Store-PMC-context-in-clocks.patch
+++ b/features/tegra/platform/patches/0108-soc-tegra-pmc-Store-PMC-context-in-clocks.patch
@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Thierry Reding <treding@nvidia.com>
 Date: Mon, 3 Feb 2025 14:33:09 +0100
-Subject: [PATCH 111/196] soc/tegra: pmc: Store PMC context in clocks
+Subject: [PATCH 108/184] soc/tegra: pmc: Store PMC context in clocks
 
 Clocks exposed by the PMC need to reference the PMC context for register
 programming. Store a reference to the context in the data structure for
@@ -11,7 +11,7 @@ Signed-off-by: Thierry Reding <treding@nvidia.com>
 (cherry picked from commit 0732dffeb093064b7954a48362ec83a25262878b)
 
 diff --git a/drivers/soc/tegra/pmc.c b/drivers/soc/tegra/pmc.c
-index 8f29a35a8e01a..ec364dda9f754 100644
+index 8f29a35a8e01..ec364dda9f75 100644
 --- a/drivers/soc/tegra/pmc.c
 +++ b/drivers/soc/tegra/pmc.c
 @@ -202,18 +202,20 @@
@@ -161,5 +161,5 @@ index 8f29a35a8e01a..ec364dda9f754 100644
  	gate->shift = shift;
  
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/platform/patches/0112-soc-tegra-pmc-Embed-reboot-notifier-in-PMC-context.patch b/features/tegra/platform/patches/0109-soc-tegra-pmc-Embed-reboot-notifier-in-PMC-context.patch
similarity index 95%
rename from features/tegra/platform/patches/0112-soc-tegra-pmc-Embed-reboot-notifier-in-PMC-context.patch
rename to features/tegra/platform/patches/0109-soc-tegra-pmc-Embed-reboot-notifier-in-PMC-context.patch
index 5b28056..cefeb1c 100644
--- a/features/tegra/platform/patches/0112-soc-tegra-pmc-Embed-reboot-notifier-in-PMC-context.patch
+++ b/features/tegra/platform/patches/0109-soc-tegra-pmc-Embed-reboot-notifier-in-PMC-context.patch
@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Thierry Reding <treding@nvidia.com>
 Date: Mon, 3 Feb 2025 14:38:24 +0100
-Subject: [PATCH 112/196] soc/tegra: pmc: Embed reboot notifier in PMC context
+Subject: [PATCH 109/184] soc/tegra: pmc: Embed reboot notifier in PMC context
 
 Instead of relying on a global variable to track the PMC context, embed
 the reboot notifier into the PMC context so that the latter can be
@@ -11,7 +11,7 @@ Signed-off-by: Thierry Reding <treding@nvidia.com>
 (cherry picked from commit 48b7f802fb78f6f13c771c03fd6329c8a88e6991)
 
 diff --git a/drivers/soc/tegra/pmc.c b/drivers/soc/tegra/pmc.c
-index ec364dda9f754..9ec033d539e9a 100644
+index ec364dda9f75..9ec033d539e9 100644
 --- a/drivers/soc/tegra/pmc.c
 +++ b/drivers/soc/tegra/pmc.c
 @@ -470,6 +470,8 @@ struct tegra_pmc {
@@ -66,5 +66,5 @@ index ec364dda9f754..9ec033d539e9a 100644
  			dev_err(&pdev->dev,
  				"unable to register reboot notifier, %d\n",
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/platform/patches/0113-soc-tegra-pmc-Pass-PMC-context-via-sys-off-callback-.patch b/features/tegra/platform/patches/0110-soc-tegra-pmc-Pass-PMC-context-via-sys-off-callback-.patch
similarity index 95%
rename from features/tegra/platform/patches/0113-soc-tegra-pmc-Pass-PMC-context-via-sys-off-callback-.patch
rename to features/tegra/platform/patches/0110-soc-tegra-pmc-Pass-PMC-context-via-sys-off-callback-.patch
index 3aa47c5..91214a7 100644
--- a/features/tegra/platform/patches/0113-soc-tegra-pmc-Pass-PMC-context-via-sys-off-callback-.patch
+++ b/features/tegra/platform/patches/0110-soc-tegra-pmc-Pass-PMC-context-via-sys-off-callback-.patch
@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Thierry Reding <treding@nvidia.com>
 Date: Mon, 3 Feb 2025 14:41:45 +0100
-Subject: [PATCH 113/196] soc/tegra: pmc: Pass PMC context via sys-off callback
+Subject: [PATCH 110/184] soc/tegra: pmc: Pass PMC context via sys-off callback
  data
 
 To avoid relying on global variables, use the sys-off callback data to
@@ -11,7 +11,7 @@ Signed-off-by: Thierry Reding <treding@nvidia.com>
 (cherry picked from commit a9f822b3ff7b47a5b78f1258b998cbeb29089a62)
 
 diff --git a/drivers/soc/tegra/pmc.c b/drivers/soc/tegra/pmc.c
-index 9ec033d539e9a..cd7c557c886b5 100644
+index 9ec033d539e9..cd7c557c886b 100644
 --- a/drivers/soc/tegra/pmc.c
 +++ b/drivers/soc/tegra/pmc.c
 @@ -1138,7 +1138,7 @@ static int tegra_pmc_reboot_notify(struct notifier_block *this,
@@ -72,5 +72,5 @@ index 9ec033d539e9a..cd7c557c886b5 100644
  		dev_err(&pdev->dev, "failed to register sys-off handler: %d\n",
  			err);
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/platform/patches/0114-soc-tegra-pmc-Pass-PMC-context-as-debugfs-data.patch b/features/tegra/platform/patches/0111-soc-tegra-pmc-Pass-PMC-context-as-debugfs-data.patch
similarity index 90%
rename from features/tegra/platform/patches/0114-soc-tegra-pmc-Pass-PMC-context-as-debugfs-data.patch
rename to features/tegra/platform/patches/0111-soc-tegra-pmc-Pass-PMC-context-as-debugfs-data.patch
index 861dafc..1f55142 100644
--- a/features/tegra/platform/patches/0114-soc-tegra-pmc-Pass-PMC-context-as-debugfs-data.patch
+++ b/features/tegra/platform/patches/0111-soc-tegra-pmc-Pass-PMC-context-as-debugfs-data.patch
@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Thierry Reding <treding@nvidia.com>
 Date: Mon, 3 Feb 2025 14:47:15 +0100
-Subject: [PATCH 114/196] soc/tegra: pmc: Pass PMC context as debugfs data
+Subject: [PATCH 111/184] soc/tegra: pmc: Pass PMC context as debugfs data
 
 Each debugfs file can have private data associated with it. Use this to
 pass the PMC context instead of relying on a global variable.
@@ -10,7 +10,7 @@ Signed-off-by: Thierry Reding <treding@nvidia.com>
 (cherry picked from commit b2a3e8200056480219d4bc44c3403cacf0125495)
 
 diff --git a/drivers/soc/tegra/pmc.c b/drivers/soc/tegra/pmc.c
-index cd7c557c886b5..f215396206f10 100644
+index cd7c557c886b..f215396206f1 100644
 --- a/drivers/soc/tegra/pmc.c
 +++ b/drivers/soc/tegra/pmc.c
 @@ -1178,6 +1178,7 @@ static int tegra_pmc_power_off_handler(struct sys_off_data *data)
@@ -31,5 +31,5 @@ index cd7c557c886b5..f215396206f10 100644
  	return 0;
  
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/platform/patches/0115-soc-tegra-pmc-Use-PMC-context-embedded-in-powergates.patch b/features/tegra/platform/patches/0112-soc-tegra-pmc-Use-PMC-context-embedded-in-powergates.patch
similarity index 96%
rename from features/tegra/platform/patches/0115-soc-tegra-pmc-Use-PMC-context-embedded-in-powergates.patch
rename to features/tegra/platform/patches/0112-soc-tegra-pmc-Use-PMC-context-embedded-in-powergates.patch
index c3c06d1..8e8c42a 100644
--- a/features/tegra/platform/patches/0115-soc-tegra-pmc-Use-PMC-context-embedded-in-powergates.patch
+++ b/features/tegra/platform/patches/0112-soc-tegra-pmc-Use-PMC-context-embedded-in-powergates.patch
@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Thierry Reding <treding@nvidia.com>
 Date: Mon, 3 Feb 2025 14:51:18 +0100
-Subject: [PATCH 115/196] soc/tegra: pmc: Use PMC context embedded in
+Subject: [PATCH 112/184] soc/tegra: pmc: Use PMC context embedded in
  powergates
 
 The powergates exposed by the PMC have a pointer to the PMC context
@@ -15,7 +15,7 @@ Signed-off-by: Thierry Reding <treding@nvidia.com>
 (cherry picked from commit bb946b0e118dc95160d2313474b2ca4de771f82b)
 
 diff --git a/drivers/soc/tegra/pmc.c b/drivers/soc/tegra/pmc.c
-index f215396206f10..da8890520fc8d 100644
+index f215396206f1..da8890520fc8 100644
 --- a/drivers/soc/tegra/pmc.c
 +++ b/drivers/soc/tegra/pmc.c
 @@ -268,6 +268,17 @@ static const struct pmc_clk_init_data tegra_pmc_clks_data[] = {
@@ -104,5 +104,5 @@ index f215396206f10..da8890520fc8d 100644
  	kfree(pg);
  }
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/platform/patches/0116-soc-tegra-pmc-Use-driver-private-data.patch b/features/tegra/platform/patches/0113-soc-tegra-pmc-Use-driver-private-data.patch
similarity index 90%
rename from features/tegra/platform/patches/0116-soc-tegra-pmc-Use-driver-private-data.patch
rename to features/tegra/platform/patches/0113-soc-tegra-pmc-Use-driver-private-data.patch
index c38d5fb..520758f 100644
--- a/features/tegra/platform/patches/0116-soc-tegra-pmc-Use-driver-private-data.patch
+++ b/features/tegra/platform/patches/0113-soc-tegra-pmc-Use-driver-private-data.patch
@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Thierry Reding <treding@nvidia.com>
 Date: Mon, 3 Feb 2025 14:52:46 +0100
-Subject: [PATCH 116/196] soc/tegra: pmc: Use driver-private data
+Subject: [PATCH 113/184] soc/tegra: pmc: Use driver-private data
 
 Instead of relying on a global variable for the PMC context, use the
 driver-private data for sysfs attributes.
@@ -10,7 +10,7 @@ Signed-off-by: Thierry Reding <treding@nvidia.com>
 (cherry picked from commit 2e944c51d6617d3ded7734d21202036c126344a1)
 
 diff --git a/drivers/soc/tegra/pmc.c b/drivers/soc/tegra/pmc.c
-index da8890520fc8d..9cfa7c3d5cae6 100644
+index da8890520fc8..9cfa7c3d5cae 100644
 --- a/drivers/soc/tegra/pmc.c
 +++ b/drivers/soc/tegra/pmc.c
 @@ -2243,6 +2243,7 @@ static int tegra_pmc_pinctrl_init(struct tegra_pmc *pmc)
@@ -30,5 +30,5 @@ index da8890520fc8d..9cfa7c3d5cae6 100644
  
  	value = tegra_pmc_readl(pmc, pmc->soc->regs->rst_status);
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/platform/patches/0117-soc-tegra-pmc-Do-not-rely-on-global-variable.patch b/features/tegra/platform/patches/0114-soc-tegra-pmc-Do-not-rely-on-global-variable.patch
similarity index 90%
rename from features/tegra/platform/patches/0117-soc-tegra-pmc-Do-not-rely-on-global-variable.patch
rename to features/tegra/platform/patches/0114-soc-tegra-pmc-Do-not-rely-on-global-variable.patch
index f6f2586..a7925c2 100644
--- a/features/tegra/platform/patches/0117-soc-tegra-pmc-Do-not-rely-on-global-variable.patch
+++ b/features/tegra/platform/patches/0114-soc-tegra-pmc-Do-not-rely-on-global-variable.patch
@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Thierry Reding <treding@nvidia.com>
 Date: Mon, 3 Feb 2025 14:55:03 +0100
-Subject: [PATCH 117/196] soc/tegra: pmc: Do not rely on global variable
+Subject: [PATCH 114/184] soc/tegra: pmc: Do not rely on global variable
 
 The reset action for changing the suspend mode back on failure can take
 a context-specific data argument that can be set to the PMC context in
@@ -11,7 +11,7 @@ Signed-off-by: Thierry Reding <treding@nvidia.com>
 (cherry picked from commit e1fd5ad68acd3c3a76651c811e1fdb4846237370)
 
 diff --git a/drivers/soc/tegra/pmc.c b/drivers/soc/tegra/pmc.c
-index 9cfa7c3d5cae6..750fe29f4cf59 100644
+index 9cfa7c3d5cae..750fe29f4cf5 100644
 --- a/drivers/soc/tegra/pmc.c
 +++ b/drivers/soc/tegra/pmc.c
 @@ -2944,6 +2944,8 @@ static int tegra_pmc_regmap_init(struct tegra_pmc *pmc)
@@ -33,5 +33,5 @@ index 9cfa7c3d5cae6..750fe29f4cf59 100644
  		return err;
  
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/platform/patches/0118-soc-tegra-pmc-Add-PMC-contextual-functions.patch b/features/tegra/platform/patches/0115-soc-tegra-pmc-Add-PMC-contextual-functions.patch
similarity index 98%
rename from features/tegra/platform/patches/0118-soc-tegra-pmc-Add-PMC-contextual-functions.patch
rename to features/tegra/platform/patches/0115-soc-tegra-pmc-Add-PMC-contextual-functions.patch
index facb801..5b71752 100644
--- a/features/tegra/platform/patches/0118-soc-tegra-pmc-Add-PMC-contextual-functions.patch
+++ b/features/tegra/platform/patches/0115-soc-tegra-pmc-Add-PMC-contextual-functions.patch
@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Thierry Reding <treding@nvidia.com>
 Date: Mon, 3 Feb 2025 16:22:58 +0100
-Subject: [PATCH 118/196] soc/tegra: pmc: Add PMC contextual functions
+Subject: [PATCH 115/184] soc/tegra: pmc: Add PMC contextual functions
 
 Add implementations that take as argument a struct tegra_pmc * for most
 public APIs, as well as a function to obtain the PMC for any given
@@ -12,7 +12,7 @@ Signed-off-by: Thierry Reding <treding@nvidia.com>
 (cherry picked from commit 70f752ebb08c85a5ea19471a5aaf26263e53dcb0)
 
 diff --git a/drivers/soc/tegra/pmc.c b/drivers/soc/tegra/pmc.c
-index 750fe29f4cf59..9cdbd8ba94be0 100644
+index 750fe29f4cf5..9cdbd8ba94be 100644
 --- a/drivers/soc/tegra/pmc.c
 +++ b/drivers/soc/tegra/pmc.c
 @@ -957,30 +957,122 @@ static int tegra_genpd_power_off(struct generic_pm_domain *domain)
@@ -288,7 +288,7 @@ index 750fe29f4cf59..9cdbd8ba94be0 100644
  				return err;
  			break;
 diff --git a/include/soc/tegra/pmc.h b/include/soc/tegra/pmc.h
-index c545875d0ff18..1fd21be025778 100644
+index c545875d0ff1..1fd21be02577 100644
 --- a/include/soc/tegra/pmc.h
 +++ b/include/soc/tegra/pmc.h
 @@ -16,6 +16,7 @@
@@ -377,5 +377,5 @@ index c545875d0ff18..1fd21be025778 100644
  {
  	return -ENOSYS;
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/platform/patches/0119-soc-tegra-pmc-Add-kerneldoc-for-reboot-notifier.patch b/features/tegra/platform/patches/0116-soc-tegra-pmc-Add-kerneldoc-for-reboot-notifier.patch
similarity index 91%
rename from features/tegra/platform/patches/0119-soc-tegra-pmc-Add-kerneldoc-for-reboot-notifier.patch
rename to features/tegra/platform/patches/0116-soc-tegra-pmc-Add-kerneldoc-for-reboot-notifier.patch
index d2c1be9..178bec0 100644
--- a/features/tegra/platform/patches/0119-soc-tegra-pmc-Add-kerneldoc-for-reboot-notifier.patch
+++ b/features/tegra/platform/patches/0116-soc-tegra-pmc-Add-kerneldoc-for-reboot-notifier.patch
@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Jon Hunter <jonathanh@nvidia.com>
 Date: Wed, 25 Mar 2026 19:25:51 +0000
-Subject: [PATCH 119/196] soc/tegra: pmc: Add kerneldoc for reboot notifier
+Subject: [PATCH 116/184] soc/tegra: pmc: Add kerneldoc for reboot notifier
 
 Commit 48b7f802fb78 ("soc/tegra: pmc: Embed reboot notifier in PMC
 context") added the reboot_notifier structure to the PMC SoC structure
@@ -14,7 +14,7 @@ Signed-off-by: Thierry Reding <treding@nvidia.com>
 (cherry picked from commit 21669619e4c17a5f097e0415bc64b1d400c54fcb)
 
 diff --git a/drivers/soc/tegra/pmc.c b/drivers/soc/tegra/pmc.c
-index 9cdbd8ba94be0..f2282d4fc860d 100644
+index 9cdbd8ba94be..f2282d4fc860 100644
 --- a/drivers/soc/tegra/pmc.c
 +++ b/drivers/soc/tegra/pmc.c
 @@ -437,6 +437,7 @@ struct tegra_pmc_soc {
@@ -26,5 +26,5 @@ index 9cdbd8ba94be0..f2282d4fc860d 100644
   */
  struct tegra_pmc {
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/platform/patches/0120-soc-tegra-pmc-Correct-function-names-in-kerneldoc.patch b/features/tegra/platform/patches/0117-soc-tegra-pmc-Correct-function-names-in-kerneldoc.patch
similarity index 92%
rename from features/tegra/platform/patches/0120-soc-tegra-pmc-Correct-function-names-in-kerneldoc.patch
rename to features/tegra/platform/patches/0117-soc-tegra-pmc-Correct-function-names-in-kerneldoc.patch
index d114114..143e81b 100644
--- a/features/tegra/platform/patches/0120-soc-tegra-pmc-Correct-function-names-in-kerneldoc.patch
+++ b/features/tegra/platform/patches/0117-soc-tegra-pmc-Correct-function-names-in-kerneldoc.patch
@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Jon Hunter <jonathanh@nvidia.com>
 Date: Wed, 25 Mar 2026 19:25:52 +0000
-Subject: [PATCH 120/196] soc/tegra: pmc: Correct function names in kerneldoc
+Subject: [PATCH 117/184] soc/tegra: pmc: Correct function names in kerneldoc
 
 Commit 70f752ebb08c ("soc/tegra: pmc: Add PMC contextual functions")
 added the functions devm_tegra_pmc_get() and
@@ -15,7 +15,7 @@ Signed-off-by: Thierry Reding <treding@nvidia.com>
 (cherry picked from commit ec0e4da5d679f9da1cc198927951f70fdf28f001)
 
 diff --git a/drivers/soc/tegra/pmc.c b/drivers/soc/tegra/pmc.c
-index f2282d4fc860d..63825882b69d1 100644
+index f2282d4fc860..63825882b69d 100644
 --- a/drivers/soc/tegra/pmc.c
 +++ b/drivers/soc/tegra/pmc.c
 @@ -1005,7 +1005,7 @@ static struct tegra_pmc *tegra_pmc_get(struct device *dev)
@@ -37,5 +37,5 @@ index f2282d4fc860d..63825882b69d1 100644
   * @id: Tegra I/O pad ID for which to enable power
   *
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/platform/patches/0121-soc-tegra-pmc-Add-kerneldoc-for-wake-up-variables.patch b/features/tegra/platform/patches/0118-soc-tegra-pmc-Add-kerneldoc-for-wake-up-variables.patch
similarity index 91%
rename from features/tegra/platform/patches/0121-soc-tegra-pmc-Add-kerneldoc-for-wake-up-variables.patch
rename to features/tegra/platform/patches/0118-soc-tegra-pmc-Add-kerneldoc-for-wake-up-variables.patch
index c134f31..1e9460d 100644
--- a/features/tegra/platform/patches/0121-soc-tegra-pmc-Add-kerneldoc-for-wake-up-variables.patch
+++ b/features/tegra/platform/patches/0118-soc-tegra-pmc-Add-kerneldoc-for-wake-up-variables.patch
@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Jon Hunter <jonathanh@nvidia.com>
 Date: Wed, 25 Mar 2026 19:25:53 +0000
-Subject: [PATCH 121/196] soc/tegra: pmc: Add kerneldoc for wake-up variables
+Subject: [PATCH 118/184] soc/tegra: pmc: Add kerneldoc for wake-up variables
 
 Commit e6d96073af68 ("soc/tegra: pmc: Fix unsafe generic_handle_irq()
 call") added the variables 'wake_work' and 'wake_status' to the
@@ -14,7 +14,7 @@ Signed-off-by: Thierry Reding <treding@nvidia.com>
 (cherry picked from commit e6ad1988e56834d641ba4aa0d58970723c1c9c9b)
 
 diff --git a/drivers/soc/tegra/pmc.c b/drivers/soc/tegra/pmc.c
-index 63825882b69d1..49033833c313a 100644
+index 63825882b69d..49033833c313 100644
 --- a/drivers/soc/tegra/pmc.c
 +++ b/drivers/soc/tegra/pmc.c
 @@ -439,6 +439,8 @@ struct tegra_pmc_soc {
@@ -27,5 +27,5 @@ index 63825882b69d1..49033833c313a 100644
  struct tegra_pmc {
  	struct device *dev;
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/platform/patches/0122-soc-tegra-pmc-Remove-unused-AOWAKE-definitions.patch b/features/tegra/platform/patches/0119-soc-tegra-pmc-Remove-unused-AOWAKE-definitions.patch
similarity index 91%
rename from features/tegra/platform/patches/0122-soc-tegra-pmc-Remove-unused-AOWAKE-definitions.patch
rename to features/tegra/platform/patches/0119-soc-tegra-pmc-Remove-unused-AOWAKE-definitions.patch
index 2a94bfe..c28aa83 100644
--- a/features/tegra/platform/patches/0122-soc-tegra-pmc-Remove-unused-AOWAKE-definitions.patch
+++ b/features/tegra/platform/patches/0119-soc-tegra-pmc-Remove-unused-AOWAKE-definitions.patch
@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Jon Hunter <jonathanh@nvidia.com>
 Date: Wed, 25 Mar 2026 19:25:54 +0000
-Subject: [PATCH 122/196] soc/tegra: pmc: Remove unused AOWAKE definitions
+Subject: [PATCH 119/184] soc/tegra: pmc: Remove unused AOWAKE definitions
 
 For Tegra264, the offsets for the AOWAKE registers have changed. Before
 adding support for the Tegra264 AOWAKE register offsets, remove the
@@ -12,7 +12,7 @@ Signed-off-by: Thierry Reding <treding@nvidia.com>
 (cherry picked from commit 8b3e944ee16ce9061b632ccab207e9a9dd540ad9)
 
 diff --git a/drivers/soc/tegra/pmc.c b/drivers/soc/tegra/pmc.c
-index 49033833c313a..8e101f1309848 100644
+index 49033833c313..8e101f130984 100644
 --- a/drivers/soc/tegra/pmc.c
 +++ b/drivers/soc/tegra/pmc.c
 @@ -181,11 +181,8 @@
@@ -28,5 +28,5 @@ index 49033833c313a..8e101f1309848 100644
  #define WAKE_AOWAKE_SW_STATUS_W_0	0x49c
  #define WAKE_AOWAKE_SW_STATUS(x)	(0x4a0 + ((x) << 2))
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/platform/patches/0123-soc-tegra-pmc-Add-support-for-SoC-specific-AOWAKE-of.patch b/features/tegra/platform/patches/0120-soc-tegra-pmc-Add-support-for-SoC-specific-AOWAKE-of.patch
similarity index 98%
rename from features/tegra/platform/patches/0123-soc-tegra-pmc-Add-support-for-SoC-specific-AOWAKE-of.patch
rename to features/tegra/platform/patches/0120-soc-tegra-pmc-Add-support-for-SoC-specific-AOWAKE-of.patch
index 2fac90d..2782111 100644
--- a/features/tegra/platform/patches/0123-soc-tegra-pmc-Add-support-for-SoC-specific-AOWAKE-of.patch
+++ b/features/tegra/platform/patches/0120-soc-tegra-pmc-Add-support-for-SoC-specific-AOWAKE-of.patch
@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Jon Hunter <jonathanh@nvidia.com>
 Date: Wed, 25 Mar 2026 19:25:55 +0000
-Subject: [PATCH 123/196] soc/tegra: pmc: Add support for SoC specific AOWAKE
+Subject: [PATCH 120/184] soc/tegra: pmc: Add support for SoC specific AOWAKE
  offsets
 
 For Tegra264, some of the AOWAKE registers have different register
@@ -15,7 +15,7 @@ Signed-off-by: Thierry Reding <treding@nvidia.com>
 (cherry picked from commit 5f87dac89270f7bf5c65eaa2dc884ba1fa2de4e2)
 
 diff --git a/drivers/soc/tegra/pmc.c b/drivers/soc/tegra/pmc.c
-index 8e101f1309848..35d689577926d 100644
+index 8e101f130984..35d689577926 100644
 --- a/drivers/soc/tegra/pmc.c
 +++ b/drivers/soc/tegra/pmc.c
 @@ -180,16 +180,18 @@
@@ -211,5 +211,5 @@ index 8e101f1309848..35d689577926d 100644
  
  static const char * const tegra234_reset_sources[] = {
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/platform/patches/0124-soc-tegra-pmc-Add-AOWAKE-regs-for-Tegra264.patch b/features/tegra/platform/patches/0121-soc-tegra-pmc-Add-AOWAKE-regs-for-Tegra264.patch
similarity index 89%
rename from features/tegra/platform/patches/0124-soc-tegra-pmc-Add-AOWAKE-regs-for-Tegra264.patch
rename to features/tegra/platform/patches/0121-soc-tegra-pmc-Add-AOWAKE-regs-for-Tegra264.patch
index b003a2e..d518d0a 100644
--- a/features/tegra/platform/patches/0124-soc-tegra-pmc-Add-AOWAKE-regs-for-Tegra264.patch
+++ b/features/tegra/platform/patches/0121-soc-tegra-pmc-Add-AOWAKE-regs-for-Tegra264.patch
@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Jon Hunter <jonathanh@nvidia.com>
 Date: Wed, 25 Mar 2026 19:25:56 +0000
-Subject: [PATCH 124/196] soc/tegra: pmc: Add AOWAKE regs for Tegra264
+Subject: [PATCH 121/184] soc/tegra: pmc: Add AOWAKE regs for Tegra264
 
 Populate the AOWAKE register offsets for Tegra264.
 
@@ -10,7 +10,7 @@ Signed-off-by: Thierry Reding <treding@nvidia.com>
 (cherry picked from commit bc8b07878cef6273aa1135630cad05227a4b223b)
 
 diff --git a/drivers/soc/tegra/pmc.c b/drivers/soc/tegra/pmc.c
-index 35d689577926d..090499a7a7ebe 100644
+index 35d689577926..090499a7a7eb 100644
 --- a/drivers/soc/tegra/pmc.c
 +++ b/drivers/soc/tegra/pmc.c
 @@ -4538,6 +4538,14 @@ static const struct tegra_pmc_regs tegra264_pmc_regs = {
@@ -29,5 +29,5 @@ index 35d689577926d..090499a7a7ebe 100644
  
  static const char * const tegra264_reset_sources[] = {
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/platform/patches/0125-soc-tegra-pmc-Add-Tegra264-wake-events.patch b/features/tegra/platform/patches/0122-soc-tegra-pmc-Add-Tegra264-wake-events.patch
similarity index 92%
rename from features/tegra/platform/patches/0125-soc-tegra-pmc-Add-Tegra264-wake-events.patch
rename to features/tegra/platform/patches/0122-soc-tegra-pmc-Add-Tegra264-wake-events.patch
index e6a4fc1..8281e69 100644
--- a/features/tegra/platform/patches/0125-soc-tegra-pmc-Add-Tegra264-wake-events.patch
+++ b/features/tegra/platform/patches/0122-soc-tegra-pmc-Add-Tegra264-wake-events.patch
@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Jon Hunter <jonathanh@nvidia.com>
 Date: Wed, 25 Mar 2026 19:25:57 +0000
-Subject: [PATCH 125/196] soc/tegra: pmc: Add Tegra264 wake events
+Subject: [PATCH 122/184] soc/tegra: pmc: Add Tegra264 wake events
 
 Populate the various wake events for the Tegra264 device.
 
@@ -10,7 +10,7 @@ Signed-off-by: Thierry Reding <treding@nvidia.com>
 (cherry picked from commit 91d5b17fd387d9822ef9fa64e8dd2c1d231c9aca)
 
 diff --git a/drivers/soc/tegra/pmc.c b/drivers/soc/tegra/pmc.c
-index 090499a7a7ebe..274ba748ccf9e 100644
+index 090499a7a7eb..274ba748ccf9 100644
 --- a/drivers/soc/tegra/pmc.c
 +++ b/drivers/soc/tegra/pmc.c
 @@ -60,6 +60,7 @@
@@ -39,5 +39,5 @@ index 090499a7a7ebe..274ba748ccf9e 100644
  
  static const struct tegra_pmc_soc tegra264_pmc_soc = {
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/platform/patches/0126-soc-tegra-pmc-Refactor-IO-pad-voltage-control.patch b/features/tegra/platform/patches/0123-soc-tegra-pmc-Refactor-IO-pad-voltage-control.patch
similarity index 99%
rename from features/tegra/platform/patches/0126-soc-tegra-pmc-Refactor-IO-pad-voltage-control.patch
rename to features/tegra/platform/patches/0123-soc-tegra-pmc-Refactor-IO-pad-voltage-control.patch
index afa956a..496274f 100644
--- a/features/tegra/platform/patches/0126-soc-tegra-pmc-Refactor-IO-pad-voltage-control.patch
+++ b/features/tegra/platform/patches/0123-soc-tegra-pmc-Refactor-IO-pad-voltage-control.patch
@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Jon Hunter <jonathanh@nvidia.com>
 Date: Wed, 25 Mar 2026 19:25:58 +0000
-Subject: [PATCH 126/196] soc/tegra: pmc: Refactor IO pad voltage control
+Subject: [PATCH 123/184] soc/tegra: pmc: Refactor IO pad voltage control
 
 For Tegra devices, only a subset of IO pads can be configured for 1.8V
 or 3.3V. Therefore, in the 'tegra_io_pad_soc' structure for Tegra SoCs
@@ -30,7 +30,7 @@ Signed-off-by: Thierry Reding <treding@nvidia.com>
 (cherry picked from commit edded7a9033a77c9b8a66176daa5e0b601e7c474)
 
 diff --git a/drivers/soc/tegra/pmc.c b/drivers/soc/tegra/pmc.c
-index 274ba748ccf9e..b95b62294d7af 100644
+index 274ba748ccf9..b95b62294d7a 100644
 --- a/drivers/soc/tegra/pmc.c
 +++ b/drivers/soc/tegra/pmc.c
 @@ -294,10 +294,15 @@ struct tegra_io_pad_soc {
@@ -637,5 +637,5 @@ index 274ba748ccf9e..b95b62294d7af 100644
  	.pin_descs = tegra234_pin_descs,
  	.regs = &tegra234_pmc_regs,
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/platform/patches/0127-soc-tegra-pmc-Rename-has_impl_33v_pwr-flag.patch b/features/tegra/platform/patches/0124-soc-tegra-pmc-Rename-has_impl_33v_pwr-flag.patch
similarity index 97%
rename from features/tegra/platform/patches/0127-soc-tegra-pmc-Rename-has_impl_33v_pwr-flag.patch
rename to features/tegra/platform/patches/0124-soc-tegra-pmc-Rename-has_impl_33v_pwr-flag.patch
index 8a1ce6f..0d78934 100644
--- a/features/tegra/platform/patches/0127-soc-tegra-pmc-Rename-has_impl_33v_pwr-flag.patch
+++ b/features/tegra/platform/patches/0124-soc-tegra-pmc-Rename-has_impl_33v_pwr-flag.patch
@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Jon Hunter <jonathanh@nvidia.com>
 Date: Wed, 25 Mar 2026 19:25:59 +0000
-Subject: [PATCH 127/196] soc/tegra: pmc: Rename has_impl_33v_pwr flag
+Subject: [PATCH 124/184] soc/tegra: pmc: Rename has_impl_33v_pwr flag
 
 The flag 'has_impl_33v_pwr' is now only used to determine if we need to
 set the write-enable bit before we can set the bit to select if 3.3V IO
@@ -13,7 +13,7 @@ Signed-off-by: Thierry Reding <treding@nvidia.com>
 (cherry picked from commit db3c16b2b90b0f56a94f9780f9dd10b50b648860)
 
 diff --git a/drivers/soc/tegra/pmc.c b/drivers/soc/tegra/pmc.c
-index b95b62294d7af..50446ea0bebc0 100644
+index b95b62294d7a..50446ea0bebc 100644
 --- a/drivers/soc/tegra/pmc.c
 +++ b/drivers/soc/tegra/pmc.c
 @@ -372,7 +372,7 @@ struct tegra_pmc_soc {
@@ -116,5 +116,5 @@ index b95b62294d7af..50446ea0bebc0 100644
  	.init = tegra186_pmc_init,
  	.setup_irq_polarity = tegra186_pmc_setup_irq_polarity,
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/platform/patches/0128-soc-tegra-pmc-Add-IO-pads-for-Tegra264.patch b/features/tegra/platform/patches/0125-soc-tegra-pmc-Add-IO-pads-for-Tegra264.patch
similarity index 97%
rename from features/tegra/platform/patches/0128-soc-tegra-pmc-Add-IO-pads-for-Tegra264.patch
rename to features/tegra/platform/patches/0125-soc-tegra-pmc-Add-IO-pads-for-Tegra264.patch
index 39ed670..054ec96 100644
--- a/features/tegra/platform/patches/0128-soc-tegra-pmc-Add-IO-pads-for-Tegra264.patch
+++ b/features/tegra/platform/patches/0125-soc-tegra-pmc-Add-IO-pads-for-Tegra264.patch
@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Jon Hunter <jonathanh@nvidia.com>
 Date: Wed, 25 Mar 2026 19:26:00 +0000
-Subject: [PATCH 128/196] soc/tegra: pmc: Add IO pads for Tegra264
+Subject: [PATCH 125/184] soc/tegra: pmc: Add IO pads for Tegra264
 
 Populate the IO pads and pins for Tegra264. Tegra264 has internal 1.8V
 and 0.6V regulators that must be enabled when selecting the 1.8V mode
@@ -17,7 +17,7 @@ Signed-off-by: Thierry Reding <treding@nvidia.com>
 (cherry picked from commit e8014b2c83f598e15f5ae48fb56ad9a8d1484965)
 
 diff --git a/drivers/soc/tegra/pmc.c b/drivers/soc/tegra/pmc.c
-index 50446ea0bebc0..590ae2eb7972c 100644
+index 50446ea0bebc..590ae2eb7972 100644
 --- a/drivers/soc/tegra/pmc.c
 +++ b/drivers/soc/tegra/pmc.c
 @@ -201,6 +201,9 @@
@@ -132,5 +132,5 @@ index 50446ea0bebc0..590ae2eb7972c 100644
  	.init = tegra186_pmc_init,
  	.setup_irq_polarity = tegra186_pmc_setup_irq_polarity,
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/platform/patches/0129-soc-tegra-Resolve-a-spelling-error-in-the-tegra194-c.patch b/features/tegra/platform/patches/0126-soc-tegra-Resolve-a-spelling-error-in-the-tegra194-c.patch
similarity index 91%
rename from features/tegra/platform/patches/0129-soc-tegra-Resolve-a-spelling-error-in-the-tegra194-c.patch
rename to features/tegra/platform/patches/0126-soc-tegra-Resolve-a-spelling-error-in-the-tegra194-c.patch
index bf2af47..8c5b857 100644
--- a/features/tegra/platform/patches/0129-soc-tegra-Resolve-a-spelling-error-in-the-tegra194-c.patch
+++ b/features/tegra/platform/patches/0126-soc-tegra-Resolve-a-spelling-error-in-the-tegra194-c.patch
@@ -2,7 +2,7 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Bruno=20Sobreira=20Fran=C3=A7a?=
  <brunofrancadevsec@gmail.com>
 Date: Fri, 24 Oct 2025 01:35:14 +0000
-Subject: [PATCH 129/196] soc/tegra: Resolve a spelling error in the
+Subject: [PATCH 126/184] soc/tegra: Resolve a spelling error in the
  tegra194-cbb.c
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
@@ -18,7 +18,7 @@ Signed-off-by: Thierry Reding <treding@nvidia.com>
 (cherry picked from commit e13c1f34aa8675363f45593e85c125e15b9a4410)
 
 diff --git a/drivers/soc/tegra/cbb/tegra194-cbb.c b/drivers/soc/tegra/cbb/tegra194-cbb.c
-index c1bdea8c853fe..ab75d50cc85c4 100644
+index c1bdea8c853f..ab75d50cc85c 100644
 --- a/drivers/soc/tegra/cbb/tegra194-cbb.c
 +++ b/drivers/soc/tegra/cbb/tegra194-cbb.c
 @@ -1836,7 +1836,7 @@ print_errlog1_2(struct seq_file *file, struct tegra194_cbb *cbb,
@@ -31,5 +31,5 @@ index c1bdea8c853fe..ab75d50cc85c4 100644
   * ErrLog0 only. But additional information is printed for errors from
   * APB targets because for them:
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/platform/patches/0130-soc-tegra-cbb-Add-support-for-CBB-fabrics-in-Tegra23.patch b/features/tegra/platform/patches/0127-soc-tegra-cbb-Add-support-for-CBB-fabrics-in-Tegra23.patch
similarity index 98%
rename from features/tegra/platform/patches/0130-soc-tegra-cbb-Add-support-for-CBB-fabrics-in-Tegra23.patch
rename to features/tegra/platform/patches/0127-soc-tegra-cbb-Add-support-for-CBB-fabrics-in-Tegra23.patch
index a2f3ffc..7371d14 100644
--- a/features/tegra/platform/patches/0130-soc-tegra-cbb-Add-support-for-CBB-fabrics-in-Tegra23.patch
+++ b/features/tegra/platform/patches/0127-soc-tegra-cbb-Add-support-for-CBB-fabrics-in-Tegra23.patch
@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Sumit Gupta <sumitg@nvidia.com>
 Date: Wed, 25 Mar 2026 18:27:26 +0530
-Subject: [PATCH 130/196] soc/tegra: cbb: Add support for CBB fabrics in
+Subject: [PATCH 127/184] soc/tegra: cbb: Add support for CBB fabrics in
  Tegra238
 
 Add support for CBB 2.0 based fabrics in Tegra238 SoC using DT.
@@ -12,7 +12,7 @@ Signed-off-by: Thierry Reding <treding@nvidia.com>
 (cherry picked from commit ad7ffe102a52141a0da19ca766c5103bec28ddb6)
 
 diff --git a/drivers/soc/tegra/cbb/tegra234-cbb.c b/drivers/soc/tegra/cbb/tegra234-cbb.c
-index 7e387fc54c6b1..fb26f085f6914 100644
+index 7e387fc54c6b..fb26f085f691 100644
 --- a/drivers/soc/tegra/cbb/tegra234-cbb.c
 +++ b/drivers/soc/tegra/cbb/tegra234-cbb.c
 @@ -89,6 +89,15 @@ enum tegra234_cbb_fabric_ids {
@@ -171,5 +171,5 @@ index 7e387fc54c6b1..fb26f085f6914 100644
  	{ .compatible = "nvidia,tegra264-top0-cbb-fabric", .data = &tegra264_top0_cbb_fabric },
  	{ .compatible = "nvidia,tegra264-uphy0-cbb-fabric", .data = &tegra264_uphy0_cbb_fabric },
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/platform/patches/0131-firmware-tegra-bpmp-Rename-Tegra239-to-Tegra238.patch b/features/tegra/platform/patches/0128-firmware-tegra-bpmp-Rename-Tegra239-to-Tegra238.patch
similarity index 98%
rename from features/tegra/platform/patches/0131-firmware-tegra-bpmp-Rename-Tegra239-to-Tegra238.patch
rename to features/tegra/platform/patches/0128-firmware-tegra-bpmp-Rename-Tegra239-to-Tegra238.patch
index fa99fef..a1a2ef7 100644
--- a/features/tegra/platform/patches/0131-firmware-tegra-bpmp-Rename-Tegra239-to-Tegra238.patch
+++ b/features/tegra/platform/patches/0128-firmware-tegra-bpmp-Rename-Tegra239-to-Tegra238.patch
@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Thierry Reding <treding@nvidia.com>
 Date: Thu, 26 Feb 2026 16:09:33 +0100
-Subject: [PATCH 131/196] firmware: tegra: bpmp: Rename Tegra239 to Tegra238
+Subject: [PATCH 128/184] firmware: tegra: bpmp: Rename Tegra239 to Tegra238
 
 This chip identifies as Tegra238, so update the BPMP ABI header to refer
 to it by the correct name.
@@ -11,7 +11,7 @@ Signed-off-by: Thierry Reding <treding@nvidia.com>
 (cherry picked from commit d921f8d3b955ba09d321c612fc485b9e9ac438c0)
 
 diff --git a/include/soc/tegra/bpmp-abi.h b/include/soc/tegra/bpmp-abi.h
-index dc0789c20333a..39bb3f87e28d4 100644
+index dc0789c20333..39bb3f87e28d 100644
 --- a/include/soc/tegra/bpmp-abi.h
 +++ b/include/soc/tegra/bpmp-abi.h
 @@ -1020,9 +1020,9 @@ struct cmd_i2c_xfer_request {
@@ -214,5 +214,5 @@ index dc0789c20333a..39bb3f87e28d4 100644
   * @addtogroup FMON
   * @{
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/platform/patches/0132-soc-tegra-Update-BPMP-ABI-header.patch b/features/tegra/platform/patches/0129-soc-tegra-Update-BPMP-ABI-header.patch
similarity index 99%
rename from features/tegra/platform/patches/0132-soc-tegra-Update-BPMP-ABI-header.patch
rename to features/tegra/platform/patches/0129-soc-tegra-Update-BPMP-ABI-header.patch
index 8ae413a..59781c6 100644
--- a/features/tegra/platform/patches/0132-soc-tegra-Update-BPMP-ABI-header.patch
+++ b/features/tegra/platform/patches/0129-soc-tegra-Update-BPMP-ABI-header.patch
@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Thierry Reding <treding@nvidia.com>
 Date: Thu, 26 Mar 2026 14:58:48 +0100
-Subject: [PATCH 132/196] soc/tegra: Update BPMP ABI header
+Subject: [PATCH 129/184] soc/tegra: Update BPMP ABI header
 
 This update primarily adds various new commands and MRQs for Tegra264,
 but also contains a few new annotations and fixes.
@@ -10,7 +10,7 @@ Signed-off-by: Thierry Reding <treding@nvidia.com>
 (cherry picked from commit 83c18a324570193140cafc12c88eb1e370564078)
 
 diff --git a/include/soc/tegra/bpmp-abi.h b/include/soc/tegra/bpmp-abi.h
-index 39bb3f87e28d4..5c64b3e022110 100644
+index 39bb3f87e28d..5c64b3e02211 100644
 --- a/include/soc/tegra/bpmp-abi.h
 +++ b/include/soc/tegra/bpmp-abi.h
 @@ -1,6 +1,6 @@
@@ -6294,5 +6294,5 @@ index 39bb3f87e28d4..5c64b3e022110 100644
  #define BPMP_EBADMSG	77
  /** @brief Operation not supported */
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/platform/patches/0133-soc-tegra-pmc-Create-PMC-context-dynamically.patch b/features/tegra/platform/patches/0130-soc-tegra-pmc-Create-PMC-context-dynamically.patch
similarity index 99%
rename from features/tegra/platform/patches/0133-soc-tegra-pmc-Create-PMC-context-dynamically.patch
rename to features/tegra/platform/patches/0130-soc-tegra-pmc-Create-PMC-context-dynamically.patch
index d6875a7..a5bf72c 100644
--- a/features/tegra/platform/patches/0133-soc-tegra-pmc-Create-PMC-context-dynamically.patch
+++ b/features/tegra/platform/patches/0130-soc-tegra-pmc-Create-PMC-context-dynamically.patch
@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Thierry Reding <treding@nvidia.com>
 Date: Mon, 3 Feb 2025 18:12:58 +0100
-Subject: [PATCH 133/196] soc/tegra: pmc: Create PMC context dynamically
+Subject: [PATCH 130/184] soc/tegra: pmc: Create PMC context dynamically
 
 For legacy purposes, an early PMC context is needed to support certain
 drivers and functionalities. However, when the PMC driver is probed in
@@ -19,7 +19,7 @@ Signed-off-by: Thierry Reding <treding@nvidia.com>
 (cherry picked from commit 4d61f03426892b14d498e160be245edcb9dd8359)
 
 diff --git a/drivers/soc/tegra/pmc.c b/drivers/soc/tegra/pmc.c
-index 590ae2eb7972c..1388e187832d0 100644
+index 590ae2eb7972..1388e187832d 100644
 --- a/drivers/soc/tegra/pmc.c
 +++ b/drivers/soc/tegra/pmc.c
 @@ -390,8 +390,7 @@ struct tegra_pmc_soc {
@@ -504,5 +504,5 @@ index 590ae2eb7972c..1388e187832d0 100644
  		of_node_put(np);
  	}
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/platform/patches/0134-drm-nouveau-tegra-Explicitly-specify-PMC-instance-to.patch b/features/tegra/platform/patches/0131-drm-nouveau-tegra-Explicitly-specify-PMC-instance-to.patch
similarity index 92%
rename from features/tegra/platform/patches/0134-drm-nouveau-tegra-Explicitly-specify-PMC-instance-to.patch
rename to features/tegra/platform/patches/0131-drm-nouveau-tegra-Explicitly-specify-PMC-instance-to.patch
index f10d7b3..b901d6b 100644
--- a/features/tegra/platform/patches/0134-drm-nouveau-tegra-Explicitly-specify-PMC-instance-to.patch
+++ b/features/tegra/platform/patches/0131-drm-nouveau-tegra-Explicitly-specify-PMC-instance-to.patch
@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Thierry Reding <treding@nvidia.com>
 Date: Mon, 3 Feb 2025 16:27:02 +0100
-Subject: [PATCH 134/196] drm/nouveau: tegra: Explicitly specify PMC instance
+Subject: [PATCH 131/184] drm/nouveau: tegra: Explicitly specify PMC instance
  to use
 
 Currently the kernel relies on a global variable to reference the PMC
@@ -14,7 +14,7 @@ Signed-off-by: Thierry Reding <treding@nvidia.com>
 (cherry picked from commit 3ef27f1ad5ed0e36c2dac82876ef7dde33a588f2)
 
 diff --git a/drivers/gpu/drm/nouveau/include/nvkm/core/tegra.h b/drivers/gpu/drm/nouveau/include/nvkm/core/tegra.h
-index 22f74fc88cd75..eba9a3dc96c8b 100644
+index 22f74fc88cd7..eba9a3dc96c8 100644
 --- a/drivers/gpu/drm/nouveau/include/nvkm/core/tegra.h
 +++ b/drivers/gpu/drm/nouveau/include/nvkm/core/tegra.h
 @@ -16,6 +16,8 @@ struct nvkm_device_tegra {
@@ -27,7 +27,7 @@ index 22f74fc88cd75..eba9a3dc96c8b 100644
  		/*
  		 * Protects accesses to mm from subsystems
 diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/device/tegra.c b/drivers/gpu/drm/nouveau/nvkm/engine/device/tegra.c
-index 114e50ca18270..ac75f566b4891 100644
+index 114e50ca1827..ac75f566b489 100644
 --- a/drivers/gpu/drm/nouveau/nvkm/engine/device/tegra.c
 +++ b/drivers/gpu/drm/nouveau/nvkm/engine/device/tegra.c
 @@ -54,7 +54,8 @@ nvkm_device_tegra_power_up(struct nvkm_device_tegra *tdev)
@@ -54,5 +54,5 @@ index 114e50ca18270..ac75f566b4891 100644
  	 * The IOMMU bit defines the upper limit of the GPU-addressable space.
  	 */
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/platform/patches/0135-drm-tegra-Explicitly-specify-PMC-instance-to-use.patch b/features/tegra/platform/patches/0132-drm-tegra-Explicitly-specify-PMC-instance-to-use.patch
similarity index 90%
rename from features/tegra/platform/patches/0135-drm-tegra-Explicitly-specify-PMC-instance-to-use.patch
rename to features/tegra/platform/patches/0132-drm-tegra-Explicitly-specify-PMC-instance-to-use.patch
index 8432930..8e363fe 100644
--- a/features/tegra/platform/patches/0135-drm-tegra-Explicitly-specify-PMC-instance-to-use.patch
+++ b/features/tegra/platform/patches/0132-drm-tegra-Explicitly-specify-PMC-instance-to-use.patch
@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Thierry Reding <treding@nvidia.com>
 Date: Mon, 3 Feb 2025 16:28:38 +0100
-Subject: [PATCH 135/196] drm/tegra: Explicitly specify PMC instance to use
+Subject: [PATCH 132/184] drm/tegra: Explicitly specify PMC instance to use
 
 Currently the kernel relies on a global variable to reference the PMC
 context. Use an explicit lookup for the PMC and pass that to the public
@@ -12,10 +12,10 @@ Signed-off-by: Thierry Reding <treding@nvidia.com>
 (cherry picked from commit e68c4244136b8e9c2a9fc3aaa4d748be83afddef)
 
 diff --git a/drivers/gpu/drm/tegra/dc.c b/drivers/gpu/drm/tegra/dc.c
-index 6c84bd69b11ff..2e247beb97a30 100644
+index dc69c8873693..66c9150ae4fe 100644
 --- a/drivers/gpu/drm/tegra/dc.c
 +++ b/drivers/gpu/drm/tegra/dc.c
-@@ -2779,7 +2779,7 @@ static int tegra_dc_runtime_suspend(struct host1x_client *client)
+@@ -2781,7 +2781,7 @@ static int tegra_dc_runtime_suspend(struct host1x_client *client)
  	}
  
  	if (dc->soc->has_powergate)
@@ -24,7 +24,7 @@ index 6c84bd69b11ff..2e247beb97a30 100644
  
  	clk_disable_unprepare(dc->clk);
  	pm_runtime_put_sync(dev);
-@@ -2800,8 +2800,9 @@ static int tegra_dc_runtime_resume(struct host1x_client *client)
+@@ -2802,8 +2802,9 @@ static int tegra_dc_runtime_resume(struct host1x_client *client)
  	}
  
  	if (dc->soc->has_powergate) {
@@ -36,7 +36,7 @@ index 6c84bd69b11ff..2e247beb97a30 100644
  		if (err < 0) {
  			dev_err(dev, "failed to power partition: %d\n", err);
  			goto put_rpm;
-@@ -3230,12 +3231,17 @@ static int tegra_dc_probe(struct platform_device *pdev)
+@@ -3232,12 +3233,17 @@ static int tegra_dc_probe(struct platform_device *pdev)
  	clk_disable_unprepare(dc->clk);
  
  	if (dc->soc->has_powergate) {
@@ -56,7 +56,7 @@ index 6c84bd69b11ff..2e247beb97a30 100644
  
  	err = tegra_dc_init_opp_table(dc);
 diff --git a/drivers/gpu/drm/tegra/dc.h b/drivers/gpu/drm/tegra/dc.h
-index 0559fa6b1bf70..10b86250e4ca6 100644
+index 0559fa6b1bf7..10b86250e4ca 100644
 --- a/drivers/gpu/drm/tegra/dc.h
 +++ b/drivers/gpu/drm/tegra/dc.h
 @@ -94,6 +94,7 @@ struct tegra_dc {
@@ -68,7 +68,7 @@ index 0559fa6b1bf70..10b86250e4ca6 100644
  	struct tegra_dc_stats stats;
  	struct list_head list;
 diff --git a/drivers/gpu/drm/tegra/gr3d.c b/drivers/gpu/drm/tegra/gr3d.c
-index 42e9656ab80c9..debf66fa4eebc 100644
+index 388e47943d5e..1ec6ced959e4 100644
 --- a/drivers/gpu/drm/tegra/gr3d.c
 +++ b/drivers/gpu/drm/tegra/gr3d.c
 @@ -46,6 +46,7 @@ struct gr3d {
@@ -79,7 +79,7 @@ index 42e9656ab80c9..debf66fa4eebc 100644
  	struct dev_pm_domain_list *pd_list;
  
  	DECLARE_BITMAP(addr_regs, GR3D_NUM_REGS);
-@@ -353,7 +354,8 @@ static int gr3d_power_up_legacy_domain(struct device *dev, const char *name,
+@@ -350,7 +351,8 @@ static int gr3d_power_up_legacy_domain(struct device *dev, const char *name,
  	if (err) {
  		dev_err(dev, "failed to acquire %s reset: %d\n", name, err);
  	} else {
@@ -89,7 +89,7 @@ index 42e9656ab80c9..debf66fa4eebc 100644
  		reset_control_release(reset);
  	}
  
-@@ -385,6 +387,11 @@ static int gr3d_init_power(struct device *dev, struct gr3d *gr3d)
+@@ -382,6 +384,11 @@ static int gr3d_init_power(struct device *dev, struct gr3d *gr3d)
  		if (err != -ENOENT)
  			return err;
  
@@ -102,7 +102,7 @@ index 42e9656ab80c9..debf66fa4eebc 100644
  		 * Older device-trees don't use GENPD. In this case we should
  		 * toggle power domain manually.
 diff --git a/drivers/gpu/drm/tegra/sor.c b/drivers/gpu/drm/tegra/sor.c
-index bc7dd562cf6b6..dcf3f109b6447 100644
+index bc7dd562cf6b..dcf3f109b644 100644
 --- a/drivers/gpu/drm/tegra/sor.c
 +++ b/drivers/gpu/drm/tegra/sor.c
 @@ -421,6 +421,8 @@ struct tegra_sor {
@@ -164,5 +164,5 @@ index bc7dd562cf6b6..dcf3f109b6447 100644
  	if (np) {
  		sor->aux = drm_dp_aux_find_by_of_node(np);
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/platform/patches/0136-usb-xhci-tegra-Explicitly-specify-PMC-instance-to-us.patch b/features/tegra/platform/patches/0133-usb-xhci-tegra-Explicitly-specify-PMC-instance-to-us.patch
similarity index 96%
rename from features/tegra/platform/patches/0136-usb-xhci-tegra-Explicitly-specify-PMC-instance-to-us.patch
rename to features/tegra/platform/patches/0133-usb-xhci-tegra-Explicitly-specify-PMC-instance-to-us.patch
index 5af876d..68c61b6 100644
--- a/features/tegra/platform/patches/0136-usb-xhci-tegra-Explicitly-specify-PMC-instance-to-us.patch
+++ b/features/tegra/platform/patches/0133-usb-xhci-tegra-Explicitly-specify-PMC-instance-to-us.patch
@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Thierry Reding <treding@nvidia.com>
 Date: Mon, 3 Feb 2025 16:31:14 +0100
-Subject: [PATCH 136/196] usb: xhci: tegra: Explicitly specify PMC instance to
+Subject: [PATCH 133/184] usb: xhci: tegra: Explicitly specify PMC instance to
  use
 
 Currently the kernel relies on a global variable to reference the PMC
@@ -14,7 +14,7 @@ Signed-off-by: Thierry Reding <treding@nvidia.com>
 (cherry picked from commit 258cff9857918615897bd5b57c588dc13c0058b6)
 
 diff --git a/drivers/usb/host/xhci-tegra.c b/drivers/usb/host/xhci-tegra.c
-index b0dcdede1fc8e..c8a272861f9ba 100644
+index b0dcdede1fc8..c8a272861f9b 100644
 --- a/drivers/usb/host/xhci-tegra.c
 +++ b/drivers/usb/host/xhci-tegra.c
 @@ -293,6 +293,7 @@ struct tegra_xusb {
@@ -98,5 +98,5 @@ index b0dcdede1fc8e..c8a272861f9ba 100644
  		err = tegra_xusb_powerdomain_init(&pdev->dev, tegra);
  		if (err)
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/platform/patches/0137-PCI-tegra-Explicitly-specify-PMC-instance-to-use.patch b/features/tegra/platform/patches/0134-PCI-tegra-Explicitly-specify-PMC-instance-to-use.patch
similarity index 96%
rename from features/tegra/platform/patches/0137-PCI-tegra-Explicitly-specify-PMC-instance-to-use.patch
rename to features/tegra/platform/patches/0134-PCI-tegra-Explicitly-specify-PMC-instance-to-use.patch
index e64faea..2729dc4 100644
--- a/features/tegra/platform/patches/0137-PCI-tegra-Explicitly-specify-PMC-instance-to-use.patch
+++ b/features/tegra/platform/patches/0134-PCI-tegra-Explicitly-specify-PMC-instance-to-use.patch
@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Thierry Reding <treding@nvidia.com>
 Date: Mon, 3 Feb 2025 16:30:24 +0100
-Subject: [PATCH 137/196] PCI: tegra: Explicitly specify PMC instance to use
+Subject: [PATCH 134/184] PCI: tegra: Explicitly specify PMC instance to use
 
 Currently the kernel relies on a global variable to reference the PMC
 context. Use an explicit lookup for the PMC and pass that to the public
@@ -13,7 +13,7 @@ Signed-off-by: Thierry Reding <treding@nvidia.com>
 (cherry picked from commit 5f726aeb505c9e5dde87530c78a11b88a44b9edd)
 
 diff --git a/drivers/pci/controller/pci-tegra.c b/drivers/pci/controller/pci-tegra.c
-index 942ddfca3bf6b..3ee91b25b136f 100644
+index 942ddfca3bf6..3ee91b25b136 100644
 --- a/drivers/pci/controller/pci-tegra.c
 +++ b/drivers/pci/controller/pci-tegra.c
 @@ -340,6 +340,8 @@ struct tegra_pcie {
@@ -82,5 +82,5 @@ index 942ddfca3bf6b..3ee91b25b136f 100644
  		err = tegra_pcie_phys_get(pcie);
  		if (err < 0) {
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/platform/patches/0138-ata-ahci_tegra-Explicitly-specify-PMC-instance-to-us.patch b/features/tegra/platform/patches/0135-ata-ahci_tegra-Explicitly-specify-PMC-instance-to-us.patch
similarity index 95%
rename from features/tegra/platform/patches/0138-ata-ahci_tegra-Explicitly-specify-PMC-instance-to-us.patch
rename to features/tegra/platform/patches/0135-ata-ahci_tegra-Explicitly-specify-PMC-instance-to-us.patch
index ffbe807..955d7d7 100644
--- a/features/tegra/platform/patches/0138-ata-ahci_tegra-Explicitly-specify-PMC-instance-to-us.patch
+++ b/features/tegra/platform/patches/0135-ata-ahci_tegra-Explicitly-specify-PMC-instance-to-us.patch
@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Thierry Reding <treding@nvidia.com>
 Date: Mon, 3 Feb 2025 16:25:29 +0100
-Subject: [PATCH 138/196] ata: ahci_tegra: Explicitly specify PMC instance to
+Subject: [PATCH 135/184] ata: ahci_tegra: Explicitly specify PMC instance to
  use
 
 Currently the kernel relies on a global variable to reference the PMC
@@ -14,7 +14,7 @@ Signed-off-by: Thierry Reding <treding@nvidia.com>
 (cherry picked from commit 64e609f9299d457a88dec0bce68b42a434a78502)
 
 diff --git a/drivers/ata/ahci_tegra.c b/drivers/ata/ahci_tegra.c
-index 44584eed63744..554f05e09f983 100644
+index 44584eed6374..554f05e09f98 100644
 --- a/drivers/ata/ahci_tegra.c
 +++ b/drivers/ata/ahci_tegra.c
 @@ -175,6 +175,7 @@ struct tegra_ahci_priv {
@@ -70,5 +70,5 @@ index 44584eed63744..554f05e09f983 100644
  				       tegra->soc->num_supplies,
  				       sizeof(*tegra->supplies), GFP_KERNEL);
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/platform/patches/0139-media-vde-Explicitly-specify-PMC-instance-to-use.patch b/features/tegra/platform/patches/0136-media-vde-Explicitly-specify-PMC-instance-to-use.patch
similarity index 93%
rename from features/tegra/platform/patches/0139-media-vde-Explicitly-specify-PMC-instance-to-use.patch
rename to features/tegra/platform/patches/0136-media-vde-Explicitly-specify-PMC-instance-to-use.patch
index f09fbfb..fe22cd8 100644
--- a/features/tegra/platform/patches/0139-media-vde-Explicitly-specify-PMC-instance-to-use.patch
+++ b/features/tegra/platform/patches/0136-media-vde-Explicitly-specify-PMC-instance-to-use.patch
@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Thierry Reding <treding@nvidia.com>
 Date: Mon, 3 Feb 2025 16:29:35 +0100
-Subject: [PATCH 139/196] media: vde: Explicitly specify PMC instance to use
+Subject: [PATCH 136/184] media: vde: Explicitly specify PMC instance to use
 
 Currently the kernel relies on a global variable to reference the PMC
 context. Use an explicit lookup for the PMC and pass that to the public
@@ -11,7 +11,7 @@ Acked-by: Jon Hunter <jonathanh@nvidia.com>
 Signed-off-by: Thierry Reding <treding@nvidia.com>
 
 diff --git a/drivers/media/platform/nvidia/tegra-vde/vde.c b/drivers/media/platform/nvidia/tegra-vde/vde.c
-index 3232392c60e20..de58d34ed2be7 100644
+index 3232392c60e2..de58d34ed2be 100644
 --- a/drivers/media/platform/nvidia/tegra-vde/vde.c
 +++ b/drivers/media/platform/nvidia/tegra-vde/vde.c
 @@ -161,7 +161,8 @@ static __maybe_unused int tegra_vde_runtime_suspend(struct device *dev)
@@ -57,7 +57,7 @@ index 3232392c60e20..de58d34ed2be7 100644
  	if (irq < 0)
  		return irq;
 diff --git a/drivers/media/platform/nvidia/tegra-vde/vde.h b/drivers/media/platform/nvidia/tegra-vde/vde.h
-index b2890484b7c34..abac0221d6e4b 100644
+index b2890484b7c3..abac0221d6e4 100644
 --- a/drivers/media/platform/nvidia/tegra-vde/vde.h
 +++ b/drivers/media/platform/nvidia/tegra-vde/vde.h
 @@ -107,6 +107,7 @@ struct tegra_vde {
@@ -69,5 +69,5 @@ index b2890484b7c34..abac0221d6e4b 100644
  	struct completion decode_completion;
  	struct clk *clk;
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/platform/patches/0140-soc-tegra-pmc-Remove-unused-legacy-functions.patch b/features/tegra/platform/patches/0137-soc-tegra-pmc-Remove-unused-legacy-functions.patch
similarity index 97%
rename from features/tegra/platform/patches/0140-soc-tegra-pmc-Remove-unused-legacy-functions.patch
rename to features/tegra/platform/patches/0137-soc-tegra-pmc-Remove-unused-legacy-functions.patch
index 4543fd7..795774c 100644
--- a/features/tegra/platform/patches/0140-soc-tegra-pmc-Remove-unused-legacy-functions.patch
+++ b/features/tegra/platform/patches/0137-soc-tegra-pmc-Remove-unused-legacy-functions.patch
@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Thierry Reding <treding@nvidia.com>
 Date: Tue, 4 Feb 2025 19:45:19 +0100
-Subject: [PATCH 140/196] soc/tegra: pmc: Remove unused legacy functions
+Subject: [PATCH 137/184] soc/tegra: pmc: Remove unused legacy functions
 
 All callers of these functions have been replaced by their variants
 taking a PMC context as an input, so they are no longer used and can be
@@ -12,7 +12,7 @@ Signed-off-by: Thierry Reding <treding@nvidia.com>
 (cherry picked from commit 72a2a9023c329aca7e7f8d3997c9a26aa317a1fd)
 
 diff --git a/drivers/soc/tegra/pmc.c b/drivers/soc/tegra/pmc.c
-index 1388e187832d0..c829fbdb7aa82 100644
+index 1388e187832d..c829fbdb7aa8 100644
 --- a/drivers/soc/tegra/pmc.c
 +++ b/drivers/soc/tegra/pmc.c
 @@ -1065,16 +1065,6 @@ int tegra_pmc_powergate_power_on(struct tegra_pmc *pmc, unsigned int id)
@@ -127,7 +127,7 @@ index 1388e187832d0..c829fbdb7aa82 100644
  {
  	const struct tegra_io_pad_soc *pad;
 diff --git a/include/soc/tegra/pmc.h b/include/soc/tegra/pmc.h
-index 1fd21be025778..8b4bcdea849e6 100644
+index 1fd21be02577..8b4bcdea849e 100644
 --- a/include/soc/tegra/pmc.h
 +++ b/include/soc/tegra/pmc.h
 @@ -164,16 +164,6 @@ int tegra_pmc_io_pad_power_enable(struct tegra_pmc *pmc, enum tegra_io_pad id);
@@ -192,5 +192,5 @@ index 1fd21be025778..8b4bcdea849e6 100644
  {
  }
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/platform/patches/0141-soc-tegra-pmc-Move-legacy-code-behind-CONFIG_ARM-gua.patch b/features/tegra/platform/patches/0138-soc-tegra-pmc-Move-legacy-code-behind-CONFIG_ARM-gua.patch
similarity index 98%
rename from features/tegra/platform/patches/0141-soc-tegra-pmc-Move-legacy-code-behind-CONFIG_ARM-gua.patch
rename to features/tegra/platform/patches/0138-soc-tegra-pmc-Move-legacy-code-behind-CONFIG_ARM-gua.patch
index eac243c..b4545ac 100644
--- a/features/tegra/platform/patches/0141-soc-tegra-pmc-Move-legacy-code-behind-CONFIG_ARM-gua.patch
+++ b/features/tegra/platform/patches/0138-soc-tegra-pmc-Move-legacy-code-behind-CONFIG_ARM-gua.patch
@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Thierry Reding <treding@nvidia.com>
 Date: Tue, 4 Feb 2025 19:04:51 +0100
-Subject: [PATCH 141/196] soc/tegra: pmc: Move legacy code behind CONFIG_ARM
+Subject: [PATCH 138/184] soc/tegra: pmc: Move legacy code behind CONFIG_ARM
  guard
 
 None of this legacy code is needed on 64-bit ARM devices, so it can be
@@ -13,7 +13,7 @@ Signed-off-by: Thierry Reding <treding@nvidia.com>
 (cherry picked from commit 8318af5dd29c819d95ec5b878e7dab6090a9ed2b)
 
 diff --git a/drivers/soc/tegra/pmc.c b/drivers/soc/tegra/pmc.c
-index c829fbdb7aa82..c789f8c1035e5 100644
+index c829fbdb7aa8..c789f8c1035e 100644
 --- a/drivers/soc/tegra/pmc.c
 +++ b/drivers/soc/tegra/pmc.c
 @@ -514,10 +514,12 @@ struct tegra_pmc {
@@ -329,7 +329,7 @@ index c829fbdb7aa82..c789f8c1035e5 100644
  early_initcall(tegra_pmc_early_init);
 +#endif /* CONFIG_ARM */
 diff --git a/include/soc/tegra/pmc.h b/include/soc/tegra/pmc.h
-index 8b4bcdea849e6..4bcbf19d75ace 100644
+index 8b4bcdea849e..4bcbf19d75ac 100644
 --- a/include/soc/tegra/pmc.h
 +++ b/include/soc/tegra/pmc.h
 @@ -18,10 +18,6 @@ struct clk;
@@ -407,5 +407,5 @@ index 8b4bcdea849e6..4bcbf19d75ace 100644
  #endif
  
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/platform/patches/0142-soc-tegra-pmc-Populate-powergate-debugfs-only-when-n.patch b/features/tegra/platform/patches/0139-soc-tegra-pmc-Populate-powergate-debugfs-only-when-n.patch
similarity index 90%
rename from features/tegra/platform/patches/0142-soc-tegra-pmc-Populate-powergate-debugfs-only-when-n.patch
rename to features/tegra/platform/patches/0139-soc-tegra-pmc-Populate-powergate-debugfs-only-when-n.patch
index 7be1532..e25bbb1 100644
--- a/features/tegra/platform/patches/0142-soc-tegra-pmc-Populate-powergate-debugfs-only-when-n.patch
+++ b/features/tegra/platform/patches/0139-soc-tegra-pmc-Populate-powergate-debugfs-only-when-n.patch
@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Jon Hunter <jonathanh@nvidia.com>
 Date: Fri, 22 May 2026 16:58:24 +0100
-Subject: [PATCH 142/196] soc/tegra: pmc: Populate powergate debugfs only when
+Subject: [PATCH 139/184] soc/tegra: pmc: Populate powergate debugfs only when
  needed
 
 The 'powergate' debugfs node is used to show the state of the powergates
@@ -14,7 +14,7 @@ Signed-off-by: Thierry Reding <treding@nvidia.com>
 (cherry picked from commit e9bfdf06fb05168e72d3d9d6163b04e2316e0aa2)
 
 diff --git a/drivers/soc/tegra/pmc.c b/drivers/soc/tegra/pmc.c
-index c789f8c1035e5..37a6f56b1631c 100644
+index c789f8c1035e..37a6f56b1631 100644
 --- a/drivers/soc/tegra/pmc.c
 +++ b/drivers/soc/tegra/pmc.c
 @@ -3160,7 +3160,8 @@ static int tegra_pmc_probe(struct platform_device *pdev)
@@ -28,5 +28,5 @@ index c789f8c1035e5..37a6f56b1631c 100644
  	return 0;
  
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/platform/patches/0143-soc-tegra-pmc-Restrict-power-off-handler-to-Nexus-7.patch b/features/tegra/platform/patches/0140-soc-tegra-pmc-Restrict-power-off-handler-to-Nexus-7.patch
similarity index 96%
rename from features/tegra/platform/patches/0143-soc-tegra-pmc-Restrict-power-off-handler-to-Nexus-7.patch
rename to features/tegra/platform/patches/0140-soc-tegra-pmc-Restrict-power-off-handler-to-Nexus-7.patch
index e8daf12..d769d78 100644
--- a/features/tegra/platform/patches/0143-soc-tegra-pmc-Restrict-power-off-handler-to-Nexus-7.patch
+++ b/features/tegra/platform/patches/0140-soc-tegra-pmc-Restrict-power-off-handler-to-Nexus-7.patch
@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Diogo Ivo <diogo.ivo@tecnico.ulisboa.pt>
 Date: Thu, 21 May 2026 15:48:48 +0200
-Subject: [PATCH 143/196] soc/tegra: pmc: Restrict power-off handler to Nexus 7
+Subject: [PATCH 140/184] soc/tegra: pmc: Restrict power-off handler to Nexus 7
 
 The Tegra PMC power-off handler exists solely to reboot the Nexus 7 into
 a special bootloader mode when a USB cable is connected, so that the
@@ -22,7 +22,7 @@ Signed-off-by: Thierry Reding <treding@nvidia.com>
 (cherry picked from commit 2545b16e3ea049a266ec8b0e509d4e093b26b906)
 
 diff --git a/drivers/soc/tegra/pmc.c b/drivers/soc/tegra/pmc.c
-index 37a6f56b1631c..b4d0e0443b2f7 100644
+index 37a6f56b1631..b4d0e0443b2f 100644
 --- a/drivers/soc/tegra/pmc.c
 +++ b/drivers/soc/tegra/pmc.c
 @@ -1207,7 +1207,7 @@ static int tegra_pmc_restart_handler(struct sys_off_data *data)
@@ -77,5 +77,5 @@ index 37a6f56b1631c..b4d0e0443b2f7 100644
  
  	/*
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/platform/patches/0144-soc-tegra-pmc-Add-Tegra238-support.patch b/features/tegra/platform/patches/0141-soc-tegra-pmc-Add-Tegra238-support.patch
similarity index 98%
rename from features/tegra/platform/patches/0144-soc-tegra-pmc-Add-Tegra238-support.patch
rename to features/tegra/platform/patches/0141-soc-tegra-pmc-Add-Tegra238-support.patch
index 4f3a6c3..e46204e 100644
--- a/features/tegra/platform/patches/0144-soc-tegra-pmc-Add-Tegra238-support.patch
+++ b/features/tegra/platform/patches/0141-soc-tegra-pmc-Add-Tegra238-support.patch
@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Prathamesh Shete <pshete@nvidia.com>
 Date: Mon, 18 May 2026 10:14:20 +0000
-Subject: [PATCH 144/196] soc/tegra: pmc: Add Tegra238 support
+Subject: [PATCH 141/184] soc/tegra: pmc: Add Tegra238 support
 
 The Tegra238 PMC is largely similar to that found on earlier chips, but
 not completely compatible. Add support for the PMC on Tegra238.
@@ -11,7 +11,7 @@ Signed-off-by: Thierry Reding <treding@nvidia.com>
 (cherry picked from commit 2cee7da9743396aff1fd13124109c78975c92ad8)
 
 diff --git a/drivers/soc/tegra/pmc.c b/drivers/soc/tegra/pmc.c
-index b4d0e0443b2f7..ef1896d567ec0 100644
+index b4d0e0443b2f..ef1896d567ec 100644
 --- a/drivers/soc/tegra/pmc.c
 +++ b/drivers/soc/tegra/pmc.c
 @@ -4471,6 +4471,164 @@ static const struct tegra_pmc_soc tegra234_pmc_soc = {
@@ -188,5 +188,5 @@ index b4d0e0443b2f7..ef1896d567ec0 100644
  	{ .compatible = "nvidia,tegra194-pmc", .data = &tegra194_pmc_soc },
  	{ .compatible = "nvidia,tegra186-pmc", .data = &tegra186_pmc_soc },
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/platform/patches/0145-soc-tegra-pmc-Don-t-register-sys-off-handler-for-mul.patch b/features/tegra/platform/patches/0142-soc-tegra-pmc-Don-t-register-sys-off-handler-for-mul.patch
similarity index 93%
rename from features/tegra/platform/patches/0145-soc-tegra-pmc-Don-t-register-sys-off-handler-for-mul.patch
rename to features/tegra/platform/patches/0142-soc-tegra-pmc-Don-t-register-sys-off-handler-for-mul.patch
index 39323b3..bff36f4 100644
--- a/features/tegra/platform/patches/0145-soc-tegra-pmc-Don-t-register-sys-off-handler-for-mul.patch
+++ b/features/tegra/platform/patches/0142-soc-tegra-pmc-Don-t-register-sys-off-handler-for-mul.patch
@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Jon Hunter <jonathanh@nvidia.com>
 Date: Wed, 15 Jul 2026 12:10:37 +0100
-Subject: [PATCH 145/196] soc/tegra: pmc: Don't register sys-off handler for
+Subject: [PATCH 142/184] soc/tegra: pmc: Don't register sys-off handler for
  multi-socket devices
 
 The kernel does not permit a device to register multiple sys-off
@@ -19,7 +19,7 @@ critical.
 Signed-off-by: Jon Hunter <jonathanh@nvidia.com>
 
 diff --git a/drivers/soc/tegra/pmc.c b/drivers/soc/tegra/pmc.c
-index ef1896d567ec0..f5759a19b6e5b 100644
+index ef1896d567ec..f5759a19b6e5 100644
 --- a/drivers/soc/tegra/pmc.c
 +++ b/drivers/soc/tegra/pmc.c
 @@ -3074,15 +3074,18 @@ static int tegra_pmc_probe(struct platform_device *pdev)
@@ -51,5 +51,5 @@ index ef1896d567ec0..f5759a19b6e5b 100644
  
  	/*
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/platform/patches/0146-spi-tegra210-quad-Refactor-error-handling-into-helpe.patch b/features/tegra/platform/patches/0143-spi-tegra210-quad-Refactor-error-handling-into-helpe.patch
similarity index 97%
rename from features/tegra/platform/patches/0146-spi-tegra210-quad-Refactor-error-handling-into-helpe.patch
rename to features/tegra/platform/patches/0143-spi-tegra210-quad-Refactor-error-handling-into-helpe.patch
index 0096f0c..88f9f61 100644
--- a/features/tegra/platform/patches/0146-spi-tegra210-quad-Refactor-error-handling-into-helpe.patch
+++ b/features/tegra/platform/patches/0143-spi-tegra210-quad-Refactor-error-handling-into-helpe.patch
@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Vishwaroop A <va@nvidia.com>
 Date: Tue, 28 Oct 2025 15:57:02 +0000
-Subject: [PATCH 146/196] spi: tegra210-quad: Refactor error handling into
+Subject: [PATCH 143/184] spi: tegra210-quad: Refactor error handling into
  helper functions
 
 Extract common cleanup code into dedicated helper functions to simplify
@@ -21,7 +21,7 @@ Signed-off-by: Mark Brown <broonie@kernel.org>
 (cherry picked from commit 6022eacdda8b0b06a2e1d4122e5268099b62ff5d)
 
 diff --git a/drivers/spi/spi-tegra210-quad.c b/drivers/spi/spi-tegra210-quad.c
-index 83def82fe48c1..b38815db98103 100644
+index 83def82fe48c..b38815db9810 100644
 --- a/drivers/spi/spi-tegra210-quad.c
 +++ b/drivers/spi/spi-tegra210-quad.c
 @@ -1022,17 +1022,22 @@ static void tegra_qspi_dump_regs(struct tegra_qspi *tqspi)
@@ -155,5 +155,5 @@ index 83def82fe48c1..b38815db98103 100644
  			ret = -EIO;
  			goto complete_xfer;
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/platform/patches/0147-spi-tegra210-quad-Check-hardware-status-on-timeout.patch b/features/tegra/platform/patches/0144-spi-tegra210-quad-Check-hardware-status-on-timeout.patch
similarity index 97%
rename from features/tegra/platform/patches/0147-spi-tegra210-quad-Check-hardware-status-on-timeout.patch
rename to features/tegra/platform/patches/0144-spi-tegra210-quad-Check-hardware-status-on-timeout.patch
index cc67bee..752ceb7 100644
--- a/features/tegra/platform/patches/0147-spi-tegra210-quad-Check-hardware-status-on-timeout.patch
+++ b/features/tegra/platform/patches/0144-spi-tegra210-quad-Check-hardware-status-on-timeout.patch
@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Vishwaroop A <va@nvidia.com>
 Date: Tue, 28 Oct 2025 15:57:03 +0000
-Subject: [PATCH 147/196] spi: tegra210-quad: Check hardware status on timeout
+Subject: [PATCH 144/184] spi: tegra210-quad: Check hardware status on timeout
 
 Under high system load, QSPI interrupts can be delayed or blocked on the
 target CPU, causing wait_for_completion_timeout() to report failure even
@@ -22,7 +22,7 @@ Signed-off-by: Mark Brown <broonie@kernel.org>
 (cherry picked from commit 380fd29d57abe6679d87ec56babe65ddc5873a37)
 
 diff --git a/drivers/spi/spi-tegra210-quad.c b/drivers/spi/spi-tegra210-quad.c
-index b38815db98103..f425d62e0c276 100644
+index b38815db9810..f425d62e0c27 100644
 --- a/drivers/spi/spi-tegra210-quad.c
 +++ b/drivers/spi/spi-tegra210-quad.c
 @@ -1051,6 +1051,49 @@ static void tegra_qspi_transfer_end(struct spi_device *spi)
@@ -149,5 +149,5 @@ index b38815db98103..f425d62e0c276 100644
  
  		if (tqspi->tx_status ||  tqspi->rx_status) {
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/platform/patches/0148-spi-tegra210-quad-Add-runtime-autosuspend-support.patch b/features/tegra/platform/patches/0145-spi-tegra210-quad-Add-runtime-autosuspend-support.patch
similarity index 96%
rename from features/tegra/platform/patches/0148-spi-tegra210-quad-Add-runtime-autosuspend-support.patch
rename to features/tegra/platform/patches/0145-spi-tegra210-quad-Add-runtime-autosuspend-support.patch
index 0e37592..f8ed74a 100644
--- a/features/tegra/platform/patches/0148-spi-tegra210-quad-Add-runtime-autosuspend-support.patch
+++ b/features/tegra/platform/patches/0145-spi-tegra210-quad-Add-runtime-autosuspend-support.patch
@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Vishwaroop A <va@nvidia.com>
 Date: Tue, 24 Feb 2026 09:24:52 +0000
-Subject: [PATCH 148/196] spi: tegra210-quad: Add runtime autosuspend support
+Subject: [PATCH 145/184] spi: tegra210-quad: Add runtime autosuspend support
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
@@ -25,7 +25,7 @@ Signed-off-by: Mark Brown <broonie@kernel.org>
 (cherry picked from commit 7c12f6ead4672cb08b74e6f6115eb04dca8ccfa4)
 
 diff --git a/drivers/spi/spi-tegra210-quad.c b/drivers/spi/spi-tegra210-quad.c
-index f425d62e0c276..1f046c1ecda7e 100644
+index f425d62e0c27..1f046c1ecda7 100644
 --- a/drivers/spi/spi-tegra210-quad.c
 +++ b/drivers/spi/spi-tegra210-quad.c
 @@ -1000,7 +1000,8 @@ static int tegra_qspi_setup(struct spi_device *spi)
@@ -90,5 +90,5 @@ index f425d62e0c276..1f046c1ecda7e 100644
  	return spi_controller_resume(host);
  }
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/platform/patches/0149-spi-tegra210-quad-Remove-redundant-pm_runtime_mark_l.patch b/features/tegra/platform/patches/0146-spi-tegra210-quad-Remove-redundant-pm_runtime_mark_l.patch
similarity index 94%
rename from features/tegra/platform/patches/0149-spi-tegra210-quad-Remove-redundant-pm_runtime_mark_l.patch
rename to features/tegra/platform/patches/0146-spi-tegra210-quad-Remove-redundant-pm_runtime_mark_l.patch
index d8017ef..d70225b 100644
--- a/features/tegra/platform/patches/0149-spi-tegra210-quad-Remove-redundant-pm_runtime_mark_l.patch
+++ b/features/tegra/platform/patches/0146-spi-tegra210-quad-Remove-redundant-pm_runtime_mark_l.patch
@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Felix Gu <ustc.gu@gmail.com>
 Date: Sat, 7 Mar 2026 15:24:45 +0800
-Subject: [PATCH 149/196] spi: tegra210-quad: Remove redundant
+Subject: [PATCH 146/184] spi: tegra210-quad: Remove redundant
  pm_runtime_mark_last_busy() calls
 
 pm_runtime_put_autosuspend() already internally updates the last_busy
@@ -15,7 +15,7 @@ Link: https://patch.msgid.link/20260307-quad-v1-1-f103515db501@gmail.com
 (cherry picked from commit d1008a8e29b09ea57c77ddf82d688f8c2ea6cbe8)
 
 diff --git a/drivers/spi/spi-tegra210-quad.c b/drivers/spi/spi-tegra210-quad.c
-index 1f046c1ecda7e..1f09e2f0bd97b 100644
+index 1f046c1ecda7..1f09e2f0bd97 100644
 --- a/drivers/spi/spi-tegra210-quad.c
 +++ b/drivers/spi/spi-tegra210-quad.c
 @@ -1000,7 +1000,6 @@ static int tegra_qspi_setup(struct spi_device *spi)
@@ -43,5 +43,5 @@ index 1f046c1ecda7e..1f09e2f0bd97b 100644
  
  	return spi_controller_resume(host);
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/platform/patches/0150-spi-tegra210-quad-Fix-false-positive-WARN-on-interru.patch b/features/tegra/platform/patches/0147-spi-tegra210-quad-Fix-false-positive-WARN-on-interru.patch
similarity index 96%
rename from features/tegra/platform/patches/0150-spi-tegra210-quad-Fix-false-positive-WARN-on-interru.patch
rename to features/tegra/platform/patches/0147-spi-tegra210-quad-Fix-false-positive-WARN-on-interru.patch
index 13a75d0..371f9c4 100644
--- a/features/tegra/platform/patches/0150-spi-tegra210-quad-Fix-false-positive-WARN-on-interru.patch
+++ b/features/tegra/platform/patches/0147-spi-tegra210-quad-Fix-false-positive-WARN-on-interru.patch
@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Breno Leitao <leitao@debian.org>
 Date: Wed, 8 Apr 2026 06:45:43 -0700
-Subject: [PATCH 150/196] spi: tegra210-quad: Fix false positive WARN on
+Subject: [PATCH 147/184] spi: tegra210-quad: Fix false positive WARN on
  interrupt timeout with transfer complete
 
 The WARN_ON_ONCE/WARN_ON fired unconditionally on any completion
@@ -31,7 +31,7 @@ Signed-off-by: Mark Brown <broonie@kernel.org>
 (cherry picked from commit 5b94c94caafcad3c77cc6b1d213a93bf5dc0a98e)
 
 diff --git a/drivers/spi/spi-tegra210-quad.c b/drivers/spi/spi-tegra210-quad.c
-index 1f09e2f0bd97b..07769d6bc45ee 100644
+index 1f09e2f0bd97..07769d6bc45e 100644
 --- a/drivers/spi/spi-tegra210-quad.c
 +++ b/drivers/spi/spi-tegra210-quad.c
 @@ -1223,7 +1223,7 @@ static int tegra_qspi_combined_seq_xfer(struct tegra_qspi *tqspi,
@@ -69,5 +69,5 @@ index 1f09e2f0bd97b..07769d6bc45ee 100644
  
  				if (tqspi->is_curr_dma_xfer)
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/platform/patches/0151-serial-amba-pl011-Introduce-skip_ibrd_fbrd-vendor-fl.patch b/features/tegra/platform/patches/0148-serial-amba-pl011-Introduce-skip_ibrd_fbrd-vendor-fl.patch
similarity index 97%
rename from features/tegra/platform/patches/0151-serial-amba-pl011-Introduce-skip_ibrd_fbrd-vendor-fl.patch
rename to features/tegra/platform/patches/0148-serial-amba-pl011-Introduce-skip_ibrd_fbrd-vendor-fl.patch
index 61bc4c8..c858b67 100644
--- a/features/tegra/platform/patches/0151-serial-amba-pl011-Introduce-skip_ibrd_fbrd-vendor-fl.patch
+++ b/features/tegra/platform/patches/0148-serial-amba-pl011-Introduce-skip_ibrd_fbrd-vendor-fl.patch
@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Kartik Rajput <kkartik@nvidia.com>
 Date: Wed, 25 Feb 2026 12:29:11 +0530
-Subject: [PATCH 151/196] serial: amba-pl011: Introduce skip_ibrd_fbrd vendor
+Subject: [PATCH 148/184] serial: amba-pl011: Introduce skip_ibrd_fbrd vendor
  flag
 
 The NVIDIA Tegra264 UART has a broken fractional baud rate
@@ -18,7 +18,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 (cherry picked from commit 42157639ddc797053e0f16e6fe0f6b64034fe559)
 
 diff --git a/drivers/tty/serial/amba-pl011.c b/drivers/tty/serial/amba-pl011.c
-index 7f17d288c8076..79e1c937a6007 100644
+index 7f17d288c807..79e1c937a600 100644
 --- a/drivers/tty/serial/amba-pl011.c
 +++ b/drivers/tty/serial/amba-pl011.c
 @@ -114,6 +114,7 @@ struct vendor_data {
@@ -112,5 +112,5 @@ index 7f17d288c8076..79e1c937a6007 100644
  	if (uap->vendor->oversampling &&
  	    (pl011_read(uap, REG_CR) & ST_UART011_CR_OVSFACT))
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/platform/patches/0152-serial-amba-pl011-Introduce-set_uartclk_rate-vendor-.patch b/features/tegra/platform/patches/0149-serial-amba-pl011-Introduce-set_uartclk_rate-vendor-.patch
similarity index 95%
rename from features/tegra/platform/patches/0152-serial-amba-pl011-Introduce-set_uartclk_rate-vendor-.patch
rename to features/tegra/platform/patches/0149-serial-amba-pl011-Introduce-set_uartclk_rate-vendor-.patch
index 62f65b8..ba611ac 100644
--- a/features/tegra/platform/patches/0152-serial-amba-pl011-Introduce-set_uartclk_rate-vendor-.patch
+++ b/features/tegra/platform/patches/0149-serial-amba-pl011-Introduce-set_uartclk_rate-vendor-.patch
@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Kartik Rajput <kkartik@nvidia.com>
 Date: Wed, 25 Feb 2026 12:29:12 +0530
-Subject: [PATCH 152/196] serial: amba-pl011: Introduce set_uartclk_rate vendor
+Subject: [PATCH 149/184] serial: amba-pl011: Introduce set_uartclk_rate vendor
  flag
 
 The NVIDIA Tegra264 UART relies on configuring the UART clock rate
@@ -18,7 +18,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 (cherry picked from commit 87df45b4a83f13952958e9916af1b2dd56d4cfc7)
 
 diff --git a/drivers/tty/serial/amba-pl011.c b/drivers/tty/serial/amba-pl011.c
-index 79e1c937a6007..ad06dc4cdf6e5 100644
+index 79e1c937a600..ad06dc4cdf6e 100644
 --- a/drivers/tty/serial/amba-pl011.c
 +++ b/drivers/tty/serial/amba-pl011.c
 @@ -115,6 +115,7 @@ struct vendor_data {
@@ -75,5 +75,5 @@ index 79e1c937a6007..ad06dc4cdf6e5 100644
  	/*
  	 * Adjust RX DMA polling rate with baud rate if not specified.
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/platform/patches/0153-serial-amba-pl011-Add-Tegra264-UART-support.patch b/features/tegra/platform/patches/0150-serial-amba-pl011-Add-Tegra264-UART-support.patch
similarity index 94%
rename from features/tegra/platform/patches/0153-serial-amba-pl011-Add-Tegra264-UART-support.patch
rename to features/tegra/platform/patches/0150-serial-amba-pl011-Add-Tegra264-UART-support.patch
index aff4d3f..8e5c1d3 100644
--- a/features/tegra/platform/patches/0153-serial-amba-pl011-Add-Tegra264-UART-support.patch
+++ b/features/tegra/platform/patches/0150-serial-amba-pl011-Add-Tegra264-UART-support.patch
@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Kartik Rajput <kkartik@nvidia.com>
 Date: Wed, 25 Feb 2026 12:29:13 +0530
-Subject: [PATCH 153/196] serial: amba-pl011: Add Tegra264 UART support
+Subject: [PATCH 150/184] serial: amba-pl011: Add Tegra264 UART support
 
 Add support for the NVIDIA Tegra264 UART controller, which is derived
 from the AMBA PL011 design.
@@ -17,7 +17,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 (cherry picked from commit a2abd18e316ee2442631f0a60896b49dd8e9a80c)
 
 diff --git a/drivers/tty/serial/amba-pl011.c b/drivers/tty/serial/amba-pl011.c
-index ad06dc4cdf6e5..7f8deb30650ad 100644
+index ad06dc4cdf6e..7f8deb30650a 100644
 --- a/drivers/tty/serial/amba-pl011.c
 +++ b/drivers/tty/serial/amba-pl011.c
 @@ -218,6 +218,28 @@ static struct vendor_data vendor_st = {
@@ -62,5 +62,5 @@ index ad06dc4cdf6e5..7f8deb30650ad 100644
  };
  
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/platform/patches/0154-serial-amba-pl011-Respect-DMA-controller-s-copy_alig.patch b/features/tegra/platform/patches/0151-serial-amba-pl011-Respect-DMA-controller-s-copy_alig.patch
similarity index 93%
rename from features/tegra/platform/patches/0154-serial-amba-pl011-Respect-DMA-controller-s-copy_alig.patch
rename to features/tegra/platform/patches/0151-serial-amba-pl011-Respect-DMA-controller-s-copy_alig.patch
index 71c1b42..260aff5 100644
--- a/features/tegra/platform/patches/0154-serial-amba-pl011-Respect-DMA-controller-s-copy_alig.patch
+++ b/features/tegra/platform/patches/0151-serial-amba-pl011-Respect-DMA-controller-s-copy_alig.patch
@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Kartik Rajput <kkartik@nvidia.com>
 Date: Wed, 25 Feb 2026 12:29:14 +0530
-Subject: [PATCH 154/196] serial: amba-pl011: Respect DMA controller's
+Subject: [PATCH 151/184] serial: amba-pl011: Respect DMA controller's
  copy_align requirement
 
 Some DMA controllers require transfer lengths to be aligned to a
@@ -19,7 +19,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 (cherry picked from commit d925538446d3f80e03a91a9ef7da34104a75df4d)
 
 diff --git a/drivers/tty/serial/amba-pl011.c b/drivers/tty/serial/amba-pl011.c
-index 7f8deb30650ad..98e434b0c30ab 100644
+index 7f8deb30650a..98e434b0c30a 100644
 --- a/drivers/tty/serial/amba-pl011.c
 +++ b/drivers/tty/serial/amba-pl011.c
 @@ -649,6 +649,15 @@ static int pl011_dma_tx_refill(struct uart_amba_port *uap)
@@ -39,5 +39,5 @@ index 7f8deb30650ad..98e434b0c30ab 100644
  	dmatx->dma = dma_map_single(dma_dev->dev, dmatx->buf, count,
  				    DMA_TO_DEVICE);
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/platform/patches/0155-NVIDIA-SAUCE-sysfs-Add-sys-kernel-realtime-entry.patch b/features/tegra/platform/patches/0152-NVIDIA-SAUCE-sysfs-Add-sys-kernel-realtime-entry.patch
similarity index 92%
rename from features/tegra/platform/patches/0155-NVIDIA-SAUCE-sysfs-Add-sys-kernel-realtime-entry.patch
rename to features/tegra/platform/patches/0152-NVIDIA-SAUCE-sysfs-Add-sys-kernel-realtime-entry.patch
index 4380c8c..da1fa5d 100644
--- a/features/tegra/platform/patches/0155-NVIDIA-SAUCE-sysfs-Add-sys-kernel-realtime-entry.patch
+++ b/features/tegra/platform/patches/0152-NVIDIA-SAUCE-sysfs-Add-sys-kernel-realtime-entry.patch
@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Clark Williams <williams@redhat.com>
 Date: Sat, 30 Jul 2011 21:55:53 -0500
-Subject: [PATCH 155/196] NVIDIA: SAUCE: sysfs: Add /sys/kernel/realtime entry
+Subject: [PATCH 152/184] NVIDIA: SAUCE: sysfs: Add /sys/kernel/realtime entry
 
 Add a /sys/kernel entry to indicate that the kernel is a
 realtime kernel.
@@ -19,7 +19,7 @@ Signed-off-by: Jon Hunter <jonathanh@nvidia.com>
 Change-Id: I676f210cae1ca8915c45c757635583058253050d
 
 diff --git a/kernel/ksysfs.c b/kernel/ksysfs.c
-index eefb67d9883c2..20ac8a5ac27d7 100644
+index eefb67d9883c..20ac8a5ac27d 100644
 --- a/kernel/ksysfs.c
 +++ b/kernel/ksysfs.c
 @@ -188,6 +188,15 @@ KERNEL_ATTR_RO(crash_elfcorehdr_size);
@@ -49,5 +49,5 @@ index eefb67d9883c2..20ac8a5ac27d7 100644
  	NULL
  };
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/platform/patches/0156-regmap-add-flat-cache-with-sparse-validity.patch b/features/tegra/platform/patches/0153-regmap-add-flat-cache-with-sparse-validity.patch
similarity index 97%
rename from features/tegra/platform/patches/0156-regmap-add-flat-cache-with-sparse-validity.patch
rename to features/tegra/platform/patches/0153-regmap-add-flat-cache-with-sparse-validity.patch
index 3f7c494..b84cdab 100644
--- a/features/tegra/platform/patches/0156-regmap-add-flat-cache-with-sparse-validity.patch
+++ b/features/tegra/platform/patches/0153-regmap-add-flat-cache-with-sparse-validity.patch
@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Sander Vanheule <sander@svanheule.net>
 Date: Wed, 29 Oct 2025 09:12:47 +0100
-Subject: [PATCH 156/196] regmap: add flat cache with sparse validity
+Subject: [PATCH 153/184] regmap: add flat cache with sparse validity
 
 The flat regcache will always assume the data in the cache is valid.
 Since the cache is preferred over hardware access, this may shadow the
@@ -23,7 +23,7 @@ Signed-off-by: Mark Brown <broonie@kernel.org>
 (cherry picked from commit 9c7f7262bc1affb9b9acd2ec2fb1f6314d5d474c)
 
 diff --git a/drivers/base/regmap/internal.h b/drivers/base/regmap/internal.h
-index 6f31240ee4a9a..8d19a1414d5b2 100644
+index 6f31240ee4a9..8d19a1414d5b 100644
 --- a/drivers/base/regmap/internal.h
 +++ b/drivers/base/regmap/internal.h
 @@ -288,6 +288,7 @@ enum regmap_endian regmap_get_val_endian(struct device *dev,
@@ -35,7 +35,7 @@ index 6f31240ee4a9a..8d19a1414d5b2 100644
  extern struct regcache_ops regcache_maple_ops;
  extern struct regcache_ops regcache_flat_ops;
 diff --git a/drivers/base/regmap/regcache-flat.c b/drivers/base/regmap/regcache-flat.c
-index f36d3618b67c1..86f7679175b16 100644
+index f36d3618b67c..86f7679175b1 100644
 --- a/drivers/base/regmap/regcache-flat.c
 +++ b/drivers/base/regmap/regcache-flat.c
 @@ -6,7 +6,11 @@
@@ -199,7 +199,7 @@ index f36d3618b67c1..86f7679175b16 100644
 +	.drop = regcache_flat_drop,
 +};
 diff --git a/drivers/base/regmap/regcache.c b/drivers/base/regmap/regcache.c
-index c7650fa434add..0392f5525cf30 100644
+index c7650fa434ad..0392f5525cf3 100644
 --- a/drivers/base/regmap/regcache.c
 +++ b/drivers/base/regmap/regcache.c
 @@ -16,6 +16,7 @@
@@ -211,7 +211,7 @@ index c7650fa434add..0392f5525cf30 100644
  	&regcache_maple_ops,
  	&regcache_flat_ops,
 diff --git a/drivers/base/regmap/regmap-kunit.c b/drivers/base/regmap/regmap-kunit.c
-index 95c5bf2a78eeb..f6fc5ed016da1 100644
+index 95c5bf2a78ee..f6fc5ed016da 100644
 --- a/drivers/base/regmap/regmap-kunit.c
 +++ b/drivers/base/regmap/regmap-kunit.c
 @@ -54,6 +54,8 @@ static const char *regcache_type_name(enum regcache_type type)
@@ -286,7 +286,7 @@ index 95c5bf2a78eeb..f6fc5ed016da1 100644
  	{ .cache = REGCACHE_RBTREE, .val_endian = REGMAP_ENDIAN_BIG },
  	{ .cache = REGCACHE_MAPLE,  .val_endian = REGMAP_ENDIAN_LITTLE },
 diff --git a/include/linux/regmap.h b/include/linux/regmap.h
-index 55343795644b9..bbb8b1b11a4fb 100644
+index 55343795644b..bbb8b1b11a4f 100644
 --- a/include/linux/regmap.h
 +++ b/include/linux/regmap.h
 @@ -55,18 +55,23 @@ struct sdw_slave;
@@ -320,5 +320,5 @@ index 55343795644b9..bbb8b1b11a4fb 100644
  
  /**
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/platform/patches/0157-regmap-warn-users-about-uninitialized-flat-cache.patch b/features/tegra/platform/patches/0154-regmap-warn-users-about-uninitialized-flat-cache.patch
similarity index 95%
rename from features/tegra/platform/patches/0157-regmap-warn-users-about-uninitialized-flat-cache.patch
rename to features/tegra/platform/patches/0154-regmap-warn-users-about-uninitialized-flat-cache.patch
index 79ef7e5..8ce74bc 100644
--- a/features/tegra/platform/patches/0157-regmap-warn-users-about-uninitialized-flat-cache.patch
+++ b/features/tegra/platform/patches/0154-regmap-warn-users-about-uninitialized-flat-cache.patch
@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Sander Vanheule <sander@svanheule.net>
 Date: Wed, 29 Oct 2025 09:12:48 +0100
-Subject: [PATCH 157/196] regmap: warn users about uninitialized flat cache
+Subject: [PATCH 154/184] regmap: warn users about uninitialized flat cache
 
 The standard flat cache did not contain any validity info, so the cache
 was always considered to be entirely valid. Multiple mechanisms exist to
@@ -20,7 +20,7 @@ Signed-off-by: Mark Brown <broonie@kernel.org>
 (cherry picked from commit e062bdfdd6adbb2dee7751d054c1d8df63ddb8b8)
 
 diff --git a/drivers/base/regmap/regcache-flat.c b/drivers/base/regmap/regcache-flat.c
-index 86f7679175b16..3b9235bb8313a 100644
+index 86f7679175b1..3b9235bb8313 100644
 --- a/drivers/base/regmap/regcache-flat.c
 +++ b/drivers/base/regmap/regcache-flat.c
 @@ -89,6 +89,11 @@ static int regcache_flat_read(struct regmap *map,
@@ -62,5 +62,5 @@ index 86f7679175b16..3b9235bb8313a 100644
  	.drop = regcache_flat_drop,
  };
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/platform/patches/0158-regcache-Add-populate-callback-to-separate-from-init.patch b/features/tegra/platform/patches/0155-regcache-Add-populate-callback-to-separate-from-init.patch
similarity index 92%
rename from features/tegra/platform/patches/0158-regcache-Add-populate-callback-to-separate-from-init.patch
rename to features/tegra/platform/patches/0155-regcache-Add-populate-callback-to-separate-from-init.patch
index d3b8de7..d75a4f3 100644
--- a/features/tegra/platform/patches/0158-regcache-Add-populate-callback-to-separate-from-init.patch
+++ b/features/tegra/platform/patches/0155-regcache-Add-populate-callback-to-separate-from-init.patch
@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
 Date: Fri, 31 Oct 2025 09:03:16 +0100
-Subject: [PATCH 158/196] regcache: Add ->populate() callback to separate from
+Subject: [PATCH 155/184] regcache: Add ->populate() callback to separate from
  ->init()
 
 In the future changes we would like to change the flow of the cache handling.
@@ -14,7 +14,7 @@ Signed-off-by: Mark Brown <broonie@kernel.org>
 (cherry picked from commit 94a3a95f03154d8d4c6206950a7f6ef9a30baec6)
 
 diff --git a/drivers/base/regmap/internal.h b/drivers/base/regmap/internal.h
-index 8d19a1414d5b2..1477329410ec4 100644
+index 8d19a1414d5b..1477329410ec 100644
 --- a/drivers/base/regmap/internal.h
 +++ b/drivers/base/regmap/internal.h
 @@ -186,6 +186,7 @@ struct regcache_ops {
@@ -26,7 +26,7 @@ index 8d19a1414d5b2..1477329410ec4 100644
  	void (*debugfs_init)(struct regmap *map);
  #endif
 diff --git a/drivers/base/regmap/regcache.c b/drivers/base/regmap/regcache.c
-index 0392f5525cf30..319c342bf5a06 100644
+index 0392f5525cf3..319c342bf5a0 100644
 --- a/drivers/base/regmap/regcache.c
 +++ b/drivers/base/regmap/regcache.c
 @@ -222,8 +222,24 @@ int regcache_init(struct regmap *map, const struct regmap_config *config)
@@ -55,5 +55,5 @@ index 0392f5525cf30..319c342bf5a06 100644
  	kfree(map->reg_defaults);
  	if (map->cache_free)
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/platform/patches/0159-regcache-flat-Remove-unneeded-check-and-error-messag.patch b/features/tegra/platform/patches/0156-regcache-flat-Remove-unneeded-check-and-error-messag.patch
similarity index 94%
rename from features/tegra/platform/patches/0159-regcache-flat-Remove-unneeded-check-and-error-messag.patch
rename to features/tegra/platform/patches/0156-regcache-flat-Remove-unneeded-check-and-error-messag.patch
index 56da207..618d623 100644
--- a/features/tegra/platform/patches/0159-regcache-flat-Remove-unneeded-check-and-error-messag.patch
+++ b/features/tegra/platform/patches/0156-regcache-flat-Remove-unneeded-check-and-error-messag.patch
@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
 Date: Fri, 31 Oct 2025 09:03:18 +0100
-Subject: [PATCH 159/196] regcache: flat: Remove unneeded check and error
+Subject: [PATCH 156/184] regcache: flat: Remove unneeded check and error
  message for -ENOMEM
 
 There is a convention in the kernel to avoid error messages
@@ -19,7 +19,7 @@ Signed-off-by: Mark Brown <broonie@kernel.org>
 (cherry picked from commit 27fef3048fe95934f6f2f87341eb33ef6581a075)
 
 diff --git a/drivers/base/regmap/regcache-flat.c b/drivers/base/regmap/regcache-flat.c
-index 3b9235bb8313a..bacb7137092fa 100644
+index 3b9235bb8313..bacb7137092f 100644
 --- a/drivers/base/regmap/regcache-flat.c
 +++ b/drivers/base/regmap/regcache-flat.c
 @@ -30,7 +30,6 @@ struct regcache_flat_data {
@@ -47,5 +47,5 @@ index 3b9235bb8313a..bacb7137092fa 100644
  		return -ENOMEM;
  
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/platform/patches/0160-regcache-flat-Split-populate-from-init.patch b/features/tegra/platform/patches/0157-regcache-flat-Split-populate-from-init.patch
similarity index 95%
rename from features/tegra/platform/patches/0160-regcache-flat-Split-populate-from-init.patch
rename to features/tegra/platform/patches/0157-regcache-flat-Split-populate-from-init.patch
index e3e0182..2ffe334 100644
--- a/features/tegra/platform/patches/0160-regcache-flat-Split-populate-from-init.patch
+++ b/features/tegra/platform/patches/0157-regcache-flat-Split-populate-from-init.patch
@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
 Date: Fri, 31 Oct 2025 09:03:19 +0100
-Subject: [PATCH 160/196] regcache: flat: Split ->populate() from ->init()
+Subject: [PATCH 157/184] regcache: flat: Split ->populate() from ->init()
 
 Split ->populate() implementation from ->init() code.
 This decoupling will help for the further changes.
@@ -13,7 +13,7 @@ Signed-off-by: Mark Brown <broonie@kernel.org>
 (cherry picked from commit 44c1a444b030647803d900e60f5a8af31a782f0e)
 
 diff --git a/drivers/base/regmap/regcache-flat.c b/drivers/base/regmap/regcache-flat.c
-index bacb7137092fa..53cc59c84e2f0 100644
+index bacb7137092f..53cc59c84e2f 100644
 --- a/drivers/base/regmap/regcache-flat.c
 +++ b/drivers/base/regmap/regcache-flat.c
 @@ -29,7 +29,6 @@ struct regcache_flat_data {
@@ -79,5 +79,5 @@ index bacb7137092fa..53cc59c84e2f0 100644
  	.write = regcache_flat_write,
  	.drop = regcache_flat_drop,
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/platform/patches/0161-regmap-Add-reg_default_cb-callback-for-flat-cache-de.patch b/features/tegra/platform/patches/0158-regmap-Add-reg_default_cb-callback-for-flat-cache-de.patch
similarity index 95%
rename from features/tegra/platform/patches/0161-regmap-Add-reg_default_cb-callback-for-flat-cache-de.patch
rename to features/tegra/platform/patches/0158-regmap-Add-reg_default_cb-callback-for-flat-cache-de.patch
index 7a61b79..65290b1 100644
--- a/features/tegra/platform/patches/0161-regmap-Add-reg_default_cb-callback-for-flat-cache-de.patch
+++ b/features/tegra/platform/patches/0158-regmap-Add-reg_default_cb-callback-for-flat-cache-de.patch
@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Sheetal <sheetal@nvidia.com>
 Date: Fri, 23 Jan 2026 15:23:44 +0530
-Subject: [PATCH 161/196] regmap: Add reg_default_cb callback for flat cache
+Subject: [PATCH 158/184] regmap: Add reg_default_cb callback for flat cache
  defaults
 
 Commit e062bdfdd6ad ("regmap: warn users about uninitialized flat cache")
@@ -26,7 +26,7 @@ Signed-off-by: Mark Brown <broonie@kernel.org>
 (cherry picked from commit dc65b1ed4bb34ab6235ff2cc6a917b9295c04c2c)
 
 diff --git a/drivers/base/regmap/internal.h b/drivers/base/regmap/internal.h
-index 1477329410ec4..5bf9931654387 100644
+index 1477329410ec..5bf993165438 100644
 --- a/drivers/base/regmap/internal.h
 +++ b/drivers/base/regmap/internal.h
 @@ -117,6 +117,9 @@ struct regmap {
@@ -40,7 +40,7 @@ index 1477329410ec4..5bf9931654387 100644
  	unsigned long write_flag_mask;
  
 diff --git a/drivers/base/regmap/regcache-flat.c b/drivers/base/regmap/regcache-flat.c
-index 53cc59c84e2f0..c924817e19b1c 100644
+index 53cc59c84e2f..c924817e19b1 100644
 --- a/drivers/base/regmap/regcache-flat.c
 +++ b/drivers/base/regmap/regcache-flat.c
 @@ -79,6 +79,25 @@ static int regcache_flat_populate(struct regmap *map)
@@ -70,7 +70,7 @@ index 53cc59c84e2f0..c924817e19b1c 100644
  }
  
 diff --git a/drivers/base/regmap/regcache.c b/drivers/base/regmap/regcache.c
-index 319c342bf5a06..31bdbf37dbed5 100644
+index 319c342bf5a0..31bdbf37dbed 100644
 --- a/drivers/base/regmap/regcache.c
 +++ b/drivers/base/regmap/regcache.c
 @@ -223,7 +223,8 @@ int regcache_init(struct regmap *map, const struct regmap_config *config)
@@ -84,7 +84,7 @@ index 319c342bf5a06..31bdbf37dbed5 100644
  		map->lock(map->lock_arg);
  		ret = map->cache_ops->populate(map);
 diff --git a/drivers/base/regmap/regmap.c b/drivers/base/regmap/regmap.c
-index a648218507236..a85cfafccec12 100644
+index a64821850723..a85cfafccec1 100644
 --- a/drivers/base/regmap/regmap.c
 +++ b/drivers/base/regmap/regmap.c
 @@ -813,6 +813,7 @@ struct regmap *__regmap_init(struct device *dev,
@@ -104,7 +104,7 @@ index a648218507236..a85cfafccec12 100644
  
  	ret = regmap_set_name(map, config);
 diff --git a/include/linux/regmap.h b/include/linux/regmap.h
-index bbb8b1b11a4fb..df7640ce0d8ea 100644
+index bbb8b1b11a4f..df7640ce0d8e 100644
 --- a/include/linux/regmap.h
 +++ b/include/linux/regmap.h
 @@ -359,6 +359,10 @@ typedef void (*regmap_unlock)(void *);
@@ -143,5 +143,5 @@ index bbb8b1b11a4fb..df7640ce0d8ea 100644
  int regmap_get_max_register(struct regmap *map);
  int regmap_get_reg_stride(struct regmap *map);
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/platform/patches/0162-ASoC-tegra-set-reg_default_cb-callback.patch b/features/tegra/platform/patches/0159-ASoC-tegra-set-reg_default_cb-callback.patch
similarity index 91%
rename from features/tegra/platform/patches/0162-ASoC-tegra-set-reg_default_cb-callback.patch
rename to features/tegra/platform/patches/0159-ASoC-tegra-set-reg_default_cb-callback.patch
index 0533158..b25decd 100644
--- a/features/tegra/platform/patches/0162-ASoC-tegra-set-reg_default_cb-callback.patch
+++ b/features/tegra/platform/patches/0159-ASoC-tegra-set-reg_default_cb-callback.patch
@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Sheetal <sheetal@nvidia.com>
 Date: Fri, 23 Jan 2026 15:23:45 +0530
-Subject: [PATCH 162/196] ASoC: tegra: set reg_default_cb callback
+Subject: [PATCH 159/184] ASoC: tegra: set reg_default_cb callback
 
 Set reg_default_cb so REGCACHE_FLAT can supply zero defaults without
 large reg_defaults tables, simplifying cache initialization for
@@ -15,7 +15,7 @@ Signed-off-by: Mark Brown <broonie@kernel.org>
 (cherry picked from commit 9409d18bf7d58ab716337749e28e2caba0d64cb0)
 
 diff --git a/sound/soc/tegra/tegra186_asrc.c b/sound/soc/tegra/tegra186_asrc.c
-index 851509ae07f59..2e0ffb75e052d 100644
+index 851509ae07f5..2e0ffb75e052 100644
 --- a/sound/soc/tegra/tegra186_asrc.c
 +++ b/sound/soc/tegra/tegra186_asrc.c
 @@ -950,6 +950,7 @@ static const struct regmap_config tegra186_asrc_regmap_config = {
@@ -27,7 +27,7 @@ index 851509ae07f59..2e0ffb75e052d 100644
  };
  
 diff --git a/sound/soc/tegra/tegra186_dspk.c b/sound/soc/tegra/tegra186_dspk.c
-index 21fdab2a19771..4e8348b3177fd 100644
+index 21fdab2a1977..4e8348b3177f 100644
 --- a/sound/soc/tegra/tegra186_dspk.c
 +++ b/sound/soc/tegra/tegra186_dspk.c
 @@ -467,6 +467,7 @@ static const struct regmap_config tegra186_dspk_regmap = {
@@ -39,7 +39,7 @@ index 21fdab2a19771..4e8348b3177fd 100644
  };
  
 diff --git a/sound/soc/tegra/tegra210_admaif.c b/sound/soc/tegra/tegra210_admaif.c
-index f88d6a2356e07..ea7bee4c0a890 100644
+index f88d6a2356e0..ea7bee4c0a89 100644
 --- a/sound/soc/tegra/tegra210_admaif.c
 +++ b/sound/soc/tegra/tegra210_admaif.c
 @@ -241,6 +241,7 @@ static const struct regmap_config tegra210_admaif_regmap_config = {
@@ -67,7 +67,7 @@ index f88d6a2356e07..ea7bee4c0a890 100644
  };
  
 diff --git a/sound/soc/tegra/tegra210_adx.c b/sound/soc/tegra/tegra210_adx.c
-index ad7cd86550478..9945a2b98dead 100644
+index ad7cd8655047..9945a2b98dea 100644
 --- a/sound/soc/tegra/tegra210_adx.c
 +++ b/sound/soc/tegra/tegra210_adx.c
 @@ -625,6 +625,7 @@ static const struct regmap_config tegra210_adx_regmap_config = {
@@ -87,10 +87,10 @@ index ad7cd86550478..9945a2b98dead 100644
  };
  
 diff --git a/sound/soc/tegra/tegra210_ahub.c b/sound/soc/tegra/tegra210_ahub.c
-index 01d60a74ad1c3..3b9dfa4c3ec7e 100644
+index 0f756ea474ce..f7785e150415 100644
 --- a/sound/soc/tegra/tegra210_ahub.c
 +++ b/sound/soc/tegra/tegra210_ahub.c
-@@ -2133,6 +2133,7 @@ static const struct regmap_config tegra210_ahub_regmap_config = {
+@@ -2135,6 +2135,7 @@ static const struct regmap_config tegra210_ahub_regmap_config = {
  	.reg_stride		= 4,
  	.writeable_reg		= tegra210_ahub_wr_reg,
  	.max_register		= TEGRA210_MAX_REGISTER_ADDR,
@@ -98,7 +98,7 @@ index 01d60a74ad1c3..3b9dfa4c3ec7e 100644
  	.cache_type		= REGCACHE_FLAT,
  };
  
-@@ -2142,6 +2143,7 @@ static const struct regmap_config tegra186_ahub_regmap_config = {
+@@ -2144,6 +2145,7 @@ static const struct regmap_config tegra186_ahub_regmap_config = {
  	.reg_stride		= 4,
  	.writeable_reg		= tegra186_ahub_wr_reg,
  	.max_register		= TEGRA186_MAX_REGISTER_ADDR,
@@ -106,7 +106,7 @@ index 01d60a74ad1c3..3b9dfa4c3ec7e 100644
  	.cache_type		= REGCACHE_FLAT,
  };
  
-@@ -2151,6 +2153,7 @@ static const struct regmap_config tegra264_ahub_regmap_config = {
+@@ -2153,6 +2155,7 @@ static const struct regmap_config tegra264_ahub_regmap_config = {
  	.reg_stride		= 4,
  	.writeable_reg		= tegra264_ahub_wr_reg,
  	.max_register		= TEGRA264_MAX_REGISTER_ADDR,
@@ -115,7 +115,7 @@ index 01d60a74ad1c3..3b9dfa4c3ec7e 100644
  };
  
 diff --git a/sound/soc/tegra/tegra210_amx.c b/sound/soc/tegra/tegra210_amx.c
-index 7f558c40e097b..f8b85f19c190b 100644
+index 7f558c40e097..f8b85f19c190 100644
 --- a/sound/soc/tegra/tegra210_amx.c
 +++ b/sound/soc/tegra/tegra210_amx.c
 @@ -654,6 +654,7 @@ static const struct regmap_config tegra210_amx_regmap_config = {
@@ -143,7 +143,7 @@ index 7f558c40e097b..f8b85f19c190b 100644
  };
  
 diff --git a/sound/soc/tegra/tegra210_dmic.c b/sound/soc/tegra/tegra210_dmic.c
-index e4a1445712659..07079f2bf173f 100644
+index e4a144571265..07079f2bf173 100644
 --- a/sound/soc/tegra/tegra210_dmic.c
 +++ b/sound/soc/tegra/tegra210_dmic.c
 @@ -483,6 +483,7 @@ static const struct regmap_config tegra210_dmic_regmap_config = {
@@ -155,7 +155,7 @@ index e4a1445712659..07079f2bf173f 100644
  };
  
 diff --git a/sound/soc/tegra/tegra210_i2s.c b/sound/soc/tegra/tegra210_i2s.c
-index 100277c390017..86554e3dab59f 100644
+index 100277c39001..86554e3dab59 100644
 --- a/sound/soc/tegra/tegra210_i2s.c
 +++ b/sound/soc/tegra/tegra210_i2s.c
 @@ -997,6 +997,7 @@ static const struct regmap_config tegra210_regmap_conf = {
@@ -175,7 +175,7 @@ index 100277c390017..86554e3dab59f 100644
  };
  
 diff --git a/sound/soc/tegra/tegra210_mbdrc.c b/sound/soc/tegra/tegra210_mbdrc.c
-index eeacb12202685..d9e83632703e0 100644
+index eeacb1220268..d9e83632703e 100644
 --- a/sound/soc/tegra/tegra210_mbdrc.c
 +++ b/sound/soc/tegra/tegra210_mbdrc.c
 @@ -763,6 +763,7 @@ static const struct regmap_config tegra210_mbdrc_regmap_cfg = {
@@ -187,7 +187,7 @@ index eeacb12202685..d9e83632703e0 100644
  };
  
 diff --git a/sound/soc/tegra/tegra210_mixer.c b/sound/soc/tegra/tegra210_mixer.c
-index 95d69a7e027f5..29e654f54f8be 100644
+index 95d69a7e027f..29e654f54f8b 100644
 --- a/sound/soc/tegra/tegra210_mixer.c
 +++ b/sound/soc/tegra/tegra210_mixer.c
 @@ -608,6 +608,7 @@ static const struct regmap_config tegra210_mixer_regmap_config = {
@@ -199,7 +199,7 @@ index 95d69a7e027f5..29e654f54f8be 100644
  };
  
 diff --git a/sound/soc/tegra/tegra210_mvc.c b/sound/soc/tegra/tegra210_mvc.c
-index 35b14c8396f43..c0d3769185465 100644
+index 35b14c8396f4..c0d376918546 100644
 --- a/sound/soc/tegra/tegra210_mvc.c
 +++ b/sound/soc/tegra/tegra210_mvc.c
 @@ -699,6 +699,7 @@ static const struct regmap_config tegra210_mvc_regmap_config = {
@@ -211,7 +211,7 @@ index 35b14c8396f43..c0d3769185465 100644
  };
  
 diff --git a/sound/soc/tegra/tegra210_ope.c b/sound/soc/tegra/tegra210_ope.c
-index 5036bcfe08289..fb171bbedcab5 100644
+index 5036bcfe0828..fb171bbedcab 100644
 --- a/sound/soc/tegra/tegra210_ope.c
 +++ b/sound/soc/tegra/tegra210_ope.c
 @@ -297,6 +297,7 @@ static const struct regmap_config tegra210_ope_regmap_config = {
@@ -223,7 +223,7 @@ index 5036bcfe08289..fb171bbedcab5 100644
  };
  
 diff --git a/sound/soc/tegra/tegra210_peq.c b/sound/soc/tegra/tegra210_peq.c
-index bd8007cc49e1c..1c887b49d27a2 100644
+index bd8007cc49e1..1c887b49d27a 100644
 --- a/sound/soc/tegra/tegra210_peq.c
 +++ b/sound/soc/tegra/tegra210_peq.c
 @@ -306,6 +306,7 @@ static const struct regmap_config tegra210_peq_regmap_config = {
@@ -235,7 +235,7 @@ index bd8007cc49e1c..1c887b49d27a2 100644
  };
  
 diff --git a/sound/soc/tegra/tegra210_sfc.c b/sound/soc/tegra/tegra210_sfc.c
-index a0bd36f12c68f..24498efc39b63 100644
+index a0bd36f12c68..24498efc39b6 100644
 --- a/sound/soc/tegra/tegra210_sfc.c
 +++ b/sound/soc/tegra/tegra210_sfc.c
 @@ -3569,6 +3569,7 @@ static const struct regmap_config tegra210_sfc_regmap_config = {
@@ -247,5 +247,5 @@ index a0bd36f12c68f..24498efc39b63 100644
  };
  
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/platform/patches/0163-ASoC-rt5640-Handle-0Hz-sysclk-during-stream-shutdown.patch b/features/tegra/platform/patches/0160-ASoC-rt5640-Handle-0Hz-sysclk-during-stream-shutdown.patch
similarity index 91%
rename from features/tegra/platform/patches/0163-ASoC-rt5640-Handle-0Hz-sysclk-during-stream-shutdown.patch
rename to features/tegra/platform/patches/0160-ASoC-rt5640-Handle-0Hz-sysclk-during-stream-shutdown.patch
index 96e4bd0..3f1f1bc 100644
--- a/features/tegra/platform/patches/0163-ASoC-rt5640-Handle-0Hz-sysclk-during-stream-shutdown.patch
+++ b/features/tegra/platform/patches/0160-ASoC-rt5640-Handle-0Hz-sysclk-during-stream-shutdown.patch
@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Sheetal <sheetal@nvidia.com>
 Date: Mon, 6 Apr 2026 09:05:47 +0000
-Subject: [PATCH 163/196] ASoC: rt5640: Handle 0Hz sysclk during stream
+Subject: [PATCH 160/184] ASoC: rt5640: Handle 0Hz sysclk during stream
  shutdown
 
 Commit 2458adb8f92a ("SoC: simple-card-utils: set 0Hz to sysclk when
@@ -20,7 +20,7 @@ Signed-off-by: Mark Brown <broonie@kernel.org>
 (cherry picked from commit 247d1c13992d2c501e2e020e84d9d2920e11bf78)
 
 diff --git a/sound/soc/codecs/rt5640.c b/sound/soc/codecs/rt5640.c
-index f50e771db24b0..7fdc81febc1fa 100644
+index f50e771db24b..7fdc81febc1f 100644
 --- a/sound/soc/codecs/rt5640.c
 +++ b/sound/soc/codecs/rt5640.c
 @@ -1838,6 +1838,11 @@ static int rt5640_set_dai_sysclk(struct snd_soc_dai *dai,
@@ -36,5 +36,5 @@ index f50e771db24b0..7fdc81febc1fa 100644
  	case RT5640_SCLK_S_MCLK:
  		ret = clk_set_rate(rt5640->mclk, freq);
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/platform/patches/0164-ASoC-tegra-Use-dev_err_probe-in-tegra186_asrc-probe.patch b/features/tegra/platform/patches/0161-ASoC-tegra-Use-dev_err_probe-in-tegra186_asrc-probe.patch
similarity index 90%
rename from features/tegra/platform/patches/0164-ASoC-tegra-Use-dev_err_probe-in-tegra186_asrc-probe.patch
rename to features/tegra/platform/patches/0161-ASoC-tegra-Use-dev_err_probe-in-tegra186_asrc-probe.patch
index 7dcdaa6..76b7e61 100644
--- a/features/tegra/platform/patches/0164-ASoC-tegra-Use-dev_err_probe-in-tegra186_asrc-probe.patch
+++ b/features/tegra/platform/patches/0161-ASoC-tegra-Use-dev_err_probe-in-tegra186_asrc-probe.patch
@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Sheetal <sheetal@nvidia.com>
 Date: Wed, 25 Mar 2026 10:14:24 +0000
-Subject: [PATCH 164/196] ASoC: tegra: Use dev_err_probe() in tegra186_asrc
+Subject: [PATCH 161/184] ASoC: tegra: Use dev_err_probe() in tegra186_asrc
  probe
 
 Log errors in the Tegra186 ASRC probe path using dev_err_probe().
@@ -12,7 +12,7 @@ Signed-off-by: Mark Brown <broonie@kernel.org>
 (cherry picked from commit 884f3101d1edb2bff463a1a4bae162ab011fe73f)
 
 diff --git a/sound/soc/tegra/tegra186_asrc.c b/sound/soc/tegra/tegra186_asrc.c
-index 2e0ffb75e052d..6ce7ddb788a54 100644
+index 2e0ffb75e052..6ce7ddb788a5 100644
 --- a/sound/soc/tegra/tegra186_asrc.c
 +++ b/sound/soc/tegra/tegra186_asrc.c
 @@ -1016,10 +1016,9 @@ static int tegra186_asrc_platform_probe(struct platform_device *pdev)
@@ -30,5 +30,5 @@ index 2e0ffb75e052d..6ce7ddb788a54 100644
  	pm_runtime_enable(dev);
  
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/platform/patches/0165-ASoC-tegra-Use-dev_err_probe-in-tegra186_dspk-probe.patch b/features/tegra/platform/patches/0162-ASoC-tegra-Use-dev_err_probe-in-tegra186_dspk-probe.patch
similarity index 93%
rename from features/tegra/platform/patches/0165-ASoC-tegra-Use-dev_err_probe-in-tegra186_dspk-probe.patch
rename to features/tegra/platform/patches/0162-ASoC-tegra-Use-dev_err_probe-in-tegra186_dspk-probe.patch
index faf1075..595a646 100644
--- a/features/tegra/platform/patches/0165-ASoC-tegra-Use-dev_err_probe-in-tegra186_dspk-probe.patch
+++ b/features/tegra/platform/patches/0162-ASoC-tegra-Use-dev_err_probe-in-tegra186_dspk-probe.patch
@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Sheetal <sheetal@nvidia.com>
 Date: Wed, 25 Mar 2026 10:14:25 +0000
-Subject: [PATCH 165/196] ASoC: tegra: Use dev_err_probe() in tegra186_dspk
+Subject: [PATCH 162/184] ASoC: tegra: Use dev_err_probe() in tegra186_dspk
  probe
 
 Log errors in the Tegra186 DSPK probe path using dev_err_probe().
@@ -12,7 +12,7 @@ Signed-off-by: Mark Brown <broonie@kernel.org>
 (cherry picked from commit 6205ca05227f26721b8d5920d976ecae6f8ce83e)
 
 diff --git a/sound/soc/tegra/tegra186_dspk.c b/sound/soc/tegra/tegra186_dspk.c
-index 4e8348b3177fd..8f750b8533062 100644
+index 4e8348b3177f..8f750b853306 100644
 --- a/sound/soc/tegra/tegra186_dspk.c
 +++ b/sound/soc/tegra/tegra186_dspk.c
 @@ -496,10 +496,9 @@ static int tegra186_dspk_platform_probe(struct platform_device *pdev)
@@ -45,5 +45,5 @@ index 4e8348b3177fd..8f750b8533062 100644
  	pm_runtime_enable(dev);
  
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/platform/patches/0166-ASoC-tegra-Add-error-logging-in-tegra210_adx-driver.patch b/features/tegra/platform/patches/0163-ASoC-tegra-Add-error-logging-in-tegra210_adx-driver.patch
similarity index 93%
rename from features/tegra/platform/patches/0166-ASoC-tegra-Add-error-logging-in-tegra210_adx-driver.patch
rename to features/tegra/platform/patches/0163-ASoC-tegra-Add-error-logging-in-tegra210_adx-driver.patch
index 5f8fb14..c7fee17 100644
--- a/features/tegra/platform/patches/0166-ASoC-tegra-Add-error-logging-in-tegra210_adx-driver.patch
+++ b/features/tegra/platform/patches/0163-ASoC-tegra-Add-error-logging-in-tegra210_adx-driver.patch
@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Sheetal <sheetal@nvidia.com>
 Date: Wed, 25 Mar 2026 10:14:27 +0000
-Subject: [PATCH 166/196] ASoC: tegra: Add error logging in tegra210_adx driver
+Subject: [PATCH 163/184] ASoC: tegra: Add error logging in tegra210_adx driver
 
 Log errors in the Tegra210 ADX probe and set_audio_cif paths.
 
@@ -11,7 +11,7 @@ Signed-off-by: Mark Brown <broonie@kernel.org>
 (cherry picked from commit 50e51b84a4b38f2dbffe48e16aef5e0568cc14e9)
 
 diff --git a/sound/soc/tegra/tegra210_adx.c b/sound/soc/tegra/tegra210_adx.c
-index 9945a2b98dead..be9d2ee74e1f1 100644
+index 9945a2b98dea..be9d2ee74e1f 100644
 --- a/sound/soc/tegra/tegra210_adx.c
 +++ b/sound/soc/tegra/tegra210_adx.c
 @@ -134,8 +134,11 @@ static int tegra210_adx_set_audio_cif(struct snd_soc_dai *dai,
@@ -50,5 +50,5 @@ index 9945a2b98dead..be9d2ee74e1f1 100644
  	pm_runtime_enable(dev);
  
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/platform/patches/0167-ASoC-tegra-Use-dev_err_probe-in-tegra210_ahub-probe.patch b/features/tegra/platform/patches/0164-ASoC-tegra-Use-dev_err_probe-in-tegra210_ahub-probe.patch
similarity index 87%
rename from features/tegra/platform/patches/0167-ASoC-tegra-Use-dev_err_probe-in-tegra210_ahub-probe.patch
rename to features/tegra/platform/patches/0164-ASoC-tegra-Use-dev_err_probe-in-tegra210_ahub-probe.patch
index 2b77c57..63b7e28 100644
--- a/features/tegra/platform/patches/0167-ASoC-tegra-Use-dev_err_probe-in-tegra210_ahub-probe.patch
+++ b/features/tegra/platform/patches/0164-ASoC-tegra-Use-dev_err_probe-in-tegra210_ahub-probe.patch
@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Sheetal <sheetal@nvidia.com>
 Date: Wed, 25 Mar 2026 10:14:28 +0000
-Subject: [PATCH 167/196] ASoC: tegra: Use dev_err_probe() in tegra210_ahub
+Subject: [PATCH 164/184] ASoC: tegra: Use dev_err_probe() in tegra210_ahub
  probe
 
 Log errors in the Tegra210 AHUB probe path using dev_err_probe().
@@ -12,10 +12,10 @@ Signed-off-by: Mark Brown <broonie@kernel.org>
 (cherry picked from commit 802d0d6c25b3aecc51c336ba784aedf75c592512)
 
 diff --git a/sound/soc/tegra/tegra210_ahub.c b/sound/soc/tegra/tegra210_ahub.c
-index 3b9dfa4c3ec7e..92418c17aeac7 100644
+index f7785e150415..5b7fd1e3f7a1 100644
 --- a/sound/soc/tegra/tegra210_ahub.c
 +++ b/sound/soc/tegra/tegra210_ahub.c
-@@ -2265,10 +2265,9 @@ static int tegra_ahub_probe(struct platform_device *pdev)
+@@ -2267,10 +2267,9 @@ static int tegra_ahub_probe(struct platform_device *pdev)
  	platform_set_drvdata(pdev, ahub);
  
  	ahub->clk = devm_clk_get(&pdev->dev, "ahub");
@@ -29,7 +29,7 @@ index 3b9dfa4c3ec7e..92418c17aeac7 100644
  
  	regs = devm_platform_ioremap_resource(pdev, 0);
  	if (IS_ERR(regs))
-@@ -2287,18 +2286,17 @@ static int tegra_ahub_probe(struct platform_device *pdev)
+@@ -2289,18 +2288,17 @@ static int tegra_ahub_probe(struct platform_device *pdev)
  					      ahub->soc_data->cmpnt_drv,
  					      ahub->soc_data->dai_drv,
  					      ahub->soc_data->num_dais);
@@ -54,5 +54,5 @@ index 3b9dfa4c3ec7e..92418c17aeac7 100644
  
  	return 0;
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/platform/patches/0168-ASoC-tegra-Add-error-logging-in-tegra210_amx-driver.patch b/features/tegra/platform/patches/0165-ASoC-tegra-Add-error-logging-in-tegra210_amx-driver.patch
similarity index 92%
rename from features/tegra/platform/patches/0168-ASoC-tegra-Add-error-logging-in-tegra210_amx-driver.patch
rename to features/tegra/platform/patches/0165-ASoC-tegra-Add-error-logging-in-tegra210_amx-driver.patch
index d017789..50faa82 100644
--- a/features/tegra/platform/patches/0168-ASoC-tegra-Add-error-logging-in-tegra210_amx-driver.patch
+++ b/features/tegra/platform/patches/0165-ASoC-tegra-Add-error-logging-in-tegra210_amx-driver.patch
@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Sheetal <sheetal@nvidia.com>
 Date: Wed, 25 Mar 2026 10:14:29 +0000
-Subject: [PATCH 168/196] ASoC: tegra: Add error logging in tegra210_amx driver
+Subject: [PATCH 165/184] ASoC: tegra: Add error logging in tegra210_amx driver
 
 Log errors in the Tegra210 AMX probe and set_audio_cif paths.
 
@@ -11,7 +11,7 @@ Signed-off-by: Mark Brown <broonie@kernel.org>
 (cherry picked from commit d310c08db2d80488435e6cef2b42d09bc63f3f43)
 
 diff --git a/sound/soc/tegra/tegra210_amx.c b/sound/soc/tegra/tegra210_amx.c
-index f8b85f19c190b..09f800b452ba7 100644
+index f8b85f19c190..09f800b452ba 100644
 --- a/sound/soc/tegra/tegra210_amx.c
 +++ b/sound/soc/tegra/tegra210_amx.c
 @@ -163,6 +163,8 @@ static int tegra210_amx_set_audio_cif(struct snd_soc_dai *dai,
@@ -38,5 +38,5 @@ index f8b85f19c190b..09f800b452ba7 100644
  	pm_runtime_enable(dev);
  
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/platform/patches/0169-ASoC-tegra-Use-dev_err_probe-in-tegra210_dmic-probe.patch b/features/tegra/platform/patches/0166-ASoC-tegra-Use-dev_err_probe-in-tegra210_dmic-probe.patch
similarity index 93%
rename from features/tegra/platform/patches/0169-ASoC-tegra-Use-dev_err_probe-in-tegra210_dmic-probe.patch
rename to features/tegra/platform/patches/0166-ASoC-tegra-Use-dev_err_probe-in-tegra210_dmic-probe.patch
index 5022c7f..23f0272 100644
--- a/features/tegra/platform/patches/0169-ASoC-tegra-Use-dev_err_probe-in-tegra210_dmic-probe.patch
+++ b/features/tegra/platform/patches/0166-ASoC-tegra-Use-dev_err_probe-in-tegra210_dmic-probe.patch
@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Sheetal <sheetal@nvidia.com>
 Date: Wed, 25 Mar 2026 10:14:30 +0000
-Subject: [PATCH 169/196] ASoC: tegra: Use dev_err_probe() in tegra210_dmic
+Subject: [PATCH 166/184] ASoC: tegra: Use dev_err_probe() in tegra210_dmic
  probe
 
 Log errors in the Tegra210 DMIC probe path using dev_err_probe().
@@ -12,7 +12,7 @@ Signed-off-by: Mark Brown <broonie@kernel.org>
 (cherry picked from commit ca069c3403ec4ffd1cfbc9a5b274bd9e799a0281)
 
 diff --git a/sound/soc/tegra/tegra210_dmic.c b/sound/soc/tegra/tegra210_dmic.c
-index 07079f2bf173f..aa37caee34692 100644
+index 07079f2bf173..aa37caee3469 100644
 --- a/sound/soc/tegra/tegra210_dmic.c
 +++ b/sound/soc/tegra/tegra210_dmic.c
 @@ -507,10 +507,9 @@ static int tegra210_dmic_probe(struct platform_device *pdev)
@@ -44,5 +44,5 @@ index 07079f2bf173f..aa37caee34692 100644
  	pm_runtime_enable(dev);
  
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/platform/patches/0170-ASoC-tegra-Add-error-logging-in-tegra210_i2s-driver.patch b/features/tegra/platform/patches/0167-ASoC-tegra-Add-error-logging-in-tegra210_i2s-driver.patch
similarity index 95%
rename from features/tegra/platform/patches/0170-ASoC-tegra-Add-error-logging-in-tegra210_i2s-driver.patch
rename to features/tegra/platform/patches/0167-ASoC-tegra-Add-error-logging-in-tegra210_i2s-driver.patch
index 52c50ac..ffb23f7 100644
--- a/features/tegra/platform/patches/0170-ASoC-tegra-Add-error-logging-in-tegra210_i2s-driver.patch
+++ b/features/tegra/platform/patches/0167-ASoC-tegra-Add-error-logging-in-tegra210_i2s-driver.patch
@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Sheetal <sheetal@nvidia.com>
 Date: Wed, 25 Mar 2026 10:14:31 +0000
-Subject: [PATCH 170/196] ASoC: tegra: Add error logging in tegra210_i2s driver
+Subject: [PATCH 167/184] ASoC: tegra: Add error logging in tegra210_i2s driver
 
 Log errors in the Tegra210 I2S probe and runtime callback paths.
 
@@ -11,7 +11,7 @@ Signed-off-by: Mark Brown <broonie@kernel.org>
 (cherry picked from commit 67b7bcdd9798536ffe2f5d77783d83f40d7e6c27)
 
 diff --git a/sound/soc/tegra/tegra210_i2s.c b/sound/soc/tegra/tegra210_i2s.c
-index 86554e3dab59f..cdaecce744160 100644
+index 86554e3dab59..cdaecce74416 100644
 --- a/sound/soc/tegra/tegra210_i2s.c
 +++ b/sound/soc/tegra/tegra210_i2s.c
 @@ -161,6 +161,7 @@ static int tegra210_i2s_init(struct snd_soc_dapm_widget *w,
@@ -75,5 +75,5 @@ index 86554e3dab59f..cdaecce744160 100644
  	pm_runtime_enable(dev);
  
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/platform/patches/0171-ASoC-tegra-Use-dev_err_probe-in-tegra210_mixer-probe.patch b/features/tegra/platform/patches/0168-ASoC-tegra-Use-dev_err_probe-in-tegra210_mixer-probe.patch
similarity index 90%
rename from features/tegra/platform/patches/0171-ASoC-tegra-Use-dev_err_probe-in-tegra210_mixer-probe.patch
rename to features/tegra/platform/patches/0168-ASoC-tegra-Use-dev_err_probe-in-tegra210_mixer-probe.patch
index 06a5846..440bbbe 100644
--- a/features/tegra/platform/patches/0171-ASoC-tegra-Use-dev_err_probe-in-tegra210_mixer-probe.patch
+++ b/features/tegra/platform/patches/0168-ASoC-tegra-Use-dev_err_probe-in-tegra210_mixer-probe.patch
@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Sheetal <sheetal@nvidia.com>
 Date: Wed, 25 Mar 2026 10:14:33 +0000
-Subject: [PATCH 171/196] ASoC: tegra: Use dev_err_probe() in tegra210_mixer
+Subject: [PATCH 168/184] ASoC: tegra: Use dev_err_probe() in tegra210_mixer
  probe
 
 Log errors in the Tegra210 Mixer probe path using dev_err_probe().
@@ -12,7 +12,7 @@ Signed-off-by: Mark Brown <broonie@kernel.org>
 (cherry picked from commit 3d027d4b93b9423d106d85cc82a084032fd2635d)
 
 diff --git a/sound/soc/tegra/tegra210_mixer.c b/sound/soc/tegra/tegra210_mixer.c
-index 29e654f54f8be..5ef2a13b31ad1 100644
+index 29e654f54f8b..5ef2a13b31ad 100644
 --- a/sound/soc/tegra/tegra210_mixer.c
 +++ b/sound/soc/tegra/tegra210_mixer.c
 @@ -651,10 +651,9 @@ static int tegra210_mixer_platform_probe(struct platform_device *pdev)
@@ -30,5 +30,5 @@ index 29e654f54f8be..5ef2a13b31ad1 100644
  	pm_runtime_enable(dev);
  
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/platform/patches/0172-ASoC-tegra-Use-dev_err_probe-in-tegra210_mvc-probe.patch b/features/tegra/platform/patches/0169-ASoC-tegra-Use-dev_err_probe-in-tegra210_mvc-probe.patch
similarity index 90%
rename from features/tegra/platform/patches/0172-ASoC-tegra-Use-dev_err_probe-in-tegra210_mvc-probe.patch
rename to features/tegra/platform/patches/0169-ASoC-tegra-Use-dev_err_probe-in-tegra210_mvc-probe.patch
index 0e1fd5c..ee4e1b7 100644
--- a/features/tegra/platform/patches/0172-ASoC-tegra-Use-dev_err_probe-in-tegra210_mvc-probe.patch
+++ b/features/tegra/platform/patches/0169-ASoC-tegra-Use-dev_err_probe-in-tegra210_mvc-probe.patch
@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Sheetal <sheetal@nvidia.com>
 Date: Wed, 25 Mar 2026 10:14:34 +0000
-Subject: [PATCH 172/196] ASoC: tegra: Use dev_err_probe() in tegra210_mvc
+Subject: [PATCH 169/184] ASoC: tegra: Use dev_err_probe() in tegra210_mvc
  probe
 
 Log errors in the Tegra210 MVC probe path using dev_err_probe().
@@ -12,7 +12,7 @@ Signed-off-by: Mark Brown <broonie@kernel.org>
 (cherry picked from commit f2067c1dba07e3816c635601a4b21fbc4a44921c)
 
 diff --git a/sound/soc/tegra/tegra210_mvc.c b/sound/soc/tegra/tegra210_mvc.c
-index c0d3769185465..e36c04a701e59 100644
+index c0d376918546..e36c04a701e5 100644
 --- a/sound/soc/tegra/tegra210_mvc.c
 +++ b/sound/soc/tegra/tegra210_mvc.c
 @@ -741,10 +741,9 @@ static int tegra210_mvc_platform_probe(struct platform_device *pdev)
@@ -30,5 +30,5 @@ index c0d3769185465..e36c04a701e59 100644
  	pm_runtime_enable(dev);
  
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/platform/patches/0173-ASoC-tegra-Use-dev_err_probe-in-tegra210_sfc-probe.patch b/features/tegra/platform/patches/0170-ASoC-tegra-Use-dev_err_probe-in-tegra210_sfc-probe.patch
similarity index 90%
rename from features/tegra/platform/patches/0173-ASoC-tegra-Use-dev_err_probe-in-tegra210_sfc-probe.patch
rename to features/tegra/platform/patches/0170-ASoC-tegra-Use-dev_err_probe-in-tegra210_sfc-probe.patch
index 982996d..f46bf60 100644
--- a/features/tegra/platform/patches/0173-ASoC-tegra-Use-dev_err_probe-in-tegra210_sfc-probe.patch
+++ b/features/tegra/platform/patches/0170-ASoC-tegra-Use-dev_err_probe-in-tegra210_sfc-probe.patch
@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Sheetal <sheetal@nvidia.com>
 Date: Wed, 25 Mar 2026 10:14:35 +0000
-Subject: [PATCH 173/196] ASoC: tegra: Use dev_err_probe() in tegra210_sfc
+Subject: [PATCH 170/184] ASoC: tegra: Use dev_err_probe() in tegra210_sfc
  probe
 
 Log errors in the Tegra210 SFC probe path using dev_err_probe().
@@ -12,7 +12,7 @@ Signed-off-by: Mark Brown <broonie@kernel.org>
 (cherry picked from commit 856ffd8f4aae227dd008e718dbb1cf7d3474a626)
 
 diff --git a/sound/soc/tegra/tegra210_sfc.c b/sound/soc/tegra/tegra210_sfc.c
-index 24498efc39b63..30afea74e066e 100644
+index 24498efc39b6..30afea74e066 100644
 --- a/sound/soc/tegra/tegra210_sfc.c
 +++ b/sound/soc/tegra/tegra210_sfc.c
 @@ -3608,10 +3608,9 @@ static int tegra210_sfc_platform_probe(struct platform_device *pdev)
@@ -30,5 +30,5 @@ index 24498efc39b63..30afea74e066e 100644
  	pm_runtime_enable(&pdev->dev);
  
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/platform/patches/0174-ASoC-tegra-Use-dev_err_probe-in-tegra_asoc_machine-p.patch b/features/tegra/platform/patches/0171-ASoC-tegra-Use-dev_err_probe-in-tegra_asoc_machine-p.patch
similarity index 97%
rename from features/tegra/platform/patches/0174-ASoC-tegra-Use-dev_err_probe-in-tegra_asoc_machine-p.patch
rename to features/tegra/platform/patches/0171-ASoC-tegra-Use-dev_err_probe-in-tegra_asoc_machine-p.patch
index 4dbce41..eb641d4 100644
--- a/features/tegra/platform/patches/0174-ASoC-tegra-Use-dev_err_probe-in-tegra_asoc_machine-p.patch
+++ b/features/tegra/platform/patches/0171-ASoC-tegra-Use-dev_err_probe-in-tegra_asoc_machine-p.patch
@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Sheetal <sheetal@nvidia.com>
 Date: Wed, 25 Mar 2026 10:14:36 +0000
-Subject: [PATCH 174/196] ASoC: tegra: Use dev_err_probe() in
+Subject: [PATCH 171/184] ASoC: tegra: Use dev_err_probe() in
  tegra_asoc_machine probe
 
 Log errors in the Tegra ASoC machine driver probe path using
@@ -13,7 +13,7 @@ Signed-off-by: Mark Brown <broonie@kernel.org>
 (cherry picked from commit fa11e1cb2b77946c56e690e431193e64a1e06bda)
 
 diff --git a/sound/soc/tegra/tegra_asoc_machine.c b/sound/soc/tegra/tegra_asoc_machine.c
-index 62f8967727319..02aab4f2389e8 100644
+index 62f896772731..02aab4f2389e 100644
 --- a/sound/soc/tegra/tegra_asoc_machine.c
 +++ b/sound/soc/tegra/tegra_asoc_machine.c
 @@ -413,7 +413,8 @@ static int tegra_machine_register_codec(struct device *dev, const char *name)
@@ -145,5 +145,5 @@ index 62f8967727319..02aab4f2389e8 100644
  		machine->clk_cdev1 = clk_out_1;
  	}
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/platform/patches/0175-ASoC-tegra-Use-dev_err_probe-in-tegra_audio_graph_ca.patch b/features/tegra/platform/patches/0172-ASoC-tegra-Use-dev_err_probe-in-tegra_audio_graph_ca.patch
similarity index 94%
rename from features/tegra/platform/patches/0175-ASoC-tegra-Use-dev_err_probe-in-tegra_audio_graph_ca.patch
rename to features/tegra/platform/patches/0172-ASoC-tegra-Use-dev_err_probe-in-tegra_audio_graph_ca.patch
index 8591e07..ad17d37 100644
--- a/features/tegra/platform/patches/0175-ASoC-tegra-Use-dev_err_probe-in-tegra_audio_graph_ca.patch
+++ b/features/tegra/platform/patches/0172-ASoC-tegra-Use-dev_err_probe-in-tegra_audio_graph_ca.patch
@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Sheetal <sheetal@nvidia.com>
 Date: Wed, 25 Mar 2026 10:14:37 +0000
-Subject: [PATCH 175/196] ASoC: tegra: Use dev_err_probe() in
+Subject: [PATCH 172/184] ASoC: tegra: Use dev_err_probe() in
  tegra_audio_graph_card probe
 
 Log errors in the Tegra audio graph card probe path using
@@ -13,7 +13,7 @@ Signed-off-by: Mark Brown <broonie@kernel.org>
 (cherry picked from commit f7d9eb0291ef00ebfb4ff4f0bec63536c15a0071)
 
 diff --git a/sound/soc/tegra/tegra_audio_graph_card.c b/sound/soc/tegra/tegra_audio_graph_card.c
-index 94b5ab77649b3..121db8ee14cc8 100644
+index 94b5ab77649b..121db8ee14cc 100644
 --- a/sound/soc/tegra/tegra_audio_graph_card.c
 +++ b/sound/soc/tegra/tegra_audio_graph_card.c
 @@ -174,20 +174,23 @@ static int tegra_audio_graph_card_probe(struct snd_soc_card *card)
@@ -50,5 +50,5 @@ index 94b5ab77649b3..121db8ee14cc8 100644
  
  static int tegra_audio_graph_probe(struct platform_device *pdev)
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/platform/patches/0176-ASoC-tegra-Add-error-logging-in-tegra210_admaif-driv.patch b/features/tegra/platform/patches/0173-ASoC-tegra-Add-error-logging-in-tegra210_admaif-driv.patch
similarity index 96%
rename from features/tegra/platform/patches/0176-ASoC-tegra-Add-error-logging-in-tegra210_admaif-driv.patch
rename to features/tegra/platform/patches/0173-ASoC-tegra-Add-error-logging-in-tegra210_admaif-driv.patch
index 91f309b..3da2004 100644
--- a/features/tegra/platform/patches/0176-ASoC-tegra-Add-error-logging-in-tegra210_admaif-driv.patch
+++ b/features/tegra/platform/patches/0173-ASoC-tegra-Add-error-logging-in-tegra210_admaif-driv.patch
@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Sheetal <sheetal@nvidia.com>
 Date: Wed, 1 Apr 2026 11:24:57 +0000
-Subject: [PATCH 176/196] ASoC: tegra: Add error logging in tegra210_admaif
+Subject: [PATCH 173/184] ASoC: tegra: Add error logging in tegra210_admaif
  driver
 
 Log errors in the Tegra210 ADMAIF probe and runtime callback paths.
@@ -14,7 +14,7 @@ Signed-off-by: Mark Brown <broonie@kernel.org>
 (cherry picked from commit 00d6070ec02c55731c7655b3227edd8b84bbcdbc)
 
 diff --git a/sound/soc/tegra/tegra210_admaif.c b/sound/soc/tegra/tegra210_admaif.c
-index ea7bee4c0a890..291de8da57a18 100644
+index ea7bee4c0a89..291de8da57a1 100644
 --- a/sound/soc/tegra/tegra210_admaif.c
 +++ b/sound/soc/tegra/tegra210_admaif.c
 @@ -408,6 +408,7 @@ static int tegra_admaif_start(struct snd_soc_dai *dai, int direction)
@@ -80,5 +80,5 @@ index ea7bee4c0a890..291de8da57a18 100644
  	pm_runtime_enable(&pdev->dev);
  
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/platform/patches/0177-ASoC-tegra-Use-dev_err_probe-in-OPE-PEQ-and-MBDRC-dr.patch b/features/tegra/platform/patches/0174-ASoC-tegra-Use-dev_err_probe-in-OPE-PEQ-and-MBDRC-dr.patch
similarity index 95%
rename from features/tegra/platform/patches/0177-ASoC-tegra-Use-dev_err_probe-in-OPE-PEQ-and-MBDRC-dr.patch
rename to features/tegra/platform/patches/0174-ASoC-tegra-Use-dev_err_probe-in-OPE-PEQ-and-MBDRC-dr.patch
index 94f1186..08637ce 100644
--- a/features/tegra/platform/patches/0177-ASoC-tegra-Use-dev_err_probe-in-OPE-PEQ-and-MBDRC-dr.patch
+++ b/features/tegra/platform/patches/0174-ASoC-tegra-Use-dev_err_probe-in-OPE-PEQ-and-MBDRC-dr.patch
@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Sheetal <sheetal@nvidia.com>
 Date: Wed, 1 Apr 2026 11:24:58 +0000
-Subject: [PATCH 177/196] ASoC: tegra: Use dev_err_probe() in OPE, PEQ and
+Subject: [PATCH 174/184] ASoC: tegra: Use dev_err_probe() in OPE, PEQ and
  MBDRC drivers
 
 Log errors in the Tegra210 OPE, PEQ and MBDRC probe paths using
@@ -15,7 +15,7 @@ Signed-off-by: Mark Brown <broonie@kernel.org>
 (cherry picked from commit 2333abb25c7e2ba823d2113b83a22be4c2ba63c1)
 
 diff --git a/sound/soc/tegra/tegra210_mbdrc.c b/sound/soc/tegra/tegra210_mbdrc.c
-index d9e83632703e0..a8a627812116c 100644
+index d9e83632703e..a8a627812116 100644
 --- a/sound/soc/tegra/tegra210_mbdrc.c
 +++ b/sound/soc/tegra/tegra210_mbdrc.c
 @@ -988,14 +988,14 @@ int tegra210_mbdrc_regmap_init(struct platform_device *pdev)
@@ -53,7 +53,7 @@ index d9e83632703e0..a8a627812116c 100644
  	regcache_cache_only(ope->mbdrc_regmap, true);
  
 diff --git a/sound/soc/tegra/tegra210_ope.c b/sound/soc/tegra/tegra210_ope.c
-index fb171bbedcab5..e19cd0563082e 100644
+index fb171bbedcab..e19cd0563082 100644
 --- a/sound/soc/tegra/tegra210_ope.c
 +++ b/sound/soc/tegra/tegra210_ope.c
 @@ -318,34 +318,28 @@ static int tegra210_ope_probe(struct platform_device *pdev)
@@ -100,7 +100,7 @@ index fb171bbedcab5..e19cd0563082e 100644
  	pm_runtime_enable(dev);
  
 diff --git a/sound/soc/tegra/tegra210_peq.c b/sound/soc/tegra/tegra210_peq.c
-index 1c887b49d27a2..f5fbbbfca4be0 100644
+index 1c887b49d27a..f5fbbbfca4be 100644
 --- a/sound/soc/tegra/tegra210_peq.c
 +++ b/sound/soc/tegra/tegra210_peq.c
 @@ -408,14 +408,14 @@ int tegra210_peq_regmap_init(struct platform_device *pdev)
@@ -138,5 +138,5 @@ index 1c887b49d27a2..f5fbbbfca4be0 100644
  	regcache_cache_only(ope->peq_regmap, true);
  
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/platform/patches/0178-ASoC-tegra-Use-dev_err_probe-for-regmap-init-failure.patch b/features/tegra/platform/patches/0175-ASoC-tegra-Use-dev_err_probe-for-regmap-init-failure.patch
similarity index 92%
rename from features/tegra/platform/patches/0178-ASoC-tegra-Use-dev_err_probe-for-regmap-init-failure.patch
rename to features/tegra/platform/patches/0175-ASoC-tegra-Use-dev_err_probe-for-regmap-init-failure.patch
index ee9827b..a10892f 100644
--- a/features/tegra/platform/patches/0178-ASoC-tegra-Use-dev_err_probe-for-regmap-init-failure.patch
+++ b/features/tegra/platform/patches/0175-ASoC-tegra-Use-dev_err_probe-for-regmap-init-failure.patch
@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Sheetal <sheetal@nvidia.com>
 Date: Wed, 1 Apr 2026 11:24:59 +0000
-Subject: [PATCH 178/196] ASoC: tegra: Use dev_err_probe() for regmap init
+Subject: [PATCH 175/184] ASoC: tegra: Use dev_err_probe() for regmap init
  failures
 
 Use dev_err_probe() for regmap init failures in Tegra audio driver
@@ -13,7 +13,7 @@ Signed-off-by: Mark Brown <broonie@kernel.org>
 (cherry picked from commit 4a8fe27e122e5a1bb1896837ed47f99abaa965a0)
 
 diff --git a/sound/soc/tegra/tegra186_asrc.c b/sound/soc/tegra/tegra186_asrc.c
-index 6ce7ddb788a54..f073166db697f 100644
+index 6ce7ddb788a5..f073166db697 100644
 --- a/sound/soc/tegra/tegra186_asrc.c
 +++ b/sound/soc/tegra/tegra186_asrc.c
 @@ -989,10 +989,9 @@ static int tegra186_asrc_platform_probe(struct platform_device *pdev)
@@ -31,7 +31,7 @@ index 6ce7ddb788a54..f073166db697f 100644
  	asrc->soc_data = of_device_get_match_data(&pdev->dev);
  
 diff --git a/sound/soc/tegra/tegra186_dspk.c b/sound/soc/tegra/tegra186_dspk.c
-index 8f750b8533062..ef0c7ec297a68 100644
+index 8f750b853306..ef0c7ec297a6 100644
 --- a/sound/soc/tegra/tegra186_dspk.c
 +++ b/sound/soc/tegra/tegra186_dspk.c
 @@ -505,10 +505,9 @@ static int tegra186_dspk_platform_probe(struct platform_device *pdev)
@@ -49,7 +49,7 @@ index 8f750b8533062..ef0c7ec297a68 100644
  	regcache_cache_only(dspk->regmap, true);
  
 diff --git a/sound/soc/tegra/tegra210_adx.c b/sound/soc/tegra/tegra210_adx.c
-index be9d2ee74e1f1..a604406c547f7 100644
+index be9d2ee74e1f..a604406c547f 100644
 --- a/sound/soc/tegra/tegra210_adx.c
 +++ b/sound/soc/tegra/tegra210_adx.c
 @@ -697,10 +697,9 @@ static int tegra210_adx_platform_probe(struct platform_device *pdev)
@@ -67,10 +67,10 @@ index be9d2ee74e1f1..a604406c547f7 100644
  	regcache_cache_only(adx->regmap, true);
  
 diff --git a/sound/soc/tegra/tegra210_ahub.c b/sound/soc/tegra/tegra210_ahub.c
-index 92418c17aeac7..ecea0cbfbb1bc 100644
+index 5b7fd1e3f7a1..001f8161eea7 100644
 --- a/sound/soc/tegra/tegra210_ahub.c
 +++ b/sound/soc/tegra/tegra210_ahub.c
-@@ -2275,10 +2275,9 @@ static int tegra_ahub_probe(struct platform_device *pdev)
+@@ -2277,10 +2277,9 @@ static int tegra_ahub_probe(struct platform_device *pdev)
  
  	ahub->regmap = devm_regmap_init_mmio(&pdev->dev, regs,
  					     ahub->soc_data->regmap_config);
@@ -85,7 +85,7 @@ index 92418c17aeac7..ecea0cbfbb1bc 100644
  	regcache_cache_only(ahub->regmap, true);
  
 diff --git a/sound/soc/tegra/tegra210_amx.c b/sound/soc/tegra/tegra210_amx.c
-index 09f800b452ba7..1e8888edf0914 100644
+index 09f800b452ba..1e8888edf091 100644
 --- a/sound/soc/tegra/tegra210_amx.c
 +++ b/sound/soc/tegra/tegra210_amx.c
 @@ -745,10 +745,9 @@ static int tegra210_amx_platform_probe(struct platform_device *pdev)
@@ -103,7 +103,7 @@ index 09f800b452ba7..1e8888edf0914 100644
  	regcache_cache_only(amx->regmap, true);
  
 diff --git a/sound/soc/tegra/tegra210_dmic.c b/sound/soc/tegra/tegra210_dmic.c
-index aa37caee34692..84c7f9e902c71 100644
+index aa37caee3469..84c7f9e902c7 100644
 --- a/sound/soc/tegra/tegra210_dmic.c
 +++ b/sound/soc/tegra/tegra210_dmic.c
 @@ -517,10 +517,9 @@ static int tegra210_dmic_probe(struct platform_device *pdev)
@@ -121,7 +121,7 @@ index aa37caee34692..84c7f9e902c71 100644
  	regcache_cache_only(dmic->regmap, true);
  
 diff --git a/sound/soc/tegra/tegra210_i2s.c b/sound/soc/tegra/tegra210_i2s.c
-index cdaecce744160..c091399d2bac7 100644
+index cdaecce74416..c091399d2bac 100644
 --- a/sound/soc/tegra/tegra210_i2s.c
 +++ b/sound/soc/tegra/tegra210_i2s.c
 @@ -1093,10 +1093,9 @@ static int tegra210_i2s_probe(struct platform_device *pdev)
@@ -139,7 +139,7 @@ index cdaecce744160..c091399d2bac7 100644
  	tegra210_parse_client_convert(dev);
  
 diff --git a/sound/soc/tegra/tegra210_mixer.c b/sound/soc/tegra/tegra210_mixer.c
-index 5ef2a13b31ad1..9066884daac66 100644
+index 5ef2a13b31ad..9066884daac6 100644
 --- a/sound/soc/tegra/tegra210_mixer.c
 +++ b/sound/soc/tegra/tegra210_mixer.c
 @@ -641,10 +641,9 @@ static int tegra210_mixer_platform_probe(struct platform_device *pdev)
@@ -157,7 +157,7 @@ index 5ef2a13b31ad1..9066884daac66 100644
  	regcache_cache_only(mixer->regmap, true);
  
 diff --git a/sound/soc/tegra/tegra210_mvc.c b/sound/soc/tegra/tegra210_mvc.c
-index e36c04a701e59..7c88d2656b5ee 100644
+index e36c04a701e5..7c88d2656b5e 100644
 --- a/sound/soc/tegra/tegra210_mvc.c
 +++ b/sound/soc/tegra/tegra210_mvc.c
 @@ -731,10 +731,9 @@ static int tegra210_mvc_platform_probe(struct platform_device *pdev)
@@ -175,7 +175,7 @@ index e36c04a701e59..7c88d2656b5ee 100644
  	regcache_cache_only(mvc->regmap, true);
  
 diff --git a/sound/soc/tegra/tegra210_sfc.c b/sound/soc/tegra/tegra210_sfc.c
-index 30afea74e066e..68bc39a650124 100644
+index 30afea74e066..68bc39a65012 100644
 --- a/sound/soc/tegra/tegra210_sfc.c
 +++ b/sound/soc/tegra/tegra210_sfc.c
 @@ -3598,10 +3598,9 @@ static int tegra210_sfc_platform_probe(struct platform_device *pdev)
@@ -193,5 +193,5 @@ index 30afea74e066e..68bc39a650124 100644
  	regcache_cache_only(sfc->regmap, true);
  
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/platform/patches/0179-ASoC-tegra-Use-dev_err_probe-in-tegra_asoc_machine-p.patch b/features/tegra/platform/patches/0176-ASoC-tegra-Use-dev_err_probe-in-tegra_asoc_machine-p.patch
similarity index 93%
rename from features/tegra/platform/patches/0179-ASoC-tegra-Use-dev_err_probe-in-tegra_asoc_machine-p.patch
rename to features/tegra/platform/patches/0176-ASoC-tegra-Use-dev_err_probe-in-tegra_asoc_machine-p.patch
index 78d200f..2bec246 100644
--- a/features/tegra/platform/patches/0179-ASoC-tegra-Use-dev_err_probe-in-tegra_asoc_machine-p.patch
+++ b/features/tegra/platform/patches/0176-ASoC-tegra-Use-dev_err_probe-in-tegra_asoc_machine-p.patch
@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Sheetal <sheetal@nvidia.com>
 Date: Wed, 1 Apr 2026 11:25:00 +0000
-Subject: [PATCH 179/196] ASoC: tegra: Use dev_err_probe() in
+Subject: [PATCH 176/184] ASoC: tegra: Use dev_err_probe() in
  tegra_asoc_machine probe
 
 Use dev_err_probe() for clock errors in the tegra_asoc_machine
@@ -13,7 +13,7 @@ Signed-off-by: Mark Brown <broonie@kernel.org>
 (cherry picked from commit b015ef4eaeff76466a359b3f53175fc11502fd8f)
 
 diff --git a/sound/soc/tegra/tegra_asoc_machine.c b/sound/soc/tegra/tegra_asoc_machine.c
-index 02aab4f2389e8..9d05c5faa13b3 100644
+index 02aab4f2389e..9d05c5faa13b 100644
 --- a/sound/soc/tegra/tegra_asoc_machine.c
 +++ b/sound/soc/tegra/tegra_asoc_machine.c
 @@ -591,16 +591,14 @@ int tegra_asoc_machine_probe(struct platform_device *pdev)
@@ -54,5 +54,5 @@ index 02aab4f2389e8..9d05c5faa13b3 100644
  	err = devm_snd_soc_register_card(dev, card);
  	if (err)
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/platform/patches/0180-ASoC-tegra-Add-per-stream-Mixer-Fade-controls.patch b/features/tegra/platform/patches/0177-ASoC-tegra-Add-per-stream-Mixer-Fade-controls.patch
similarity index 98%
rename from features/tegra/platform/patches/0180-ASoC-tegra-Add-per-stream-Mixer-Fade-controls.patch
rename to features/tegra/platform/patches/0177-ASoC-tegra-Add-per-stream-Mixer-Fade-controls.patch
index 3208c1c..f1fb1ab 100644
--- a/features/tegra/platform/patches/0180-ASoC-tegra-Add-per-stream-Mixer-Fade-controls.patch
+++ b/features/tegra/platform/patches/0177-ASoC-tegra-Add-per-stream-Mixer-Fade-controls.patch
@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Sheetal <sheetal@nvidia.com>
 Date: Wed, 6 May 2026 10:20:32 +0000
-Subject: [PATCH 180/196] ASoC: tegra: Add per-stream Mixer Fade controls
+Subject: [PATCH 177/184] ASoC: tegra: Add per-stream Mixer Fade controls
 
 Add per-stream fade controls for the Tegra mixer to allow
 independently configuring target gain and fade duration for each of
@@ -32,7 +32,7 @@ Signed-off-by: Mark Brown <broonie@kernel.org>
 (cherry picked from commit 36645381b864b53ae976221854bbfc23da6abba3)
 
 diff --git a/sound/soc/tegra/tegra210_mixer.c b/sound/soc/tegra/tegra210_mixer.c
-index 9066884daac66..aab414af6d0db 100644
+index 9066884daac6..aab414af6d0d 100644
 --- a/sound/soc/tegra/tegra210_mixer.c
 +++ b/sound/soc/tegra/tegra210_mixer.c
 @@ -151,10 +151,17 @@ static int tegra210_mixer_configure_gain(struct snd_soc_component *cmpnt,
@@ -352,7 +352,7 @@ index 9066884daac66..aab414af6d0db 100644
  	regs = devm_platform_ioremap_resource(pdev, 0);
  	if (IS_ERR(regs))
 diff --git a/sound/soc/tegra/tegra210_mixer.h b/sound/soc/tegra/tegra210_mixer.h
-index a330530fbc613..bcbad08cbb9d3 100644
+index a330530fbc61..bcbad08cbb9d 100644
 --- a/sound/soc/tegra/tegra210_mixer.h
 +++ b/sound/soc/tegra/tegra210_mixer.h
 @@ -79,12 +79,25 @@
@@ -394,5 +394,5 @@ index a330530fbc613..bcbad08cbb9d3 100644
  };
  
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/platform/patches/0181-bus-tegra-aconnect-Use-dev_err_probe-for-probe-error.patch b/features/tegra/platform/patches/0178-bus-tegra-aconnect-Use-dev_err_probe-for-probe-error.patch
similarity index 92%
rename from features/tegra/platform/patches/0181-bus-tegra-aconnect-Use-dev_err_probe-for-probe-error.patch
rename to features/tegra/platform/patches/0178-bus-tegra-aconnect-Use-dev_err_probe-for-probe-error.patch
index cdf17c7..0e3d68c 100644
--- a/features/tegra/platform/patches/0181-bus-tegra-aconnect-Use-dev_err_probe-for-probe-error.patch
+++ b/features/tegra/platform/patches/0178-bus-tegra-aconnect-Use-dev_err_probe-for-probe-error.patch
@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Sheetal <sheetal@nvidia.com>
 Date: Wed, 18 Mar 2026 07:11:29 +0000
-Subject: [PATCH 181/196] bus: tegra-aconnect: Use dev_err_probe for probe
+Subject: [PATCH 178/184] bus: tegra-aconnect: Use dev_err_probe for probe
  error paths
 
 Convert probe error handling to use dev_err_probe() which provides
@@ -13,7 +13,7 @@ Signed-off-by: Thierry Reding <treding@nvidia.com>
 (cherry picked from commit 36df0ef3b4187c69c271af7a1d56f7abb788655e)
 
 diff --git a/drivers/bus/tegra-aconnect.c b/drivers/bus/tegra-aconnect.c
-index 90e3b0a108161..9b2b227332b22 100644
+index 90e3b0a10816..9b2b227332b2 100644
 --- a/drivers/bus/tegra-aconnect.c
 +++ b/drivers/bus/tegra-aconnect.c
 @@ -32,16 +32,14 @@ static int tegra_aconnect_probe(struct platform_device *pdev)
@@ -40,5 +40,5 @@ index 90e3b0a108161..9b2b227332b22 100644
  	dev_set_drvdata(&pdev->dev, aconnect);
  	pm_runtime_enable(&pdev->dev);
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/platform/patches/0182-ASoC-codecs-rt56-Remove-IRQF_ONESHOT.patch b/features/tegra/platform/patches/0179-ASoC-codecs-rt56-Remove-IRQF_ONESHOT.patch
similarity index 93%
rename from features/tegra/platform/patches/0182-ASoC-codecs-rt56-Remove-IRQF_ONESHOT.patch
rename to features/tegra/platform/patches/0179-ASoC-codecs-rt56-Remove-IRQF_ONESHOT.patch
index e5cb70a..c49203c 100644
--- a/features/tegra/platform/patches/0182-ASoC-codecs-rt56-Remove-IRQF_ONESHOT.patch
+++ b/features/tegra/platform/patches/0179-ASoC-codecs-rt56-Remove-IRQF_ONESHOT.patch
@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
 Date: Fri, 23 Jan 2026 12:36:58 +0100
-Subject: [PATCH 182/196] ASoC: codecs: rt56*: Remove IRQF_ONESHOT
+Subject: [PATCH 179/184] ASoC: codecs: rt56*: Remove IRQF_ONESHOT
 
 Passing IRQF_ONESHOT ensures that the interrupt source is masked until
 the secondary (threaded) handler is done. If only a primary handler is
@@ -23,7 +23,7 @@ Link: https://patch.msgid.link/20260123113708.416727-13-bigeasy@linutronix.de
 Signed-off-by: Mark Brown <broonie@kernel.org>
 
 diff --git a/sound/soc/codecs/rt5640.c b/sound/soc/codecs/rt5640.c
-index 7fdc81febc1fa..411300894eff3 100644
+index 7fdc81febc1f..411300894eff 100644
 --- a/sound/soc/codecs/rt5640.c
 +++ b/sound/soc/codecs/rt5640.c
 @@ -2568,7 +2568,7 @@ static void rt5640_enable_jack_detect(struct snd_soc_component *component,
@@ -45,7 +45,7 @@ index 7fdc81febc1fa..411300894eff3 100644
  		dev_warn(component->dev, "Failed to request IRQ %d: %d\n", rt5640->irq, ret);
  		rt5640->jack = NULL;
 diff --git a/sound/soc/codecs/rt5651.c b/sound/soc/codecs/rt5651.c
-index 9eeeba8cd6ffc..d9733195ffa07 100644
+index 9eeeba8cd6ff..d9733195ffa0 100644
 --- a/sound/soc/codecs/rt5651.c
 +++ b/sound/soc/codecs/rt5651.c
 @@ -2259,7 +2259,7 @@ static int rt5651_i2c_probe(struct i2c_client *i2c)
@@ -58,7 +58,7 @@ index 9eeeba8cd6ffc..d9733195ffa07 100644
  		dev_warn(&i2c->dev, "Failed to request IRQ %d: %d\n",
  			 rt5651->irq, ret);
 diff --git a/sound/soc/codecs/rt5663.c b/sound/soc/codecs/rt5663.c
-index 45057562c0c81..380b69a72d06e 100644
+index 45057562c0c8..380b69a72d06 100644
 --- a/sound/soc/codecs/rt5663.c
 +++ b/sound/soc/codecs/rt5663.c
 @@ -3689,8 +3689,8 @@ static int rt5663_i2c_probe(struct i2c_client *i2c)
@@ -73,5 +73,5 @@ index 45057562c0c81..380b69a72d06e 100644
  			dev_err(&i2c->dev, "%s Failed to request IRQ: %d\n",
  				__func__, ret);
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/platform/patches/0183-ASoC-rt5640-Handle-nested-IRQs.patch b/features/tegra/platform/patches/0180-ASoC-rt5640-Handle-nested-IRQs.patch
similarity index 96%
rename from features/tegra/platform/patches/0183-ASoC-rt5640-Handle-nested-IRQs.patch
rename to features/tegra/platform/patches/0180-ASoC-rt5640-Handle-nested-IRQs.patch
index 36f8a59..d52dcf6 100644
--- a/features/tegra/platform/patches/0183-ASoC-rt5640-Handle-nested-IRQs.patch
+++ b/features/tegra/platform/patches/0180-ASoC-rt5640-Handle-nested-IRQs.patch
@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Anupama Kunkulagunta <akunkulagunt@nvidia.com>
 Date: Thu, 7 May 2026 09:44:31 +0000
-Subject: [PATCH 183/196] ASoC: rt5640: Handle nested IRQs
+Subject: [PATCH 180/184] ASoC: rt5640: Handle nested IRQs
 
 On some Tegra platforms, the RT5640 codec interrupt line
 is connected via a GPIO controller that operates as a
@@ -21,7 +21,7 @@ Signed-off-by: Mark Brown <broonie@kernel.org>
 (cherry picked from commit b613e2b4075038501fadc1c2d1a5c2ce0f801655)
 
 diff --git a/sound/soc/codecs/rt5640.c b/sound/soc/codecs/rt5640.c
-index 411300894eff3..650655aeea53f 100644
+index 411300894eff..650655aeea53 100644
 --- a/sound/soc/codecs/rt5640.c
 +++ b/sound/soc/codecs/rt5640.c
 @@ -2552,10 +2552,12 @@ static void rt5640_enable_jack_detect(struct snd_soc_component *component,
@@ -70,5 +70,5 @@ index 411300894eff3..650655aeea53f 100644
  		rt5640->jack = NULL;
  		return;
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/platform/patches/0193-perf-test-parse-events-Use-evsel__match-for-legacy-e.patch b/features/tegra/platform/patches/0181-perf-test-parse-events-Use-evsel__match-for-legacy-e.patch
similarity index 99%
rename from features/tegra/platform/patches/0193-perf-test-parse-events-Use-evsel__match-for-legacy-e.patch
rename to features/tegra/platform/patches/0181-perf-test-parse-events-Use-evsel__match-for-legacy-e.patch
index ef16fa2..16c1c87 100644
--- a/features/tegra/platform/patches/0193-perf-test-parse-events-Use-evsel__match-for-legacy-e.patch
+++ b/features/tegra/platform/patches/0181-perf-test-parse-events-Use-evsel__match-for-legacy-e.patch
@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Ian Rogers <irogers@google.com>
 Date: Sun, 5 Oct 2025 11:24:24 -0700
-Subject: [PATCH 193/196] perf test parse-events: Use evsel__match for legacy
+Subject: [PATCH 181/184] perf test parse-events: Use evsel__match for legacy
  events
 
 Switch from the test's assert_hw/test_config to the common
@@ -17,7 +17,7 @@ Signed-off-by: Namhyung Kim <namhyung@kernel.org>
 (cherry picked from commit ecfcc6a825dfacdb4f3cf38fe4b463396fa0d029)
 
 diff --git a/tools/perf/tests/parse-events.c b/tools/perf/tests/parse-events.c
-index 67550cc60555d..30e5cf124bda6 100644
+index 67550cc60555..30e5cf124bda 100644
 --- a/tools/perf/tests/parse-events.c
 +++ b/tools/perf/tests/parse-events.c
 @@ -155,60 +155,38 @@ static int test__checkevent_numeric(struct evlist *evlist)
@@ -793,5 +793,5 @@ index 67550cc60555d..30e5cf124bda6 100644
  	return TEST_OK;
  }
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/platform/patches/0194-perf-test-parse-events-Without-a-PMU-use-cpu-cycles-.patch b/features/tegra/platform/patches/0182-perf-test-parse-events-Without-a-PMU-use-cpu-cycles-.patch
similarity index 98%
rename from features/tegra/platform/patches/0194-perf-test-parse-events-Without-a-PMU-use-cpu-cycles-.patch
rename to features/tegra/platform/patches/0182-perf-test-parse-events-Without-a-PMU-use-cpu-cycles-.patch
index d78573f..81a253f 100644
--- a/features/tegra/platform/patches/0194-perf-test-parse-events-Without-a-PMU-use-cpu-cycles-.patch
+++ b/features/tegra/platform/patches/0182-perf-test-parse-events-Without-a-PMU-use-cpu-cycles-.patch
@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Ian Rogers <irogers@google.com>
 Date: Sun, 5 Oct 2025 11:24:25 -0700
-Subject: [PATCH 194/196] perf test parse-events: Without a PMU use cpu-cycles
+Subject: [PATCH 182/184] perf test parse-events: Without a PMU use cpu-cycles
  rather than cycles
 
 Without a PMU perf matches an event against any PMU with the
@@ -17,7 +17,7 @@ Signed-off-by: Namhyung Kim <namhyung@kernel.org>
 (cherry picked from commit 2e6dc3b9334cd0d404591009b3d9957edcf2f6cf)
 
 diff --git a/tools/perf/tests/parse-events.c b/tools/perf/tests/parse-events.c
-index 30e5cf124bda6..ff1a2d6edc4aa 100644
+index 30e5cf124bda..ff1a2d6edc4a 100644
 --- a/tools/perf/tests/parse-events.c
 +++ b/tools/perf/tests/parse-events.c
 @@ -585,9 +585,10 @@ static int test__checkevent_pmu(struct evlist *evlist)
@@ -246,5 +246,5 @@ index 30e5cf124bda6..ff1a2d6edc4aa 100644
  		.check = test__checkevent_complex_name,
  		/* 3 */
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/platform/patches/0195-perf-test-parse-events-Remove-cpu-PMU-requirement.patch b/features/tegra/platform/patches/0183-perf-test-parse-events-Remove-cpu-PMU-requirement.patch
similarity index 99%
rename from features/tegra/platform/patches/0195-perf-test-parse-events-Remove-cpu-PMU-requirement.patch
rename to features/tegra/platform/patches/0183-perf-test-parse-events-Remove-cpu-PMU-requirement.patch
index bd1e8fd..cbecc1b 100644
--- a/features/tegra/platform/patches/0195-perf-test-parse-events-Remove-cpu-PMU-requirement.patch
+++ b/features/tegra/platform/patches/0183-perf-test-parse-events-Remove-cpu-PMU-requirement.patch
@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Ian Rogers <irogers@google.com>
 Date: Sun, 5 Oct 2025 11:24:26 -0700
-Subject: [PATCH 195/196] perf test parse-events: Remove cpu PMU requirement
+Subject: [PATCH 183/184] perf test parse-events: Remove cpu PMU requirement
 
 In the event parse string, switch "cpu" to "default_core" and then
 rewrite this to the first core PMU name prior to parsing. This enables
@@ -14,7 +14,7 @@ Tested-by: James Clark <james.clark@linaro.org>
 Signed-off-by: Namhyung Kim <namhyung@kernel.org>
 
 diff --git a/tools/perf/tests/parse-events.c b/tools/perf/tests/parse-events.c
-index ff1a2d6edc4aa..0e5d028a97efe 100644
+index ff1a2d6edc4a..0e5d028a97ef 100644
 --- a/tools/perf/tests/parse-events.c
 +++ b/tools/perf/tests/parse-events.c
 @@ -20,17 +20,24 @@
@@ -581,5 +581,5 @@ index ff1a2d6edc4aa..0e5d028a97efe 100644
  		}
  	}
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/platform/patches/0184-perf-metricgroup-Constify-variables-storing-the-resu.patch b/features/tegra/platform/patches/0184-perf-metricgroup-Constify-variables-storing-the-resu.patch
deleted file mode 100644
index 54d6bda..0000000
--- a/features/tegra/platform/patches/0184-perf-metricgroup-Constify-variables-storing-the-resu.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Arnaldo Carvalho de Melo <acme@redhat.com>
-Date: Tue, 27 Jan 2026 01:15:47 -0300
-Subject: [PATCH 184/196] perf metricgroup: Constify variables storing the
- result of strchr() on const tables
-
-As newer glibcs will propagate the const attribute of the searched table
-to its return.
-
-Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
-(cherry picked from commit b42868624c7d00206f77d19a6fbfea73a44ff6f2)
-
-diff --git a/tools/perf/util/metricgroup.c b/tools/perf/util/metricgroup.c
-index 595b83142d2cc..238c3e605bfe1 100644
---- a/tools/perf/util/metricgroup.c
-+++ b/tools/perf/util/metricgroup.c
-@@ -364,7 +364,7 @@ static int setup_metric_events(const char *pmu, struct hashmap *ids,
- static bool match_metric_or_groups(const char *metric_or_groups, const char *sought)
- {
- 	int len;
--	char *m;
-+	const char *m;
- 
- 	if (!sought)
- 		return false;
-@@ -439,11 +439,10 @@ static const char *code_characters = ",-=@";
- 
- static int encode_metric_id(struct strbuf *sb, const char *x)
- {
--	char *c;
- 	int ret = 0;
- 
- 	for (; *x; x++) {
--		c = strchr(code_characters, *x);
-+		const char *c = strchr(code_characters, *x);
- 		if (c) {
- 			ret = strbuf_addch(sb, '!');
- 			if (ret)
--- 
-2.43.0
-
diff --git a/features/tegra/platform/patches/0196-perf-tools-Use-const-for-variables-receiving-str-str.patch b/features/tegra/platform/patches/0184-perf-tools-Use-const-for-variables-receiving-str-str.patch
similarity index 56%
rename from features/tegra/platform/patches/0196-perf-tools-Use-const-for-variables-receiving-str-str.patch
rename to features/tegra/platform/patches/0184-perf-tools-Use-const-for-variables-receiving-str-str.patch
index 390d9f2..2055bdf 100644
--- a/features/tegra/platform/patches/0196-perf-tools-Use-const-for-variables-receiving-str-str.patch
+++ b/features/tegra/platform/patches/0184-perf-tools-Use-const-for-variables-receiving-str-str.patch
@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Arnaldo Carvalho de Melo <acme@kernel.org>
 Date: Thu, 11 Dec 2025 19:17:55 -0300
-Subject: [PATCH 196/196] perf tools: Use const for variables receiving
+Subject: [PATCH 184/184] perf tools: Use const for variables receiving
  str{str,r?chr}() returns
 
 Newer glibc versions return const char for str{str,chr}() where the
@@ -18,21 +18,8 @@ Link: https://lore.kernel.org/r/20251211221756.96294-4-acme@kernel.org
 Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
 (cherry picked from commit 45718bce7daf39c618188b70a52644bb5a2f968a)
 
-diff --git a/tools/perf/jvmti/libjvmti.c b/tools/perf/jvmti/libjvmti.c
-index 82514e6532b8c..87bfd4781003a 100644
---- a/tools/perf/jvmti/libjvmti.c
-+++ b/tools/perf/jvmti/libjvmti.c
-@@ -142,7 +142,7 @@ copy_class_filename(const char * class_sign, const char * file_name, char * resu
- 	*/
- 	if (*class_sign == 'L') {
- 		size_t j, i = 0;
--		char *p = strrchr(class_sign, '/');
-+		const char *p = strrchr(class_sign, '/');
- 		if (p) {
- 			/* drop the 'L' prefix and copy up to the final '/' */
- 			for (i = 0; i < (size_t)(p - class_sign); i++)
 diff --git a/tools/perf/tests/parse-events.c b/tools/perf/tests/parse-events.c
-index 0e5d028a97efe..a537883b2e8d9 100644
+index 0e5d028a97ef..a537883b2e8d 100644
 --- a/tools/perf/tests/parse-events.c
 +++ b/tools/perf/tests/parse-events.c
 @@ -2416,8 +2416,8 @@ static int test_events(const struct evlist_test *events, int cnt)
@@ -46,20 +33,6 @@ index 0e5d028a97efe..a537883b2e8d9 100644
  
  		while ((end = strstr(pos, "default_core"))) {
  			size_t len = end - pos;
-diff --git a/tools/perf/util/evlist.c b/tools/perf/util/evlist.c
-index 80d8387e6b97b..ef22d72b34339 100644
---- a/tools/perf/util/evlist.c
-+++ b/tools/perf/util/evlist.c
-@@ -1936,7 +1936,8 @@ static int evlist__parse_control_fifo(const char *str, int *ctl_fd, int *ctl_fd_
- 
- int evlist__parse_control(const char *str, int *ctl_fd, int *ctl_fd_ack, bool *ctl_fd_close)
- {
--	char *comma = NULL, *endptr = NULL;
-+	const char *comma = NULL;
-+	char *endptr = NULL;
- 
- 	*ctl_fd_close = false;
- 
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/platform/patches/0185-perf-strlist-Don-t-write-to-const-memory.patch b/features/tegra/platform/patches/0185-perf-strlist-Don-t-write-to-const-memory.patch
deleted file mode 100644
index 533b9aa..0000000
--- a/features/tegra/platform/patches/0185-perf-strlist-Don-t-write-to-const-memory.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Arnaldo Carvalho de Melo <acme@redhat.com>
-Date: Tue, 27 Jan 2026 02:03:01 -0300
-Subject: [PATCH 185/196] perf strlist: Don't write to const memory
-
-Do a strdup to the list string and parse from it, free at the end.
-
-This is to deal with newer glibcs const-correctness.
-
-Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
-(cherry picked from commit 678ed6b707e4b2db250f255d2f959322896dae65)
-
-diff --git a/tools/perf/util/strlist.c b/tools/perf/util/strlist.c
-index 8a868cbeffae2..98883672fcf47 100644
---- a/tools/perf/util/strlist.c
-+++ b/tools/perf/util/strlist.c
-@@ -139,21 +139,25 @@ static int strlist__parse_list_entry(struct strlist *slist, const char *s,
- 	return err;
- }
- 
--static int strlist__parse_list(struct strlist *slist, const char *s, const char *subst_dir)
-+static int strlist__parse_list(struct strlist *slist, const char *list, const char *subst_dir)
- {
--	char *sep;
-+	char *sep, *s = strdup(list), *sdup = s;
- 	int err;
- 
-+	if (s == NULL)
-+		return -ENOMEM;
-+
- 	while ((sep = strchr(s, ',')) != NULL) {
- 		*sep = '\0';
- 		err = strlist__parse_list_entry(slist, s, subst_dir);
--		*sep = ',';
- 		if (err != 0)
- 			return err;
- 		s = sep + 1;
- 	}
- 
--	return *s ? strlist__parse_list_entry(slist, s, subst_dir) : 0;
-+	err = *s ? strlist__parse_list_entry(slist, s, subst_dir) : 0;
-+	free(sdup);
-+	return err;
- }
- 
- struct strlist *strlist__new(const char *list, const struct strlist_config *config)
--- 
-2.43.0
-
diff --git a/features/tegra/platform/patches/0186-perf-session-Don-t-write-to-memory-pointed-to-a-cons.patch b/features/tegra/platform/patches/0186-perf-session-Don-t-write-to-memory-pointed-to-a-cons.patch
deleted file mode 100644
index 2cf280d..0000000
--- a/features/tegra/platform/patches/0186-perf-session-Don-t-write-to-memory-pointed-to-a-cons.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Arnaldo Carvalho de Melo <acme@redhat.com>
-Date: Tue, 27 Jan 2026 02:09:37 -0300
-Subject: [PATCH 186/196] perf session: Don't write to memory pointed to a
- const pointer
-
-Since it is freshly allocated just attribute it to a non-const pointer
-and then change it via that pointer.
-
-That way we avoid const-correctness warnings in recent glibc versions.
-
-Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
-(cherry picked from commit f1321cce848c558fde4c0c6bcd5e53f3cefd3af2)
-
-diff --git a/tools/perf/util/session.c b/tools/perf/util/session.c
-index 09af486c83e4f..4500a0575e597 100644
---- a/tools/perf/util/session.c
-+++ b/tools/perf/util/session.c
-@@ -2473,7 +2473,7 @@ bool perf_session__has_switch_events(struct perf_session *session)
- 
- int map__set_kallsyms_ref_reloc_sym(struct map *map, const char *symbol_name, u64 addr)
- {
--	char *bracket;
-+	char *bracket, *name;
- 	struct ref_reloc_sym *ref;
- 	struct kmap *kmap;
- 
-@@ -2481,13 +2481,13 @@ int map__set_kallsyms_ref_reloc_sym(struct map *map, const char *symbol_name, u6
- 	if (ref == NULL)
- 		return -ENOMEM;
- 
--	ref->name = strdup(symbol_name);
-+	ref->name = name = strdup(symbol_name);
- 	if (ref->name == NULL) {
- 		free(ref);
- 		return -ENOMEM;
- 	}
- 
--	bracket = strchr(ref->name, ']');
-+	bracket = strchr(name, ']');
- 	if (bracket)
- 		*bracket = '\0';
- 
--- 
-2.43.0
-
diff --git a/features/tegra/platform/patches/0187-perf-trace-event-Constify-variables-storing-the-resu.patch b/features/tegra/platform/patches/0187-perf-trace-event-Constify-variables-storing-the-resu.patch
deleted file mode 100644
index 4f4e556..0000000
--- a/features/tegra/platform/patches/0187-perf-trace-event-Constify-variables-storing-the-resu.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Arnaldo Carvalho de Melo <acme@redhat.com>
-Date: Tue, 27 Jan 2026 01:15:47 -0300
-Subject: [PATCH 187/196] perf trace-event: Constify variables storing the
- result of strchr() on const tables
-
-As newer glibcs will propagate the const attribute of the searched table
-to its return.
-
-Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
-(cherry picked from commit 97b81df7225830c4db3c17ed1235d2f3eb613d3d)
-
-diff --git a/tools/perf/util/trace-event-info.c b/tools/perf/util/trace-event-info.c
-index c8755679281eb..45774722f2492 100644
---- a/tools/perf/util/trace-event-info.c
-+++ b/tools/perf/util/trace-event-info.c
-@@ -482,7 +482,7 @@ char *tracepoint_id_to_name(u64 config)
- static struct tracepoint_path *tracepoint_name_to_path(const char *name)
- {
- 	struct tracepoint_path *path = zalloc(sizeof(*path));
--	char *str = strchr(name, ':');
-+	const char *str = strchr(name, ':');
- 
- 	if (path == NULL || str == NULL) {
- 		free(path);
--- 
-2.43.0
-
diff --git a/features/tegra/platform/patches/0188-perf-units-Constify-variables-storing-the-result-of-.patch b/features/tegra/platform/patches/0188-perf-units-Constify-variables-storing-the-result-of-.patch
deleted file mode 100644
index 84819aa..0000000
--- a/features/tegra/platform/patches/0188-perf-units-Constify-variables-storing-the-result-of-.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Arnaldo Carvalho de Melo <acme@redhat.com>
-Date: Tue, 27 Jan 2026 01:15:47 -0300
-Subject: [PATCH 188/196] perf units: Constify variables storing the result of
- strchr() on const tables
-
-As newer glibcs will propagate the const attribute of the searched table
-to its return.
-
-Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
-(cherry picked from commit 0e14cb3b24f8f301cf6490a4493afc98321ed5bb)
-
-diff --git a/tools/perf/util/units.c b/tools/perf/util/units.c
-index 4c6a86e1cb54b..0bbacf5a29aaf 100644
---- a/tools/perf/util/units.c
-+++ b/tools/perf/util/units.c
-@@ -12,7 +12,7 @@ unsigned long parse_tag_value(const char *str, struct parse_tag *tags)
- 	struct parse_tag *i = tags;
- 
- 	while (i->tag) {
--		char *s = strchr(str, i->tag);
-+		const char *s = strchr(str, i->tag);
- 
- 		if (s) {
- 			unsigned long int value;
--- 
-2.43.0
-
diff --git a/features/tegra/platform/patches/0189-perf-time-utils-Constify-variables-storing-the-resul.patch b/features/tegra/platform/patches/0189-perf-time-utils-Constify-variables-storing-the-resul.patch
deleted file mode 100644
index bc43d06..0000000
--- a/features/tegra/platform/patches/0189-perf-time-utils-Constify-variables-storing-the-resul.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Arnaldo Carvalho de Melo <acme@redhat.com>
-Date: Tue, 27 Jan 2026 01:15:47 -0300
-Subject: [PATCH 189/196] perf time-utils: Constify variables storing the
- result of strchr() on const tables
-
-As newer glibcs will propagate the const attribute of the searched table
-to its return.
-
-Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
-(cherry picked from commit 21c0bc9144834e39762dd6fddbb255ebb80cf079)
-
-diff --git a/tools/perf/util/time-utils.c b/tools/perf/util/time-utils.c
-index 1b91ccd4d5234..d43c4577d7ebc 100644
---- a/tools/perf/util/time-utils.c
-+++ b/tools/perf/util/time-utils.c
-@@ -325,7 +325,7 @@ static int percent_comma_split(struct perf_time_interval *ptime_buf, int num,
- }
- 
- static int one_percent_convert(struct perf_time_interval *ptime_buf,
--			       const char *ostr, u64 start, u64 end, char *c)
-+			       const char *ostr, u64 start, u64 end, const char *c)
- {
- 	char *str;
- 	int len = strlen(ostr), ret;
-@@ -358,7 +358,7 @@ static int one_percent_convert(struct perf_time_interval *ptime_buf,
- int perf_time__percent_parse_str(struct perf_time_interval *ptime_buf, int num,
- 				 const char *ostr, u64 start, u64 end)
- {
--	char *c;
-+	const char *c;
- 
- 	/*
- 	 * ostr example:
--- 
-2.43.0
-
diff --git a/features/tegra/platform/patches/0190-perf-demangle-java-Constify-variables-storing-the-re.patch b/features/tegra/platform/patches/0190-perf-demangle-java-Constify-variables-storing-the-re.patch
deleted file mode 100644
index 27f9252..0000000
--- a/features/tegra/platform/patches/0190-perf-demangle-java-Constify-variables-storing-the-re.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Arnaldo Carvalho de Melo <acme@redhat.com>
-Date: Tue, 27 Jan 2026 01:15:47 -0300
-Subject: [PATCH 190/196] perf demangle-java: Constify variables storing the
- result of strchr() on const tables
-
-As newer glibcs will propagate the const attribute of the searched table
-to its return.
-
-Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
-(cherry picked from commit 79bba3a1834e7ba6c437674582cc9f3ae6fb638c)
-
-diff --git a/tools/perf/util/demangle-java.c b/tools/perf/util/demangle-java.c
-index ddf33d58bcd35..c3cb327ed5623 100644
---- a/tools/perf/util/demangle-java.c
-+++ b/tools/perf/util/demangle-java.c
-@@ -158,7 +158,7 @@ char *
- java_demangle_sym(const char *str, int flags)
- {
- 	char *buf, *ptr;
--	char *p;
-+	const char *p;
- 	size_t len, l1 = 0;
- 
- 	if (!str)
--- 
-2.43.0
-
diff --git a/features/tegra/platform/patches/0191-perf-bpf-event-Constify-variables-storing-the-result.patch b/features/tegra/platform/patches/0191-perf-bpf-event-Constify-variables-storing-the-result.patch
deleted file mode 100644
index 87b3dd8..0000000
--- a/features/tegra/platform/patches/0191-perf-bpf-event-Constify-variables-storing-the-result.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Arnaldo Carvalho de Melo <acme@redhat.com>
-Date: Tue, 27 Jan 2026 01:15:47 -0300
-Subject: [PATCH 191/196] perf bpf-event: Constify variables storing the result
- of strchr() on const tables
-
-As newer glibcs will propagate the const attribute of the searched table
-to its return.
-
-Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
-(cherry picked from commit 8bf093acb3f1f07d846c86e32308f9f9954ed579)
-
-diff --git a/tools/perf/util/bpf-event.c b/tools/perf/util/bpf-event.c
-index 2298cd396c423..3673d1bb4c23d 100644
---- a/tools/perf/util/bpf-event.c
-+++ b/tools/perf/util/bpf-event.c
-@@ -733,7 +733,8 @@ kallsyms_process_symbol(void *data, const char *_name,
- 			char type __maybe_unused, u64 start)
- {
- 	char disp[KSYM_NAME_LEN];
--	char *module, *name;
-+	const char *module;
-+	char *name;
- 	unsigned long id;
- 	int err = 0;
- 
--- 
-2.43.0
-
diff --git a/features/tegra/platform/patches/0192-perf-jitdump-Constify-variables-storing-the-result-o.patch b/features/tegra/platform/patches/0192-perf-jitdump-Constify-variables-storing-the-result-o.patch
deleted file mode 100644
index ceb3b46..0000000
--- a/features/tegra/platform/patches/0192-perf-jitdump-Constify-variables-storing-the-result-o.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Arnaldo Carvalho de Melo <acme@redhat.com>
-Date: Tue, 27 Jan 2026 01:15:47 -0300
-Subject: [PATCH 192/196] perf jitdump: Constify variables storing the result
- of strchr() on const tables
-
-As newer glibcs will propagate the const attribute of the searched table
-to its return.
-
-Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
-(cherry picked from commit 68abacb0686651dd3f0bbce2fa94b438afeb2fc4)
-
-diff --git a/tools/perf/util/jitdump.c b/tools/perf/util/jitdump.c
-index b062b1f234b62..28d32e3cfdba9 100644
---- a/tools/perf/util/jitdump.c
-+++ b/tools/perf/util/jitdump.c
-@@ -754,7 +754,7 @@ jit_inject(struct jit_buf_desc *jd, const char *path)
- static int
- jit_detect(const char *mmap_name, pid_t pid, struct nsinfo *nsi, bool *in_pidns)
-  {
--	char *p;
-+	const char *p;
- 	char *end = NULL;
- 	pid_t pid2;
- 
--- 
-2.43.0
-
diff --git a/features/tegra/sauce/patches/0001-NVIDIA-SAUCE-crypto-tcrypt-Changes-to-support-NVIDIA.patch b/features/tegra/sauce/patches/0001-NVIDIA-SAUCE-crypto-tcrypt-Changes-to-support-NVIDIA.patch
index e6153fd..672cfb7 100644
--- a/features/tegra/sauce/patches/0001-NVIDIA-SAUCE-crypto-tcrypt-Changes-to-support-NVIDIA.patch
+++ b/features/tegra/sauce/patches/0001-NVIDIA-SAUCE-crypto-tcrypt-Changes-to-support-NVIDIA.patch
@@ -20,7 +20,7 @@ Reviewed-by: Laxman Dewangan <ldewangan@nvidia.com>
 Tested-by: Prathamesh Shete <pshete@nvidia.com>
 
 diff --git a/crypto/Kconfig b/crypto/Kconfig
-index a04595f9d0ca4..a6f4f086df73f 100644
+index a04595f9d0ca..a6f4f086df73 100644
 --- a/crypto/Kconfig
 +++ b/crypto/Kconfig
 @@ -204,6 +204,12 @@ config CRYPTO_SELFTESTS_FULL
@@ -37,7 +37,7 @@ index a04595f9d0ca4..a6f4f086df73f 100644
  	tristate "Null algorithms"
  	select CRYPTO_ALGAPI
 diff --git a/crypto/tcrypt.c b/crypto/tcrypt.c
-index d1d88debbd71e..e86d1470227cc 100644
+index d1d88debbd71..e86d1470227c 100644
 --- a/crypto/tcrypt.c
 +++ b/crypto/tcrypt.c
 @@ -1523,8 +1523,10 @@ static int do_test(const char *alg, u32 type, u32 mask, int m, u32 num_mb)
@@ -52,7 +52,7 @@ index d1d88debbd71e..e86d1470227cc 100644
  
  	case 11:
 diff --git a/crypto/testmgr.c b/crypto/testmgr.c
-index 6a490aaa71b9a..1a48dd9750b76 100644
+index 6a490aaa71b9..1a48dd9750b7 100644
 --- a/crypto/testmgr.c
 +++ b/crypto/testmgr.c
 @@ -58,7 +58,7 @@ MODULE_PARM_DESC(fuzz_iterations, "number of fuzz test iterations");
@@ -159,7 +159,7 @@ index 6a490aaa71b9a..1a48dd9750b76 100644
  		.alg = "ghash",
  		.test = alg_test_hash,
 diff --git a/crypto/testmgr.h b/crypto/testmgr.h
-index 2682312272824..7a74ab184d298 100644
+index 268231227282..7a74ab184d29 100644
 --- a/crypto/testmgr.h
 +++ b/crypto/testmgr.h
 @@ -7,6 +7,7 @@
@@ -436,5 +436,5 @@ index 2682312272824..7a74ab184d298 100644
  };
  
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/sauce/patches/0002-NVIDIA-SAUCE-crypto-Skip-lrw-aes-in-tcrypt.patch b/features/tegra/sauce/patches/0002-NVIDIA-SAUCE-crypto-Skip-lrw-aes-in-tcrypt.patch
index f440c9a..d732e8f 100644
--- a/features/tegra/sauce/patches/0002-NVIDIA-SAUCE-crypto-Skip-lrw-aes-in-tcrypt.patch
+++ b/features/tegra/sauce/patches/0002-NVIDIA-SAUCE-crypto-Skip-lrw-aes-in-tcrypt.patch
@@ -13,7 +13,7 @@ GVS: Gerrit_Virtual_Submit <buildbot_gerritrpt@nvidia.com>
 Reviewed-by: Laxman Dewangan <ldewangan@nvidia.com>
 
 diff --git a/crypto/tcrypt.c b/crypto/tcrypt.c
-index e86d1470227cc..41916804efef8 100644
+index e86d1470227c..41916804efef 100644
 --- a/crypto/tcrypt.c
 +++ b/crypto/tcrypt.c
 @@ -1520,10 +1520,10 @@ static int do_test(const char *alg, u32 type, u32 mask, int m, u32 num_mb)
@@ -38,5 +38,5 @@ index e86d1470227cc..41916804efef8 100644
  
  	/* We intentionaly return -EAGAIN to prevent keeping the module,
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/sauce/patches/0003-NVIDIA-SAUCE-bluetooth-usb-Blacklist-8822CE-modules.patch b/features/tegra/sauce/patches/0003-NVIDIA-SAUCE-bluetooth-usb-Blacklist-8822CE-modules.patch
index 6d5d563..02a2e76 100644
--- a/features/tegra/sauce/patches/0003-NVIDIA-SAUCE-bluetooth-usb-Blacklist-8822CE-modules.patch
+++ b/features/tegra/sauce/patches/0003-NVIDIA-SAUCE-bluetooth-usb-Blacklist-8822CE-modules.patch
@@ -20,7 +20,7 @@ Reviewed-by: Bitan Biswas <bbiswas@nvidia.com>
 GVS: Gerrit_Virtual_Submit <buildbot_gerritrpt@nvidia.com>
 
 diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c
-index b9e5adecfed60..6dfe2e7d54cb9 100644
+index fea3cb502a4e..02d08313d389 100644
 --- a/drivers/bluetooth/btusb.c
 +++ b/drivers/bluetooth/btusb.c
 @@ -823,8 +823,8 @@ static const struct usb_device_id quirks_table[] = {
@@ -35,5 +35,5 @@ index b9e5adecfed60..6dfe2e7d54cb9 100644
  						     BTUSB_WIDEBAND_SPEECH },
  	{ USB_DEVICE(0x13d3, 0x3555), .driver_info = BTUSB_REALTEK |
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/sauce/patches/0004-NVIDIA-SAUCE-bt_usb-Disable-RTL8852CE-upstream-drive.patch b/features/tegra/sauce/patches/0004-NVIDIA-SAUCE-bt_usb-Disable-RTL8852CE-upstream-drive.patch
index 213c058..0eb7d37 100644
--- a/features/tegra/sauce/patches/0004-NVIDIA-SAUCE-bt_usb-Disable-RTL8852CE-upstream-drive.patch
+++ b/features/tegra/sauce/patches/0004-NVIDIA-SAUCE-bt_usb-Disable-RTL8852CE-upstream-drive.patch
@@ -19,7 +19,7 @@ GVS: buildbot_gerritrpt <buildbot_gerritrpt@nvidia.com>
 (cherry picked from commit 4fd847e5fc26bf6386537abf11ed797162418cb4)
 
 diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c
-index 6dfe2e7d54cb9..1d3810849189d 100644
+index 02d08313d389..a3263c326137 100644
 --- a/drivers/bluetooth/btusb.c
 +++ b/drivers/bluetooth/btusb.c
 @@ -559,8 +559,7 @@ static const struct usb_device_id quirks_table[] = {
@@ -33,5 +33,5 @@ index 6dfe2e7d54cb9..1d3810849189d 100644
  						     BTUSB_WIDEBAND_SPEECH },
  	{ USB_DEVICE(0x13d3, 0x3612), .driver_info = BTUSB_REALTEK |
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/sauce/patches/0005-NVIDIA-SAUCE-bluetooth-usb-disable-8822CE-modules.patch b/features/tegra/sauce/patches/0005-NVIDIA-SAUCE-bluetooth-usb-disable-8822CE-modules.patch
index 8ee7303..a7b6681 100644
--- a/features/tegra/sauce/patches/0005-NVIDIA-SAUCE-bluetooth-usb-disable-8822CE-modules.patch
+++ b/features/tegra/sauce/patches/0005-NVIDIA-SAUCE-bluetooth-usb-disable-8822CE-modules.patch
@@ -17,7 +17,7 @@ Reviewed-by: Revanth Kumar Uppala <ruppala@nvidia.com>
 (cherry picked from commit f672a3817b827a131011dac4ed5ae6f6904eef90)
 
 diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c
-index 1d3810849189d..2cd6f7e8a2627 100644
+index a3263c326137..0039e409e5a7 100644
 --- a/drivers/bluetooth/btusb.c
 +++ b/drivers/bluetooth/btusb.c
 @@ -510,12 +510,10 @@ static const struct usb_device_id quirks_table[] = {
@@ -36,5 +36,5 @@ index 1d3810849189d..2cd6f7e8a2627 100644
  	/* Realtek 8851BE Bluetooth devices */
  	{ USB_DEVICE(0x0bda, 0xb850), .driver_info = BTUSB_REALTEK },
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/sauce/patches/0006-NVIDIA-SAUCE-clk-tegra-make-nocache-for-clocks.patch b/features/tegra/sauce/patches/0006-NVIDIA-SAUCE-clk-tegra-make-nocache-for-clocks.patch
index 0733bf9..4624a5c 100644
--- a/features/tegra/sauce/patches/0006-NVIDIA-SAUCE-clk-tegra-make-nocache-for-clocks.patch
+++ b/features/tegra/sauce/patches/0006-NVIDIA-SAUCE-clk-tegra-make-nocache-for-clocks.patch
@@ -26,7 +26,7 @@ GVS: buildbot_gerritrpt <buildbot_gerritrpt@nvidia.com>
 (cherry picked from commit 8606cfa1ad8545187eb7e3431b57adfe58ac447f)
 
 diff --git a/drivers/clk/tegra/clk-bpmp.c b/drivers/clk/tegra/clk-bpmp.c
-index 8bf469639c607..10d33004f9d3c 100644
+index 8bf469639c60..10d33004f9d3 100644
 --- a/drivers/clk/tegra/clk-bpmp.c
 +++ b/drivers/clk/tegra/clk-bpmp.c
 @@ -1,6 +1,6 @@
@@ -46,5 +46,5 @@ index 8bf469639c607..10d33004f9d3c 100644
  	err = devm_clk_hw_register(bpmp->dev, &clk->hw);
  
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/sauce/patches/0007-NVIDIA-SAUCE-clocksource-timer-tegra186-adjust-WDT-t.patch b/features/tegra/sauce/patches/0007-NVIDIA-SAUCE-clocksource-timer-tegra186-adjust-WDT-t.patch
index b4b8ba8..56a9e3c 100644
--- a/features/tegra/sauce/patches/0007-NVIDIA-SAUCE-clocksource-timer-tegra186-adjust-WDT-t.patch
+++ b/features/tegra/sauce/patches/0007-NVIDIA-SAUCE-clocksource-timer-tegra186-adjust-WDT-t.patch
@@ -22,7 +22,7 @@ Reviewed-by: Jon Hunter <jonathanh@nvidia.com>
 (cherry picked from commit c8d6529832fafbcc8a80535302597404b9488714)
 
 diff --git a/drivers/clocksource/timer-tegra186.c b/drivers/clocksource/timer-tegra186.c
-index bfe16d2d5104e..e05dd5477fcd7 100644
+index bfe16d2d5104..e05dd5477fcd 100644
 --- a/drivers/clocksource/timer-tegra186.c
 +++ b/drivers/clocksource/timer-tegra186.c
 @@ -506,8 +506,9 @@ static int __maybe_unused tegra186_timer_resume(struct device *dev)
@@ -38,5 +38,5 @@ index bfe16d2d5104e..e05dd5477fcd7 100644
  static const struct tegra186_timer_soc tegra186_timer = {
  	.num_timers = 10,
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/sauce/patches/0008-NVIDIA-SAUCE-clocksource-timer-tegra186-Enable-WDT-a.patch b/features/tegra/sauce/patches/0008-NVIDIA-SAUCE-clocksource-timer-tegra186-Enable-WDT-a.patch
index e1f0a87..0b41863 100644
--- a/features/tegra/sauce/patches/0008-NVIDIA-SAUCE-clocksource-timer-tegra186-Enable-WDT-a.patch
+++ b/features/tegra/sauce/patches/0008-NVIDIA-SAUCE-clocksource-timer-tegra186-Enable-WDT-a.patch
@@ -35,7 +35,7 @@ GVS: buildbot_gerritrpt <buildbot_gerritrpt@nvidia.com>
 (cherry picked from commit f1b86419ed688791d0c116a701319d288ab3e84c)
 
 diff --git a/drivers/clocksource/timer-tegra186.c b/drivers/clocksource/timer-tegra186.c
-index e05dd5477fcd7..36bb08825c5ca 100644
+index e05dd5477fcd..36bb08825c5c 100644
 --- a/drivers/clocksource/timer-tegra186.c
 +++ b/drivers/clocksource/timer-tegra186.c
 @@ -57,6 +57,8 @@
@@ -145,5 +145,5 @@ index e05dd5477fcd7..36bb08825c5ca 100644
  
  unregister_osc:
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/sauce/patches/0009-NVIDIA-SAUCE-bpmp-stop-mounting-bpmp-debugfs-on-vdk.patch b/features/tegra/sauce/patches/0009-NVIDIA-SAUCE-bpmp-stop-mounting-bpmp-debugfs-on-vdk.patch
index fb59cba..27ee714 100644
--- a/features/tegra/sauce/patches/0009-NVIDIA-SAUCE-bpmp-stop-mounting-bpmp-debugfs-on-vdk.patch
+++ b/features/tegra/sauce/patches/0009-NVIDIA-SAUCE-bpmp-stop-mounting-bpmp-debugfs-on-vdk.patch
@@ -16,7 +16,7 @@ Tested-by: Kartik Rajput <kkartik@nvidia.com>
 Reviewed-by: Kartik Rajput <kkartik@nvidia.com>
 
 diff --git a/drivers/firmware/tegra/bpmp.c b/drivers/firmware/tegra/bpmp.c
-index e74bba7ccc443..af1144619acc4 100644
+index e74bba7ccc44..af1144619acc 100644
 --- a/drivers/firmware/tegra/bpmp.c
 +++ b/drivers/firmware/tegra/bpmp.c
 @@ -17,6 +17,7 @@
@@ -43,5 +43,5 @@ index e74bba7ccc443..af1144619acc4 100644
  	return 0;
  
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/sauce/patches/0010-NVIDIA-SAUCE-mailbox-tegra-hsp-add-support-for-multi.patch b/features/tegra/sauce/patches/0010-NVIDIA-SAUCE-mailbox-tegra-hsp-add-support-for-multi.patch
index 24e5766..868dbf9 100644
--- a/features/tegra/sauce/patches/0010-NVIDIA-SAUCE-mailbox-tegra-hsp-add-support-for-multi.patch
+++ b/features/tegra/sauce/patches/0010-NVIDIA-SAUCE-mailbox-tegra-hsp-add-support-for-multi.patch
@@ -20,7 +20,7 @@ Tested-by: Abhilash G <abhilashg@nvidia.com>
 Reviewed-by: Abhilash G <abhilashg@nvidia.com>
 
 diff --git a/drivers/mailbox/tegra-hsp.c b/drivers/mailbox/tegra-hsp.c
-index 7991e8dba579f..d80ef4aebabc6 100644
+index 7991e8dba579..d80ef4aebabc 100644
 --- a/drivers/mailbox/tegra-hsp.c
 +++ b/drivers/mailbox/tegra-hsp.c
 @@ -73,8 +73,15 @@ struct tegra_hsp_sm_ops {
@@ -291,5 +291,5 @@ index 7991e8dba579f..d80ef4aebabc6 100644
  			}
  
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/sauce/patches/0011-NVIDIA-SAUCE-mailbox-tegra-hsp-Add-sm-ops-route_irq-.patch b/features/tegra/sauce/patches/0011-NVIDIA-SAUCE-mailbox-tegra-hsp-Add-sm-ops-route_irq-.patch
index e014252..8989aa5 100644
--- a/features/tegra/sauce/patches/0011-NVIDIA-SAUCE-mailbox-tegra-hsp-Add-sm-ops-route_irq-.patch
+++ b/features/tegra/sauce/patches/0011-NVIDIA-SAUCE-mailbox-tegra-hsp-Add-sm-ops-route_irq-.patch
@@ -47,7 +47,7 @@ Tested-by: Laxman Dewangan <ldewangan@nvidia.com>
 GVS: Gerrit_Virtual_Submit <buildbot_gerritrpt@nvidia.com>
 
 diff --git a/drivers/mailbox/tegra-hsp.c b/drivers/mailbox/tegra-hsp.c
-index d80ef4aebabc6..4376f936cc82e 100644
+index d80ef4aebabc..4376f936cc82 100644
 --- a/drivers/mailbox/tegra-hsp.c
 +++ b/drivers/mailbox/tegra-hsp.c
 @@ -51,6 +51,7 @@
@@ -293,5 +293,5 @@ index d80ef4aebabc6..4376f936cc82e 100644
  	.reg_stride = 0x100,
  	.si_shift = 16,
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/sauce/patches/0012-NVIDIA-SAUCE-mailbox-tegra-hsp-Add-support-for-virtu.patch b/features/tegra/sauce/patches/0012-NVIDIA-SAUCE-mailbox-tegra-hsp-Add-support-for-virtu.patch
index 1f043a0..09a73b5 100644
--- a/features/tegra/sauce/patches/0012-NVIDIA-SAUCE-mailbox-tegra-hsp-Add-support-for-virtu.patch
+++ b/features/tegra/sauce/patches/0012-NVIDIA-SAUCE-mailbox-tegra-hsp-Add-support-for-virtu.patch
@@ -25,7 +25,7 @@ Tested-by: Laxman Dewangan <ldewangan@nvidia.com>
 GVS: Gerrit_Virtual_Submit <buildbot_gerritrpt@nvidia.com>
 
 diff --git a/drivers/mailbox/tegra-hsp.c b/drivers/mailbox/tegra-hsp.c
-index 4376f936cc82e..f89ed6d0646df 100644
+index 4376f936cc82..f89ed6d0646d 100644
 --- a/drivers/mailbox/tegra-hsp.c
 +++ b/drivers/mailbox/tegra-hsp.c
 @@ -115,6 +115,7 @@ struct tegra_hsp_soc {
@@ -149,5 +149,5 @@ index 4376f936cc82e..f89ed6d0646df 100644
  };
  
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/sauce/patches/0013-NVIDIA-SAUCE-mailbox-tegra-hsp-Add-virtualization-su.patch b/features/tegra/sauce/patches/0013-NVIDIA-SAUCE-mailbox-tegra-hsp-Add-virtualization-su.patch
index a187704..7645a14 100644
--- a/features/tegra/sauce/patches/0013-NVIDIA-SAUCE-mailbox-tegra-hsp-Add-virtualization-su.patch
+++ b/features/tegra/sauce/patches/0013-NVIDIA-SAUCE-mailbox-tegra-hsp-Add-virtualization-su.patch
@@ -10,7 +10,7 @@ Change-Id: I8e5de37cf0f1e73aa1ea00e42f6c90ddc304e586
 Signed-off-by: Kartik <kkartik@nvidia.com>
 
 diff --git a/drivers/mailbox/tegra-hsp.c b/drivers/mailbox/tegra-hsp.c
-index f89ed6d0646df..4abcf77ae22b7 100644
+index f89ed6d0646d..4abcf77ae22b 100644
 --- a/drivers/mailbox/tegra-hsp.c
 +++ b/drivers/mailbox/tegra-hsp.c
 @@ -1149,12 +1149,31 @@ static const struct tegra_hsp_soc tegra234_hv_hsp_soc = {
@@ -46,5 +46,5 @@ index f89ed6d0646df..4abcf77ae22b7 100644
  };
  
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/sauce/patches/0014-NVIDIA-SAUCE-mailbox-tegra-hsp-Do-not-clear-interrup.patch b/features/tegra/sauce/patches/0014-NVIDIA-SAUCE-mailbox-tegra-hsp-Do-not-clear-interrup.patch
index 5d2366d..eb4bf71 100644
--- a/features/tegra/sauce/patches/0014-NVIDIA-SAUCE-mailbox-tegra-hsp-Do-not-clear-interrup.patch
+++ b/features/tegra/sauce/patches/0014-NVIDIA-SAUCE-mailbox-tegra-hsp-Do-not-clear-interrup.patch
@@ -23,7 +23,7 @@ Reviewed-by: Brad Griffis <bgriffis@nvidia.com>
 (cherry picked from commit 41152afc729bfbb8f3a737f2aa7a1e8773c9fe58)
 
 diff --git a/drivers/mailbox/tegra-hsp.c b/drivers/mailbox/tegra-hsp.c
-index 4abcf77ae22b7..fda5dbf95604d 100644
+index 4abcf77ae22b..fda5dbf95604 100644
 --- a/drivers/mailbox/tegra-hsp.c
 +++ b/drivers/mailbox/tegra-hsp.c
 @@ -836,7 +836,6 @@ static int tegra_hsp_request_shared_irq(struct tegra_hsp *hsp)
@@ -49,5 +49,5 @@ index 4abcf77ae22b7..fda5dbf95604d 100644
  		if (default_si == hsp->num_si)
  			default_si = i;
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/sauce/patches/0015-NVIDIA-SAUCE-v4l2-core-Add-new-packed-v4l2-pixel-for.patch b/features/tegra/sauce/patches/0015-NVIDIA-SAUCE-v4l2-core-Add-new-packed-v4l2-pixel-for.patch
index 10b0e1b..efbfd5a 100644
--- a/features/tegra/sauce/patches/0015-NVIDIA-SAUCE-v4l2-core-Add-new-packed-v4l2-pixel-for.patch
+++ b/features/tegra/sauce/patches/0015-NVIDIA-SAUCE-v4l2-core-Add-new-packed-v4l2-pixel-for.patch
@@ -19,7 +19,7 @@ Tested-by: Abhilash G <abhilashg@nvidia.com>
 Reviewed-by: Abhilash G <abhilashg@nvidia.com>
 
 diff --git a/drivers/media/v4l2-core/v4l2-ioctl.c b/drivers/media/v4l2-core/v4l2-ioctl.c
-index 5e019c10afa34..ff16bc5a3d49d 100644
+index 5e019c10afa3..ff16bc5a3d49 100644
 --- a/drivers/media/v4l2-core/v4l2-ioctl.c
 +++ b/drivers/media/v4l2-core/v4l2-ioctl.c
 @@ -1403,6 +1403,18 @@ static void v4l_fill_fmtdesc(struct v4l2_fmtdesc *fmt)
@@ -42,5 +42,5 @@ index 5e019c10afa34..ff16bc5a3d49d 100644
  	case V4L2_PIX_FMT_SGBRG10ALAW8:	descr = "8-bit Bayer GBGB/RGRG (A-law)"; break;
  	case V4L2_PIX_FMT_SGRBG10ALAW8:	descr = "8-bit Bayer GRGR/BGBG (A-law)"; break;
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/sauce/patches/0016-NVIDIA-SAUCE-v4l2-core-Add-sync-op-to-subdev_core_op.patch b/features/tegra/sauce/patches/0016-NVIDIA-SAUCE-v4l2-core-Add-sync-op-to-subdev_core_op.patch
index 7ce17a8..066001b 100644
--- a/features/tegra/sauce/patches/0016-NVIDIA-SAUCE-v4l2-core-Add-sync-op-to-subdev_core_op.patch
+++ b/features/tegra/sauce/patches/0016-NVIDIA-SAUCE-v4l2-core-Add-sync-op-to-subdev_core_op.patch
@@ -25,7 +25,7 @@ Tested-by: Abhilash G <abhilashg@nvidia.com>
 Reviewed-by: Abhilash G <abhilashg@nvidia.com>
 
 diff --git a/include/media/v4l2-subdev.h b/include/media/v4l2-subdev.h
-index e0bb58cb6d042..96343c330a411 100644
+index e0bb58cb6d04..96343c330a41 100644
 --- a/include/media/v4l2-subdev.h
 +++ b/include/media/v4l2-subdev.h
 @@ -139,6 +139,10 @@ struct v4l2_subdev_io_pin_config {
@@ -61,7 +61,7 @@ index e0bb58cb6d042..96343c330a411 100644
  
  /**
 diff --git a/include/uapi/linux/videodev2.h b/include/uapi/linux/videodev2.h
-index becd08fdbddb8..95a5e76e8c268 100644
+index becd08fdbddb..95a5e76e8c26 100644
 --- a/include/uapi/linux/videodev2.h
 +++ b/include/uapi/linux/videodev2.h
 @@ -2580,6 +2580,7 @@ struct v4l2_event_frame_sync {
@@ -73,5 +73,5 @@ index becd08fdbddb8..95a5e76e8c268 100644
  struct v4l2_event_src_change {
  	__u32 changes;
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/sauce/patches/0017-NVIDIA-SAUCE-include-linux-Add-new-packed-v4l2-pixel.patch b/features/tegra/sauce/patches/0017-NVIDIA-SAUCE-include-linux-Add-new-packed-v4l2-pixel.patch
index ea7d23d..ecc0851 100644
--- a/features/tegra/sauce/patches/0017-NVIDIA-SAUCE-include-linux-Add-new-packed-v4l2-pixel.patch
+++ b/features/tegra/sauce/patches/0017-NVIDIA-SAUCE-include-linux-Add-new-packed-v4l2-pixel.patch
@@ -30,7 +30,7 @@ Tested-by: Abhilash G <abhilashg@nvidia.com>
 Reviewed-by: Abhilash G <abhilashg@nvidia.com>
 
 diff --git a/include/uapi/linux/media-bus-format.h b/include/uapi/linux/media-bus-format.h
-index ff62056feed5b..61bee70cf74e5 100644
+index ff62056feed5..61bee70cf74e 100644
 --- a/include/uapi/linux/media-bus-format.h
 +++ b/include/uapi/linux/media-bus-format.h
 @@ -156,6 +156,11 @@
@@ -46,7 +46,7 @@ index ff62056feed5b..61bee70cf74e5 100644
  /* JPEG compressed formats - next is	0x4002 */
  #define MEDIA_BUS_FMT_JPEG_1X8			0x4001
 diff --git a/include/uapi/linux/videodev2.h b/include/uapi/linux/videodev2.h
-index 95a5e76e8c268..e26a39d0e1cb6 100644
+index 95a5e76e8c26..e26a39d0e1cb 100644
 --- a/include/uapi/linux/videodev2.h
 +++ b/include/uapi/linux/videodev2.h
 @@ -707,6 +707,11 @@ struct v4l2_pix_format {
@@ -62,5 +62,5 @@ index 95a5e76e8c268..e26a39d0e1cb6 100644
  #define V4L2_PIX_FMT_SBGGR10P v4l2_fourcc('p', 'B', 'A', 'A')
  #define V4L2_PIX_FMT_SGBRG10P v4l2_fourcc('p', 'G', 'A', 'A')
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/sauce/patches/0018-NVIDIA-SAUCE-media-uvc-zero-seq-number-when-disablin.patch b/features/tegra/sauce/patches/0018-NVIDIA-SAUCE-media-uvc-zero-seq-number-when-disablin.patch
index 45c395c..851b085 100644
--- a/features/tegra/sauce/patches/0018-NVIDIA-SAUCE-media-uvc-zero-seq-number-when-disablin.patch
+++ b/features/tegra/sauce/patches/0018-NVIDIA-SAUCE-media-uvc-zero-seq-number-when-disablin.patch
@@ -42,7 +42,7 @@ Tested-by: Henry Lin <henryl@nvidia.com>
 (cherry picked from commit 4ca5cf37519ac003e2fb53fdc945f83fb5582996)
 
 diff --git a/drivers/media/usb/uvc/uvc_video.c b/drivers/media/usb/uvc/uvc_video.c
-index ec76595f3c4be..b0f39fc5cdb40 100644
+index 9629e17cc5eb..4227f0302ba7 100644
 --- a/drivers/media/usb/uvc/uvc_video.c
 +++ b/drivers/media/usb/uvc/uvc_video.c
 @@ -2,6 +2,7 @@
@@ -53,7 +53,7 @@ index ec76595f3c4be..b0f39fc5cdb40 100644
   *      Copyright (C) 2005-2010
   *          Laurent Pinchart (laurent.pinchart@ideasonboard.com)
   */
-@@ -2320,9 +2321,8 @@ void uvc_video_stop_streaming(struct uvc_streaming *stream)
+@@ -2361,9 +2362,8 @@ void uvc_video_stop_streaming(struct uvc_streaming *stream)
  {
  	uvc_video_stop_transfer(stream, 1);
  
@@ -66,5 +66,5 @@ index ec76595f3c4be..b0f39fc5cdb40 100644
  		 * UVC doesn't specify how to inform a bulk-based device
  		 * when the video stream is stopped. Windows sends a
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/sauce/patches/0019-NVIDIA-SAUCE-mmc-host-Add-support-to-bypass-clock-re.patch b/features/tegra/sauce/patches/0019-NVIDIA-SAUCE-mmc-host-Add-support-to-bypass-clock-re.patch
index 95a8ce3..3842200 100644
--- a/features/tegra/sauce/patches/0019-NVIDIA-SAUCE-mmc-host-Add-support-to-bypass-clock-re.patch
+++ b/features/tegra/sauce/patches/0019-NVIDIA-SAUCE-mmc-host-Add-support-to-bypass-clock-re.patch
@@ -15,7 +15,7 @@ Tested-by: Laxman Dewangan <ldewangan@nvidia.com>
 Reviewed-by: Laxman Dewangan <ldewangan@nvidia.com>
 
 diff --git a/drivers/mmc/host/sdhci-tegra.c b/drivers/mmc/host/sdhci-tegra.c
-index 820ce4dae58ba..c69262b3cc662 100644
+index 820ce4dae58b..c69262b3cc66 100644
 --- a/drivers/mmc/host/sdhci-tegra.c
 +++ b/drivers/mmc/host/sdhci-tegra.c
 @@ -183,6 +183,7 @@ struct sdhci_tegra {
@@ -192,5 +192,5 @@ index 820ce4dae58ba..c69262b3cc662 100644
  
  static int sdhci_tegra_runtime_suspend(struct device *dev)
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/sauce/patches/0020-NVIDIA-SAUCE-mmc-core-separate-mmc_test-and-mmc-driv.patch b/features/tegra/sauce/patches/0020-NVIDIA-SAUCE-mmc-core-separate-mmc_test-and-mmc-driv.patch
index 7b5aac7..1a30c68 100644
--- a/features/tegra/sauce/patches/0020-NVIDIA-SAUCE-mmc-core-separate-mmc_test-and-mmc-driv.patch
+++ b/features/tegra/sauce/patches/0020-NVIDIA-SAUCE-mmc-core-separate-mmc_test-and-mmc-driv.patch
@@ -23,7 +23,7 @@ Reviewed-by: Abhilash G <abhilashg@nvidia.com>
 Reviewed-by: Laxman Dewangan <ldewangan@nvidia.com>
 
 diff --git a/drivers/mmc/core/bus.c b/drivers/mmc/core/bus.c
-index ec4f3462bf809..e137f2123fdfc 100644
+index ec4f3462bf80..e137f2123fdf 100644
 --- a/drivers/mmc/core/bus.c
 +++ b/drivers/mmc/core/bus.c
 @@ -4,6 +4,7 @@
@@ -61,7 +61,7 @@ index ec4f3462bf809..e137f2123fdfc 100644
  }
  
 diff --git a/drivers/mmc/core/mmc_test.c b/drivers/mmc/core/mmc_test.c
-index 67d4a301895c9..7bdfb8714f933 100644
+index 67d4a301895c..7bdfb8714f93 100644
 --- a/drivers/mmc/core/mmc_test.c
 +++ b/drivers/mmc/core/mmc_test.c
 @@ -1,6 +1,7 @@
@@ -118,7 +118,7 @@ index 67d4a301895c9..7bdfb8714f933 100644
  
  MODULE_LICENSE("GPL");
 diff --git a/include/linux/mmc/card.h b/include/linux/mmc/card.h
-index 8151f2240db41..f24a4da5dc057 100644
+index 8151f2240db4..f24a4da5dc05 100644
 --- a/include/linux/mmc/card.h
 +++ b/include/linux/mmc/card.h
 @@ -2,6 +2,8 @@
@@ -148,5 +148,5 @@ index 8151f2240db41..f24a4da5dc057 100644
  
  #define mmc_card_mmc(c)		((c)->type == MMC_TYPE_MMC)
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/sauce/patches/0021-NVIDIA-SAUCE-mmc-host-Add-eMMC-support-on-VSP-platfo.patch b/features/tegra/sauce/patches/0021-NVIDIA-SAUCE-mmc-host-Add-eMMC-support-on-VSP-platfo.patch
index 6508f7f..7a3a2f0 100644
--- a/features/tegra/sauce/patches/0021-NVIDIA-SAUCE-mmc-host-Add-eMMC-support-on-VSP-platfo.patch
+++ b/features/tegra/sauce/patches/0021-NVIDIA-SAUCE-mmc-host-Add-eMMC-support-on-VSP-platfo.patch
@@ -26,7 +26,7 @@ GVS: Gerrit_Virtual_Submit <buildbot_gerritrpt@nvidia.com>
 Reviewed-by: Laxman Dewangan <ldewangan@nvidia.com>
 
 diff --git a/drivers/mmc/host/sdhci-tegra.c b/drivers/mmc/host/sdhci-tegra.c
-index c69262b3cc662..dc540e2544801 100644
+index c69262b3cc66..dc540e254480 100644
 --- a/drivers/mmc/host/sdhci-tegra.c
 +++ b/drivers/mmc/host/sdhci-tegra.c
 @@ -28,6 +28,7 @@
@@ -97,7 +97,7 @@ index c69262b3cc662..dc540e2544801 100644
  		clk = devm_clk_get(mmc_dev(host->mmc), NULL);
  		if (IS_ERR(clk)) {
 diff --git a/drivers/mmc/host/sdhci.h b/drivers/mmc/host/sdhci.h
-index b6a571d866fa5..ea24ae91cb455 100644
+index b6a571d866fa..ea24ae91cb45 100644
 --- a/drivers/mmc/host/sdhci.h
 +++ b/drivers/mmc/host/sdhci.h
 @@ -19,6 +19,8 @@
@@ -208,5 +208,5 @@ index b6a571d866fa5..ea24ae91cb455 100644
  }
  
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/sauce/patches/0022-NVIDIA-SAUCE-mmc-core-Update-bus-status-on-sd-card-r.patch b/features/tegra/sauce/patches/0022-NVIDIA-SAUCE-mmc-core-Update-bus-status-on-sd-card-r.patch
index eb57f3d..4c150a1 100644
--- a/features/tegra/sauce/patches/0022-NVIDIA-SAUCE-mmc-core-Update-bus-status-on-sd-card-r.patch
+++ b/features/tegra/sauce/patches/0022-NVIDIA-SAUCE-mmc-core-Update-bus-status-on-sd-card-r.patch
@@ -22,7 +22,7 @@ Reviewed-by: Bitan Biswas <bbiswas@nvidia.com>
 GVS: Gerrit_Virtual_Submit <buildbot_gerritrpt@nvidia.com>
 
 diff --git a/drivers/mmc/core/bus.c b/drivers/mmc/core/bus.c
-index e137f2123fdfc..070d373e0e2ca 100644
+index e137f2123fdf..070d373e0e2c 100644
 --- a/drivers/mmc/core/bus.c
 +++ b/drivers/mmc/core/bus.c
 @@ -134,12 +134,18 @@ static int mmc_bus_probe(struct device *dev)
@@ -63,5 +63,5 @@ index e137f2123fdfc..070d373e0e2ca 100644
  }
  
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/sauce/patches/0023-NVIDIA-SAUCE-mmc-host-Use-tegra_sku_info.patch b/features/tegra/sauce/patches/0023-NVIDIA-SAUCE-mmc-host-Use-tegra_sku_info.patch
index 8182862..5d34894 100644
--- a/features/tegra/sauce/patches/0023-NVIDIA-SAUCE-mmc-host-Use-tegra_sku_info.patch
+++ b/features/tegra/sauce/patches/0023-NVIDIA-SAUCE-mmc-host-Use-tegra_sku_info.patch
@@ -17,7 +17,7 @@ GVS: buildbot_gerritrpt <buildbot_gerritrpt@nvidia.com>
 (cherry picked from commit fe4b44eff754dace658a95335d7dbcb2deac8189)
 
 diff --git a/drivers/mmc/host/sdhci-tegra.c b/drivers/mmc/host/sdhci-tegra.c
-index dc540e2544801..fdef1c7352481 100644
+index dc540e254480..fdef1c735248 100644
 --- a/drivers/mmc/host/sdhci-tegra.c
 +++ b/drivers/mmc/host/sdhci-tegra.c
 @@ -193,7 +193,7 @@ static u16 tegra_sdhci_readw(struct sdhci_host *host, int reg)
@@ -66,7 +66,7 @@ index dc540e2544801..fdef1c7352481 100644
  	if (!tegra_host->skip_clk_rst) {
  		clk = devm_clk_get(mmc_dev(host->mmc), NULL);
 diff --git a/drivers/mmc/host/sdhci.h b/drivers/mmc/host/sdhci.h
-index ea24ae91cb455..2b8feb794fa5a 100644
+index ea24ae91cb45..2b8feb794fa5 100644
 --- a/drivers/mmc/host/sdhci.h
 +++ b/drivers/mmc/host/sdhci.h
 @@ -732,7 +732,7 @@ struct sdhci_ops {
@@ -173,5 +173,5 @@ index ea24ae91cb455..2b8feb794fa5a 100644
  	return readb(host->ioaddr + reg);
  }
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/sauce/patches/0024-NVIDIA-SAUCE-s25fs-Add-post-get-map-id-fixup.patch b/features/tegra/sauce/patches/0024-NVIDIA-SAUCE-s25fs-Add-post-get-map-id-fixup.patch
index 9d57370..6dc9fcb 100644
--- a/features/tegra/sauce/patches/0024-NVIDIA-SAUCE-s25fs-Add-post-get-map-id-fixup.patch
+++ b/features/tegra/sauce/patches/0024-NVIDIA-SAUCE-s25fs-Add-post-get-map-id-fixup.patch
@@ -27,7 +27,7 @@ Reviewed-by: Laxman Dewangan <ldewangan@nvidia.com>
 GVS: buildbot_gerritrpt <buildbot_gerritrpt@nvidia.com>
 
 diff --git a/drivers/mtd/spi-nor/core.c b/drivers/mtd/spi-nor/core.c
-index 19dc13faf9fd9..96788c1c9fe86 100644
+index 19dc13faf9fd..96788c1c9fe8 100644
 --- a/drivers/mtd/spi-nor/core.c
 +++ b/drivers/mtd/spi-nor/core.c
 @@ -2523,6 +2523,35 @@ int spi_nor_post_bfpt_fixups(struct spi_nor *nor,
@@ -67,7 +67,7 @@ index 19dc13faf9fd9..96788c1c9fe86 100644
  			       u32 shared_hwcaps)
  {
 diff --git a/drivers/mtd/spi-nor/core.h b/drivers/mtd/spi-nor/core.h
-index e838c40a25897..1efa61eaec23a 100644
+index e838c40a2589..1efa61eaec23 100644
 --- a/drivers/mtd/spi-nor/core.h
 +++ b/drivers/mtd/spi-nor/core.h
 @@ -434,6 +434,7 @@ struct spi_nor_fixups {
@@ -89,7 +89,7 @@ index e838c40a25897..1efa61eaec23a 100644
  void spi_nor_try_unlock_all(struct spi_nor *nor);
  void spi_nor_set_mtd_locking_ops(struct spi_nor *nor);
 diff --git a/drivers/mtd/spi-nor/sfdp.c b/drivers/mtd/spi-nor/sfdp.c
-index a8324c2da0acf..e59d6e18523f3 100644
+index a8324c2da0ac..e59d6e18523f 100644
 --- a/drivers/mtd/spi-nor/sfdp.c
 +++ b/drivers/mtd/spi-nor/sfdp.c
 @@ -699,17 +699,6 @@ static u8 spi_nor_smpt_addr_nbytes(const struct spi_nor *nor, const u32 settings
@@ -147,7 +147,7 @@ index a8324c2da0acf..e59d6e18523f3 100644
  	/*
  	 * If command descriptors are provided, they always precede map
 diff --git a/drivers/mtd/spi-nor/spansion.c b/drivers/mtd/spi-nor/spansion.c
-index a0296c8716346..f15abe18fc6c1 100644
+index 3ba7dcc39032..5a9f6483ac4f 100644
 --- a/drivers/mtd/spi-nor/spansion.c
 +++ b/drivers/mtd/spi-nor/spansion.c
 @@ -26,6 +26,7 @@
@@ -166,7 +166,7 @@ index a0296c8716346..f15abe18fc6c1 100644
  #define SPINOR_REG_CYPRESS_CFR3_PGSZ		BIT(4) /* Page size. */
  #define SPINOR_REG_CYPRESS_CFR5			0x6
  #define SPINOR_REG_CYPRESS_CFR5_BIT6		BIT(6)
-@@ -785,8 +787,54 @@ s25fs_s_nor_post_bfpt_fixups(struct spi_nor *nor,
+@@ -787,8 +789,54 @@ s25fs_s_nor_post_bfpt_fixups(struct spi_nor *nor,
  	return 0;
  }
  
@@ -222,5 +222,5 @@ index a0296c8716346..f15abe18fc6c1 100644
  
  static const struct flash_info spansion_nor_parts[] = {
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/sauce/patches/0025-NVIDIA-SAUCE-mtd-spi-nor-support-for-spansion-and-ma.patch b/features/tegra/sauce/patches/0025-NVIDIA-SAUCE-mtd-spi-nor-support-for-spansion-and-ma.patch
index 5b65c05..036998b 100644
--- a/features/tegra/sauce/patches/0025-NVIDIA-SAUCE-mtd-spi-nor-support-for-spansion-and-ma.patch
+++ b/features/tegra/sauce/patches/0025-NVIDIA-SAUCE-mtd-spi-nor-support-for-spansion-and-ma.patch
@@ -22,7 +22,7 @@ Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
 Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
 
 diff --git a/drivers/mtd/spi-nor/macronix.c b/drivers/mtd/spi-nor/macronix.c
-index e97f5cbd9aad2..0e91c726b4b69 100644
+index e97f5cbd9aad..0e91c726b4b6 100644
 --- a/drivers/mtd/spi-nor/macronix.c
 +++ b/drivers/mtd/spi-nor/macronix.c
 @@ -225,6 +225,12 @@ static const struct flash_info macronix_nor_parts[] = {
@@ -39,10 +39,10 @@ index e97f5cbd9aad2..0e91c726b4b69 100644
  		/* MX25L3255E */
  		.id = SNOR_ID(0xc2, 0x9e, 0x16),
 diff --git a/drivers/mtd/spi-nor/spansion.c b/drivers/mtd/spi-nor/spansion.c
-index f15abe18fc6c1..60520f5e4dba5 100644
+index 5a9f6483ac4f..be599c0682da 100644
 --- a/drivers/mtd/spi-nor/spansion.c
 +++ b/drivers/mtd/spi-nor/spansion.c
-@@ -939,6 +939,12 @@ static const struct flash_info spansion_nor_parts[] = {
+@@ -941,6 +941,12 @@ static const struct flash_info spansion_nor_parts[] = {
  		.size = SZ_16M,
  		.no_sfdp_flags = SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ,
  		.mfr_flags = USE_CLSR,
@@ -56,5 +56,5 @@ index f15abe18fc6c1..60520f5e4dba5 100644
  		.id = SNOR_ID(0x01, 0x20, 0x18, 0x4d, 0x01, 0x81),
  		.name = "s25fs128s1",
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/sauce/patches/0026-NVIDIA-SAUCE-net-phy-aqr113c-restore-PHY-configurati.patch b/features/tegra/sauce/patches/0026-NVIDIA-SAUCE-net-phy-aqr113c-restore-PHY-configurati.patch
index 8455b41..317a3c8 100644
--- a/features/tegra/sauce/patches/0026-NVIDIA-SAUCE-net-phy-aqr113c-restore-PHY-configurati.patch
+++ b/features/tegra/sauce/patches/0026-NVIDIA-SAUCE-net-phy-aqr113c-restore-PHY-configurati.patch
@@ -17,7 +17,7 @@ Signed-off-by: Revanth Kumar Uppala <ruppala@nvidia.com>
 Reviewed-on: https://git-master.nvidia.com/r/c/linux-stable/+/2906740
 
 diff --git a/drivers/net/phy/aquantia/aquantia_main.c b/drivers/net/phy/aquantia/aquantia_main.c
-index 41f3676c7f1ec..6b7009e6d4ffa 100644
+index 41f3676c7f1e..6b7009e6d4ff 100644
 --- a/drivers/net/phy/aquantia/aquantia_main.c
 +++ b/drivers/net/phy/aquantia/aquantia_main.c
 @@ -110,6 +110,8 @@
@@ -63,5 +63,5 @@ index 41f3676c7f1ec..6b7009e6d4ffa 100644
  				  MDIO_AN_TX_VEND_INT_STATUS2);
  	if (irq_status < 0) {
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/sauce/patches/0027-NVIDIA-SAUCE-net-phy-add-10G-5G-for-fixed-link.patch b/features/tegra/sauce/patches/0027-NVIDIA-SAUCE-net-phy-add-10G-5G-for-fixed-link.patch
index 097a1a2..ffbccc5 100644
--- a/features/tegra/sauce/patches/0027-NVIDIA-SAUCE-net-phy-add-10G-5G-for-fixed-link.patch
+++ b/features/tegra/sauce/patches/0027-NVIDIA-SAUCE-net-phy-add-10G-5G-for-fixed-link.patch
@@ -20,7 +20,7 @@ Reviewed-on: https://git-master.nvidia.com/r/c/linux-stable/+/2872938
 Reviewed-by: Laxman Dewangan <ldewangan@nvidia.com>
 
 diff --git a/drivers/net/phy/swphy.c b/drivers/net/phy/swphy.c
-index 59f1ba4d49bc1..6e946285fa0f6 100644
+index 59f1ba4d49bc..6e946285fa0f 100644
 --- a/drivers/net/phy/swphy.c
 +++ b/drivers/net/phy/swphy.c
 @@ -8,6 +8,7 @@
@@ -52,5 +52,5 @@ index 59f1ba4d49bc1..6e946285fa0f6 100644
  		return SWMII_SPEED_1000;
  	case 100:
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/sauce/patches/0028-NVIDIA-SAUCE-net-phy-enable-pause-in-realtek-and-aqu.patch b/features/tegra/sauce/patches/0028-NVIDIA-SAUCE-net-phy-enable-pause-in-realtek-and-aqu.patch
index c60b483..2d09e5f 100644
--- a/features/tegra/sauce/patches/0028-NVIDIA-SAUCE-net-phy-enable-pause-in-realtek-and-aqu.patch
+++ b/features/tegra/sauce/patches/0028-NVIDIA-SAUCE-net-phy-enable-pause-in-realtek-and-aqu.patch
@@ -18,7 +18,7 @@ Reviewed-by: Abhilash G <abhilashg@nvidia.com>
 Reviewed-by: Laxman Dewangan <ldewangan@nvidia.com>
 
 diff --git a/drivers/net/phy/aquantia/aquantia_main.c b/drivers/net/phy/aquantia/aquantia_main.c
-index 6b7009e6d4ffa..d71758eb67e6b 100644
+index 6b7009e6d4ff..d71758eb67e6 100644
 --- a/drivers/net/phy/aquantia/aquantia_main.c
 +++ b/drivers/net/phy/aquantia/aquantia_main.c
 @@ -35,6 +35,9 @@
@@ -49,7 +49,7 @@ index 6b7009e6d4ffa..d71758eb67e6b 100644
  	if (phydev->interface != PHY_INTERFACE_MODE_SGMII &&
  	    phydev->interface != PHY_INTERFACE_MODE_1000BASEKX &&
 diff --git a/drivers/net/phy/realtek/realtek_main.c b/drivers/net/phy/realtek/realtek_main.c
-index 7c3d277efaf07..5a095d1c8adc5 100644
+index 05df1a33b0e2..9b8d33a65e2b 100644
 --- a/drivers/net/phy/realtek/realtek_main.c
 +++ b/drivers/net/phy/realtek/realtek_main.c
 @@ -692,7 +692,12 @@ static int rtl8211f_config_init(struct phy_device *phydev)
@@ -67,5 +67,5 @@ index 7c3d277efaf07..5a095d1c8adc5 100644
  
  static int rtl821x_suspend(struct phy_device *phydev)
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/sauce/patches/0029-NVIDIA-SAUCE-net-phy-aquantia-Enable-MAC-Controlled-.patch b/features/tegra/sauce/patches/0029-NVIDIA-SAUCE-net-phy-aquantia-Enable-MAC-Controlled-.patch
index 1b4f295..e09978c 100644
--- a/features/tegra/sauce/patches/0029-NVIDIA-SAUCE-net-phy-aquantia-Enable-MAC-Controlled-.patch
+++ b/features/tegra/sauce/patches/0029-NVIDIA-SAUCE-net-phy-aquantia-Enable-MAC-Controlled-.patch
@@ -18,7 +18,7 @@ Reviewed-by: Abhilash G <abhilashg@nvidia.com>
 Reviewed-by: Laxman Dewangan <ldewangan@nvidia.com>
 
 diff --git a/drivers/net/phy/aquantia/aquantia_main.c b/drivers/net/phy/aquantia/aquantia_main.c
-index d71758eb67e6b..a69bb0a16638e 100644
+index d71758eb67e6..a69bb0a16638 100644
 --- a/drivers/net/phy/aquantia/aquantia_main.c
 +++ b/drivers/net/phy/aquantia/aquantia_main.c
 @@ -121,6 +121,8 @@
@@ -51,5 +51,5 @@ index d71758eb67e6b..a69bb0a16638e 100644
  	/* Check that the PHY interface type is compatible */
  	if (phydev->interface != PHY_INTERFACE_MODE_SGMII &&
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/sauce/patches/0030-NVIDIA-SAUCE-net-phy-aqr113c-Enable-Wake-on-boot-con.patch b/features/tegra/sauce/patches/0030-NVIDIA-SAUCE-net-phy-aqr113c-Enable-Wake-on-boot-con.patch
index 7e7c82b..8e522b1 100644
--- a/features/tegra/sauce/patches/0030-NVIDIA-SAUCE-net-phy-aqr113c-Enable-Wake-on-boot-con.patch
+++ b/features/tegra/sauce/patches/0030-NVIDIA-SAUCE-net-phy-aqr113c-Enable-Wake-on-boot-con.patch
@@ -20,7 +20,7 @@ Reviewed-by: Laxman Dewangan <ldewangan@nvidia.com>
 Tested-by: Abhilash G <abhilashg@nvidia.com>
 
 diff --git a/drivers/net/phy/aquantia/aquantia_main.c b/drivers/net/phy/aquantia/aquantia_main.c
-index a69bb0a16638e..3f8d2a614690c 100644
+index a69bb0a16638..3f8d2a614690 100644
 --- a/drivers/net/phy/aquantia/aquantia_main.c
 +++ b/drivers/net/phy/aquantia/aquantia_main.c
 @@ -5,6 +5,7 @@
@@ -331,5 +331,5 @@ index a69bb0a16638e..3f8d2a614690c 100644
  {
  	PHY_ID_MATCH_MODEL(PHY_ID_AQR405),
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/sauce/patches/0031-NVIDIA-SAUCE-net-phy-aqr-add-phy_mode-support.patch b/features/tegra/sauce/patches/0031-NVIDIA-SAUCE-net-phy-aqr-add-phy_mode-support.patch
index 4238318..3a16b91 100644
--- a/features/tegra/sauce/patches/0031-NVIDIA-SAUCE-net-phy-aqr-add-phy_mode-support.patch
+++ b/features/tegra/sauce/patches/0031-NVIDIA-SAUCE-net-phy-aqr-add-phy_mode-support.patch
@@ -22,7 +22,7 @@ Reviewed-by: Abhilash G <abhilashg@nvidia.com>
 Reviewed-by: Laxman Dewangan <ldewangan@nvidia.com>
 
 diff --git a/drivers/net/phy/aquantia/aquantia_main.c b/drivers/net/phy/aquantia/aquantia_main.c
-index 3f8d2a614690c..56752e0d277fa 100644
+index 3f8d2a614690..56752e0d277f 100644
 --- a/drivers/net/phy/aquantia/aquantia_main.c
 +++ b/drivers/net/phy/aquantia/aquantia_main.c
 @@ -142,6 +142,9 @@
@@ -73,5 +73,5 @@ index 3f8d2a614690c..56752e0d277fa 100644
  }
  
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/sauce/patches/0032-NVIDIA-SAUCE-net-phy-aqr-configure-1G-100M-of-aqr-PH.patch b/features/tegra/sauce/patches/0032-NVIDIA-SAUCE-net-phy-aqr-configure-1G-100M-of-aqr-PH.patch
index d7e43b2..f5bb9f1 100644
--- a/features/tegra/sauce/patches/0032-NVIDIA-SAUCE-net-phy-aqr-configure-1G-100M-of-aqr-PH.patch
+++ b/features/tegra/sauce/patches/0032-NVIDIA-SAUCE-net-phy-aqr-configure-1G-100M-of-aqr-PH.patch
@@ -25,7 +25,7 @@ Reviewed-by: Abhilash G <abhilashg@nvidia.com>
 Reviewed-by: Laxman Dewangan <ldewangan@nvidia.com>
 
 diff --git a/drivers/net/phy/aquantia/aquantia_main.c b/drivers/net/phy/aquantia/aquantia_main.c
-index 56752e0d277fa..7ee9eb6cbc4bb 100644
+index 56752e0d277f..7ee9eb6cbc4b 100644
 --- a/drivers/net/phy/aquantia/aquantia_main.c
 +++ b/drivers/net/phy/aquantia/aquantia_main.c
 @@ -295,14 +295,59 @@ static int aqr_config_aneg(struct phy_device *phydev)
@@ -95,5 +95,5 @@ index 56752e0d277fa..7ee9eb6cbc4bb 100644
  	} else {
  		phydev_info(phydev, "No AQR phy_mode setting in DT\n");
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/sauce/patches/0033-NVIDIA-SAUCE-net-phy-aqr113c-poll-for-TX-ready-at-PH.patch b/features/tegra/sauce/patches/0033-NVIDIA-SAUCE-net-phy-aqr113c-poll-for-TX-ready-at-PH.patch
index cd9f5d7..4f0f214 100644
--- a/features/tegra/sauce/patches/0033-NVIDIA-SAUCE-net-phy-aqr113c-poll-for-TX-ready-at-PH.patch
+++ b/features/tegra/sauce/patches/0033-NVIDIA-SAUCE-net-phy-aqr113c-poll-for-TX-ready-at-PH.patch
@@ -21,7 +21,7 @@ Reviewed-by: Abhilash G <abhilashg@nvidia.com>
 Reviewed-by: Laxman Dewangan <ldewangan@nvidia.com>
 
 diff --git a/drivers/net/phy/aquantia/aquantia.h b/drivers/net/phy/aquantia/aquantia.h
-index 31427ee343e36..89655b6e40048 100644
+index 31427ee343e3..89655b6e4004 100644
 --- a/drivers/net/phy/aquantia/aquantia.h
 +++ b/drivers/net/phy/aquantia/aquantia.h
 @@ -230,6 +230,7 @@ struct aqr107_priv {
@@ -33,7 +33,7 @@ index 31427ee343e36..89655b6e40048 100644
  
  #if IS_REACHABLE(CONFIG_HWMON)
 diff --git a/drivers/net/phy/aquantia/aquantia_main.c b/drivers/net/phy/aquantia/aquantia_main.c
-index 7ee9eb6cbc4bb..96aee6a22b5f3 100644
+index 7ee9eb6cbc4b..96aee6a22b5f 100644
 --- a/drivers/net/phy/aquantia/aquantia_main.c
 +++ b/drivers/net/phy/aquantia/aquantia_main.c
 @@ -54,6 +54,7 @@
@@ -85,5 +85,5 @@ index 7ee9eb6cbc4bb..96aee6a22b5f3 100644
  	return ret;
  }
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/sauce/patches/0034-NVIDIA-SAUCE-net-phy-aqr113c-Read-WOL-status-registe.patch b/features/tegra/sauce/patches/0034-NVIDIA-SAUCE-net-phy-aqr113c-Read-WOL-status-registe.patch
index c32793b..2106350 100644
--- a/features/tegra/sauce/patches/0034-NVIDIA-SAUCE-net-phy-aqr113c-Read-WOL-status-registe.patch
+++ b/features/tegra/sauce/patches/0034-NVIDIA-SAUCE-net-phy-aqr113c-Read-WOL-status-registe.patch
@@ -20,7 +20,7 @@ Reviewed-by: Abhilash G <abhilashg@nvidia.com>
 Reviewed-by: Laxman Dewangan <ldewangan@nvidia.com>
 
 diff --git a/drivers/net/phy/aquantia/aquantia_main.c b/drivers/net/phy/aquantia/aquantia_main.c
-index 96aee6a22b5f3..f1f1a9d632465 100644
+index 96aee6a22b5f..f1f1a9d63246 100644
 --- a/drivers/net/phy/aquantia/aquantia_main.c
 +++ b/drivers/net/phy/aquantia/aquantia_main.c
 @@ -56,6 +56,8 @@
@@ -49,5 +49,5 @@ index 96aee6a22b5f3..f1f1a9d632465 100644
  }
  
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/sauce/patches/0035-NVIDIA-SAUCE-net-phy-realtek-phy-Add-support-for-RTL.patch b/features/tegra/sauce/patches/0035-NVIDIA-SAUCE-net-phy-realtek-phy-Add-support-for-RTL.patch
index da8db28..44a1778 100644
--- a/features/tegra/sauce/patches/0035-NVIDIA-SAUCE-net-phy-realtek-phy-Add-support-for-RTL.patch
+++ b/features/tegra/sauce/patches/0035-NVIDIA-SAUCE-net-phy-realtek-phy-Add-support-for-RTL.patch
@@ -17,7 +17,7 @@ Reviewed-by: Laxman Dewangan <ldewangan@nvidia.com>
 Tested-by: Abhilash G <abhilashg@nvidia.com>
 
 diff --git a/drivers/net/phy/realtek/realtek_main.c b/drivers/net/phy/realtek/realtek_main.c
-index 5a095d1c8adc5..a0de77abb5226 100644
+index 9b8d33a65e2b..8e136a9ac54b 100644
 --- a/drivers/net/phy/realtek/realtek_main.c
 +++ b/drivers/net/phy/realtek/realtek_main.c
 @@ -169,6 +169,9 @@
@@ -51,7 +51,7 @@ index 5a095d1c8adc5..a0de77abb5226 100644
  		err = phy_write_paged(phydev, 0xa42, RTL821x_INER, val);
  		if (err == 0)
  			priv->iner = val;
-@@ -1846,6 +1855,18 @@ static struct phy_driver realtek_drvs[] = {
+@@ -1847,6 +1856,18 @@ static struct phy_driver realtek_drvs[] = {
  		.read_page	= rtl821x_read_page,
  		.write_page	= rtl821x_write_page,
  		.flags		= PHY_ALWAYS_CALL_SUSPEND,
@@ -71,5 +71,5 @@ index 5a095d1c8adc5..a0de77abb5226 100644
  		.name		= "Generic FE-GE Realtek PHY",
  		.match_phy_device = rtlgen_match_phy_device,
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/sauce/patches/0036-NVIDIA-SAUCE-net-phy-aqr113c-Handling-Duplicate-WOL-.patch b/features/tegra/sauce/patches/0036-NVIDIA-SAUCE-net-phy-aqr113c-Handling-Duplicate-WOL-.patch
index d887401..78484cd 100644
--- a/features/tegra/sauce/patches/0036-NVIDIA-SAUCE-net-phy-aqr113c-Handling-Duplicate-WOL-.patch
+++ b/features/tegra/sauce/patches/0036-NVIDIA-SAUCE-net-phy-aqr113c-Handling-Duplicate-WOL-.patch
@@ -16,7 +16,7 @@ Reviewed-by: Abhilash G <abhilashg@nvidia.com>
 Reviewed-by: Laxman Dewangan <ldewangan@nvidia.com>
 
 diff --git a/drivers/net/phy/aquantia/aquantia_main.c b/drivers/net/phy/aquantia/aquantia_main.c
-index f1f1a9d632465..1143efd50a91f 100644
+index f1f1a9d63246..1143efd50a91 100644
 --- a/drivers/net/phy/aquantia/aquantia_main.c
 +++ b/drivers/net/phy/aquantia/aquantia_main.c
 @@ -1433,7 +1433,7 @@ static int aqr113c_wol_settings(struct phy_device *phydev, bool enable)
@@ -42,5 +42,5 @@ index f1f1a9d632465..1143efd50a91f 100644
  		return aqr113c_wol_settings(phydev, true);
  	else
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/sauce/patches/0037-NVIDIA-SAUCE-net-phy-aqr113c-skip-PHY-low-power-mode.patch b/features/tegra/sauce/patches/0037-NVIDIA-SAUCE-net-phy-aqr113c-skip-PHY-low-power-mode.patch
index 21eafd2..05e51d2 100644
--- a/features/tegra/sauce/patches/0037-NVIDIA-SAUCE-net-phy-aqr113c-skip-PHY-low-power-mode.patch
+++ b/features/tegra/sauce/patches/0037-NVIDIA-SAUCE-net-phy-aqr113c-skip-PHY-low-power-mode.patch
@@ -23,7 +23,7 @@ Reviewed-by: Abhilash G <abhilashg@nvidia.com>
 Reviewed-by: Laxman Dewangan <ldewangan@nvidia.com>
 
 diff --git a/drivers/net/phy/aquantia/aquantia.h b/drivers/net/phy/aquantia/aquantia.h
-index 89655b6e40048..666755125df6c 100644
+index 89655b6e4004..666755125df6 100644
 --- a/drivers/net/phy/aquantia/aquantia.h
 +++ b/drivers/net/phy/aquantia/aquantia.h
 @@ -231,6 +231,7 @@ struct aqr107_priv {
@@ -35,7 +35,7 @@ index 89655b6e40048..666755125df6c 100644
  
  #if IS_REACHABLE(CONFIG_HWMON)
 diff --git a/drivers/net/phy/aquantia/aquantia_main.c b/drivers/net/phy/aquantia/aquantia_main.c
-index 1143efd50a91f..d492d5b99f9ac 100644
+index 1143efd50a91..d492d5b99f9a 100644
 --- a/drivers/net/phy/aquantia/aquantia_main.c
 +++ b/drivers/net/phy/aquantia/aquantia_main.c
 @@ -1223,8 +1223,12 @@ static int aqr_gen2_get_rate_matching(struct phy_device *phydev,
@@ -87,5 +87,5 @@ index 1143efd50a91f..d492d5b99f9ac 100644
  }
  
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/sauce/patches/0038-NVIDIA-SAUCE-net-phy-fix-data-corruption.patch b/features/tegra/sauce/patches/0038-NVIDIA-SAUCE-net-phy-fix-data-corruption.patch
index 836fef5..618dcea 100644
--- a/features/tegra/sauce/patches/0038-NVIDIA-SAUCE-net-phy-fix-data-corruption.patch
+++ b/features/tegra/sauce/patches/0038-NVIDIA-SAUCE-net-phy-fix-data-corruption.patch
@@ -21,7 +21,7 @@ Reviewed-by: Laxman Dewangan <ldewangan@nvidia.com>
 Tested-by: Abhilash G <abhilashg@nvidia.com>
 
 diff --git a/drivers/net/phy/aquantia/aquantia_main.c b/drivers/net/phy/aquantia/aquantia_main.c
-index d492d5b99f9ac..922fd352d2c3b 100644
+index d492d5b99f9a..922fd352d2c3 100644
 --- a/drivers/net/phy/aquantia/aquantia_main.c
 +++ b/drivers/net/phy/aquantia/aquantia_main.c
 @@ -934,8 +934,8 @@ static int aqr_gen1_config_init(struct phy_device *phydev)
@@ -36,5 +36,5 @@ index d492d5b99f9ac..922fd352d2c3b 100644
  
  	/* Configure flow control */
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/sauce/patches/0039-NVIDIA-SAUCE-net-phy-fix-ubsan-warning-network-layer.patch b/features/tegra/sauce/patches/0039-NVIDIA-SAUCE-net-phy-fix-ubsan-warning-network-layer.patch
index c3cff9c..fd4ed4a 100644
--- a/features/tegra/sauce/patches/0039-NVIDIA-SAUCE-net-phy-fix-ubsan-warning-network-layer.patch
+++ b/features/tegra/sauce/patches/0039-NVIDIA-SAUCE-net-phy-fix-ubsan-warning-network-layer.patch
@@ -49,7 +49,7 @@ Reviewed-by: Abhilash G <abhilashg@nvidia.com>
 Reviewed-by: Laxman Dewangan <ldewangan@nvidia.com>
 
 diff --git a/drivers/net/phy/swphy.c b/drivers/net/phy/swphy.c
-index 6e946285fa0f6..5380f952e846e 100644
+index 6e946285fa0f..5380f952e846 100644
 --- a/drivers/net/phy/swphy.c
 +++ b/drivers/net/phy/swphy.c
 @@ -54,6 +54,10 @@ static const struct swmii_regs speed[] = {
@@ -64,5 +64,5 @@ index 6e946285fa0f6..5380f952e846e 100644
  
  static const struct swmii_regs duplex[] = {
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/sauce/patches/0040-NVIDIA-SAUCE-brcmfmac-Fix-PCIE-suspend-resume-issue.patch b/features/tegra/sauce/patches/0040-NVIDIA-SAUCE-brcmfmac-Fix-PCIE-suspend-resume-issue.patch
index bf0fcb3..f3a3561 100644
--- a/features/tegra/sauce/patches/0040-NVIDIA-SAUCE-brcmfmac-Fix-PCIE-suspend-resume-issue.patch
+++ b/features/tegra/sauce/patches/0040-NVIDIA-SAUCE-brcmfmac-Fix-PCIE-suspend-resume-issue.patch
@@ -21,7 +21,7 @@ Signed-off-by: Revanth Kumar Uppala <ruppala@nvidia.com>
 Reviewed-on: https://git-master.nvidia.com/r/c/linux-stable/+/2914037
 
 diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/msgbuf.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/msgbuf.c
-index 45fbcbdc7d9e4..00d53d6596851 100644
+index 45fbcbdc7d9e..00d53d659685 100644
 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/msgbuf.c
 +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/msgbuf.c
 @@ -23,6 +23,7 @@
@@ -147,7 +147,7 @@ index 45fbcbdc7d9e4..00d53d6596851 100644
  		bphy_err(drvr, "Unsupported msgtype %d\n", msg->msgtype);
  		break;
 diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/msgbuf.h b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/msgbuf.h
-index 6a849f4a94dd7..99359a1523451 100644
+index 6a849f4a94dd..99359a152345 100644
 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/msgbuf.h
 +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/msgbuf.h
 @@ -39,5 +39,6 @@ static inline int brcmf_proto_msgbuf_attach(struct brcmf_pub *drvr)
@@ -158,7 +158,7 @@ index 6a849f4a94dd7..99359a1523451 100644
  
  #endif /* BRCMFMAC_MSGBUF_H */
 diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c
-index 6327f4eca5007..d2eb64112919b 100644
+index fe4f23decc70..408bda49ff9b 100644
 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c
 +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c
 @@ -213,12 +213,14 @@ static const struct brcmf_firmware_mapping brcmf_pcie_fwnames[] = {
@@ -355,7 +355,7 @@ index 6327f4eca5007..d2eb64112919b 100644
  			if (devinfo->state == BRCMFMAC_PCIE_STATE_UP)
  				brcmf_proto_msgbuf_rx_trigger(
  							&devinfo->pdev->dev);
-@@ -1621,6 +1652,7 @@ brcmf_pcie_init_share_ram_info(struct brcmf_pciedev_info *devinfo,
+@@ -1625,6 +1656,7 @@ brcmf_pcie_init_share_ram_info(struct brcmf_pciedev_info *devinfo,
  	struct brcmf_bus *bus = dev_get_drvdata(&devinfo->pdev->dev);
  	struct brcmf_pcie_shared_info *shared;
  	u32 addr;
@@ -363,7 +363,7 @@ index 6327f4eca5007..d2eb64112919b 100644
  
  	shared = &devinfo->shared;
  	shared->tcm_base_address = sharedram_addr;
-@@ -1660,6 +1692,26 @@ brcmf_pcie_init_share_ram_info(struct brcmf_pciedev_info *devinfo,
+@@ -1664,6 +1696,26 @@ brcmf_pcie_init_share_ram_info(struct brcmf_pciedev_info *devinfo,
  	addr = sharedram_addr + BRCMF_SHARED_RING_INFO_ADDR_OFFSET;
  	shared->ring_info_addr = brcmf_pcie_read_tcm32(devinfo, addr);
  
@@ -390,7 +390,7 @@ index 6327f4eca5007..d2eb64112919b 100644
  	brcmf_dbg(PCIE, "max rx buf post %d, rx dataoffset %d\n",
  		  shared->max_rxbufpost, shared->rx_dataoffset);
  
-@@ -2670,8 +2722,14 @@ static int brcmf_pcie_pm_leave_D3(struct device *dev)
+@@ -2674,8 +2726,14 @@ static int brcmf_pcie_pm_leave_D3(struct device *dev)
  	/* Check if device is still up and running, if so we are ready */
  	if (brcmf_pcie_read_reg32(devinfo, devinfo->reginfo->intmask) != 0) {
  		brcmf_dbg(PCIE, "Try to wakeup device....\n");
@@ -407,7 +407,7 @@ index 6327f4eca5007..d2eb64112919b 100644
  		brcmf_dbg(PCIE, "Hot resume, continue....\n");
  		devinfo->state = BRCMFMAC_PCIE_STATE_UP;
  		brcmf_pcie_select_core(devinfo, BCMA_CORE_PCIE2);
-@@ -2679,6 +2737,12 @@ static int brcmf_pcie_pm_leave_D3(struct device *dev)
+@@ -2683,6 +2741,12 @@ static int brcmf_pcie_pm_leave_D3(struct device *dev)
  		brcmf_pcie_intr_enable(devinfo);
  		brcmf_pcie_hostready(devinfo);
  		brcmf_pcie_fwcon_timer(devinfo, true);
@@ -420,7 +420,7 @@ index 6327f4eca5007..d2eb64112919b 100644
  		return 0;
  	}
  
-@@ -2755,10 +2819,8 @@ static const struct pci_device_id brcmf_pcie_devid_table[] = {
+@@ -2759,10 +2823,8 @@ static const struct pci_device_id brcmf_pcie_devid_table[] = {
  	{ /* end: all zeroes */ }
  };
  
@@ -431,7 +431,7 @@ index 6327f4eca5007..d2eb64112919b 100644
  static struct pci_driver brcmf_pciedrvr = {
  	.name = KBUILD_MODNAME,
  	.id_table = brcmf_pcie_devid_table,
-@@ -2770,14 +2832,12 @@ static struct pci_driver brcmf_pciedrvr = {
+@@ -2774,14 +2836,12 @@ static struct pci_driver brcmf_pciedrvr = {
  	.driver.coredump = brcmf_dev_coredump,
  };
  
@@ -447,7 +447,7 @@ index 6327f4eca5007..d2eb64112919b 100644
  {
  	brcmf_dbg(PCIE, "Enter\n");
 diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.h b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.h
-index 8e6c227e8315c..8e4f486378944 100644
+index 8e6c227e8315..8e4f48637894 100644
 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.h
 +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.h
 @@ -11,4 +11,6 @@ struct brcmf_pciedev {
@@ -458,5 +458,5 @@ index 8e6c227e8315c..8e4f486378944 100644
 +
  #endif /* BRCMFMAC_PCIE_H */
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/sauce/patches/0041-NVIDIA-SAUCE-aquantia-issue-PHY-reset-during-phy-ini.patch b/features/tegra/sauce/patches/0041-NVIDIA-SAUCE-aquantia-issue-PHY-reset-during-phy-ini.patch
index 3b47c73..2be751e 100644
--- a/features/tegra/sauce/patches/0041-NVIDIA-SAUCE-aquantia-issue-PHY-reset-during-phy-ini.patch
+++ b/features/tegra/sauce/patches/0041-NVIDIA-SAUCE-aquantia-issue-PHY-reset-during-phy-ini.patch
@@ -25,7 +25,7 @@ Reviewed-by: Laxman Dewangan <ldewangan@nvidia.com>
 GVS: Gerrit_Virtual_Submit <buildbot_gerritrpt@nvidia.com>
 
 diff --git a/drivers/net/phy/aquantia/aquantia_main.c b/drivers/net/phy/aquantia/aquantia_main.c
-index 922fd352d2c3b..6785862fa2d89 100644
+index 922fd352d2c3..6785862fa2d8 100644
 --- a/drivers/net/phy/aquantia/aquantia_main.c
 +++ b/drivers/net/phy/aquantia/aquantia_main.c
 @@ -5,7 +5,7 @@
@@ -60,5 +60,5 @@ index 922fd352d2c3b..6785862fa2d89 100644
  	if (!ret) {
  		/* The PHY might work without a firmware image, so only build a
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/sauce/patches/0042-NVIDIA-SAUCE-net-phy-add-new-speeds.patch b/features/tegra/sauce/patches/0042-NVIDIA-SAUCE-net-phy-add-new-speeds.patch
index 254217e..1f1fdd7 100644
--- a/features/tegra/sauce/patches/0042-NVIDIA-SAUCE-net-phy-add-new-speeds.patch
+++ b/features/tegra/sauce/patches/0042-NVIDIA-SAUCE-net-phy-add-new-speeds.patch
@@ -19,7 +19,7 @@ Tested-by: Satish Seelamsetti <sseelamsetti@nvidia.com>
 Reviewed-by: Bitan Biswas <bbiswas@nvidia.com>
 
 diff --git a/drivers/net/phy/swphy.c b/drivers/net/phy/swphy.c
-index 5380f952e846e..6a986c8f7ff8d 100644
+index 5380f952e846..6a986c8f7ff8 100644
 --- a/drivers/net/phy/swphy.c
 +++ b/drivers/net/phy/swphy.c
 @@ -8,7 +8,7 @@
@@ -73,5 +73,5 @@ index 5380f952e846e..6a986c8f7ff8d 100644
  		return SWMII_SPEED_1000;
  	case 100:
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/sauce/patches/0043-NVIDIA-SAUCE-net-phy-aquantia-Poll-for-valid-FW-ID.patch b/features/tegra/sauce/patches/0043-NVIDIA-SAUCE-net-phy-aquantia-Poll-for-valid-FW-ID.patch
index cd45ab9..2f3ff0b 100644
--- a/features/tegra/sauce/patches/0043-NVIDIA-SAUCE-net-phy-aquantia-Poll-for-valid-FW-ID.patch
+++ b/features/tegra/sauce/patches/0043-NVIDIA-SAUCE-net-phy-aquantia-Poll-for-valid-FW-ID.patch
@@ -23,7 +23,7 @@ GVS: Gerrit_Virtual_Submit <buildbot_gerritrpt@nvidia.com>
 Reviewed-by: Bitan Biswas <bbiswas@nvidia.com>
 
 diff --git a/drivers/net/phy/aquantia/aquantia.h b/drivers/net/phy/aquantia/aquantia.h
-index 666755125df6c..2861dc467ae1b 100644
+index 666755125df6..2861dc467ae1 100644
 --- a/drivers/net/phy/aquantia/aquantia.h
 +++ b/drivers/net/phy/aquantia/aquantia.h
 @@ -20,6 +20,7 @@
@@ -35,7 +35,7 @@ index 666755125df6c..2861dc467ae1b 100644
  #define VEND1_GLOBAL_MAILBOX_INTERFACE1			0x0200
  #define VEND1_GLOBAL_MAILBOX_INTERFACE1_EXECUTE		BIT(15)
 diff --git a/drivers/net/phy/aquantia/aquantia_main.c b/drivers/net/phy/aquantia/aquantia_main.c
-index 6785862fa2d89..e956d29b6493b 100644
+index 6785862fa2d8..e956d29b6493 100644
 --- a/drivers/net/phy/aquantia/aquantia_main.c
 +++ b/drivers/net/phy/aquantia/aquantia_main.c
 @@ -830,7 +830,9 @@ int aqr_wait_reset_complete(struct phy_device *phydev)
@@ -50,5 +50,5 @@ index 6785862fa2d89..e956d29b6493b 100644
  				false, phydev, MDIO_MMD_VEND1,
  				VEND1_GLOBAL_FW_ID);
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/sauce/patches/0044-NVIDIA-SAUCE-net-phy-aquantia-Fix-PHY-interfaces.patch b/features/tegra/sauce/patches/0044-NVIDIA-SAUCE-net-phy-aquantia-Fix-PHY-interfaces.patch
index 60f7f5f..991f73a 100644
--- a/features/tegra/sauce/patches/0044-NVIDIA-SAUCE-net-phy-aquantia-Fix-PHY-interfaces.patch
+++ b/features/tegra/sauce/patches/0044-NVIDIA-SAUCE-net-phy-aquantia-Fix-PHY-interfaces.patch
@@ -20,7 +20,7 @@ Reviewed-by: Revanth Kumar Uppala <ruppala@nvidia.com>
 (cherry picked from commit 65b5dbebef09b42543c3e74da4f63a18fc2b3e8a)
 
 diff --git a/drivers/net/phy/aquantia/aquantia_main.c b/drivers/net/phy/aquantia/aquantia_main.c
-index e956d29b6493b..2ae16db806da5 100644
+index e956d29b6493..2ae16db806da 100644
 --- a/drivers/net/phy/aquantia/aquantia_main.c
 +++ b/drivers/net/phy/aquantia/aquantia_main.c
 @@ -918,11 +918,15 @@ static int aqr_gen1_config_init(struct phy_device *phydev)
@@ -41,5 +41,5 @@ index e956d29b6493b..2ae16db806da5 100644
  
  	WARN(phydev->interface == PHY_INTERFACE_MODE_XGMII,
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/sauce/patches/0045-NVIDIA-SAUCE-perf-smmuv3-Read-ceid-override-from-DT.patch b/features/tegra/sauce/patches/0045-NVIDIA-SAUCE-perf-smmuv3-Read-ceid-override-from-DT.patch
index d207293..61a29bd 100644
--- a/features/tegra/sauce/patches/0045-NVIDIA-SAUCE-perf-smmuv3-Read-ceid-override-from-DT.patch
+++ b/features/tegra/sauce/patches/0045-NVIDIA-SAUCE-perf-smmuv3-Read-ceid-override-from-DT.patch
@@ -23,7 +23,7 @@ GVS: buildbot_gerritrpt <buildbot_gerritrpt@nvidia.com>
 (cherry picked from commit 28864b1a90ac68498a35e1452b31a1ffe36eaa51)
 
 diff --git a/drivers/perf/arm_smmuv3_pmu.c b/drivers/perf/arm_smmuv3_pmu.c
-index 621f02a7f43be..c48a9504dacd8 100644
+index 621f02a7f43b..c48a9504dacd 100644
 --- a/drivers/perf/arm_smmuv3_pmu.c
 +++ b/drivers/perf/arm_smmuv3_pmu.c
 @@ -849,7 +849,7 @@ static int smmu_pmu_probe(struct platform_device *pdev)
@@ -53,5 +53,5 @@ index 621f02a7f43be..c48a9504dacd8 100644
  			  SMMU_PMCG_ARCH_MAX_EVENTS);
  
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/sauce/patches/0046-NVIDIA-SAUCE-perf-arm_cspmu-add-pmpidr-support.patch b/features/tegra/sauce/patches/0046-NVIDIA-SAUCE-perf-arm_cspmu-add-pmpidr-support.patch
index 5a59601..e61ed12 100644
--- a/features/tegra/sauce/patches/0046-NVIDIA-SAUCE-perf-arm_cspmu-add-pmpidr-support.patch
+++ b/features/tegra/sauce/patches/0046-NVIDIA-SAUCE-perf-arm_cspmu-add-pmpidr-support.patch
@@ -12,7 +12,7 @@ Change-Id: I25ada0e24a7c773df6a21778fed9fc633f497c29
 Signed-off-by: Besar Wicaksono <bwicaksono@nvidia.com>
 
 diff --git a/drivers/perf/arm_cspmu/arm_cspmu.c b/drivers/perf/arm_cspmu/arm_cspmu.c
-index e0d4293f06f93..00bdf6452512e 100644
+index e0d4293f06f9..00bdf6452512 100644
 --- a/drivers/perf/arm_cspmu/arm_cspmu.c
 +++ b/drivers/perf/arm_cspmu/arm_cspmu.c
 @@ -40,6 +40,75 @@
@@ -146,7 +146,7 @@ index e0d4293f06f93..00bdf6452512e 100644
  		DEFAULT_IMPL_OP(get_event_attrs),
  		DEFAULT_IMPL_OP(get_format_attrs),
 diff --git a/drivers/perf/arm_cspmu/arm_cspmu.h b/drivers/perf/arm_cspmu/arm_cspmu.h
-index 19684b76bd969..779dd2d6aa26b 100644
+index 19684b76bd96..779dd2d6aa26 100644
 --- a/drivers/perf/arm_cspmu/arm_cspmu.h
 +++ b/drivers/perf/arm_cspmu/arm_cspmu.h
 @@ -115,8 +115,15 @@
@@ -168,5 +168,5 @@ index 19684b76bd969..779dd2d6aa26b 100644
  /* JEDEC-assigned JEP106 identification code */
  #define ARM_CSPMU_IMPL_ID_NVIDIA	0x36B
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/sauce/patches/0047-NVIDIA-SAUCE-perf-arm_cspmu-nvidia-add-revision-id-m.patch b/features/tegra/sauce/patches/0047-NVIDIA-SAUCE-perf-arm_cspmu-nvidia-add-revision-id-m.patch
index a9e57ad..4dde477 100644
--- a/features/tegra/sauce/patches/0047-NVIDIA-SAUCE-perf-arm_cspmu-nvidia-add-revision-id-m.patch
+++ b/features/tegra/sauce/patches/0047-NVIDIA-SAUCE-perf-arm_cspmu-nvidia-add-revision-id-m.patch
@@ -13,7 +13,7 @@ Change-Id: I12615f73b8c587165a3784f755916951f1cc425e
 Signed-off-by: Besar Wicaksono <bwicaksono@nvidia.com>
 
 diff --git a/drivers/perf/arm_cspmu/nvidia_cspmu.c b/drivers/perf/arm_cspmu/nvidia_cspmu.c
-index dc6d4e3e2a1ba..bec9dda4e3877 100644
+index dc6d4e3e2a1b..bec9dda4e387 100644
 --- a/drivers/perf/arm_cspmu/nvidia_cspmu.c
 +++ b/drivers/perf/arm_cspmu/nvidia_cspmu.c
 @@ -23,7 +23,9 @@
@@ -82,5 +82,5 @@ index dc6d4e3e2a1ba..bec9dda4e3877 100644
  	/* Find matching PMU. */
  	for (; match->prodid; match++) {
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/sauce/patches/0048-NVIDIA-SAUCE-perf-arm_cspmu-nvidia-add-T264-support.patch b/features/tegra/sauce/patches/0048-NVIDIA-SAUCE-perf-arm_cspmu-nvidia-add-T264-support.patch
index 84ebd6d..b2fc3e1 100644
--- a/features/tegra/sauce/patches/0048-NVIDIA-SAUCE-perf-arm_cspmu-nvidia-add-T264-support.patch
+++ b/features/tegra/sauce/patches/0048-NVIDIA-SAUCE-perf-arm_cspmu-nvidia-add-T264-support.patch
@@ -15,7 +15,7 @@ Change-Id: I595dc746e3b45b9f40c5f4343212c37f42f0faa1
 Signed-off-by: Besar Wicaksono <bwicaksono@nvidia.com>
 
 diff --git a/Documentation/admin-guide/perf/nvidia-pmu.rst b/Documentation/admin-guide/perf/nvidia-pmu.rst
-index f538ef67e0e8f..b286e9594ef31 100644
+index f538ef67e0e8..b286e9594ef3 100644
 --- a/Documentation/admin-guide/perf/nvidia-pmu.rst
 +++ b/Documentation/admin-guide/perf/nvidia-pmu.rst
 @@ -10,6 +10,11 @@ metrics like memory bandwidth, latency, and utilization:
@@ -191,7 +191,7 @@ index f538ef67e0e8f..b286e9594ef31 100644
  
  Traffic Coverage
 diff --git a/drivers/perf/arm_cspmu/nvidia_cspmu.c b/drivers/perf/arm_cspmu/nvidia_cspmu.c
-index bec9dda4e3877..eee3da896fb82 100644
+index bec9dda4e387..eee3da896fb8 100644
 --- a/drivers/perf/arm_cspmu/nvidia_cspmu.c
 +++ b/drivers/perf/arm_cspmu/nvidia_cspmu.c
 @@ -21,6 +21,16 @@
@@ -397,5 +397,5 @@ index bec9dda4e3877..eee3da896fb82 100644
  	  .prodid = 0,
  	  .prodid_mask = 0,
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/sauce/patches/0049-NVIDIA-SAUCE-perf-arm_cspmu-add-stop-counters-to-imp.patch b/features/tegra/sauce/patches/0049-NVIDIA-SAUCE-perf-arm_cspmu-add-stop-counters-to-imp.patch
index b6aefa5..df0d775 100644
--- a/features/tegra/sauce/patches/0049-NVIDIA-SAUCE-perf-arm_cspmu-add-stop-counters-to-imp.patch
+++ b/features/tegra/sauce/patches/0049-NVIDIA-SAUCE-perf-arm_cspmu-add-stop-counters-to-imp.patch
@@ -13,7 +13,7 @@ Change-Id: If60bca7b796fa38bd96e97f57301841ed2ab13af
 Signed-off-by: Eric Funsten <efunsten@nvidia.com>
 
 diff --git a/drivers/perf/arm_cspmu/arm_cspmu.c b/drivers/perf/arm_cspmu/arm_cspmu.c
-index 00bdf6452512e..525b0a383aaea 100644
+index 00bdf6452512..525b0a383aae 100644
 --- a/drivers/perf/arm_cspmu/arm_cspmu.c
 +++ b/drivers/perf/arm_cspmu/arm_cspmu.c
 @@ -139,6 +139,8 @@ static void arm_cspmu_set_ev_filter(struct arm_cspmu *cspmu,
@@ -52,7 +52,7 @@ index 00bdf6452512e..525b0a383aaea 100644
  	has_overflowed = arm_cspmu_get_reset_overflow(cspmu, (u32 *)pmovs);
  	if (!has_overflowed)
 diff --git a/drivers/perf/arm_cspmu/arm_cspmu.h b/drivers/perf/arm_cspmu/arm_cspmu.h
-index 779dd2d6aa26b..094e3b89393a9 100644
+index 779dd2d6aa26..094e3b89393a 100644
 --- a/drivers/perf/arm_cspmu/arm_cspmu.h
 +++ b/drivers/perf/arm_cspmu/arm_cspmu.h
 @@ -170,6 +170,8 @@ struct arm_cspmu_impl_ops {
@@ -65,5 +65,5 @@ index 779dd2d6aa26b..094e3b89393a9 100644
  
  /* Vendor/implementer registration parameter. */
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/sauce/patches/0050-NVIDIA-SAUCE-perf-arm_cspmu-NVIDIA-T264-PMU-leakage-.patch b/features/tegra/sauce/patches/0050-NVIDIA-SAUCE-perf-arm_cspmu-NVIDIA-T264-PMU-leakage-.patch
index f281e66..b9c9bcb 100644
--- a/features/tegra/sauce/patches/0050-NVIDIA-SAUCE-perf-arm_cspmu-NVIDIA-T264-PMU-leakage-.patch
+++ b/features/tegra/sauce/patches/0050-NVIDIA-SAUCE-perf-arm_cspmu-NVIDIA-T264-PMU-leakage-.patch
@@ -17,7 +17,7 @@ Change-Id: Ie5885b9bb9495aa0cfb1844a88cbdc7e0509ce67
 Signed-off-by: Eric Funsten <efunsten@nvidia.com>
 
 diff --git a/drivers/perf/arm_cspmu/nvidia_cspmu.c b/drivers/perf/arm_cspmu/nvidia_cspmu.c
-index eee3da896fb82..3754e14794700 100644
+index eee3da896fb8..3754e1479470 100644
 --- a/drivers/perf/arm_cspmu/nvidia_cspmu.c
 +++ b/drivers/perf/arm_cspmu/nvidia_cspmu.c
 @@ -12,6 +12,12 @@
@@ -117,5 +117,5 @@ index eee3da896fb82..3754e14794700 100644
  	return 0;
  }
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/sauce/patches/0051-NVIDIA-SAUCE-perf-arm-spe-Add-Poseidon-AE-to-neovers.patch b/features/tegra/sauce/patches/0051-NVIDIA-SAUCE-perf-arm-spe-Add-Poseidon-AE-to-neovers.patch
index 07ac8d2..540c7f2 100644
--- a/features/tegra/sauce/patches/0051-NVIDIA-SAUCE-perf-arm-spe-Add-Poseidon-AE-to-neovers.patch
+++ b/features/tegra/sauce/patches/0051-NVIDIA-SAUCE-perf-arm-spe-Add-Poseidon-AE-to-neovers.patch
@@ -13,7 +13,7 @@ Change-Id: Ib711ff2c7781b0a739da5349f3bf00e509cb9365
 Signed-off-by: Besar Wicaksono <bwicaksono@nvidia.com>
 
 diff --git a/tools/arch/arm64/include/asm/cputype.h b/tools/arch/arm64/include/asm/cputype.h
-index 139d5e87dc959..9cb44638d41e1 100644
+index 139d5e87dc95..9cb44638d41e 100644
 --- a/tools/arch/arm64/include/asm/cputype.h
 +++ b/tools/arch/arm64/include/asm/cputype.h
 @@ -93,6 +93,7 @@
@@ -33,7 +33,7 @@ index 139d5e87dc959..9cb44638d41e1 100644
  #define MIDR_CORTEX_X925 MIDR_CPU_MODEL(ARM_CPU_IMP_ARM, ARM_CPU_PART_CORTEX_X925)
  #define MIDR_CORTEX_A725 MIDR_CPU_MODEL(ARM_CPU_IMP_ARM, ARM_CPU_PART_CORTEX_A725)
 diff --git a/tools/perf/util/arm-spe.c b/tools/perf/util/arm-spe.c
-index 71be979f50771..e6c47831bc729 100644
+index 71be979f5077..e6c47831bc72 100644
 --- a/tools/perf/util/arm-spe.c
 +++ b/tools/perf/util/arm-spe.c
 @@ -579,6 +579,7 @@ static const struct midr_range common_ds_encoding_cpus[] = {
@@ -45,5 +45,5 @@ index 71be979f50771..e6c47831bc729 100644
  };
  
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/sauce/patches/0052-NVIDIA-SAUCE-net-phy-tegra-p2u-Add-lane-margin-suppo.patch b/features/tegra/sauce/patches/0052-NVIDIA-SAUCE-net-phy-tegra-p2u-Add-lane-margin-suppo.patch
index dc6dc40..ad2b179 100644
--- a/features/tegra/sauce/patches/0052-NVIDIA-SAUCE-net-phy-tegra-p2u-Add-lane-margin-suppo.patch
+++ b/features/tegra/sauce/patches/0052-NVIDIA-SAUCE-net-phy-tegra-p2u-Add-lane-margin-suppo.patch
@@ -18,7 +18,7 @@ Tested-by: Abhilash G <abhilashg@nvidia.com>
 Reviewed-by: Abhilash G <abhilashg@nvidia.com>
 
 diff --git a/drivers/phy/tegra/phy-tegra194-p2u.c b/drivers/phy/tegra/phy-tegra194-p2u.c
-index f49b417c9eb60..63735934aab48 100644
+index f49b417c9eb6..63735934aab4 100644
 --- a/drivers/phy/tegra/phy-tegra194-p2u.c
 +++ b/drivers/phy/tegra/phy-tegra194-p2u.c
 @@ -7,12 +7,15 @@
@@ -407,5 +407,5 @@ index f49b417c9eb60..63735934aab48 100644
  		.name = "tegra194-p2u",
  		.of_match_table = tegra_p2u_id_table,
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/sauce/patches/0053-NVIDIA-SAUCE-net-phy-tegra-p2u-update-power-on-seque.patch b/features/tegra/sauce/patches/0053-NVIDIA-SAUCE-net-phy-tegra-p2u-update-power-on-seque.patch
index 479006f..86350d8 100644
--- a/features/tegra/sauce/patches/0053-NVIDIA-SAUCE-net-phy-tegra-p2u-update-power-on-seque.patch
+++ b/features/tegra/sauce/patches/0053-NVIDIA-SAUCE-net-phy-tegra-p2u-update-power-on-seque.patch
@@ -19,7 +19,7 @@ Tested-by: Abhilash G <abhilashg@nvidia.com>
 Reviewed-by: Abhilash G <abhilashg@nvidia.com>
 
 diff --git a/drivers/phy/tegra/phy-tegra194-p2u.c b/drivers/phy/tegra/phy-tegra194-p2u.c
-index 63735934aab48..480de32819e8a 100644
+index 63735934aab4..480de32819e8 100644
 --- a/drivers/phy/tegra/phy-tegra194-p2u.c
 +++ b/drivers/phy/tegra/phy-tegra194-p2u.c
 @@ -21,6 +21,10 @@
@@ -71,5 +71,5 @@ index 63735934aab48..480de32819e8a 100644
  
  static const struct of_device_id tegra_p2u_id_table[] = {
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/sauce/patches/0054-NVIDIA-SAUCE-phy-tegra194-p2u-Fix-device-tree-backwa.patch b/features/tegra/sauce/patches/0054-NVIDIA-SAUCE-phy-tegra194-p2u-Fix-device-tree-backwa.patch
index 93d946a..0231014 100644
--- a/features/tegra/sauce/patches/0054-NVIDIA-SAUCE-phy-tegra194-p2u-Fix-device-tree-backwa.patch
+++ b/features/tegra/sauce/patches/0054-NVIDIA-SAUCE-phy-tegra194-p2u-Fix-device-tree-backwa.patch
@@ -38,7 +38,7 @@ GVS: Gerrit_Virtual_Submit <buildbot_gerritrpt@nvidia.com>
 Reviewed-by: Brad Griffis <bgriffis@nvidia.com>
 
 diff --git a/drivers/phy/tegra/phy-tegra194-p2u.c b/drivers/phy/tegra/phy-tegra194-p2u.c
-index 480de32819e8a..5d347774ac3aa 100644
+index 480de32819e8..5d347774ac3a 100644
 --- a/drivers/phy/tegra/phy-tegra194-p2u.c
 +++ b/drivers/phy/tegra/phy-tegra194-p2u.c
 @@ -155,7 +155,7 @@ static int tegra_p2u_power_on(struct phy *x)
@@ -93,5 +93,5 @@ index 480de32819e8a..5d347774ac3aa 100644
  }
  
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/sauce/patches/0055-NVIDIA-SAUCE-phy-tegra-xusb-add-vf-support.patch b/features/tegra/sauce/patches/0055-NVIDIA-SAUCE-phy-tegra-xusb-add-vf-support.patch
index 5a76aed..af39b8a 100644
--- a/features/tegra/sauce/patches/0055-NVIDIA-SAUCE-phy-tegra-xusb-add-vf-support.patch
+++ b/features/tegra/sauce/patches/0055-NVIDIA-SAUCE-phy-tegra-xusb-add-vf-support.patch
@@ -19,7 +19,7 @@ Reviewed-by: Laxman Dewangan <ldewangan@nvidia.com>
 (cherry picked from commit dc374ea86ae26744401eaaa513d19f37d15a5c9f)
 
 diff --git a/drivers/phy/tegra/xusb-tegra186.c b/drivers/phy/tegra/xusb-tegra186.c
-index 4452e73fb82a6..1d8a9e57ecf67 100644
+index 4452e73fb82a..1d8a9e57ecf6 100644
 --- a/drivers/phy/tegra/xusb-tegra186.c
 +++ b/drivers/phy/tegra/xusb-tegra186.c
 @@ -609,9 +609,11 @@ static void tegra186_utmi_bias_pad_power_on(struct tegra_xusb_padctl *padctl)
@@ -134,7 +134,7 @@ index 4452e73fb82a6..1d8a9e57ecf67 100644
  	return &priv->base;
  }
 diff --git a/drivers/phy/tegra/xusb.c b/drivers/phy/tegra/xusb.c
-index c89df95aa6ca9..f7bd83e5f3504 100644
+index c89df95aa6ca..f7bd83e5f350 100644
 --- a/drivers/phy/tegra/xusb.c
 +++ b/drivers/phy/tegra/xusb.c
 @@ -1,6 +1,6 @@
@@ -291,7 +291,7 @@ index c89df95aa6ca9..f7bd83e5f3504 100644
  					unsigned int port)
  {
 diff --git a/drivers/phy/tegra/xusb.h b/drivers/phy/tegra/xusb.h
-index 810b410672f37..7e7774ef2668a 100644
+index 810b410672f3..7e7774ef2668 100644
 --- a/drivers/phy/tegra/xusb.h
 +++ b/drivers/phy/tegra/xusb.h
 @@ -1,6 +1,6 @@
@@ -325,7 +325,7 @@ index 810b410672f37..7e7774ef2668a 100644
  
  static inline void padctl_writel(struct tegra_xusb_padctl *padctl, u32 value,
 diff --git a/include/linux/phy/tegra/xusb.h b/include/linux/phy/tegra/xusb.h
-index 6ca51e0080ec0..bcb0e9ee3d468 100644
+index 6ca51e0080ec..bcb0e9ee3d46 100644
 --- a/include/linux/phy/tegra/xusb.h
 +++ b/include/linux/phy/tegra/xusb.h
 @@ -8,11 +8,20 @@
@@ -351,5 +351,5 @@ index 6ca51e0080ec0..bcb0e9ee3d468 100644
  					unsigned int port);
  int tegra_xusb_padctl_hsic_set_idle(struct tegra_xusb_padctl *padctl,
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/sauce/patches/0056-NVIDIA-SAUCE-phy-tegra-Increase-timeout-for-USB2_TRK.patch b/features/tegra/sauce/patches/0056-NVIDIA-SAUCE-phy-tegra-Increase-timeout-for-USB2_TRK.patch
index 9835dcd..4fbd6eb 100644
--- a/features/tegra/sauce/patches/0056-NVIDIA-SAUCE-phy-tegra-Increase-timeout-for-USB2_TRK.patch
+++ b/features/tegra/sauce/patches/0056-NVIDIA-SAUCE-phy-tegra-Increase-timeout-for-USB2_TRK.patch
@@ -24,7 +24,7 @@ GVS: buildbot_gerritrpt <buildbot_gerritrpt@nvidia.com>
 Reviewed-by: Laxman Dewangan <ldewangan@nvidia.com>
 
 diff --git a/drivers/phy/tegra/xusb-tegra186.c b/drivers/phy/tegra/xusb-tegra186.c
-index 1d8a9e57ecf67..bf37b214776c9 100644
+index 1d8a9e57ecf6..bf37b214776c 100644
 --- a/drivers/phy/tegra/xusb-tegra186.c
 +++ b/drivers/phy/tegra/xusb-tegra186.c
 @@ -638,7 +638,7 @@ static void tegra186_utmi_bias_pad_power_on(struct tegra_xusb_padctl *padctl)
@@ -37,5 +37,5 @@ index 1d8a9e57ecf67..bf37b214776c9 100644
  			/* The failure with polling on trk complete will not
  			 * cause the failure of powering on the bias pad.
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/sauce/patches/0057-NVIDIA-SAUCE-phy-tegra-fix-memory-corruption.patch b/features/tegra/sauce/patches/0057-NVIDIA-SAUCE-phy-tegra-fix-memory-corruption.patch
index 0a7a18e..bef1685 100644
--- a/features/tegra/sauce/patches/0057-NVIDIA-SAUCE-phy-tegra-fix-memory-corruption.patch
+++ b/features/tegra/sauce/patches/0057-NVIDIA-SAUCE-phy-tegra-fix-memory-corruption.patch
@@ -23,7 +23,7 @@ Reviewed-by: Laxman Dewangan <ldewangan@nvidia.com>
 Reviewed-by: Petlozu Pravareshwar <petlozup@nvidia.com>
 
 diff --git a/drivers/phy/tegra/xusb.c b/drivers/phy/tegra/xusb.c
-index f7bd83e5f3504..e85341bdd5492 100644
+index f7bd83e5f350..e85341bdd549 100644
 --- a/drivers/phy/tegra/xusb.c
 +++ b/drivers/phy/tegra/xusb.c
 @@ -1388,6 +1388,13 @@ int tegra_xusb_padctl_event_register(struct tegra_xusb_padctl *padctl,
@@ -41,7 +41,7 @@ index f7bd83e5f3504..e85341bdd5492 100644
  				     unsigned long val)
  {
 diff --git a/include/linux/phy/tegra/xusb.h b/include/linux/phy/tegra/xusb.h
-index bcb0e9ee3d468..e547490b33975 100644
+index bcb0e9ee3d46..e547490b3397 100644
 --- a/include/linux/phy/tegra/xusb.h
 +++ b/include/linux/phy/tegra/xusb.h
 @@ -1,6 +1,6 @@
@@ -62,5 +62,5 @@ index bcb0e9ee3d468..e547490b33975 100644
  				     unsigned long val);
  int tegra_xusb_padctl_usb3_save_context(struct tegra_xusb_padctl *padctl,
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/sauce/patches/0058-NVIDIA-SAUCE-Add-tegra-EPL-driver.patch b/features/tegra/sauce/patches/0058-NVIDIA-SAUCE-Add-tegra-EPL-driver.patch
index e162cfd..8973279 100644
--- a/features/tegra/sauce/patches/0058-NVIDIA-SAUCE-Add-tegra-EPL-driver.patch
+++ b/features/tegra/sauce/patches/0058-NVIDIA-SAUCE-Add-tegra-EPL-driver.patch
@@ -18,10 +18,10 @@ Tested-by: Abhilash G <abhilashg@nvidia.com>
 Reviewed-by: Abhilash G <abhilashg@nvidia.com>
 
 diff --git a/MAINTAINERS b/MAINTAINERS
-index 1792c69a7faf0..d28100c441f39 100644
+index bd8af95b6f95..140534d53c02 100644
 --- a/MAINTAINERS
 +++ b/MAINTAINERS
-@@ -25279,6 +25279,14 @@ M:	Jon Hunter <jonathanh@nvidia.com>
+@@ -25292,6 +25292,14 @@ M:	Jon Hunter <jonathanh@nvidia.com>
  S:	Supported
  F:	drivers/dma/tegra*
  
@@ -37,7 +37,7 @@ index 1792c69a7faf0..d28100c441f39 100644
  M:	Laxman Dewangan <ldewangan@nvidia.com>
  R:	Dmitry Osipenko <digetx@gmail.com>
 diff --git a/drivers/platform/Kconfig b/drivers/platform/Kconfig
-index 960fd6a82450a..eb18091a503ff 100644
+index 960fd6a82450..eb18091a503f 100644
 --- a/drivers/platform/Kconfig
 +++ b/drivers/platform/Kconfig
 @@ -18,3 +18,5 @@ source "drivers/platform/surface/Kconfig"
@@ -47,7 +47,7 @@ index 960fd6a82450a..eb18091a503ff 100644
 +
 +source "drivers/platform/tegra/Kconfig"
 diff --git a/drivers/platform/Makefile b/drivers/platform/Makefile
-index 19ac54648586e..bed2220d32378 100644
+index 19ac54648586..bed2220d3237 100644
 --- a/drivers/platform/Makefile
 +++ b/drivers/platform/Makefile
 @@ -13,3 +13,4 @@ obj-$(CONFIG_CHROME_PLATFORMS)	+= chrome/
@@ -57,7 +57,7 @@ index 19ac54648586e..bed2220d32378 100644
 +obj-$(CONFIG_ARCH_TEGRA)	+= tegra/
 diff --git a/drivers/platform/tegra/Kconfig b/drivers/platform/tegra/Kconfig
 new file mode 100644
-index 0000000000000..d8f93678d183e
+index 000000000000..d8f93678d183
 --- /dev/null
 +++ b/drivers/platform/tegra/Kconfig
 @@ -0,0 +1,30 @@
@@ -93,7 +93,7 @@ index 0000000000000..d8f93678d183e
 +endif # TEGRA_PLATFORM_DEVICES
 diff --git a/drivers/platform/tegra/Makefile b/drivers/platform/tegra/Makefile
 new file mode 100644
-index 0000000000000..d20e795034723
+index 000000000000..d20e79503472
 --- /dev/null
 +++ b/drivers/platform/tegra/Makefile
 @@ -0,0 +1,2 @@
@@ -101,7 +101,7 @@ index 0000000000000..d20e795034723
 +obj-$(CONFIG_TEGRA_EPL) += tegra-epl.o
 diff --git a/drivers/platform/tegra/tegra-epl.c b/drivers/platform/tegra/tegra-epl.c
 new file mode 100644
-index 0000000000000..e45195cbc3600
+index 000000000000..e45195cbc360
 --- /dev/null
 +++ b/drivers/platform/tegra/tegra-epl.c
 @@ -0,0 +1,392 @@
@@ -499,7 +499,7 @@ index 0000000000000..e45195cbc3600
 +MODULE_LICENSE("GPL v2");
 diff --git a/include/linux/tegra-epl.h b/include/linux/tegra-epl.h
 new file mode 100644
-index 0000000000000..cd0447be1f748
+index 000000000000..cd0447be1f74
 --- /dev/null
 +++ b/include/linux/tegra-epl.h
 @@ -0,0 +1,103 @@
@@ -608,7 +608,7 @@ index 0000000000000..cd0447be1f748
 +#endif /* _TEGRA_EPL_H_ */
 diff --git a/include/uapi/linux/tegra-epl.h b/include/uapi/linux/tegra-epl.h
 new file mode 100644
-index 0000000000000..2418f81aa8d6d
+index 000000000000..2418f81aa8d6
 --- /dev/null
 +++ b/include/uapi/linux/tegra-epl.h
 @@ -0,0 +1,14 @@
@@ -627,5 +627,5 @@ index 0000000000000..2418f81aa8d6d
 +
 +#endif /* _UAPI_TEGRA_EPL_H_ */
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/sauce/patches/0059-NVIDIA-SAUCE-tegra-epl-send-state-notification-fsi.patch b/features/tegra/sauce/patches/0059-NVIDIA-SAUCE-tegra-epl-send-state-notification-fsi.patch
index 520e61a..7e8c349 100644
--- a/features/tegra/sauce/patches/0059-NVIDIA-SAUCE-tegra-epl-send-state-notification-fsi.patch
+++ b/features/tegra/sauce/patches/0059-NVIDIA-SAUCE-tegra-epl-send-state-notification-fsi.patch
@@ -17,7 +17,7 @@ Tested-by: Abhilash G <abhilashg@nvidia.com>
 Reviewed-by: Abhilash G <abhilashg@nvidia.com>
 
 diff --git a/drivers/platform/tegra/tegra-epl.c b/drivers/platform/tegra/tegra-epl.c
-index e45195cbc3600..d7b7cae727906 100644
+index e45195cbc360..d7b7cae72790 100644
 --- a/drivers/platform/tegra/tegra-epl.c
 +++ b/drivers/platform/tegra/tegra-epl.c
 @@ -1,5 +1,5 @@
@@ -119,5 +119,5 @@ index e45195cbc3600..d7b7cae727906 100644
  
  module_platform_driver(epl_client);
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/sauce/patches/0060-NVIDIA-SAUCE-tegra-epl-Remove-dependency-on-ARCH_TEG.patch b/features/tegra/sauce/patches/0060-NVIDIA-SAUCE-tegra-epl-Remove-dependency-on-ARCH_TEG.patch
index e3aa428..f1174b5 100644
--- a/features/tegra/sauce/patches/0060-NVIDIA-SAUCE-tegra-epl-Remove-dependency-on-ARCH_TEG.patch
+++ b/features/tegra/sauce/patches/0060-NVIDIA-SAUCE-tegra-epl-Remove-dependency-on-ARCH_TEG.patch
@@ -17,7 +17,7 @@ Tested-by: Abhilash G <abhilashg@nvidia.com>
 Reviewed-by: Abhilash G <abhilashg@nvidia.com>
 
 diff --git a/drivers/platform/tegra/Kconfig b/drivers/platform/tegra/Kconfig
-index d8f93678d183e..404281dc1e6eb 100644
+index d8f93678d183..404281dc1e6e 100644
 --- a/drivers/platform/tegra/Kconfig
 +++ b/drivers/platform/tegra/Kconfig
 @@ -17,7 +17,7 @@ if TEGRA_PLATFORM_DEVICES
@@ -30,5 +30,5 @@ index d8f93678d183e..404281dc1e6eb 100644
  	  The tegra-epl driver provides interface for reporting software detected
  	  errors to Functional Safety Island (FSI) via HSP mailbox or MISC EC
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/sauce/patches/0061-NVIDIA-SAUCE-tegra-epl-fix-deinit-notification-to-fs.patch b/features/tegra/sauce/patches/0061-NVIDIA-SAUCE-tegra-epl-fix-deinit-notification-to-fs.patch
index ccddd19..b71176b 100644
--- a/features/tegra/sauce/patches/0061-NVIDIA-SAUCE-tegra-epl-fix-deinit-notification-to-fs.patch
+++ b/features/tegra/sauce/patches/0061-NVIDIA-SAUCE-tegra-epl-fix-deinit-notification-to-fs.patch
@@ -17,7 +17,7 @@ Reviewed-by: Prathamesh Shete <pshete@nvidia.com>
 Reviewed-by: Laxman Dewangan <ldewangan@nvidia.com>
 
 diff --git a/drivers/platform/tegra/tegra-epl.c b/drivers/platform/tegra/tegra-epl.c
-index d7b7cae727906..da33dd765179d 100644
+index d7b7cae72790..da33dd765179 100644
 --- a/drivers/platform/tegra/tegra-epl.c
 +++ b/drivers/platform/tegra/tegra-epl.c
 @@ -78,6 +78,8 @@ static DEFINE_MUTEX(hs_state_mutex);
@@ -66,5 +66,5 @@ index d7b7cae727906..da33dd765179d 100644
  	mutex_lock(&hs_state_mutex);
  	hs_state = HANDSHAKE_PENDING;
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/sauce/patches/0062-NVIDIA-SAUCE-tegra-epl-Set-handshake-retry-count-to-.patch b/features/tegra/sauce/patches/0062-NVIDIA-SAUCE-tegra-epl-Set-handshake-retry-count-to-.patch
index be1d1de..5d278b0 100644
--- a/features/tegra/sauce/patches/0062-NVIDIA-SAUCE-tegra-epl-Set-handshake-retry-count-to-.patch
+++ b/features/tegra/sauce/patches/0062-NVIDIA-SAUCE-tegra-epl-Set-handshake-retry-count-to-.patch
@@ -35,7 +35,7 @@ Tested-by: Kartik Rajput <kkartik@nvidia.com>
 Reviewed-by: Kartik Rajput <kkartik@nvidia.com>
 
 diff --git a/drivers/platform/tegra/tegra-epl.c b/drivers/platform/tegra/tegra-epl.c
-index da33dd765179d..7c22bfefb06f3 100644
+index da33dd765179..7c22bfefb06f 100644
 --- a/drivers/platform/tegra/tegra-epl.c
 +++ b/drivers/platform/tegra/tegra-epl.c
 @@ -12,8 +12,6 @@
@@ -187,5 +187,5 @@ index da33dd765179d..7c22bfefb06f3 100644
  	epl_unregister_device();
  }
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/sauce/patches/0063-NVIDIA-SAUCE-tegra-epl-publish-kernel-pm-state-to-FS.patch b/features/tegra/sauce/patches/0063-NVIDIA-SAUCE-tegra-epl-publish-kernel-pm-state-to-FS.patch
index a8006cc..d807f41 100644
--- a/features/tegra/sauce/patches/0063-NVIDIA-SAUCE-tegra-epl-publish-kernel-pm-state-to-FS.patch
+++ b/features/tegra/sauce/patches/0063-NVIDIA-SAUCE-tegra-epl-publish-kernel-pm-state-to-FS.patch
@@ -21,7 +21,7 @@ Reviewed-by: Laxman Dewangan <ldewangan@nvidia.com>
 GVS: Gerrit_Virtual_Submit <buildbot_gerritrpt@nvidia.com>
 
 diff --git a/drivers/platform/tegra/tegra-epl.c b/drivers/platform/tegra/tegra-epl.c
-index 7c22bfefb06f3..978ccdfec9d0a 100644
+index 7c22bfefb06f..978ccdfec9d0 100644
 --- a/drivers/platform/tegra/tegra-epl.c
 +++ b/drivers/platform/tegra/tegra-epl.c
 @@ -1,5 +1,5 @@
@@ -84,5 +84,5 @@ index 7c22bfefb06f3..978ccdfec9d0a 100644
  
  	hs_state = HANDSHAKE_PENDING;
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/sauce/patches/0064-NVIDIA-SAUCE-tegra-epl-Set-default-handshake-retry-c.patch b/features/tegra/sauce/patches/0064-NVIDIA-SAUCE-tegra-epl-Set-default-handshake-retry-c.patch
index 0098ecf..180ca81 100644
--- a/features/tegra/sauce/patches/0064-NVIDIA-SAUCE-tegra-epl-Set-default-handshake-retry-c.patch
+++ b/features/tegra/sauce/patches/0064-NVIDIA-SAUCE-tegra-epl-Set-default-handshake-retry-c.patch
@@ -23,7 +23,7 @@ Reviewed-by: Laxman Dewangan <ldewangan@nvidia.com>
 GVS: Gerrit_Virtual_Submit <buildbot_gerritrpt@nvidia.com>
 
 diff --git a/drivers/platform/tegra/tegra-epl.c b/drivers/platform/tegra/tegra-epl.c
-index 978ccdfec9d0a..d44cba4d6f2f4 100644
+index 978ccdfec9d0..d44cba4d6f2f 100644
 --- a/drivers/platform/tegra/tegra-epl.c
 +++ b/drivers/platform/tegra/tegra-epl.c
 @@ -75,6 +75,8 @@ static struct epl_misc_sw_err_cfg miscerr_cfg[NUM_SW_GENERIC_ERR];
@@ -66,5 +66,5 @@ index 978ccdfec9d0a..d44cba4d6f2f4 100644
  	if (IS_ERR(mission_err_status_va)) {
  		isAddrMappOk = false;
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/sauce/patches/0065-NVIDIA-SAUCE-tegra-epl-Map-mission-status-reg-if-onl.patch b/features/tegra/sauce/patches/0065-NVIDIA-SAUCE-tegra-epl-Map-mission-status-reg-if-onl.patch
index 3cd186c..6969445 100644
--- a/features/tegra/sauce/patches/0065-NVIDIA-SAUCE-tegra-epl-Map-mission-status-reg-if-onl.patch
+++ b/features/tegra/sauce/patches/0065-NVIDIA-SAUCE-tegra-epl-Map-mission-status-reg-if-onl.patch
@@ -19,7 +19,7 @@ Reviewed-by: Laxman Dewangan <ldewangan@nvidia.com>
 (cherry picked from commit c28c7e50c460912f60a1b4e265d37a88fc522136)
 
 diff --git a/drivers/platform/tegra/tegra-epl.c b/drivers/platform/tegra/tegra-epl.c
-index d44cba4d6f2f4..49c8a94837a03 100644
+index d44cba4d6f2f..49c8a94837a0 100644
 --- a/drivers/platform/tegra/tegra-epl.c
 +++ b/drivers/platform/tegra/tegra-epl.c
 @@ -1,5 +1,5 @@
@@ -66,5 +66,5 @@ index d44cba4d6f2f4..49c8a94837a03 100644
  
  	if (ret == 0) {
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/sauce/patches/0066-NVIDIA-SAUCE-tegra-epl-allow-tegra-epl-to-be-built-a.patch b/features/tegra/sauce/patches/0066-NVIDIA-SAUCE-tegra-epl-allow-tegra-epl-to-be-built-a.patch
index 1c68a25..9c09653 100644
--- a/features/tegra/sauce/patches/0066-NVIDIA-SAUCE-tegra-epl-allow-tegra-epl-to-be-built-a.patch
+++ b/features/tegra/sauce/patches/0066-NVIDIA-SAUCE-tegra-epl-allow-tegra-epl-to-be-built-a.patch
@@ -23,7 +23,7 @@ GVS: buildbot_gerritrpt <buildbot_gerritrpt@nvidia.com>
 (cherry picked from commit 2a56160a9c270b5b411a88f9e79865e5442581d3)
 
 diff --git a/drivers/platform/tegra/Kconfig b/drivers/platform/tegra/Kconfig
-index 404281dc1e6eb..344bf38dea5a5 100644
+index 404281dc1e6e..344bf38dea5a 100644
 --- a/drivers/platform/tegra/Kconfig
 +++ b/drivers/platform/tegra/Kconfig
 @@ -16,7 +16,7 @@ menuconfig TEGRA_PLATFORM_DEVICES
@@ -36,7 +36,7 @@ index 404281dc1e6eb..344bf38dea5a5 100644
  	help
  	  The tegra-epl driver provides interface for reporting software detected
 diff --git a/drivers/platform/tegra/tegra-epl.c b/drivers/platform/tegra/tegra-epl.c
-index 49c8a94837a03..219dbc108f64f 100644
+index 49c8a94837a0..219dbc108f64 100644
 --- a/drivers/platform/tegra/tegra-epl.c
 +++ b/drivers/platform/tegra/tegra-epl.c
 @@ -22,9 +22,6 @@
@@ -93,7 +93,7 @@ index 49c8a94837a03..219dbc108f64f 100644
  		mission_err_status_va = devm_platform_ioremap_resource(pdev, NUM_SW_GENERIC_ERR * 2);
  		if (IS_ERR(mission_err_status_va)) {
 diff --git a/include/linux/tegra-epl.h b/include/linux/tegra-epl.h
-index cd0447be1f748..1038f56712fbc 100644
+index cd0447be1f74..1038f56712fb 100644
 --- a/include/linux/tegra-epl.h
 +++ b/include/linux/tegra-epl.h
 @@ -25,7 +25,7 @@ struct epl_error_report_frame {
@@ -106,5 +106,5 @@ index cd0447be1f748..1038f56712fbc 100644
   * @brief API to check if SW error can be reported via Misc EC
   *        by reading and checking Misc EC error status register value.
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/sauce/patches/0067-NVIDIA-SAUCE-tegra-epl-add-plausibility-checks-and-i.patch b/features/tegra/sauce/patches/0067-NVIDIA-SAUCE-tegra-epl-add-plausibility-checks-and-i.patch
index 6f27dda..6338ca3 100644
--- a/features/tegra/sauce/patches/0067-NVIDIA-SAUCE-tegra-epl-add-plausibility-checks-and-i.patch
+++ b/features/tegra/sauce/patches/0067-NVIDIA-SAUCE-tegra-epl-add-plausibility-checks-and-i.patch
@@ -33,7 +33,7 @@ Reviewed-by: Laxman Dewangan <ldewangan@nvidia.com>
 (cherry picked from commit a7415c43437d37f2732d334cfe90ef2f4c7d7575)
 
 diff --git a/drivers/platform/tegra/tegra-epl.c b/drivers/platform/tegra/tegra-epl.c
-index 219dbc108f64f..8ccb303ce8098 100644
+index 219dbc108f64..8ccb303ce809 100644
 --- a/drivers/platform/tegra/tegra-epl.c
 +++ b/drivers/platform/tegra/tegra-epl.c
 @@ -25,6 +25,16 @@
@@ -375,5 +375,5 @@ index 219dbc108f64f..8ccb303ce8098 100644
  	hs_state = HANDSHAKE_PENDING;
  
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/sauce/patches/0068-NVIDIA-SAUCE-tegra-epl-Fix-CERT-C-violations-and-sec.patch b/features/tegra/sauce/patches/0068-NVIDIA-SAUCE-tegra-epl-Fix-CERT-C-violations-and-sec.patch
index 70b4bc8..2df6fc0 100644
--- a/features/tegra/sauce/patches/0068-NVIDIA-SAUCE-tegra-epl-Fix-CERT-C-violations-and-sec.patch
+++ b/features/tegra/sauce/patches/0068-NVIDIA-SAUCE-tegra-epl-Fix-CERT-C-violations-and-sec.patch
@@ -19,7 +19,7 @@ GVS: buildbot_gerritrpt <buildbot_gerritrpt@nvidia.com>
 (cherry picked from commit 9c7c02d1c39b501578d65f0300384a1545ec674f)
 
 diff --git a/drivers/platform/tegra/tegra-epl.c b/drivers/platform/tegra/tegra-epl.c
-index 8ccb303ce8098..5c0bfec6bce14 100644
+index 8ccb303ce809..5c0bfec6bce1 100644
 --- a/drivers/platform/tegra/tegra-epl.c
 +++ b/drivers/platform/tegra/tegra-epl.c
 @@ -105,7 +105,20 @@ static inline uint32_t epl_get_current_timestamp(void)
@@ -143,5 +143,5 @@ index 8ccb303ce8098..5c0bfec6bce14 100644
  	}
  
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/sauce/patches/0069-NVIDIA-SAUCE-tegra-epl-add-periodic-alive-packet-fun.patch b/features/tegra/sauce/patches/0069-NVIDIA-SAUCE-tegra-epl-add-periodic-alive-packet-fun.patch
index 211ce30..b8dafb5 100644
--- a/features/tegra/sauce/patches/0069-NVIDIA-SAUCE-tegra-epl-add-periodic-alive-packet-fun.patch
+++ b/features/tegra/sauce/patches/0069-NVIDIA-SAUCE-tegra-epl-add-periodic-alive-packet-fun.patch
@@ -32,7 +32,7 @@ GVS: buildbot_gerritrpt <buildbot_gerritrpt@nvidia.com>
 (cherry picked from commit a6534e367f5cd0f1c3f0a479f39b354218a1ef98)
 
 diff --git a/drivers/platform/tegra/tegra-epl.c b/drivers/platform/tegra/tegra-epl.c
-index 5c0bfec6bce14..4dee455d2f58c 100644
+index 5c0bfec6bce1..4dee455d2f58 100644
 --- a/drivers/platform/tegra/tegra-epl.c
 +++ b/drivers/platform/tegra/tegra-epl.c
 @@ -12,6 +12,10 @@
@@ -370,5 +370,5 @@ index 5c0bfec6bce14..4dee455d2f58c 100644
  }
  
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/sauce/patches/0070-NVIDIA-SAUCE-tegra-epl-Add-dts-parameter-for-epl-mai.patch b/features/tegra/sauce/patches/0070-NVIDIA-SAUCE-tegra-epl-Add-dts-parameter-for-epl-mai.patch
index 172f8df..aa51b93 100644
--- a/features/tegra/sauce/patches/0070-NVIDIA-SAUCE-tegra-epl-Add-dts-parameter-for-epl-mai.patch
+++ b/features/tegra/sauce/patches/0070-NVIDIA-SAUCE-tegra-epl-Add-dts-parameter-for-epl-mai.patch
@@ -22,7 +22,7 @@ GVS: buildbot_gerritrpt <buildbot_gerritrpt@nvidia.com>
 (cherry picked from commit 47b4f2a7edf2d3dc4a1adc0d279656e2c436394b)
 
 diff --git a/drivers/platform/tegra/tegra-epl.c b/drivers/platform/tegra/tegra-epl.c
-index 4dee455d2f58c..7787a99310669 100644
+index 4dee455d2f58..7787a9931066 100644
 --- a/drivers/platform/tegra/tegra-epl.c
 +++ b/drivers/platform/tegra/tegra-epl.c
 @@ -181,14 +181,25 @@ static void tegra_hsp_tx_empty_notify(struct mbox_client *cl,
@@ -53,5 +53,5 @@ index 4dee455d2f58c..7787a99310669 100644
  
  	epl_hsp_v->tx.chan = mbox_request_channel_byname(&epl_hsp_v->tx.client,
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/sauce/patches/0071-NVIDIA-SAUCE-Documentation-Add-DT-binding-for-tegra-.patch b/features/tegra/sauce/patches/0071-NVIDIA-SAUCE-Documentation-Add-DT-binding-for-tegra-.patch
index 4df88b9..39f4a67 100644
--- a/features/tegra/sauce/patches/0071-NVIDIA-SAUCE-Documentation-Add-DT-binding-for-tegra-.patch
+++ b/features/tegra/sauce/patches/0071-NVIDIA-SAUCE-Documentation-Add-DT-binding-for-tegra-.patch
@@ -16,7 +16,7 @@ Reviewed-by: Kovid Kumar <kovidk@nvidia.com>
 
 diff --git a/Documentation/devicetree/bindings/platform/tegra/tegra-epl.yaml b/Documentation/devicetree/bindings/platform/tegra/tegra-epl.yaml
 new file mode 100644
-index 0000000000000..4b2686157c1cf
+index 000000000000..4b2686157c1c
 --- /dev/null
 +++ b/Documentation/devicetree/bindings/platform/tegra/tegra-epl.yaml
 @@ -0,0 +1,123 @@
@@ -144,5 +144,5 @@ index 0000000000000..4b2686157c1cf
 +     };
 +...
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/sauce/patches/0072-NVIDIA-SAUCE-Add-tegra-HSI-Err-Inj-driver.patch b/features/tegra/sauce/patches/0072-NVIDIA-SAUCE-Add-tegra-HSI-Err-Inj-driver.patch
index 5a56f64..abfac64 100644
--- a/features/tegra/sauce/patches/0072-NVIDIA-SAUCE-Add-tegra-HSI-Err-Inj-driver.patch
+++ b/features/tegra/sauce/patches/0072-NVIDIA-SAUCE-Add-tegra-HSI-Err-Inj-driver.patch
@@ -19,10 +19,10 @@ Tested-by: Abhilash G <abhilashg@nvidia.com>
 Reviewed-by: Abhilash G <abhilashg@nvidia.com>
 
 diff --git a/MAINTAINERS b/MAINTAINERS
-index d28100c441f39..85f2928dc79e0 100644
+index 140534d53c02..c0951ad457d4 100644
 --- a/MAINTAINERS
 +++ b/MAINTAINERS
-@@ -28437,3 +28437,11 @@ S:	Buried alive in reporters
+@@ -28450,3 +28450,11 @@ S:	Buried alive in reporters
  T:	git git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
  F:	*
  F:	*/
@@ -35,7 +35,7 @@ index d28100c441f39..85f2928dc79e0 100644
 +F:	drivers/platform/tegra/tegra-hsierrrptinj.c
 +F:	include/linux/tegra-hsierrrptinj.h
 diff --git a/drivers/platform/tegra/Kconfig b/drivers/platform/tegra/Kconfig
-index 344bf38dea5a5..2502c0ccd2f06 100644
+index 344bf38dea5a..2502c0ccd2f0 100644
 --- a/drivers/platform/tegra/Kconfig
 +++ b/drivers/platform/tegra/Kconfig
 @@ -26,5 +26,13 @@ config TEGRA_EPL
@@ -53,7 +53,7 @@ index 344bf38dea5a5..2502c0ccd2f06 100644
  
  endif # TEGRA_PLATFORM_DEVICES
 diff --git a/drivers/platform/tegra/Makefile b/drivers/platform/tegra/Makefile
-index d20e795034723..55e92006a555f 100644
+index d20e79503472..55e92006a555 100644
 --- a/drivers/platform/tegra/Makefile
 +++ b/drivers/platform/tegra/Makefile
 @@ -1,2 +1,3 @@
@@ -62,7 +62,7 @@ index d20e795034723..55e92006a555f 100644
 +obj-$(CONFIG_TEGRA_HSIERRRPTINJ) += tegra-hsierrrptinj.o
 diff --git a/drivers/platform/tegra/tegra-hsierrrptinj.c b/drivers/platform/tegra/tegra-hsierrrptinj.c
 new file mode 100644
-index 0000000000000..adf9dbf811750
+index 000000000000..adf9dbf81175
 --- /dev/null
 +++ b/drivers/platform/tegra/tegra-hsierrrptinj.c
 @@ -0,0 +1,455 @@
@@ -523,7 +523,7 @@ index 0000000000000..adf9dbf811750
 +MODULE_LICENSE("GPL v2");
 diff --git a/include/linux/tegra-hsierrrptinj.h b/include/linux/tegra-hsierrrptinj.h
 new file mode 100644
-index 0000000000000..13b9d0c861399
+index 000000000000..13b9d0c86139
 --- /dev/null
 +++ b/include/linux/tegra-hsierrrptinj.h
 @@ -0,0 +1,124 @@
@@ -652,5 +652,5 @@ index 0000000000000..13b9d0c861399
 +
 +#endif /* TEGRA_HSIERRRPTINJ_H */
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/sauce/patches/0073-NVIDIA-SAUCE-hsierrrptinj-Update-supported-IPs.patch b/features/tegra/sauce/patches/0073-NVIDIA-SAUCE-hsierrrptinj-Update-supported-IPs.patch
index a39a71e..ffc1285 100644
--- a/features/tegra/sauce/patches/0073-NVIDIA-SAUCE-hsierrrptinj-Update-supported-IPs.patch
+++ b/features/tegra/sauce/patches/0073-NVIDIA-SAUCE-hsierrrptinj-Update-supported-IPs.patch
@@ -19,7 +19,7 @@ Reviewed-by: Abhilash G <abhilashg@nvidia.com>
 Reviewed-by: Laxman Dewangan <ldewangan@nvidia.com>
 
 diff --git a/drivers/platform/tegra/tegra-hsierrrptinj.c b/drivers/platform/tegra/tegra-hsierrrptinj.c
-index adf9dbf811750..7052e59582478 100644
+index adf9dbf81175..7052e5958247 100644
 --- a/drivers/platform/tegra/tegra-hsierrrptinj.c
 +++ b/drivers/platform/tegra/tegra-hsierrrptinj.c
 @@ -43,6 +43,7 @@
@@ -61,7 +61,7 @@ index adf9dbf811750..7052e59582478 100644
  	ret = mbox_send_message(hsierrrptinj_tx.chan, (void *)&error_report);
  
 diff --git a/include/linux/tegra-hsierrrptinj.h b/include/linux/tegra-hsierrrptinj.h
-index 13b9d0c861399..e8ba5503af2a1 100644
+index 13b9d0c86139..e8ba5503af2a 100644
 --- a/include/linux/tegra-hsierrrptinj.h
 +++ b/include/linux/tegra-hsierrrptinj.h
 @@ -39,6 +39,8 @@ IP_TSEC  = 0x0009,
@@ -74,5 +74,5 @@ index 13b9d0c861399..e8ba5503af2a1 100644
  IP_HSM   = 0x00FF
  } hsierrrpt_ipid_t;
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/sauce/patches/0074-NVIDIA-SAUCE-hsierrrptinj-add-ID-for-DLA.patch b/features/tegra/sauce/patches/0074-NVIDIA-SAUCE-hsierrrptinj-add-ID-for-DLA.patch
index 75e3566..90f63d6 100644
--- a/features/tegra/sauce/patches/0074-NVIDIA-SAUCE-hsierrrptinj-add-ID-for-DLA.patch
+++ b/features/tegra/sauce/patches/0074-NVIDIA-SAUCE-hsierrrptinj-add-ID-for-DLA.patch
@@ -15,7 +15,7 @@ Reviewed-by: Bitan Biswas <bbiswas@nvidia.com>
 Reviewed-on: https://git-master.nvidia.com/r/c/linux-stable/+/2907303
 
 diff --git a/drivers/platform/tegra/tegra-hsierrrptinj.c b/drivers/platform/tegra/tegra-hsierrrptinj.c
-index 7052e59582478..664e17263496e 100644
+index 7052e5958247..664e17263496 100644
 --- a/drivers/platform/tegra/tegra-hsierrrptinj.c
 +++ b/drivers/platform/tegra/tegra-hsierrrptinj.c
 @@ -1,5 +1,5 @@
@@ -37,7 +37,7 @@ index 7052e59582478..664e17263496e 100644
  /* This directory entry will point to `/sys/kernel/debug/tegra_hsierrrptinj`. */
  static struct dentry *hsierrrptinj_debugfs_root;
 diff --git a/include/linux/tegra-hsierrrptinj.h b/include/linux/tegra-hsierrrptinj.h
-index e8ba5503af2a1..a31bb5abb48a6 100644
+index e8ba5503af2a..a31bb5abb48a 100644
 --- a/include/linux/tegra-hsierrrptinj.h
 +++ b/include/linux/tegra-hsierrrptinj.h
 @@ -1,5 +1,5 @@
@@ -65,5 +65,5 @@ index e8ba5503af2a1..a31bb5abb48a6 100644
  IP_EC    = 0x00FC,
  IP_SC7   = 0x00FD,
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/sauce/patches/0075-NVIDIA-SAUCE-hsierrrptinj-Update-Ethernet-IP-instanc.patch b/features/tegra/sauce/patches/0075-NVIDIA-SAUCE-hsierrrptinj-Update-Ethernet-IP-instanc.patch
index 5536c2d..6989c6e 100644
--- a/features/tegra/sauce/patches/0075-NVIDIA-SAUCE-hsierrrptinj-Update-Ethernet-IP-instanc.patch
+++ b/features/tegra/sauce/patches/0075-NVIDIA-SAUCE-hsierrrptinj-Update-Ethernet-IP-instanc.patch
@@ -16,7 +16,7 @@ Reviewed-by: Harshraj Rao <hmrao@nvidia.com>
 Reviewed-on: https://git-master.nvidia.com/r/c/linux-stable/+/2907253
 
 diff --git a/drivers/platform/tegra/tegra-hsierrrptinj.c b/drivers/platform/tegra/tegra-hsierrrptinj.c
-index 664e17263496e..79cf0b6b13b7c 100644
+index 664e17263496..79cf0b6b13b7 100644
 --- a/drivers/platform/tegra/tegra-hsierrrptinj.c
 +++ b/drivers/platform/tegra/tegra-hsierrrptinj.c
 @@ -64,8 +64,8 @@ struct hsm_error_report_frame {
@@ -40,5 +40,5 @@ index 664e17263496e..79cf0b6b13b7c 100644
  /* This directory entry will point to `/sys/kernel/debug/tegra_hsierrrptinj`. */
  static struct dentry *hsierrrptinj_debugfs_root;
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/sauce/patches/0076-NVIDIA-SAUCE-hsierrrptinj-update-driver.patch b/features/tegra/sauce/patches/0076-NVIDIA-SAUCE-hsierrrptinj-update-driver.patch
index fa27a1c..54c163e 100644
--- a/features/tegra/sauce/patches/0076-NVIDIA-SAUCE-hsierrrptinj-update-driver.patch
+++ b/features/tegra/sauce/patches/0076-NVIDIA-SAUCE-hsierrrptinj-update-driver.patch
@@ -18,7 +18,7 @@ Reviewed-by: Prathamesh Shete <pshete@nvidia.com>
 Tested-by: Prathamesh Shete <pshete@nvidia.com>
 
 diff --git a/drivers/platform/tegra/tegra-hsierrrptinj.c b/drivers/platform/tegra/tegra-hsierrrptinj.c
-index 79cf0b6b13b7c..22e2d65786416 100644
+index 79cf0b6b13b7..22e2d6578641 100644
 --- a/drivers/platform/tegra/tegra-hsierrrptinj.c
 +++ b/drivers/platform/tegra/tegra-hsierrrptinj.c
 @@ -70,13 +70,13 @@ struct hsm_error_report_frame {
@@ -176,5 +176,5 @@ index 79cf0b6b13b7c..22e2d65786416 100644
  };
  
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/sauce/patches/0077-NVIDIA-SAUCE-hsierrrptinj-increase-SDMMC-clients.patch b/features/tegra/sauce/patches/0077-NVIDIA-SAUCE-hsierrrptinj-increase-SDMMC-clients.patch
index e314f87..552d104 100644
--- a/features/tegra/sauce/patches/0077-NVIDIA-SAUCE-hsierrrptinj-increase-SDMMC-clients.patch
+++ b/features/tegra/sauce/patches/0077-NVIDIA-SAUCE-hsierrrptinj-increase-SDMMC-clients.patch
@@ -20,7 +20,7 @@ GVS: buildbot_gerritrpt <buildbot_gerritrpt@nvidia.com>
 Reviewed-by: Petlozu Pravareshwar <petlozup@nvidia.com>
 
 diff --git a/drivers/platform/tegra/tegra-hsierrrptinj.c b/drivers/platform/tegra/tegra-hsierrrptinj.c
-index 22e2d65786416..3249832fea52d 100644
+index 22e2d6578641..3249832fea52 100644
 --- a/drivers/platform/tegra/tegra-hsierrrptinj.c
 +++ b/drivers/platform/tegra/tegra-hsierrrptinj.c
 @@ -1,5 +1,5 @@
@@ -47,5 +47,5 @@ index 22e2d65786416..3249832fea52d 100644
  /* This directory entry will point to `/sys/kernel/debug/tegra_hsierrrptinj`. */
  static struct dentry *hsierrrptinj_debugfs_root;
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/sauce/patches/0078-NVIDIA-SAUCE-hsierrrptinj-Update-I2C-instances.patch b/features/tegra/sauce/patches/0078-NVIDIA-SAUCE-hsierrrptinj-Update-I2C-instances.patch
index e0ca9ba..002d238 100644
--- a/features/tegra/sauce/patches/0078-NVIDIA-SAUCE-hsierrrptinj-Update-I2C-instances.patch
+++ b/features/tegra/sauce/patches/0078-NVIDIA-SAUCE-hsierrrptinj-Update-I2C-instances.patch
@@ -18,7 +18,7 @@ Reviewed-by: Akhil R <akhilrajeev@nvidia.com>
 (cherry picked from commit 04d747cd17d902bef580577c4006031e7c6a521b)
 
 diff --git a/drivers/platform/tegra/tegra-hsierrrptinj.c b/drivers/platform/tegra/tegra-hsierrrptinj.c
-index 3249832fea52d..053f687a0b4f8 100644
+index 3249832fea52..053f687a0b4f 100644
 --- a/drivers/platform/tegra/tegra-hsierrrptinj.c
 +++ b/drivers/platform/tegra/tegra-hsierrrptinj.c
 @@ -35,7 +35,7 @@
@@ -49,5 +49,5 @@ index 3249832fea52d..053f687a0b4f8 100644
  /* This directory entry will point to `/sys/kernel/debug/tegra_hsierrrptinj`. */
  static struct dentry *hsierrrptinj_debugfs_root;
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/sauce/patches/0079-NVIDIA-SAUCE-platform-tegra-Add-tegra-prod-as-built-.patch b/features/tegra/sauce/patches/0079-NVIDIA-SAUCE-platform-tegra-Add-tegra-prod-as-built-.patch
index c5abbca..ef3607f 100644
--- a/features/tegra/sauce/patches/0079-NVIDIA-SAUCE-platform-tegra-Add-tegra-prod-as-built-.patch
+++ b/features/tegra/sauce/patches/0079-NVIDIA-SAUCE-platform-tegra-Add-tegra-prod-as-built-.patch
@@ -59,7 +59,7 @@ Reviewed-by: Laxman Dewangan <ldewangan@nvidia.com>
 Change-Id: Icd2480c42924607b2f8361a47795ca2d1faa43a5
 
 diff --git a/drivers/platform/tegra/Kconfig b/drivers/platform/tegra/Kconfig
-index 2502c0ccd2f06..5f6da15cd161a 100644
+index 2502c0ccd2f0..5f6da15cd161 100644
 --- a/drivers/platform/tegra/Kconfig
 +++ b/drivers/platform/tegra/Kconfig
 @@ -36,3 +36,8 @@ config TEGRA_HSIERRRPTINJ
@@ -72,7 +72,7 @@ index 2502c0ccd2f06..5f6da15cd161a 100644
 +	  This config helps client driver to identify whether prod
 +	  framework is implemented as legacy method or not.
 diff --git a/drivers/platform/tegra/Makefile b/drivers/platform/tegra/Makefile
-index 55e92006a555f..d00b69d54cfcc 100644
+index 55e92006a555..d00b69d54cfc 100644
 --- a/drivers/platform/tegra/Makefile
 +++ b/drivers/platform/tegra/Makefile
 @@ -1,3 +1,5 @@
@@ -83,7 +83,7 @@ index 55e92006a555f..d00b69d54cfcc 100644
 +obj-$(CONFIG_TEGRA_PROD_LEGACY) += tegra_prod.o
 diff --git a/drivers/platform/tegra/tegra_prod.c b/drivers/platform/tegra/tegra_prod.c
 new file mode 100644
-index 0000000000000..19aa893df939a
+index 000000000000..19aa893df939
 --- /dev/null
 +++ b/drivers/platform/tegra/tegra_prod.c
 @@ -0,0 +1,620 @@
@@ -709,7 +709,7 @@ index 0000000000000..19aa893df939a
 +EXPORT_SYMBOL(devm_tegra_prod_get_from_node);
 diff --git a/include/linux/tegra_prod.h b/include/linux/tegra_prod.h
 new file mode 100644
-index 0000000000000..b69938d504e67
+index 000000000000..b69938d504e6
 --- /dev/null
 +++ b/include/linux/tegra_prod.h
 @@ -0,0 +1,126 @@
@@ -840,5 +840,5 @@ index 0000000000000..b69938d504e67
 +						 struct device_node *np);
 +#endif
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/sauce/patches/0080-NVIDIA-SAUCE-scsi-ufs-Switch-UFS-init-sequence.patch b/features/tegra/sauce/patches/0080-NVIDIA-SAUCE-scsi-ufs-Switch-UFS-init-sequence.patch
index 6c31702..2fc853c 100644
--- a/features/tegra/sauce/patches/0080-NVIDIA-SAUCE-scsi-ufs-Switch-UFS-init-sequence.patch
+++ b/features/tegra/sauce/patches/0080-NVIDIA-SAUCE-scsi-ufs-Switch-UFS-init-sequence.patch
@@ -18,7 +18,7 @@ Reviewed-on: https://git-master.nvidia.com/r/c/linux-stable/+/2914016
 Reviewed-by: Laxman Dewangan <ldewangan@nvidia.com>
 
 diff --git a/drivers/ufs/core/ufshcd.c b/drivers/ufs/core/ufshcd.c
-index 5371f173e28b9..71b5a21bb72b2 100644
+index 8de3d0886a12..6b94518b664f 100644
 --- a/drivers/ufs/core/ufshcd.c
 +++ b/drivers/ufs/core/ufshcd.c
 @@ -4692,8 +4692,6 @@ static int ufshcd_change_power_mode(struct ufs_hba *hba,
@@ -61,5 +61,5 @@ index 5371f173e28b9..71b5a21bb72b2 100644
  		memcpy(&hba->pwr_info, pwr_mode,
  			sizeof(struct ufs_pa_layer_attr));
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/sauce/patches/0081-NVIDIA-SAUCE-scsi-ufs-Export-query-functions.patch b/features/tegra/sauce/patches/0081-NVIDIA-SAUCE-scsi-ufs-Export-query-functions.patch
index b096a25..92e199c 100644
--- a/features/tegra/sauce/patches/0081-NVIDIA-SAUCE-scsi-ufs-Export-query-functions.patch
+++ b/features/tegra/sauce/patches/0081-NVIDIA-SAUCE-scsi-ufs-Export-query-functions.patch
@@ -14,7 +14,7 @@ Signed-off-by: Abhilash G <abhilashg@nvidia.com>
 Reviewed-on: https://git-master.nvidia.com/r/c/linux-stable/+/2914025
 
 diff --git a/drivers/ufs/core/ufshcd.c b/drivers/ufs/core/ufshcd.c
-index 71b5a21bb72b2..e0314560ebaf5 100644
+index 6b94518b664f..a8c65a78c42f 100644
 --- a/drivers/ufs/core/ufshcd.c
 +++ b/drivers/ufs/core/ufshcd.c
 @@ -3530,6 +3530,7 @@ int ufshcd_query_attr(struct ufs_hba *hba, enum query_opcode opcode,
@@ -34,5 +34,5 @@ index 71b5a21bb72b2..e0314560ebaf5 100644
  /**
   * ufshcd_read_desc_param - read the specified descriptor parameter
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/sauce/patches/0082-NVIDIA-SAUCE-scsi-ufs-core-Add-config-flag-to-findou.patch b/features/tegra/sauce/patches/0082-NVIDIA-SAUCE-scsi-ufs-core-Add-config-flag-to-findou.patch
index e811dd5..7ede0bd 100644
--- a/features/tegra/sauce/patches/0082-NVIDIA-SAUCE-scsi-ufs-core-Add-config-flag-to-findou.patch
+++ b/features/tegra/sauce/patches/0082-NVIDIA-SAUCE-scsi-ufs-core-Add-config-flag-to-findou.patch
@@ -13,7 +13,7 @@ Reviewed-on: https://git-master.nvidia.com/r/c/linux-stable/+/2917006
 Reviewed-by: Laxman Dewangan <ldewangan@nvidia.com>
 
 diff --git a/drivers/ufs/core/Kconfig b/drivers/ufs/core/Kconfig
-index 817208ee64ecf..ec26b5b00b816 100644
+index 817208ee64ec..ec26b5b00b81 100644
 --- a/drivers/ufs/core/Kconfig
 +++ b/drivers/ufs/core/Kconfig
 @@ -50,3 +50,11 @@ config SCSI_UFS_HWMON
@@ -29,5 +29,5 @@ index 817208ee64ecf..ec26b5b00b816 100644
 +	  Export the  UFS HCD query APIs for provisioning the UFS. This config will
 +	  tell whether APIs are exported or not.
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/sauce/patches/0083-NVIDIA-SAUCE-scsi-ufs-Change-the-power-sequence-to-L.patch b/features/tegra/sauce/patches/0083-NVIDIA-SAUCE-scsi-ufs-Change-the-power-sequence-to-L.patch
index 7ec7ffe..c014235 100644
--- a/features/tegra/sauce/patches/0083-NVIDIA-SAUCE-scsi-ufs-Change-the-power-sequence-to-L.patch
+++ b/features/tegra/sauce/patches/0083-NVIDIA-SAUCE-scsi-ufs-Change-the-power-sequence-to-L.patch
@@ -15,7 +15,7 @@ Reviewed-by: Laxman Dewangan <ldewangan@nvidia.com>
 GVS: buildbot_gerritrpt <buildbot_gerritrpt@nvidia.com>
 
 diff --git a/drivers/ufs/core/ufshcd.c b/drivers/ufs/core/ufshcd.c
-index e0314560ebaf5..c0d95fe3dee1c 100644
+index a8c65a78c42f..6b2a096d9c8b 100644
 --- a/drivers/ufs/core/ufshcd.c
 +++ b/drivers/ufs/core/ufshcd.c
 @@ -4693,7 +4693,27 @@ static int ufshcd_change_power_mode(struct ufs_hba *hba,
@@ -89,7 +89,7 @@ index e0314560ebaf5..c0d95fe3dee1c 100644
  
  /**
 diff --git a/include/ufs/ufshcd.h b/include/ufs/ufshcd.h
-index 17fe07dac6a7e..0da0a0ed68040 100644
+index 17fe07dac6a7..0da0a0ed6804 100644
 --- a/include/ufs/ufshcd.h
 +++ b/include/ufs/ufshcd.h
 @@ -695,6 +695,11 @@ enum ufshcd_quirks {
@@ -105,5 +105,5 @@ index 17fe07dac6a7e..0da0a0ed68040 100644
  
  enum ufshcd_caps {
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/sauce/patches/0084-NVIDIA-SAUCE-scsi-ufs-skip-ufs-init-if-already-initi.patch b/features/tegra/sauce/patches/0084-NVIDIA-SAUCE-scsi-ufs-skip-ufs-init-if-already-initi.patch
index 8d87f14..c83c411 100644
--- a/features/tegra/sauce/patches/0084-NVIDIA-SAUCE-scsi-ufs-skip-ufs-init-if-already-initi.patch
+++ b/features/tegra/sauce/patches/0084-NVIDIA-SAUCE-scsi-ufs-skip-ufs-init-if-already-initi.patch
@@ -14,7 +14,7 @@ GVS: buildbot_gerritrpt <buildbot_gerritrpt@nvidia.com>
 (cherry picked from commit c3c1db5b1103af75f0fb704ba2043c30a8c4a61c)
 
 diff --git a/drivers/ufs/core/ufshcd.c b/drivers/ufs/core/ufshcd.c
-index c0d95fe3dee1c..2bc9e89cce3c0 100644
+index 6b2a096d9c8b..090361e06433 100644
 --- a/drivers/ufs/core/ufshcd.c
 +++ b/drivers/ufs/core/ufshcd.c
 @@ -4674,6 +4674,11 @@ static int ufshcd_change_power_mode(struct ufs_hba *hba,
@@ -117,7 +117,7 @@ index c0d95fe3dee1c..2bc9e89cce3c0 100644
  		/* check if device is detected by inter-connect layer */
  		if (!ret && !ufshcd_is_device_present(hba)) {
 diff --git a/include/ufs/ufshcd.h b/include/ufs/ufshcd.h
-index 0da0a0ed68040..73fb085c274d1 100644
+index 0da0a0ed6804..73fb085c274d 100644
 --- a/include/ufs/ufshcd.h
 +++ b/include/ufs/ufshcd.h
 @@ -1032,6 +1032,7 @@ struct ufs_hba {
@@ -129,5 +129,5 @@ index 0da0a0ed68040..73fb085c274d1 100644
  	struct semaphore host_sem;
  
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/sauce/patches/0085-NVIDIA-SAUCE-usb-xhci-tegra-don-t-assign-port-role-b.patch b/features/tegra/sauce/patches/0085-NVIDIA-SAUCE-usb-xhci-tegra-don-t-assign-port-role-b.patch
index 0d1920f..2bd93b0 100644
--- a/features/tegra/sauce/patches/0085-NVIDIA-SAUCE-usb-xhci-tegra-don-t-assign-port-role-b.patch
+++ b/features/tegra/sauce/patches/0085-NVIDIA-SAUCE-usb-xhci-tegra-don-t-assign-port-role-b.patch
@@ -19,7 +19,7 @@ Reviewed-by: Abhilash G <abhilashg@nvidia.com>
 Reviewed-by: Laxman Dewangan <ldewangan@nvidia.com>
 
 diff --git a/drivers/usb/host/xhci-tegra.c b/drivers/usb/host/xhci-tegra.c
-index c8a272861f9ba..97644ec915f4e 100644
+index c8a272861f9b..97644ec915f4 100644
 --- a/drivers/usb/host/xhci-tegra.c
 +++ b/drivers/usb/host/xhci-tegra.c
 @@ -2,7 +2,7 @@
@@ -45,5 +45,5 @@ index c8a272861f9ba..97644ec915f4e 100644
  			 * usb-phy is optional, continue if its not available.
  			 */
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/sauce/patches/0086-NVIDIA-SAUCE-usb-typec-ucsi-Find-connector-fwnode-wi.patch b/features/tegra/sauce/patches/0086-NVIDIA-SAUCE-usb-typec-ucsi-Find-connector-fwnode-wi.patch
index 11fb56f..28545f5 100644
--- a/features/tegra/sauce/patches/0086-NVIDIA-SAUCE-usb-typec-ucsi-Find-connector-fwnode-wi.patch
+++ b/features/tegra/sauce/patches/0086-NVIDIA-SAUCE-usb-typec-ucsi-Find-connector-fwnode-wi.patch
@@ -29,10 +29,10 @@ Reviewed-by: Prathamesh Shete <pshete@nvidia.com>
 Tested-by: Prathamesh Shete <pshete@nvidia.com>
 
 diff --git a/drivers/usb/typec/ucsi/ucsi.c b/drivers/usb/typec/ucsi/ucsi.c
-index b4b0c46d2fa44..dc828d057d8c5 100644
+index 01a15ab5a734..83a3e40b2d9e 100644
 --- a/drivers/usb/typec/ucsi/ucsi.c
 +++ b/drivers/usb/typec/ucsi/ucsi.c
-@@ -1574,11 +1574,14 @@ static const struct typec_operations ucsi_ops = {
+@@ -1712,11 +1712,14 @@ static const struct typec_operations ucsi_ops = {
  static struct fwnode_handle *ucsi_find_fwnode(struct ucsi_connector *con)
  {
  	struct fwnode_handle *fwnode;
@@ -52,5 +52,5 @@ index b4b0c46d2fa44..dc828d057d8c5 100644
  }
  
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/sauce/patches/0087-NVIDIA-SAUCE-xhci-tegra-avoid-usb-access-after-shutd.patch b/features/tegra/sauce/patches/0087-NVIDIA-SAUCE-xhci-tegra-avoid-usb-access-after-shutd.patch
index 0303a80..6c4dea7 100644
--- a/features/tegra/sauce/patches/0087-NVIDIA-SAUCE-xhci-tegra-avoid-usb-access-after-shutd.patch
+++ b/features/tegra/sauce/patches/0087-NVIDIA-SAUCE-xhci-tegra-avoid-usb-access-after-shutd.patch
@@ -33,7 +33,7 @@ Reviewed-by: Bitan Biswas <bbiswas@nvidia.com>
 GVS: Gerrit_Virtual_Submit <buildbot_gerritrpt@nvidia.com>
 
 diff --git a/drivers/usb/host/xhci-tegra.c b/drivers/usb/host/xhci-tegra.c
-index 97644ec915f4e..98e2b182c0bc4 100644
+index 97644ec915f4..98e2b182c0bc 100644
 --- a/drivers/usb/host/xhci-tegra.c
 +++ b/drivers/usb/host/xhci-tegra.c
 @@ -2,7 +2,7 @@
@@ -132,5 +132,5 @@ index 97644ec915f4e..98e2b182c0bc4 100644
  }
  
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/sauce/patches/0088-NVIDIA-SAUCE-usb-xhci-tegra-use-reset-control-framew.patch b/features/tegra/sauce/patches/0088-NVIDIA-SAUCE-usb-xhci-tegra-use-reset-control-framew.patch
index 41e9f20..60ac01a 100644
--- a/features/tegra/sauce/patches/0088-NVIDIA-SAUCE-usb-xhci-tegra-use-reset-control-framew.patch
+++ b/features/tegra/sauce/patches/0088-NVIDIA-SAUCE-usb-xhci-tegra-use-reset-control-framew.patch
@@ -22,7 +22,7 @@ Reviewed-by: Laxman Dewangan <ldewangan@nvidia.com>
 (cherry picked from commit d4a690c44daef79676b0b99b2a57737d75f24611)
 
 diff --git a/drivers/usb/host/xhci-tegra.c b/drivers/usb/host/xhci-tegra.c
-index 98e2b182c0bc4..eb1f2cc75ebf2 100644
+index 98e2b182c0bc..eb1f2cc75ebf 100644
 --- a/drivers/usb/host/xhci-tegra.c
 +++ b/drivers/usb/host/xhci-tegra.c
 @@ -250,6 +250,7 @@ struct tegra_xusb_soc {
@@ -211,5 +211,5 @@ index 98e2b182c0bc4..eb1f2cc75ebf2 100644
  
  static const struct of_device_id tegra_xusb_of_match[] = {
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/sauce/patches/0089-NVIDIA-SAUCE-xhci-tegra-enable-firmware-log.patch b/features/tegra/sauce/patches/0089-NVIDIA-SAUCE-xhci-tegra-enable-firmware-log.patch
index ce022b4..8e24be0 100644
--- a/features/tegra/sauce/patches/0089-NVIDIA-SAUCE-xhci-tegra-enable-firmware-log.patch
+++ b/features/tegra/sauce/patches/0089-NVIDIA-SAUCE-xhci-tegra-enable-firmware-log.patch
@@ -18,7 +18,7 @@ Reviewed-by: Laxman Dewangan <ldewangan@nvidia.com>
 (cherry picked from commit 6ae34c8204121f69e7d3fe86503405bfd58cb9fa)
 
 diff --git a/drivers/usb/host/xhci-tegra.c b/drivers/usb/host/xhci-tegra.c
-index eb1f2cc75ebf2..a8474d2825651 100644
+index eb1f2cc75ebf..a8474d282565 100644
 --- a/drivers/usb/host/xhci-tegra.c
 +++ b/drivers/usb/host/xhci-tegra.c
 @@ -2,12 +2,14 @@
@@ -723,5 +723,5 @@ index eb1f2cc75ebf2..a8474d2825651 100644
  		tegra_xusb_powergate_partitions(tegra);
  	else {
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/sauce/patches/0090-NVIDIA-SAUCE-virt-tegra-build-tegra_hv.c-driver-as-b.patch b/features/tegra/sauce/patches/0090-NVIDIA-SAUCE-virt-tegra-build-tegra_hv.c-driver-as-b.patch
index f7c6328..c0539e4 100644
--- a/features/tegra/sauce/patches/0090-NVIDIA-SAUCE-virt-tegra-build-tegra_hv.c-driver-as-b.patch
+++ b/features/tegra/sauce/patches/0090-NVIDIA-SAUCE-virt-tegra-build-tegra_hv.c-driver-as-b.patch
@@ -21,7 +21,7 @@ Reviewed-by: Bibek Basu <bbasu@nvidia.com>
 (cherry picked from commit 4b43217a59cbdf9f76dbace03e9a577d4e130688)
 
 diff --git a/drivers/virt/Kconfig b/drivers/virt/Kconfig
-index d8c848cf09a6a..99aed786ce8b1 100644
+index d8c848cf09a6..99aed786ce8b 100644
 --- a/drivers/virt/Kconfig
 +++ b/drivers/virt/Kconfig
 @@ -49,4 +49,6 @@ source "drivers/virt/acrn/Kconfig"
@@ -32,7 +32,7 @@ index d8c848cf09a6a..99aed786ce8b1 100644
 +
  endif
 diff --git a/drivers/virt/Makefile b/drivers/virt/Makefile
-index f29901bd78205..c1fad483bfc1e 100644
+index f29901bd7820..c1fad483bfc1 100644
 --- a/drivers/virt/Makefile
 +++ b/drivers/virt/Makefile
 @@ -10,3 +10,5 @@ obj-y				+= vboxguest/
@@ -43,7 +43,7 @@ index f29901bd78205..c1fad483bfc1e 100644
 +obj-$(CONFIG_TEGRA_HV_DRIVER)   += tegra/
 diff --git a/drivers/virt/tegra/Kconfig b/drivers/virt/tegra/Kconfig
 new file mode 100644
-index 0000000000000..1adf0f951075b
+index 000000000000..1adf0f951075
 --- /dev/null
 +++ b/drivers/virt/tegra/Kconfig
 @@ -0,0 +1,9 @@
@@ -58,7 +58,7 @@ index 0000000000000..1adf0f951075b
 +	  Tegra Hypervisor Driver used for tegra virtualized environment.
 diff --git a/drivers/virt/tegra/Makefile b/drivers/virt/tegra/Makefile
 new file mode 100644
-index 0000000000000..9172577716d1f
+index 000000000000..9172577716d1
 --- /dev/null
 +++ b/drivers/virt/tegra/Makefile
 @@ -0,0 +1,8 @@
@@ -72,7 +72,7 @@ index 0000000000000..9172577716d1f
 +obj-$(CONFIG_TEGRA_HV_DRIVER)          += tegra_hv.o
 diff --git a/drivers/virt/tegra/tegra_hv.c b/drivers/virt/tegra/tegra_hv.c
 new file mode 100644
-index 0000000000000..8de28870da846
+index 000000000000..8de28870da84
 --- /dev/null
 +++ b/drivers/virt/tegra/tegra_hv.c
 @@ -0,0 +1,1022 @@
@@ -1100,7 +1100,7 @@ index 0000000000000..8de28870da846
 +MODULE_LICENSE("GPL v2");
 diff --git a/include/soc/tegra/virt/hv-ivc.h b/include/soc/tegra/virt/hv-ivc.h
 new file mode 100644
-index 0000000000000..6eef871eaa1c6
+index 000000000000..6eef871eaa1c
 --- /dev/null
 +++ b/include/soc/tegra/virt/hv-ivc.h
 @@ -0,0 +1,309 @@
@@ -1415,7 +1415,7 @@ index 0000000000000..6eef871eaa1c6
 +#endif /* __TEGRA_HV_IVC_H */
 diff --git a/include/soc/tegra/virt/syscalls.h b/include/soc/tegra/virt/syscalls.h
 new file mode 100644
-index 0000000000000..8775e904bc5f2
+index 000000000000..8775e904bc5f
 --- /dev/null
 +++ b/include/soc/tegra/virt/syscalls.h
 @@ -0,0 +1,495 @@
@@ -1916,7 +1916,7 @@ index 0000000000000..8775e904bc5f2
 +#endif /* __TEGRA_SYSCALLS_H__ */
 diff --git a/include/soc/tegra/virt/tegra_hv.h b/include/soc/tegra/virt/tegra_hv.h
 new file mode 100644
-index 0000000000000..c64db45e90efd
+index 000000000000..c64db45e90ef
 --- /dev/null
 +++ b/include/soc/tegra/virt/tegra_hv.h
 @@ -0,0 +1,18 @@
@@ -1940,7 +1940,7 @@ index 0000000000000..c64db45e90efd
 +#endif /* __TEGRA_HV_H__ */
 diff --git a/include/soc/tegra/virt/tegra_hv_sysmgr.h b/include/soc/tegra/virt/tegra_hv_sysmgr.h
 new file mode 100644
-index 0000000000000..e735b6f172495
+index 000000000000..e735b6f17249
 --- /dev/null
 +++ b/include/soc/tegra/virt/tegra_hv_sysmgr.h
 @@ -0,0 +1,133 @@
@@ -2078,5 +2078,5 @@ index 0000000000000..e735b6f172495
 +#define SYS_SUSPEND_COMPLETE_CMD	CREATE_CMD(SYSTEM_SUSPEND_COMPLETE, 0)
 +#endif /* _TEGRA_HV_SYSMGR_H */
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/sauce/patches/0091-NVIDIA-SAUCE-drivers-tegra-virt-support-hvc-call-to-.patch b/features/tegra/sauce/patches/0091-NVIDIA-SAUCE-drivers-tegra-virt-support-hvc-call-to-.patch
index 5a4a8af..eda8a28 100644
--- a/features/tegra/sauce/patches/0091-NVIDIA-SAUCE-drivers-tegra-virt-support-hvc-call-to-.patch
+++ b/features/tegra/sauce/patches/0091-NVIDIA-SAUCE-drivers-tegra-virt-support-hvc-call-to-.patch
@@ -19,7 +19,7 @@ Reviewed-by: svcacv <svcacv@nvidia.com>
 (cherry picked from commit b60c30d0dcb61311718fa8a2a7a7f4da235844e1)
 
 diff --git a/include/soc/tegra/virt/syscalls.h b/include/soc/tegra/virt/syscalls.h
-index 8775e904bc5f2..0b337ec2165de 100644
+index 8775e904bc5f..0b337ec2165d 100644
 --- a/include/soc/tegra/virt/syscalls.h
 +++ b/include/soc/tegra/virt/syscalls.h
 @@ -18,11 +18,13 @@
@@ -105,5 +105,5 @@ index 8775e904bc5f2..0b337ec2165de 100644
  static inline int hyp_read_ivc_info(uint64_t *ivc_info_page_pa)
  {
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/sauce/patches/0092-NVIDIA-SAUCE-drivers-tegra-virt-runtime-frequency.patch b/features/tegra/sauce/patches/0092-NVIDIA-SAUCE-drivers-tegra-virt-runtime-frequency.patch
index 8311cfc..a28e36d 100644
--- a/features/tegra/sauce/patches/0092-NVIDIA-SAUCE-drivers-tegra-virt-runtime-frequency.patch
+++ b/features/tegra/sauce/patches/0092-NVIDIA-SAUCE-drivers-tegra-virt-runtime-frequency.patch
@@ -20,7 +20,7 @@ Reviewed-by: Bibek Basu <bbasu@nvidia.com>
 (cherry picked from commit dffd783fc499a8c95675f82567b0940636ec8166)
 
 diff --git a/include/soc/tegra/virt/syscalls.h b/include/soc/tegra/virt/syscalls.h
-index 0b337ec2165de..bd73c57e85c8a 100644
+index 0b337ec2165d..bd73c57e85c8 100644
 --- a/include/soc/tegra/virt/syscalls.h
 +++ b/include/soc/tegra/virt/syscalls.h
 @@ -525,7 +525,7 @@ static __attribute__((always_inline)) inline void hyp_call44(uint16_t id, uint64
@@ -45,5 +45,5 @@ index 0b337ec2165de..bd73c57e85c8a 100644
  	hyp_call44(HVC_NR_TRACE_SET_EVENT_MASK, args);
  	return (int) args[0];
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/sauce/patches/0093-NVIDIA-SAUCE-hvc_sysfs-update-trace-hypercall-wrappe.patch b/features/tegra/sauce/patches/0093-NVIDIA-SAUCE-hvc_sysfs-update-trace-hypercall-wrappe.patch
index 849894d..f7f46b2 100644
--- a/features/tegra/sauce/patches/0093-NVIDIA-SAUCE-hvc_sysfs-update-trace-hypercall-wrappe.patch
+++ b/features/tegra/sauce/patches/0093-NVIDIA-SAUCE-hvc_sysfs-update-trace-hypercall-wrappe.patch
@@ -21,7 +21,7 @@ Reviewed-by: Bitan Biswas <bbiswas@nvidia.com>
 (cherry picked from commit cec21bbcdc64787407485aa6a80968061c0ffe6b)
 
 diff --git a/include/soc/tegra/virt/syscalls.h b/include/soc/tegra/virt/syscalls.h
-index bd73c57e85c8a..18fb0bb8e582e 100644
+index bd73c57e85c8..18fb0bb8e582 100644
 --- a/include/soc/tegra/virt/syscalls.h
 +++ b/include/soc/tegra/virt/syscalls.h
 @@ -19,14 +19,19 @@
@@ -92,5 +92,5 @@ index bd73c57e85c8a..18fb0bb8e582e 100644
  }
  
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/sauce/patches/0094-NVIDIA-SAUCE-tegra_hv-Add-sysfs-to-trigger-HVC.patch b/features/tegra/sauce/patches/0094-NVIDIA-SAUCE-tegra_hv-Add-sysfs-to-trigger-HVC.patch
index 59ba086..042fe6a 100644
--- a/features/tegra/sauce/patches/0094-NVIDIA-SAUCE-tegra_hv-Add-sysfs-to-trigger-HVC.patch
+++ b/features/tegra/sauce/patches/0094-NVIDIA-SAUCE-tegra_hv-Add-sysfs-to-trigger-HVC.patch
@@ -23,7 +23,7 @@ Reviewed-by: Deepak Nibade <dnibade@nvidia.com>
 (cherry picked from commit 451f77c9111fec082663da4cd1238bc343b18257)
 
 diff --git a/drivers/virt/tegra/tegra_hv.c b/drivers/virt/tegra/tegra_hv.c
-index 8de28870da846..46f259e1cc468 100644
+index 8de28870da84..46f259e1cc46 100644
 --- a/drivers/virt/tegra/tegra_hv.c
 +++ b/drivers/virt/tegra/tegra_hv.c
 @@ -29,6 +29,11 @@
@@ -109,7 +109,7 @@ index 8de28870da846..46f259e1cc468 100644
  	if (ret != 0) {
  		ERR("failed to obtain IVC info page: %d\n", ret);
 diff --git a/include/soc/tegra/virt/syscalls.h b/include/soc/tegra/virt/syscalls.h
-index 18fb0bb8e582e..c33a01fc6714c 100644
+index 18fb0bb8e582..c33a01fc6714 100644
 --- a/include/soc/tegra/virt/syscalls.h
 +++ b/include/soc/tegra/virt/syscalls.h
 @@ -376,6 +376,20 @@ static inline int hyp_guest_reset(unsigned int id, struct hyp_sys_state_info *ou
@@ -134,7 +134,7 @@ index 18fb0bb8e582e..c33a01fc6714c 100644
  static inline uint64_t hyp_sysinfo_ipa(void)
  {
 diff --git a/include/soc/tegra/virt/tegra_hv_sysmgr.h b/include/soc/tegra/virt/tegra_hv_sysmgr.h
-index e735b6f172495..d8ac0cc255521 100644
+index e735b6f17249..d8ac0cc25552 100644
 --- a/include/soc/tegra/virt/tegra_hv_sysmgr.h
 +++ b/include/soc/tegra/virt/tegra_hv_sysmgr.h
 @@ -93,6 +93,7 @@ enum system_function_id {
@@ -153,5 +153,5 @@ index e735b6f172495..d8ac0cc255521 100644
 +
  #endif /* _TEGRA_HV_SYSMGR_H */
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/sauce/patches/0095-NVIDIA-SAUCE-tegra_hv-cert-misra-fixes-in-tegra_hv.c.patch b/features/tegra/sauce/patches/0095-NVIDIA-SAUCE-tegra_hv-cert-misra-fixes-in-tegra_hv.c.patch
index b80df60..30c35f2 100644
--- a/features/tegra/sauce/patches/0095-NVIDIA-SAUCE-tegra_hv-cert-misra-fixes-in-tegra_hv.c.patch
+++ b/features/tegra/sauce/patches/0095-NVIDIA-SAUCE-tegra_hv-cert-misra-fixes-in-tegra_hv.c.patch
@@ -24,7 +24,7 @@ GVS: buildbot_gerritrpt <buildbot_gerritrpt@nvidia.com>
 (cherry picked from commit 3c3e41412b47c4e98a6ce4c43a1ca6ab259586ef)
 
 diff --git a/drivers/virt/tegra/tegra_hv.c b/drivers/virt/tegra/tegra_hv.c
-index 46f259e1cc468..5261bde1be76c 100644
+index 46f259e1cc46..5261bde1be76 100644
 --- a/drivers/virt/tegra/tegra_hv.c
 +++ b/drivers/virt/tegra/tegra_hv.c
 @@ -19,6 +19,7 @@
@@ -127,5 +127,5 @@ index 46f259e1cc468..5261bde1be76c 100644
  
  		INFO("added mempool %u: ipa=%llx size=%llx peer=%u\n",
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/sauce/patches/0096-NVIDIA-SAUCE-virt-add-sanity-checks-for-ivc-info-s-m.patch b/features/tegra/sauce/patches/0096-NVIDIA-SAUCE-virt-add-sanity-checks-for-ivc-info-s-m.patch
index 220d62c..fce6aeb 100644
--- a/features/tegra/sauce/patches/0096-NVIDIA-SAUCE-virt-add-sanity-checks-for-ivc-info-s-m.patch
+++ b/features/tegra/sauce/patches/0096-NVIDIA-SAUCE-virt-add-sanity-checks-for-ivc-info-s-m.patch
@@ -17,7 +17,7 @@ GVS: buildbot_gerritrpt <buildbot_gerritrpt@nvidia.com>
 (cherry picked from commit aa245d4b56f521afa32f83799df15e80e8d79a90)
 
 diff --git a/drivers/virt/tegra/tegra_hv.c b/drivers/virt/tegra/tegra_hv.c
-index 5261bde1be76c..38863277b0c6d 100644
+index 5261bde1be76..38863277b0c6 100644
 --- a/drivers/virt/tegra/tegra_hv.c
 +++ b/drivers/virt/tegra/tegra_hv.c
 @@ -517,6 +517,19 @@ static int tegra_hv_setup(struct tegra_hv_data *hvd)
@@ -41,7 +41,7 @@ index 5261bde1be76c..38863277b0c6d 100644
  	 *  Map IVC Trap MMIO Notification region
  	 */
 diff --git a/include/soc/tegra/virt/tegra_hv.h b/include/soc/tegra/virt/tegra_hv.h
-index c64db45e90efd..00c4fcb0e5db0 100644
+index c64db45e90ef..00c4fcb0e5db 100644
 --- a/include/soc/tegra/virt/tegra_hv.h
 +++ b/include/soc/tegra/virt/tegra_hv.h
 @@ -12,6 +12,13 @@
@@ -59,5 +59,5 @@ index c64db45e90efd..00c4fcb0e5db0 100644
  int tegra_hv_get_vmid(void);
  
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/sauce/patches/0097-NVIDIA-SAUCE-tegra_hv-don-t-expose-mempool-and-ivc-a.patch b/features/tegra/sauce/patches/0097-NVIDIA-SAUCE-tegra_hv-don-t-expose-mempool-and-ivc-a.patch
index b4dfebb..9c09afd 100644
--- a/features/tegra/sauce/patches/0097-NVIDIA-SAUCE-tegra_hv-don-t-expose-mempool-and-ivc-a.patch
+++ b/features/tegra/sauce/patches/0097-NVIDIA-SAUCE-tegra_hv-don-t-expose-mempool-and-ivc-a.patch
@@ -17,7 +17,7 @@ GVS: buildbot_gerritrpt <buildbot_gerritrpt@nvidia.com>
 (cherry picked from commit 65efa5a44a61f61deb16b0db6380e3b3b35056f8)
 
 diff --git a/drivers/virt/tegra/tegra_hv.c b/drivers/virt/tegra/tegra_hv.c
-index 38863277b0c6d..a0bfee3792247 100644
+index 38863277b0c6..a0bfee379224 100644
 --- a/drivers/virt/tegra/tegra_hv.c
 +++ b/drivers/virt/tegra/tegra_hv.c
 @@ -324,8 +324,6 @@ static int tegra_hv_add_ivc(struct tegra_hv_data *hvd,
@@ -60,5 +60,5 @@ index 38863277b0c6d..a0bfee3792247 100644
  
  	INFO("Memory usage: ivc:0x%llx mempool=0x%llx\n", ivcsize, mpsize);
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/sauce/patches/0098-NVIDIA-SAUCE-tegra_hv-add-support-of-async-error-dia.patch b/features/tegra/sauce/patches/0098-NVIDIA-SAUCE-tegra_hv-add-support-of-async-error-dia.patch
index a9ca7e1..2949d2a 100644
--- a/features/tegra/sauce/patches/0098-NVIDIA-SAUCE-tegra_hv-add-support-of-async-error-dia.patch
+++ b/features/tegra/sauce/patches/0098-NVIDIA-SAUCE-tegra_hv-add-support-of-async-error-dia.patch
@@ -17,7 +17,7 @@ Reviewed-by: svc-mobile-coverity <svc-mobile-coverity@nvidia.com>
 (cherry picked from commit 91997a2a5cb7f0a84a1c61ab504abdfc9c09636e)
 
 diff --git a/drivers/virt/tegra/tegra_hv.c b/drivers/virt/tegra/tegra_hv.c
-index a0bfee3792247..43d5d8873d8ff 100644
+index a0bfee379224..43d5d8873d8f 100644
 --- a/drivers/virt/tegra/tegra_hv.c
 +++ b/drivers/virt/tegra/tegra_hv.c
 @@ -103,6 +103,8 @@ struct tegra_hv_data {
@@ -156,7 +156,7 @@ index a0bfee3792247..43d5d8873d8ff 100644
  	if (ret != 0) {
  		tegra_hv_cleanup(hvd);
 diff --git a/include/soc/tegra/virt/syscalls.h b/include/soc/tegra/virt/syscalls.h
-index c33a01fc6714c..03f97c46976ae 100644
+index c33a01fc6714..03f97c46976a 100644
 --- a/include/soc/tegra/virt/syscalls.h
 +++ b/include/soc/tegra/virt/syscalls.h
 @@ -18,9 +18,13 @@
@@ -219,5 +219,5 @@ index c33a01fc6714c..03f97c46976ae 100644
  #undef _X4_X17
  
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/sauce/patches/0099-NVIDIA-SAUCE-tegra_hv-use-prod-kernel-flag-exposed-b.patch b/features/tegra/sauce/patches/0099-NVIDIA-SAUCE-tegra_hv-use-prod-kernel-flag-exposed-b.patch
index a813dc7..0d56851 100644
--- a/features/tegra/sauce/patches/0099-NVIDIA-SAUCE-tegra_hv-use-prod-kernel-flag-exposed-b.patch
+++ b/features/tegra/sauce/patches/0099-NVIDIA-SAUCE-tegra_hv-use-prod-kernel-flag-exposed-b.patch
@@ -16,7 +16,7 @@ Reviewed-by: svcacv <svcacv@nvidia.com>
 (cherry picked from commit 7708801841e4456c0a039c6fee6967896eb39bac)
 
 diff --git a/drivers/virt/tegra/tegra_hv.c b/drivers/virt/tegra/tegra_hv.c
-index 43d5d8873d8ff..c130a91d96933 100644
+index 43d5d8873d8f..c130a91d9693 100644
 --- a/drivers/virt/tegra/tegra_hv.c
 +++ b/drivers/virt/tegra/tegra_hv.c
 @@ -925,6 +925,7 @@ int tegra_hv_ivc_read_user(struct tegra_hv_ivc_cookie *ivck, void __user *buf, i
@@ -52,7 +52,7 @@ index 43d5d8873d8ff..c130a91d96933 100644
  void *tegra_hv_ivc_read_get_next_frame(struct tegra_hv_ivc_cookie *ivck)
  {
 diff --git a/include/soc/tegra/virt/hv-ivc.h b/include/soc/tegra/virt/hv-ivc.h
-index 6eef871eaa1c6..dab9b26bc39a7 100644
+index 6eef871eaa1c..dab9b26bc39a 100644
 --- a/include/soc/tegra/virt/hv-ivc.h
 +++ b/include/soc/tegra/virt/hv-ivc.h
 @@ -134,6 +134,17 @@ int tegra_hv_ivc_can_read(struct tegra_hv_ivc_cookie *ivck);
@@ -99,5 +99,5 @@ index 6eef871eaa1c6..dab9b26bc39a7 100644
  /**
   * ivc_hv_ivc_read_get_next_frame - Peek at the next frame to receive
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/sauce/patches/0100-NVIDIA-SAUCE-tegra_hv-add-max-number-of-vmid-check.patch b/features/tegra/sauce/patches/0100-NVIDIA-SAUCE-tegra_hv-add-max-number-of-vmid-check.patch
index 4e29e36..0a9b8b0 100644
--- a/features/tegra/sauce/patches/0100-NVIDIA-SAUCE-tegra_hv-add-max-number-of-vmid-check.patch
+++ b/features/tegra/sauce/patches/0100-NVIDIA-SAUCE-tegra_hv-add-max-number-of-vmid-check.patch
@@ -14,7 +14,7 @@ GVS: buildbot_gerritrpt <buildbot_gerritrpt@nvidia.com>
 (cherry picked from commit 0b43455aba72c45d44ae237980cf92b1f0f9bbbc)
 
 diff --git a/drivers/virt/tegra/tegra_hv.c b/drivers/virt/tegra/tegra_hv.c
-index c130a91d96933..19ba8d544acf8 100644
+index c130a91d9693..19ba8d544acf 100644
 --- a/drivers/virt/tegra/tegra_hv.c
 +++ b/drivers/virt/tegra/tegra_hv.c
 @@ -174,11 +174,14 @@ EXPORT_SYMBOL(tegra_hv_get_ivc_info);
@@ -59,5 +59,5 @@ index c130a91d96933..19ba8d544acf8 100644
  	if (IS_ERR(hvd->hv_class)) {
  		ERR("class_create() failed\n");
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/sauce/patches/0101-NVIDIA-SAUCE-tegra_hv-use-kzalloc-instead-of-kmalloc.patch b/features/tegra/sauce/patches/0101-NVIDIA-SAUCE-tegra_hv-use-kzalloc-instead-of-kmalloc.patch
index 49c2835..736aa1c 100644
--- a/features/tegra/sauce/patches/0101-NVIDIA-SAUCE-tegra_hv-use-kzalloc-instead-of-kmalloc.patch
+++ b/features/tegra/sauce/patches/0101-NVIDIA-SAUCE-tegra_hv-use-kzalloc-instead-of-kmalloc.patch
@@ -18,7 +18,7 @@ Reviewed-by: Sandeep Trasi <strasi@nvidia.com>
 (cherry picked from commit 04247506dbdf9e914609dedd42e84a88182984c2)
 
 diff --git a/drivers/virt/tegra/tegra_hv.c b/drivers/virt/tegra/tegra_hv.c
-index 19ba8d544acf8..869380d307532 100644
+index 19ba8d544acf..869380d30753 100644
 --- a/drivers/virt/tegra/tegra_hv.c
 +++ b/drivers/virt/tegra/tegra_hv.c
 @@ -678,7 +678,7 @@ static int tegra_hv_setup(struct tegra_hv_data *hvd)
@@ -31,5 +31,5 @@ index 19ba8d544acf8..869380d307532 100644
  	if (hvd->interrupts_arr == NULL) {
  		ERR("failed to allocate array for interrupts property\n");
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/sauce/patches/0102-NVIDIA-SAUCE-tegra_hv-remove-tegra_hv_ivc_convert_co.patch b/features/tegra/sauce/patches/0102-NVIDIA-SAUCE-tegra_hv-remove-tegra_hv_ivc_convert_co.patch
index a9253eb..106f3b9 100644
--- a/features/tegra/sauce/patches/0102-NVIDIA-SAUCE-tegra_hv-remove-tegra_hv_ivc_convert_co.patch
+++ b/features/tegra/sauce/patches/0102-NVIDIA-SAUCE-tegra_hv-remove-tegra_hv_ivc_convert_co.patch
@@ -19,7 +19,7 @@ GVS: buildbot_gerritrpt <buildbot_gerritrpt@nvidia.com>
 (cherry picked from commit bb8edf1919e49386ff52e5dd3849a24e2f0d88f4)
 
 diff --git a/drivers/virt/tegra/tegra_hv.c b/drivers/virt/tegra/tegra_hv.c
-index 869380d307532..9b1be4d1db2b5 100644
+index 869380d30753..9b1be4d1db2b 100644
 --- a/drivers/virt/tegra/tegra_hv.c
 +++ b/drivers/virt/tegra/tegra_hv.c
 @@ -1033,12 +1033,6 @@ int tegra_hv_ivc_read_advance(struct tegra_hv_ivc_cookie *ivck)
@@ -36,7 +36,7 @@ index 869380d307532..9b1be4d1db2b5 100644
  {
  	uint32_t i;
 diff --git a/include/soc/tegra/virt/hv-ivc.h b/include/soc/tegra/virt/hv-ivc.h
-index dab9b26bc39a7..35fdb9876e1fd 100644
+index dab9b26bc39a..35fdb9876e1f 100644
 --- a/include/soc/tegra/virt/hv-ivc.h
 +++ b/include/soc/tegra/virt/hv-ivc.h
 @@ -306,6 +306,4 @@ int tegra_hv_ivc_get_info(struct tegra_hv_ivc_cookie *ivck, uint64_t *pa,
@@ -47,5 +47,5 @@ index dab9b26bc39a7..35fdb9876e1fd 100644
 -
  #endif /* __TEGRA_HV_IVC_H */
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/sauce/patches/0103-NVIDIA-SAUCE-tegra_hv-clear-out-memory-before-releas.patch b/features/tegra/sauce/patches/0103-NVIDIA-SAUCE-tegra_hv-clear-out-memory-before-releas.patch
index 5e55f70..6ad8ed5 100644
--- a/features/tegra/sauce/patches/0103-NVIDIA-SAUCE-tegra_hv-clear-out-memory-before-releas.patch
+++ b/features/tegra/sauce/patches/0103-NVIDIA-SAUCE-tegra_hv-clear-out-memory-before-releas.patch
@@ -18,7 +18,7 @@ Reviewed-by: svcacv <svcacv@nvidia.com>
 (cherry picked from commit 9670b0e58fa4d81733edde9773b91904a9508926)
 
 diff --git a/drivers/virt/tegra/tegra_hv.c b/drivers/virt/tegra/tegra_hv.c
-index 9b1be4d1db2b5..5404738330b87 100644
+index 9b1be4d1db2b..5404738330b8 100644
 --- a/drivers/virt/tegra/tegra_hv.c
 +++ b/drivers/virt/tegra/tegra_hv.c
 @@ -1063,15 +1063,45 @@ EXPORT_SYMBOL(tegra_hv_mempool_reserve);
@@ -71,5 +71,5 @@ index 9b1be4d1db2b5..5404738330b87 100644
  }
  EXPORT_SYMBOL(tegra_hv_mempool_unreserve);
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/sauce/patches/0104-NVIDIA-SAUCE-tegra_hv-stop-logging-total-mempool-ivc.patch b/features/tegra/sauce/patches/0104-NVIDIA-SAUCE-tegra_hv-stop-logging-total-mempool-ivc.patch
index b6d0e91..7942a1e 100644
--- a/features/tegra/sauce/patches/0104-NVIDIA-SAUCE-tegra_hv-stop-logging-total-mempool-ivc.patch
+++ b/features/tegra/sauce/patches/0104-NVIDIA-SAUCE-tegra_hv-stop-logging-total-mempool-ivc.patch
@@ -19,7 +19,7 @@ GVS: buildbot_gerritrpt <buildbot_gerritrpt@nvidia.com>
 (cherry picked from commit 243cdfc7a9952b5157d5bf3faadb7782b2bafd4c)
 
 diff --git a/drivers/virt/tegra/tegra_hv.c b/drivers/virt/tegra/tegra_hv.c
-index 5404738330b87..fbd5c1cb075f4 100644
+index 5404738330b8..fbd5c1cb075f 100644
 --- a/drivers/virt/tegra/tegra_hv.c
 +++ b/drivers/virt/tegra/tegra_hv.c
 @@ -771,7 +771,9 @@ static int tegra_hv_setup(struct tegra_hv_data *hvd)
@@ -33,5 +33,5 @@ index 5404738330b87..fbd5c1cb075f4 100644
  	return 0;
  }
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/sauce/patches/0105-NVIDIA-SAUCE-tegra_hv-doxygen-comment-fixes-in-hv-dr.patch b/features/tegra/sauce/patches/0105-NVIDIA-SAUCE-tegra_hv-doxygen-comment-fixes-in-hv-dr.patch
index 10cf9c7..072afdd 100644
--- a/features/tegra/sauce/patches/0105-NVIDIA-SAUCE-tegra_hv-doxygen-comment-fixes-in-hv-dr.patch
+++ b/features/tegra/sauce/patches/0105-NVIDIA-SAUCE-tegra_hv-doxygen-comment-fixes-in-hv-dr.patch
@@ -24,7 +24,7 @@ Reviewed-by: Suresh Venkatachalam <skathirampat@nvidia.com>
 (cherry picked from commit c9314b533e3c6729e3add69faaf3a781d10c1c7e)
 
 diff --git a/drivers/virt/tegra/tegra_hv.c b/drivers/virt/tegra/tegra_hv.c
-index fbd5c1cb075f4..371f4ea4c58b2 100644
+index fbd5c1cb075f..371f4ea4c58b 100644
 --- a/drivers/virt/tegra/tegra_hv.c
 +++ b/drivers/virt/tegra/tegra_hv.c
 @@ -939,17 +939,6 @@ int tegra_hv_ivc_read_user(struct tegra_hv_ivc_cookie *ivck, void __user *buf, i
@@ -46,7 +46,7 @@ index fbd5c1cb075f4..371f4ea4c58b2 100644
  {
  	struct hv_ivc *ivc = cookie_to_ivc_dev(ivck);
 diff --git a/include/soc/tegra/virt/hv-ivc.h b/include/soc/tegra/virt/hv-ivc.h
-index 35fdb9876e1fd..fa61b6223449f 100644
+index 35fdb9876e1f..fa61b6223449 100644
 --- a/include/soc/tegra/virt/hv-ivc.h
 +++ b/include/soc/tegra/virt/hv-ivc.h
 @@ -9,301 +9,686 @@
@@ -925,7 +925,7 @@ index 35fdb9876e1fd..fa61b6223449f 100644
 +
  #endif /* __TEGRA_HV_IVC_H */
 diff --git a/include/soc/tegra/virt/syscalls.h b/include/soc/tegra/virt/syscalls.h
-index 03f97c46976ae..0497f749d4a9e 100644
+index 03f97c46976a..0497f749d4a9 100644
 --- a/include/soc/tegra/virt/syscalls.h
 +++ b/include/soc/tegra/virt/syscalls.h
 @@ -8,34 +8,84 @@
@@ -1969,7 +1969,7 @@ index 03f97c46976ae..0497f749d4a9e 100644
 +
  #endif /* __TEGRA_SYSCALLS_H__ */
 diff --git a/include/soc/tegra/virt/tegra_hv.h b/include/soc/tegra/virt/tegra_hv.h
-index 00c4fcb0e5db0..b23dfae84a63c 100644
+index 00c4fcb0e5db..b23dfae84a63 100644
 --- a/include/soc/tegra/virt/tegra_hv.h
 +++ b/include/soc/tegra/virt/tegra_hv.h
 @@ -6,10 +6,17 @@
@@ -2047,7 +2047,7 @@ index 00c4fcb0e5db0..b23dfae84a63c 100644
 +
  #endif /* __TEGRA_HV_H__ */
 diff --git a/include/soc/tegra/virt/tegra_hv_sysmgr.h b/include/soc/tegra/virt/tegra_hv_sysmgr.h
-index d8ac0cc255521..8d15bc3e2e913 100644
+index d8ac0cc25552..8d15bc3e2e91 100644
 --- a/include/soc/tegra/virt/tegra_hv_sysmgr.h
 +++ b/include/soc/tegra/virt/tegra_hv_sysmgr.h
 @@ -8,129 +8,207 @@
@@ -2280,5 +2280,5 @@ index d8ac0cc255521..8d15bc3e2e913 100644
 +
  #endif /* _TEGRA_HV_SYSMGR_H */
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/sauce/patches/0106-NVIDIA-SAUCE-hv-ivc-add-doxygen-comment.patch b/features/tegra/sauce/patches/0106-NVIDIA-SAUCE-hv-ivc-add-doxygen-comment.patch
index 42be0cb..e46da92 100644
--- a/features/tegra/sauce/patches/0106-NVIDIA-SAUCE-hv-ivc-add-doxygen-comment.patch
+++ b/features/tegra/sauce/patches/0106-NVIDIA-SAUCE-hv-ivc-add-doxygen-comment.patch
@@ -16,7 +16,7 @@ GVS: buildbot_gerritrpt <buildbot_gerritrpt@nvidia.com>
 (cherry picked from commit f21f1e02fba3afe5a602744c1a73b49945936dad)
 
 diff --git a/include/soc/tegra/virt/hv-ivc.h b/include/soc/tegra/virt/hv-ivc.h
-index fa61b6223449f..09a00501c434d 100644
+index fa61b6223449..09a00501c434 100644
 --- a/include/soc/tegra/virt/hv-ivc.h
 +++ b/include/soc/tegra/virt/hv-ivc.h
 @@ -49,17 +49,19 @@ struct tegra_hv_ivm_cookie {
@@ -660,7 +660,7 @@ index fa61b6223449f..09a00501c434d 100644
   *                   - Interrupt handler: Yes
   *                   - Signal handler: N/A
 diff --git a/include/soc/tegra/virt/syscalls.h b/include/soc/tegra/virt/syscalls.h
-index 0497f749d4a9e..b068712cf13d8 100644
+index 0497f749d4a9..b068712cf13d 100644
 --- a/include/soc/tegra/virt/syscalls.h
 +++ b/include/soc/tegra/virt/syscalls.h
 @@ -414,17 +414,19 @@ struct hyp_server_page {
@@ -689,7 +689,7 @@ index 0497f749d4a9e..b068712cf13d8 100644
   * @usage
   *                 - Allowed context for the API call
 diff --git a/include/soc/tegra/virt/tegra_hv.h b/include/soc/tegra/virt/tegra_hv.h
-index b23dfae84a63c..33086114b3017 100644
+index b23dfae84a63..33086114b301 100644
 --- a/include/soc/tegra/virt/tegra_hv.h
 +++ b/include/soc/tegra/virt/tegra_hv.h
 @@ -29,13 +29,15 @@
@@ -732,5 +732,5 @@ index b23dfae84a63c..33086114b3017 100644
   * @usage
   *                 - Allowed context for the API call
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/sauce/patches/0107-NVIDIA-SAUCE-tegra_hv-clear-out-memory-while-unreser.patch b/features/tegra/sauce/patches/0107-NVIDIA-SAUCE-tegra_hv-clear-out-memory-while-unreser.patch
index a35fb7f..0b84dc2 100644
--- a/features/tegra/sauce/patches/0107-NVIDIA-SAUCE-tegra_hv-clear-out-memory-while-unreser.patch
+++ b/features/tegra/sauce/patches/0107-NVIDIA-SAUCE-tegra_hv-clear-out-memory-while-unreser.patch
@@ -17,7 +17,7 @@ Reviewed-by: Suresh Venkatachalam <skathirampat@nvidia.com>
 (cherry picked from commit ec3b32edfa1e6bb85d30734a9cbc7e7863241410)
 
 diff --git a/drivers/firmware/tegra/ivc.c b/drivers/firmware/tegra/ivc.c
-index 8c9aff9804c0d..75e50a7da4a0a 100644
+index 8c9aff9804c0..75e50a7da4a0 100644
 --- a/drivers/firmware/tegra/ivc.c
 +++ b/drivers/firmware/tegra/ivc.c
 @@ -643,6 +643,13 @@ static inline void *iosys_map_get_vaddr(const struct iosys_map *map)
@@ -35,7 +35,7 @@ index 8c9aff9804c0d..75e50a7da4a0a 100644
  		   dma_addr_t rx_phys, const struct iosys_map *tx, dma_addr_t tx_phys,
  		   unsigned int num_frames, size_t frame_size,
 diff --git a/drivers/virt/tegra/tegra_hv.c b/drivers/virt/tegra/tegra_hv.c
-index 371f4ea4c58b2..77b5534b357df 100644
+index 371f4ea4c58b..77b5534b357d 100644
 --- a/drivers/virt/tegra/tegra_hv.c
 +++ b/drivers/virt/tegra/tegra_hv.c
 @@ -895,6 +895,7 @@ int tegra_hv_ivc_unreserve(struct tegra_hv_ivc_cookie *ivck)
@@ -47,7 +47,7 @@ index 371f4ea4c58b2..77b5534b357df 100644
  	} else {
  		ret = -EINVAL;
 diff --git a/include/soc/tegra/ivc.h b/include/soc/tegra/ivc.h
-index be45d5f5adeaa..736590774114d 100644
+index be45d5f5adea..736590774114 100644
 --- a/include/soc/tegra/ivc.h
 +++ b/include/soc/tegra/ivc.h
 @@ -29,6 +29,15 @@ struct tegra_ivc {
@@ -67,5 +67,5 @@ index be45d5f5adeaa..736590774114d 100644
   * tegra_ivc_read_get_next_frame - Peek at the next frame to receive
   * @ivc		pointer of the IVC channel
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/sauce/patches/0108-NVIDIA-SAUCE-tegra_hv-cert-misra-fixes.patch b/features/tegra/sauce/patches/0108-NVIDIA-SAUCE-tegra_hv-cert-misra-fixes.patch
index 4cda62d..a8ed6d6 100644
--- a/features/tegra/sauce/patches/0108-NVIDIA-SAUCE-tegra_hv-cert-misra-fixes.patch
+++ b/features/tegra/sauce/patches/0108-NVIDIA-SAUCE-tegra_hv-cert-misra-fixes.patch
@@ -23,7 +23,7 @@ GVS: buildbot_gerritrpt <buildbot_gerritrpt@nvidia.com>
 (cherry picked from commit eedfc6404fcfeb73f514d6677ff7567f2c7b28c2)
 
 diff --git a/drivers/virt/tegra/tegra_hv.c b/drivers/virt/tegra/tegra_hv.c
-index 77b5534b357df..d62aaf826a1df 100644
+index 77b5534b357d..d62aaf826a1d 100644
 --- a/drivers/virt/tegra/tegra_hv.c
 +++ b/drivers/virt/tegra/tegra_hv.c
 @@ -533,9 +533,65 @@ static ssize_t async_err_diagnostics_store(const struct class *class,
@@ -124,5 +124,5 @@ index 77b5534b357df..d62aaf826a1df 100644
  	}
  
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/sauce/patches/0109-NVIDIA-SAUCE-tegra_hv-cert-misra-fixes.patch b/features/tegra/sauce/patches/0109-NVIDIA-SAUCE-tegra_hv-cert-misra-fixes.patch
index 0883711..1942d80 100644
--- a/features/tegra/sauce/patches/0109-NVIDIA-SAUCE-tegra_hv-cert-misra-fixes.patch
+++ b/features/tegra/sauce/patches/0109-NVIDIA-SAUCE-tegra_hv-cert-misra-fixes.patch
@@ -26,7 +26,7 @@ Reviewed-by: Sandeep Trasi <strasi@nvidia.com>
 (cherry picked from commit 38340e780b8762c102d0fc56bfa34ab58ab74dbf)
 
 diff --git a/drivers/firmware/tegra/ivc.c b/drivers/firmware/tegra/ivc.c
-index 75e50a7da4a0a..bf2b45ad19807 100644
+index 75e50a7da4a0..bf2b45ad1980 100644
 --- a/drivers/firmware/tegra/ivc.c
 +++ b/drivers/firmware/tegra/ivc.c
 @@ -645,6 +645,14 @@ static inline void *iosys_map_get_vaddr(const struct iosys_map *map)
@@ -45,7 +45,7 @@ index 75e50a7da4a0a..bf2b45ad19807 100644
  	iosys_map_memset(&ivc->tx.map, sizeof(struct tegra_ivc_header), 0, ivc->num_frames * ivc->frame_size);
  }
 diff --git a/drivers/virt/tegra/tegra_hv.c b/drivers/virt/tegra/tegra_hv.c
-index d62aaf826a1df..2f38cadb4a7d0 100644
+index d62aaf826a1d..2f38cadb4a7d 100644
 --- a/drivers/virt/tegra/tegra_hv.c
 +++ b/drivers/virt/tegra/tegra_hv.c
 @@ -781,6 +781,11 @@ static int tegra_hv_setup(struct tegra_hv_data *hvd)
@@ -73,5 +73,5 @@ index d62aaf826a1df..2f38cadb4a7d0 100644
  		return ret;
  	}
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/sauce/patches/0110-NVIDIA-SAUCE-tegra_hv-Update-interrupt-property-hand.patch b/features/tegra/sauce/patches/0110-NVIDIA-SAUCE-tegra_hv-Update-interrupt-property-hand.patch
index d4e79b4..56ba1b3 100644
--- a/features/tegra/sauce/patches/0110-NVIDIA-SAUCE-tegra_hv-Update-interrupt-property-hand.patch
+++ b/features/tegra/sauce/patches/0110-NVIDIA-SAUCE-tegra_hv-Update-interrupt-property-hand.patch
@@ -20,7 +20,7 @@ Reviewed-by: Suresh Mangipudi <smangipudi@nvidia.com>
 (cherry picked from commit 68ae606c6b62fb95cbabf494bcd55470b842b724)
 
 diff --git a/drivers/virt/tegra/tegra_hv.c b/drivers/virt/tegra/tegra_hv.c
-index 2f38cadb4a7d0..c2ce088cbe964 100644
+index 2f38cadb4a7d..c2ce088cbe96 100644
 --- a/drivers/virt/tegra/tegra_hv.c
 +++ b/drivers/virt/tegra/tegra_hv.c
 @@ -590,7 +590,8 @@ static struct ivc_info_page *validate_ivc_info_page(void __iomem *mapped_mem, si
@@ -70,5 +70,5 @@ index 2f38cadb4a7d0..c2ce088cbe964 100644
  
  	interrupts_prop.length =
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/sauce/patches/0111-NVIDIA-SAUCE-icd-reworked-changes-on-icd-doc-review-.patch b/features/tegra/sauce/patches/0111-NVIDIA-SAUCE-icd-reworked-changes-on-icd-doc-review-.patch
index 4e06836..d65a0f2 100644
--- a/features/tegra/sauce/patches/0111-NVIDIA-SAUCE-icd-reworked-changes-on-icd-doc-review-.patch
+++ b/features/tegra/sauce/patches/0111-NVIDIA-SAUCE-icd-reworked-changes-on-icd-doc-review-.patch
@@ -18,7 +18,7 @@ Reviewed-by: svcacv <svcacv@nvidia.com>
 (cherry picked from commit 08a7fd1f9dc57292e9760105059c10d24914058b)
 
 diff --git a/include/soc/tegra/virt/hv-ivc.h b/include/soc/tegra/virt/hv-ivc.h
-index 09a00501c434d..9f7d09ac3164e 100644
+index 09a00501c434..9f7d09ac3164 100644
 --- a/include/soc/tegra/virt/hv-ivc.h
 +++ b/include/soc/tegra/virt/hv-ivc.h
 @@ -57,15 +57,14 @@ struct tegra_hv_ivm_cookie {
@@ -229,7 +229,7 @@ index 09a00501c434d..9f7d09ac3164e 100644
   *                   - Interrupt handler: Yes
   *                   - Signal handler: N/A
 diff --git a/include/soc/tegra/virt/tegra_hv.h b/include/soc/tegra/virt/tegra_hv.h
-index 33086114b3017..d3f8dff1a80e4 100644
+index 33086114b301..d3f8dff1a80e 100644
 --- a/include/soc/tegra/virt/tegra_hv.h
 +++ b/include/soc/tegra/virt/tegra_hv.h
 @@ -42,7 +42,7 @@
@@ -251,5 +251,5 @@ index 33086114b3017..d3f8dff1a80e4 100644
   *                   - Async/Sync: Sync
   *                   - Re-entrant: No
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/sauce/patches/0112-NVIDIA-SAUCE-tegra_hv-stop-ivc-ops-for-unreserved-IV.patch b/features/tegra/sauce/patches/0112-NVIDIA-SAUCE-tegra_hv-stop-ivc-ops-for-unreserved-IV.patch
index ff2ff0b..4adf337 100644
--- a/features/tegra/sauce/patches/0112-NVIDIA-SAUCE-tegra_hv-stop-ivc-ops-for-unreserved-IV.patch
+++ b/features/tegra/sauce/patches/0112-NVIDIA-SAUCE-tegra_hv-stop-ivc-ops-for-unreserved-IV.patch
@@ -23,7 +23,7 @@ Reviewed-by: svc-mobile-coverity <svc-mobile-coverity@nvidia.com>
 (cherry picked from commit 23803b31af948055dc98a6a87d89abe725350a85)
 
 diff --git a/drivers/virt/tegra/tegra_hv.c b/drivers/virt/tegra/tegra_hv.c
-index c2ce088cbe964..9f38c60b1068f 100644
+index c2ce088cbe96..9f38c60b1068 100644
 --- a/drivers/virt/tegra/tegra_hv.c
 +++ b/drivers/virt/tegra/tegra_hv.c
 @@ -926,6 +926,11 @@ void tegra_hv_ivc_notify(struct tegra_hv_ivc_cookie *ivck)
@@ -315,5 +315,5 @@ index c2ce088cbe964..9f38c60b1068f 100644
  	if (ivc->cookie_ops) {
  		ERR("reset unsupported with callbacks");
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/sauce/patches/0113-NVIDIA-SAUCE-tegra_hv-change-to-fix-compilation-erro.patch b/features/tegra/sauce/patches/0113-NVIDIA-SAUCE-tegra_hv-change-to-fix-compilation-erro.patch
index f4daf50..d4feb90 100644
--- a/features/tegra/sauce/patches/0113-NVIDIA-SAUCE-tegra_hv-change-to-fix-compilation-erro.patch
+++ b/features/tegra/sauce/patches/0113-NVIDIA-SAUCE-tegra_hv-change-to-fix-compilation-erro.patch
@@ -22,7 +22,7 @@ Reviewed-by: Sandeep Trasi <strasi@nvidia.com>
 (cherry picked from commit 6c745d30b73145a49a4f39fc45ff83dfc5d46361)
 
 diff --git a/include/soc/tegra/virt/tegra_hv_sysmgr.h b/include/soc/tegra/virt/tegra_hv_sysmgr.h
-index 8d15bc3e2e913..a106b095449f4 100644
+index 8d15bc3e2e91..a106b095449f 100644
 --- a/include/soc/tegra/virt/tegra_hv_sysmgr.h
 +++ b/include/soc/tegra/virt/tegra_hv_sysmgr.h
 @@ -142,7 +142,7 @@ enum system_function_id {
@@ -44,5 +44,5 @@ index 8d15bc3e2e913..a106b095449f4 100644
  /** @brief Macro to create Command using function id and vmid */
  #define CREATE_CMD(func_id, vmid)	((func_id << 24U) | vmid)
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/sauce/patches/0114-NVIDIA-SAUCE-virt-linux-hv-driver-cert-misra-fixes.patch b/features/tegra/sauce/patches/0114-NVIDIA-SAUCE-virt-linux-hv-driver-cert-misra-fixes.patch
index c7995cb..319cfec 100644
--- a/features/tegra/sauce/patches/0114-NVIDIA-SAUCE-virt-linux-hv-driver-cert-misra-fixes.patch
+++ b/features/tegra/sauce/patches/0114-NVIDIA-SAUCE-virt-linux-hv-driver-cert-misra-fixes.patch
@@ -46,7 +46,7 @@ Reviewed-by: svcacv <svcacv@nvidia.com>
 (cherry picked from commit d886c26b30c34c670f82c01a6e06b97ce5134050)
 
 diff --git a/include/soc/tegra/virt/hv-ivc.h b/include/soc/tegra/virt/hv-ivc.h
-index 9f7d09ac3164e..6f80c80d064b9 100644
+index 9f7d09ac3164..6f80c80d064b 100644
 --- a/include/soc/tegra/virt/hv-ivc.h
 +++ b/include/soc/tegra/virt/hv-ivc.h
 @@ -3,8 +3,8 @@
@@ -67,7 +67,7 @@ index 9f7d09ac3164e..6f80c80d064b9 100644
 -#endif /* __TEGRA_HV_IVC_H */
 +#endif /* TEGRA_HV_IVC_H */
 diff --git a/include/soc/tegra/virt/syscalls.h b/include/soc/tegra/virt/syscalls.h
-index b068712cf13d8..bb92039453059 100644
+index b068712cf13d..bb9203945305 100644
 --- a/include/soc/tegra/virt/syscalls.h
 +++ b/include/soc/tegra/virt/syscalls.h
 @@ -3,8 +3,8 @@
@@ -88,7 +88,7 @@ index b068712cf13d8..bb92039453059 100644
 -#endif /* __TEGRA_SYSCALLS_H__ */
 +#endif /* TEGRA_SYSCALLS_H */
 diff --git a/include/soc/tegra/virt/tegra_hv.h b/include/soc/tegra/virt/tegra_hv.h
-index d3f8dff1a80e4..59984d04af3fd 100644
+index d3f8dff1a80e..59984d04af3f 100644
 --- a/include/soc/tegra/virt/tegra_hv.h
 +++ b/include/soc/tegra/virt/tegra_hv.h
 @@ -3,8 +3,8 @@
@@ -109,7 +109,7 @@ index d3f8dff1a80e4..59984d04af3fd 100644
 -#endif /* __TEGRA_HV_H__ */
 +#endif /* TEGRA_HV_H */
 diff --git a/include/soc/tegra/virt/tegra_hv_sysmgr.h b/include/soc/tegra/virt/tegra_hv_sysmgr.h
-index a106b095449f4..4da15df49dd0b 100644
+index a106b095449f..4da15df49dd0 100644
 --- a/include/soc/tegra/virt/tegra_hv_sysmgr.h
 +++ b/include/soc/tegra/virt/tegra_hv_sysmgr.h
 @@ -3,8 +3,8 @@
@@ -130,5 +130,5 @@ index a106b095449f4..4da15df49dd0b 100644
 -#endif /* _TEGRA_HV_SYSMGR_H */
 +#endif /* TEGRA_HV_SYSMGR_H */
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/sauce/patches/0115-NVIDIA-SAUCE-virt-tegra-segregate-hv-ivc-from-tegra_.patch b/features/tegra/sauce/patches/0115-NVIDIA-SAUCE-virt-tegra-segregate-hv-ivc-from-tegra_.patch
index d51cefc..792d3a2 100644
--- a/features/tegra/sauce/patches/0115-NVIDIA-SAUCE-virt-tegra-segregate-hv-ivc-from-tegra_.patch
+++ b/features/tegra/sauce/patches/0115-NVIDIA-SAUCE-virt-tegra-segregate-hv-ivc-from-tegra_.patch
@@ -23,7 +23,7 @@ GVS: buildbot_gerritrpt <buildbot_gerritrpt@nvidia.com>
 (cherry picked from commit a56df8dbdb42743a8dcd0ecc160fa364ad0c4075)
 
 diff --git a/drivers/virt/tegra/Makefile b/drivers/virt/tegra/Makefile
-index 9172577716d1f..63fa41f8408d9 100644
+index 9172577716d1..63fa41f8408d 100644
 --- a/drivers/virt/tegra/Makefile
 +++ b/drivers/virt/tegra/Makefile
 @@ -1,8 +1,9 @@
@@ -38,7 +38,7 @@ index 9172577716d1f..63fa41f8408d9 100644
 +obj-$(CONFIG_TEGRA_HV_DRIVER)          += tegra_hv_ivc.o
  obj-$(CONFIG_TEGRA_HV_DRIVER)          += tegra_hv.o
 diff --git a/drivers/virt/tegra/tegra_hv.c b/drivers/virt/tegra/tegra_hv.c
-index 9f38c60b1068f..fdeff62441ef8 100644
+index 9f38c60b1068..fdeff62441ef 100644
 --- a/drivers/virt/tegra/tegra_hv.c
 +++ b/drivers/virt/tegra/tegra_hv.c
 @@ -1,5 +1,5 @@
@@ -1137,7 +1137,7 @@ index 9f38c60b1068f..fdeff62441ef8 100644
  MODULE_LICENSE("GPL v2");
 diff --git a/drivers/virt/tegra/tegra_hv_ivc.c b/drivers/virt/tegra/tegra_hv_ivc.c
 new file mode 100644
-index 0000000000000..0a78cc2e86469
+index 000000000000..0a78cc2e8646
 --- /dev/null
 +++ b/drivers/virt/tegra/tegra_hv_ivc.c
 @@ -0,0 +1,1041 @@
@@ -2183,7 +2183,7 @@ index 0000000000000..0a78cc2e86469
 +MODULE_LICENSE("GPL v2");
 +
 diff --git a/include/soc/tegra/virt/hv-ivc.h b/include/soc/tegra/virt/hv-ivc.h
-index 6f80c80d064b9..d88650786019f 100644
+index 6f80c80d064b..d88650786019 100644
 --- a/include/soc/tegra/virt/hv-ivc.h
 +++ b/include/soc/tegra/virt/hv-ivc.h
 @@ -1,6 +1,6 @@
@@ -2303,7 +2303,7 @@ index 6f80c80d064b9..d88650786019f 100644
   * @brief          Handle internal messages.
   *                 This function must be called following every notification (interrupt or
 diff --git a/include/soc/tegra/virt/tegra_hv.h b/include/soc/tegra/virt/tegra_hv.h
-index 59984d04af3fd..77fc7c25a7f20 100644
+index 59984d04af3f..77fc7c25a7f2 100644
 --- a/include/soc/tegra/virt/tegra_hv.h
 +++ b/include/soc/tegra/virt/tegra_hv.h
 @@ -1,6 +1,6 @@
@@ -2416,5 +2416,5 @@ index 59984d04af3fd..77fc7c25a7f20 100644
   * @brief          Query IVC meta data from hypervisor
   *
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/sauce/patches/0116-NVIDIA-SAUCE-virt-tegra-add-nvlog-ability-to-access-.patch b/features/tegra/sauce/patches/0116-NVIDIA-SAUCE-virt-tegra-add-nvlog-ability-to-access-.patch
index cd9a41a..2f2c8ac 100644
--- a/features/tegra/sauce/patches/0116-NVIDIA-SAUCE-virt-tegra-add-nvlog-ability-to-access-.patch
+++ b/features/tegra/sauce/patches/0116-NVIDIA-SAUCE-virt-tegra-add-nvlog-ability-to-access-.patch
@@ -29,7 +29,7 @@ GVS: buildbot_gerritrpt <buildbot_gerritrpt@nvidia.com>
 (cherry picked from commit 9c721fdd8b2412f407b9ef9c5847bd5bcb67c237)
 
 diff --git a/include/soc/tegra/virt/syscalls.h b/include/soc/tegra/virt/syscalls.h
-index bb92039453059..e087b25173aab 100644
+index bb9203945305..e087b25173aa 100644
 --- a/include/soc/tegra/virt/syscalls.h
 +++ b/include/soc/tegra/virt/syscalls.h
 @@ -1,6 +1,6 @@
@@ -83,5 +83,5 @@ index bb92039453059..e087b25173aab 100644
  
  /**
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/sauce/patches/0117-NVIDIA-SAUCE-tegra_hv_ivc-Add-interface-for-nvscicom.patch b/features/tegra/sauce/patches/0117-NVIDIA-SAUCE-tegra_hv_ivc-Add-interface-for-nvscicom.patch
index 7862c1f..2b9613b 100644
--- a/features/tegra/sauce/patches/0117-NVIDIA-SAUCE-tegra_hv_ivc-Add-interface-for-nvscicom.patch
+++ b/features/tegra/sauce/patches/0117-NVIDIA-SAUCE-tegra_hv_ivc-Add-interface-for-nvscicom.patch
@@ -24,7 +24,7 @@ Reviewed-by: Brad Griffis <bgriffis@nvidia.com>
 (cherry picked from commit 7806423929bac69ba648d07058a01bd591396785)
 
 diff --git a/drivers/virt/tegra/tegra_hv_ivc.c b/drivers/virt/tegra/tegra_hv_ivc.c
-index 0a78cc2e86469..c43baee0603d8 100644
+index 0a78cc2e8646..c43baee0603d 100644
 --- a/drivers/virt/tegra/tegra_hv_ivc.c
 +++ b/drivers/virt/tegra/tegra_hv_ivc.c
 @@ -15,6 +15,7 @@
@@ -525,7 +525,7 @@ index 0a78cc2e86469..c43baee0603d8 100644
  
  static int ivc_dump(struct hv_ivc *ivc)
 diff --git a/include/soc/tegra/virt/tegra_hv.h b/include/soc/tegra/virt/tegra_hv.h
-index 77fc7c25a7f20..2825a39930c8c 100644
+index 77fc7c25a7f2..2825a39930c8 100644
 --- a/include/soc/tegra/virt/tegra_hv.h
 +++ b/include/soc/tegra/virt/tegra_hv.h
 @@ -11,6 +11,7 @@
@@ -695,5 +695,5 @@ index 77fc7c25a7f20..2825a39930c8c 100644
  
  #endif /* TEGRA_HV_H */
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/sauce/patches/0118-NVIDIA-SAUCE-tegra_hv_ivc-Add-API-to-reserve-an-IVC-.patch b/features/tegra/sauce/patches/0118-NVIDIA-SAUCE-tegra_hv_ivc-Add-API-to-reserve-an-IVC-.patch
index da47a71..335d645 100644
--- a/features/tegra/sauce/patches/0118-NVIDIA-SAUCE-tegra_hv_ivc-Add-API-to-reserve-an-IVC-.patch
+++ b/features/tegra/sauce/patches/0118-NVIDIA-SAUCE-tegra_hv_ivc-Add-API-to-reserve-an-IVC-.patch
@@ -21,7 +21,7 @@ Reviewed-by: Manish Bhardwaj <mbhardwaj@nvidia.com>
 (cherry picked from commit f3c52101af0762929bb8c454b2e87f6e71626c1f)
 
 diff --git a/drivers/virt/tegra/tegra_hv_ivc.c b/drivers/virt/tegra/tegra_hv_ivc.c
-index c43baee0603d8..b08e2620a5a30 100644
+index c43baee0603d..b08e2620a5a3 100644
 --- a/drivers/virt/tegra/tegra_hv_ivc.c
 +++ b/drivers/virt/tegra/tegra_hv_ivc.c
 @@ -57,9 +57,11 @@ struct hv_ivc {
@@ -90,7 +90,7 @@ index c43baee0603d8..b08e2620a5a30 100644
  		int size)
  {
 diff --git a/include/soc/tegra/virt/tegra_hv.h b/include/soc/tegra/virt/tegra_hv.h
-index 2825a39930c8c..035d2546d28d7 100644
+index 2825a39930c8..035d2546d28d 100644
 --- a/include/soc/tegra/virt/tegra_hv.h
 +++ b/include/soc/tegra/virt/tegra_hv.h
 @@ -212,6 +212,62 @@ const struct ivc_info_page *tegra_hv_get_ivc_info(void);
@@ -157,5 +157,5 @@ index 2825a39930c8c..035d2546d28d7 100644
   * @brief          Initialize IVC layout structure
   * @param[in,out]  layout Pointer to layout structure to initialize
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/sauce/patches/0119-NVIDIA-SAUCE-tegra_hv_ivc-Defer-setting-the-IRQ-unti.patch b/features/tegra/sauce/patches/0119-NVIDIA-SAUCE-tegra_hv_ivc-Defer-setting-the-IRQ-unti.patch
index 90cdeb6..ae46718 100644
--- a/features/tegra/sauce/patches/0119-NVIDIA-SAUCE-tegra_hv_ivc-Defer-setting-the-IRQ-unti.patch
+++ b/features/tegra/sauce/patches/0119-NVIDIA-SAUCE-tegra_hv_ivc-Defer-setting-the-IRQ-unti.patch
@@ -20,7 +20,7 @@ Tested-by: Manish Bhardwaj <mbhardwaj@nvidia.com>
 (cherry picked from commit fb8a9a8d588206807eab8af3560aafbbd4ff7f75)
 
 diff --git a/drivers/virt/tegra/tegra_hv_ivc.c b/drivers/virt/tegra/tegra_hv_ivc.c
-index b08e2620a5a30..b6155fc48a6f5 100644
+index b08e2620a5a3..b6155fc48a6f 100644
 --- a/drivers/virt/tegra/tegra_hv_ivc.c
 +++ b/drivers/virt/tegra/tegra_hv_ivc.c
 @@ -103,7 +103,6 @@ static int tegra_hv_add_ivc(struct tegra_hv_data *hvd,
@@ -71,5 +71,5 @@ index b08e2620a5a30..b6155fc48a6f5 100644
  
  	ivck = &ivc->cookie;
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/sauce/patches/0120-NVIDIA-SAUCE-depmod-Create-dependency-list-for-displ.patch b/features/tegra/sauce/patches/0120-NVIDIA-SAUCE-depmod-Create-dependency-list-for-displ.patch
index 449dc34..5eb72fb 100644
--- a/features/tegra/sauce/patches/0120-NVIDIA-SAUCE-depmod-Create-dependency-list-for-displ.patch
+++ b/features/tegra/sauce/patches/0120-NVIDIA-SAUCE-depmod-Create-dependency-list-for-displ.patch
@@ -19,7 +19,7 @@ GVS: Gerrit_Virtual_Submit <buildbot_gerritrpt@nvidia.com>
 Reviewed-by: Bitan Biswas <bbiswas@nvidia.com>
 
 diff --git a/scripts/depmod.sh b/scripts/depmod.sh
-index 3c34fecacbc82..179935291705a 100755
+index 3c34fecacbc8..179935291705 100755
 --- a/scripts/depmod.sh
 +++ b/scripts/depmod.sh
 @@ -29,4 +29,27 @@ set -- -ae -F "${objtree}/System.map"
@@ -52,5 +52,5 @@ index 3c34fecacbc82..179935291705a 100755
 +	exec "$DEPMOD" "$@" "$KERNELRELEASE"
 +fi
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/sauce/patches/0121-NVIDIA-SAUCE-lib-Avoid-call-dump-trace-on-UBSAN-erro.patch b/features/tegra/sauce/patches/0121-NVIDIA-SAUCE-lib-Avoid-call-dump-trace-on-UBSAN-erro.patch
index 3a3ebef..cba498a 100644
--- a/features/tegra/sauce/patches/0121-NVIDIA-SAUCE-lib-Avoid-call-dump-trace-on-UBSAN-erro.patch
+++ b/features/tegra/sauce/patches/0121-NVIDIA-SAUCE-lib-Avoid-call-dump-trace-on-UBSAN-erro.patch
@@ -16,7 +16,7 @@ Reviewed-on: https://git-master.nvidia.com/r/c/linux-stable/+/3042024
 GVS: Gerrit_Virtual_Submit <buildbot_gerritrpt@nvidia.com>
 
 diff --git a/lib/ubsan.c b/lib/ubsan.c
-index 456e3dd8f4ea8..e0459bf113ad6 100644
+index 456e3dd8f4ea..e0459bf113ad 100644
 --- a/lib/ubsan.c
 +++ b/lib/ubsan.c
 @@ -230,7 +230,8 @@ static void ubsan_prologue(struct source_location *loc, const char *reason)
@@ -30,5 +30,5 @@ index 456e3dd8f4ea8..e0459bf113ad6 100644
  
  	current->in_ubsan--;
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/sauce/patches/0122-NVIDIA-SAUCE-dtc-check-Disable-warning-for-plugin-DT.patch b/features/tegra/sauce/patches/0122-NVIDIA-SAUCE-dtc-check-Disable-warning-for-plugin-DT.patch
index e717d86..d0d50ac 100644
--- a/features/tegra/sauce/patches/0122-NVIDIA-SAUCE-dtc-check-Disable-warning-for-plugin-DT.patch
+++ b/features/tegra/sauce/patches/0122-NVIDIA-SAUCE-dtc-check-Disable-warning-for-plugin-DT.patch
@@ -28,7 +28,7 @@ Tested-by: Abhilash G <abhilashg@nvidia.com>
 Reviewed-by: Abhilash G <abhilashg@nvidia.com>
 
 diff --git a/scripts/dtc/checks.c b/scripts/dtc/checks.c
-index 7e3fed5005b31..ba5cc30d81b4d 100644
+index 7e3fed5005b3..ba5cc30d81b4 100644
 --- a/scripts/dtc/checks.c
 +++ b/scripts/dtc/checks.c
 @@ -759,6 +759,10 @@ static void check_reg_format(struct check *c, struct dt_info *dti,
@@ -98,5 +98,5 @@ index 7e3fed5005b31..ba5cc30d81b4d 100644
  		FAIL_PROP(c, dti, node, irq_prop, "size (%d) is invalid, expected multiple of %zu",
  		     irq_prop->val.len, sizeof(cell_t));
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/sauce/patches/0123-NVIDIA-SAUCE-kernel-script-depmod-Do-not-use-exec-fo.patch b/features/tegra/sauce/patches/0123-NVIDIA-SAUCE-kernel-script-depmod-Do-not-use-exec-fo.patch
index cb19515..0342c5b 100644
--- a/features/tegra/sauce/patches/0123-NVIDIA-SAUCE-kernel-script-depmod-Do-not-use-exec-fo.patch
+++ b/features/tegra/sauce/patches/0123-NVIDIA-SAUCE-kernel-script-depmod-Do-not-use-exec-fo.patch
@@ -16,7 +16,7 @@ GVS: buildbot_gerritrpt <buildbot_gerritrpt@nvidia.com>
 (cherry picked from commit e59c7dc35e2b6830c1deab4410aa37f478cd247a)
 
 diff --git a/scripts/depmod.sh b/scripts/depmod.sh
-index 179935291705a..8ae4f49a71114 100755
+index 179935291705..8ae4f49a7111 100755
 --- a/scripts/depmod.sh
 +++ b/scripts/depmod.sh
 @@ -37,7 +37,7 @@ do
@@ -29,5 +29,5 @@ index 179935291705a..8ae4f49a71114 100755
  		exit_status=$?
  		if [ "$exit_status" -ne 0 ]; then
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/sauce/patches/0124-NVIDIA-SAUCE-pstore-Avoid-using-pr_cont.patch b/features/tegra/sauce/patches/0124-NVIDIA-SAUCE-pstore-Avoid-using-pr_cont.patch
index fcf7d46..9ceb084 100644
--- a/features/tegra/sauce/patches/0124-NVIDIA-SAUCE-pstore-Avoid-using-pr_cont.patch
+++ b/features/tegra/sauce/patches/0124-NVIDIA-SAUCE-pstore-Avoid-using-pr_cont.patch
@@ -26,7 +26,7 @@ Reviewed-by: Laxman Dewangan <ldewangan@nvidia.com>
 (cherry picked from commit 622348e0f269905af325cf843771d21964a404de)
 
 diff --git a/fs/pstore/zone.c b/fs/pstore/zone.c
-index eb61ba5bb9642..50cefe04462b2 100644
+index eb61ba5bb964..50cefe04462b 100644
 --- a/fs/pstore/zone.c
 +++ b/fs/pstore/zone.c
 @@ -1301,6 +1301,8 @@ int register_pstore_zone(struct pstore_zone_info *info)
@@ -90,5 +90,5 @@ index eb61ba5bb9642..50cefe04462b2 100644
  	err = pstore_register(&cxt->pstore);
  	if (err) {
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/sauce/patches/0125-NVIDIA-SAUCE-tegra-prod-use-legacy-prod-settings.patch b/features/tegra/sauce/patches/0125-NVIDIA-SAUCE-tegra-prod-use-legacy-prod-settings.patch
index cade83c..3d0f22d 100644
--- a/features/tegra/sauce/patches/0125-NVIDIA-SAUCE-tegra-prod-use-legacy-prod-settings.patch
+++ b/features/tegra/sauce/patches/0125-NVIDIA-SAUCE-tegra-prod-use-legacy-prod-settings.patch
@@ -35,7 +35,7 @@ Reviewed-by: Laxman Dewangan <ldewangan@nvidia.com>
 GVS: buildbot_gerritrpt <buildbot_gerritrpt@nvidia.com>
 
 diff --git a/drivers/mmc/host/sdhci-tegra.c b/drivers/mmc/host/sdhci-tegra.c
-index fdef1c7352481..cecfc691b8c7c 100644
+index fdef1c735248..cecfc691b8c7 100644
 --- a/drivers/mmc/host/sdhci-tegra.c
 +++ b/drivers/mmc/host/sdhci-tegra.c
 @@ -1,6 +1,6 @@
@@ -225,5 +225,5 @@ index fdef1c7352481..cecfc691b8c7c 100644
  	if (IS_ERR(tegra_host->pinctrl_sdmmc)) {
  		dev_dbg(dev, "No pinctrl info, err: %ld\n",
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/sauce/patches/0126-NVIDIA-SAUCE-tegra-sdhci-do-not-apply-prod-settings-.patch b/features/tegra/sauce/patches/0126-NVIDIA-SAUCE-tegra-sdhci-do-not-apply-prod-settings-.patch
index c0f2a9d..0dff103 100644
--- a/features/tegra/sauce/patches/0126-NVIDIA-SAUCE-tegra-sdhci-do-not-apply-prod-settings-.patch
+++ b/features/tegra/sauce/patches/0126-NVIDIA-SAUCE-tegra-sdhci-do-not-apply-prod-settings-.patch
@@ -24,7 +24,7 @@ Reviewed-by: Laxman Dewangan <ldewangan@nvidia.com>
 Tested-by: Petlozu Pravareshwar <petlozup@nvidia.com>
 
 diff --git a/drivers/mmc/host/sdhci-tegra.c b/drivers/mmc/host/sdhci-tegra.c
-index cecfc691b8c7c..ce94d23ca00a4 100644
+index cecfc691b8c7..ce94d23ca00a 100644
 --- a/drivers/mmc/host/sdhci-tegra.c
 +++ b/drivers/mmc/host/sdhci-tegra.c
 @@ -436,9 +436,6 @@ static void tegra_sdhci_reset(struct sdhci_host *host, u8 mask)
@@ -38,5 +38,5 @@ index cecfc691b8c7c..ce94d23ca00a4 100644
  
  	misc_ctrl = sdhci_readl(host, SDHCI_TEGRA_VENDOR_MISC_CTRL);
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/sauce/patches/0127-NVIDIA-SAUCE-mmc-sd-Add-quirk-for-SanDisk-SR64G-Extr.patch b/features/tegra/sauce/patches/0127-NVIDIA-SAUCE-mmc-sd-Add-quirk-for-SanDisk-SR64G-Extr.patch
index 0120e72..d3e8360 100644
--- a/features/tegra/sauce/patches/0127-NVIDIA-SAUCE-mmc-sd-Add-quirk-for-SanDisk-SR64G-Extr.patch
+++ b/features/tegra/sauce/patches/0127-NVIDIA-SAUCE-mmc-sd-Add-quirk-for-SanDisk-SR64G-Extr.patch
@@ -41,7 +41,7 @@ GVS: buildbot_gerritrpt <buildbot_gerritrpt@nvidia.com>
 (cherry picked from commit 1b5cb13c08b4c46ac8c638013baf1cba15d85a75)
 
 diff --git a/drivers/mmc/core/quirks.h b/drivers/mmc/core/quirks.h
-index 6f727b4a60a52..54901102b17f7 100644
+index 6f727b4a60a5..54901102b17f 100644
 --- a/drivers/mmc/core/quirks.h
 +++ b/drivers/mmc/core/quirks.h
 @@ -50,6 +50,16 @@ static const struct mmc_fixup __maybe_unused mmc_sd_fixups[] = {
@@ -62,5 +62,5 @@ index 6f727b4a60a52..54901102b17f7 100644
  };
  
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/sauce/patches/0128-NVIDIA-SAUCE-mmc-tegra-use-gpio-for-voltage-switchin.patch b/features/tegra/sauce/patches/0128-NVIDIA-SAUCE-mmc-tegra-use-gpio-for-voltage-switchin.patch
index e62add4..c9619c8 100644
--- a/features/tegra/sauce/patches/0128-NVIDIA-SAUCE-mmc-tegra-use-gpio-for-voltage-switchin.patch
+++ b/features/tegra/sauce/patches/0128-NVIDIA-SAUCE-mmc-tegra-use-gpio-for-voltage-switchin.patch
@@ -21,7 +21,7 @@ Reviewed-on: https://git-master.nvidia.com/r/c/linux-5.9/+/2386067
 Signed-off-by: Prathamesh Shete <pshete@nvidia.com>
 
 diff --git a/drivers/mmc/host/sdhci-tegra.c b/drivers/mmc/host/sdhci-tegra.c
-index ce94d23ca00a4..977bd519acbfa 100644
+index ce94d23ca00a..977bd519acbf 100644
 --- a/drivers/mmc/host/sdhci-tegra.c
 +++ b/drivers/mmc/host/sdhci-tegra.c
 @@ -26,6 +26,8 @@
@@ -93,5 +93,5 @@ index ce94d23ca00a4..977bd519acbfa 100644
  	if (rc)
  		goto err_add_host;
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/sauce/patches/0129-NVIDIA-SAUCE-sdhci-tegra-t264-Add-T264-support-for-S.patch b/features/tegra/sauce/patches/0129-NVIDIA-SAUCE-sdhci-tegra-t264-Add-T264-support-for-S.patch
index 2d296dd..a3e9864 100644
--- a/features/tegra/sauce/patches/0129-NVIDIA-SAUCE-sdhci-tegra-t264-Add-T264-support-for-S.patch
+++ b/features/tegra/sauce/patches/0129-NVIDIA-SAUCE-sdhci-tegra-t264-Add-T264-support-for-S.patch
@@ -13,7 +13,7 @@ Signed-off-by: Prathamesh Shete <pshete@nvidia.com>
 Change-Id: Icc1b20e8b67507a7531de9c2c4ec89ce545904e8
 
 diff --git a/drivers/mmc/host/sdhci-tegra.c b/drivers/mmc/host/sdhci-tegra.c
-index 977bd519acbfa..53f7a75629cc5 100644
+index 977bd519acbf..53f7a75629cc 100644
 --- a/drivers/mmc/host/sdhci-tegra.c
 +++ b/drivers/mmc/host/sdhci-tegra.c
 @@ -1681,7 +1681,20 @@ static const struct sdhci_tegra_soc_data soc_data_tegra234 = {
@@ -38,5 +38,5 @@ index 977bd519acbfa..53f7a75629cc5 100644
  	{ .compatible = "nvidia,tegra194-sdhci", .data = &soc_data_tegra194 },
  	{ .compatible = "nvidia,tegra186-sdhci", .data = &soc_data_tegra186 },
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/sauce/patches/0130-NVIDIA-SAUCE-pinctrl-tegra-Enhance-suspend-resume-to.patch b/features/tegra/sauce/patches/0130-NVIDIA-SAUCE-pinctrl-tegra-Enhance-suspend-resume-to.patch
index 3d88552..7014b8d 100644
--- a/features/tegra/sauce/patches/0130-NVIDIA-SAUCE-pinctrl-tegra-Enhance-suspend-resume-to.patch
+++ b/features/tegra/sauce/patches/0130-NVIDIA-SAUCE-pinctrl-tegra-Enhance-suspend-resume-to.patch
@@ -31,7 +31,7 @@ GVS: buildbot_gerritrpt <buildbot_gerritrpt@nvidia.com>
 (cherry picked from commit 17c772f4d0c1d3d466b6a25ff11f3c3fc6d6a5ec)
 
 diff --git a/drivers/pinctrl/tegra/pinctrl-tegra.c b/drivers/pinctrl/tegra/pinctrl-tegra.c
-index 0cb7a705a5243..2282a96af025c 100644
+index 0cb7a705a524..2282a96af025 100644
 --- a/drivers/pinctrl/tegra/pinctrl-tegra.c
 +++ b/drivers/pinctrl/tegra/pinctrl-tegra.c
 @@ -23,6 +23,7 @@
@@ -218,5 +218,5 @@ index 0cb7a705a5243..2282a96af025c 100644
  		pmx->regs[i] = devm_platform_ioremap_resource(pdev, i);
  		if (IS_ERR(pmx->regs[i]))
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/sauce/patches/0131-NVIDIA-SAUCE-pinctrl-tegra-add-tegra_hv.h-header-fil.patch b/features/tegra/sauce/patches/0131-NVIDIA-SAUCE-pinctrl-tegra-add-tegra_hv.h-header-fil.patch
index 3c53724..02672ca 100644
--- a/features/tegra/sauce/patches/0131-NVIDIA-SAUCE-pinctrl-tegra-add-tegra_hv.h-header-fil.patch
+++ b/features/tegra/sauce/patches/0131-NVIDIA-SAUCE-pinctrl-tegra-add-tegra_hv.h-header-fil.patch
@@ -24,7 +24,7 @@ Reviewed-by: Brad Griffis <bgriffis@nvidia.com>
 (cherry picked from commit 2fa4b2850fb6d5a3441f728746a1be1c13689555)
 
 diff --git a/drivers/pinctrl/tegra/pinctrl-tegra.c b/drivers/pinctrl/tegra/pinctrl-tegra.c
-index 2282a96af025c..8eacfe5898973 100644
+index 2282a96af025..8eacfe589897 100644
 --- a/drivers/pinctrl/tegra/pinctrl-tegra.c
 +++ b/drivers/pinctrl/tegra/pinctrl-tegra.c
 @@ -1,4 +1,5 @@
@@ -46,5 +46,5 @@ index 2282a96af025c..8eacfe5898973 100644
  #include "../core.h"
  #include "../pinctrl-utils.h"
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/sauce/patches/0132-NVIDIA-SAUCE-xhci-tegra-add-VF-support.patch b/features/tegra/sauce/patches/0132-NVIDIA-SAUCE-xhci-tegra-add-VF-support.patch
index dac9130..4ebf2e7 100644
--- a/features/tegra/sauce/patches/0132-NVIDIA-SAUCE-xhci-tegra-add-VF-support.patch
+++ b/features/tegra/sauce/patches/0132-NVIDIA-SAUCE-xhci-tegra-add-VF-support.patch
@@ -22,7 +22,7 @@ Reviewed-by: Laxman Dewangan <ldewangan@nvidia.com>
 (cherry picked from commit 44b353ccf8fddd0088c3c4ec94216d6ed3155942)
 
 diff --git a/drivers/usb/host/xhci-tegra.c b/drivers/usb/host/xhci-tegra.c
-index a8474d2825651..19543068354ad 100644
+index a8474d282565..19543068354a 100644
 --- a/drivers/usb/host/xhci-tegra.c
 +++ b/drivers/usb/host/xhci-tegra.c
 @@ -279,6 +279,8 @@ struct tegra_xusb_soc {
@@ -438,5 +438,5 @@ index a8474d2825651..19543068354ad 100644
  };
  MODULE_DEVICE_TABLE(of, tegra_xusb_of_match);
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/sauce/patches/0133-NVIDIA-SAUCE-usb-gadget-xudc-use-reset-control-frame.patch b/features/tegra/sauce/patches/0133-NVIDIA-SAUCE-usb-gadget-xudc-use-reset-control-frame.patch
index 29b1672..01d9706 100644
--- a/features/tegra/sauce/patches/0133-NVIDIA-SAUCE-usb-gadget-xudc-use-reset-control-frame.patch
+++ b/features/tegra/sauce/patches/0133-NVIDIA-SAUCE-usb-gadget-xudc-use-reset-control-frame.patch
@@ -26,7 +26,7 @@ GVS: buildbot_gerritrpt <buildbot_gerritrpt@nvidia.com>
 (cherry picked from commit 82200af1d93d0c109095a1e1c054f3a92494fa15)
 
 diff --git a/drivers/usb/gadget/udc/tegra-xudc.c b/drivers/usb/gadget/udc/tegra-xudc.c
-index 7f7251c10e952..20f41f9fd32ab 100644
+index 7f7251c10e95..20f41f9fd32a 100644
 --- a/drivers/usb/gadget/udc/tegra-xudc.c
 +++ b/drivers/usb/gadget/udc/tegra-xudc.c
 @@ -2,7 +2,7 @@
@@ -235,5 +235,5 @@ index 7f7251c10e952..20f41f9fd32ab 100644
  
  static const struct dev_pm_ops tegra_xudc_pm_ops = {
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/sauce/patches/0134-NVIDIA-SAUCE-usb-gadget-xudc-support-hv-guest.patch b/features/tegra/sauce/patches/0134-NVIDIA-SAUCE-usb-gadget-xudc-support-hv-guest.patch
index 2a33483..8d7d5dd 100644
--- a/features/tegra/sauce/patches/0134-NVIDIA-SAUCE-usb-gadget-xudc-support-hv-guest.patch
+++ b/features/tegra/sauce/patches/0134-NVIDIA-SAUCE-usb-gadget-xudc-support-hv-guest.patch
@@ -19,7 +19,7 @@ Reviewed-by: Laxman Dewangan <ldewangan@nvidia.com>
 (cherry picked from commit 986c15c5bb7ea1ef2436d88f50050258032d3d03)
 
 diff --git a/drivers/usb/gadget/udc/tegra-xudc.c b/drivers/usb/gadget/udc/tegra-xudc.c
-index 20f41f9fd32ab..57eb306629e8d 100644
+index 20f41f9fd32a..57eb306629e8 100644
 --- a/drivers/usb/gadget/udc/tegra-xudc.c
 +++ b/drivers/usb/gadget/udc/tegra-xudc.c
 @@ -2,7 +2,7 @@
@@ -90,5 +90,5 @@ index 20f41f9fd32ab..57eb306629e8d 100644
  	if (IS_ERR(xudc->genpd_dev_device)) {
  		err = PTR_ERR(xudc->genpd_dev_device);
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/sauce/patches/0135-NVIDIA-SAUCE-xudc-Set-COREPLL_PWRDN-to-0.patch b/features/tegra/sauce/patches/0135-NVIDIA-SAUCE-xudc-Set-COREPLL_PWRDN-to-0.patch
index bcdf43b..a4e3d96 100644
--- a/features/tegra/sauce/patches/0135-NVIDIA-SAUCE-xudc-Set-COREPLL_PWRDN-to-0.patch
+++ b/features/tegra/sauce/patches/0135-NVIDIA-SAUCE-xudc-Set-COREPLL_PWRDN-to-0.patch
@@ -19,7 +19,7 @@ Reviewed-by: Petlozu Pravareshwar <petlozup@nvidia.com>
 GVS: buildbot_gerritrpt <buildbot_gerritrpt@nvidia.com>
 
 diff --git a/drivers/usb/gadget/udc/tegra-xudc.c b/drivers/usb/gadget/udc/tegra-xudc.c
-index 57eb306629e8d..5743d2ea36856 100644
+index 57eb306629e8..5743d2ea3685 100644
 --- a/drivers/usb/gadget/udc/tegra-xudc.c
 +++ b/drivers/usb/gadget/udc/tegra-xudc.c
 @@ -1563,6 +1563,12 @@ static int __tegra_xudc_ep_set_halt(struct tegra_xudc_ep *ep, bool halt)
@@ -71,5 +71,5 @@ index 57eb306629e8d..5743d2ea36856 100644
  
  	clk_bulk_disable_unprepare(xudc->soc->num_clks, xudc->clks);
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/sauce/patches/0136-NVIDIA-SAUCE-xhci-tegra-fix-memory-corruption.patch b/features/tegra/sauce/patches/0136-NVIDIA-SAUCE-xhci-tegra-fix-memory-corruption.patch
index 9cc708e..8fbfca2 100644
--- a/features/tegra/sauce/patches/0136-NVIDIA-SAUCE-xhci-tegra-fix-memory-corruption.patch
+++ b/features/tegra/sauce/patches/0136-NVIDIA-SAUCE-xhci-tegra-fix-memory-corruption.patch
@@ -23,7 +23,7 @@ GVS: buildbot_gerritrpt <buildbot_gerritrpt@nvidia.com>
 Reviewed-by: Petlozu Pravareshwar <petlozup@nvidia.com>
 
 diff --git a/drivers/usb/host/xhci-tegra.c b/drivers/usb/host/xhci-tegra.c
-index 19543068354ad..299515c678676 100644
+index 19543068354a..299515c67867 100644
 --- a/drivers/usb/host/xhci-tegra.c
 +++ b/drivers/usb/host/xhci-tegra.c
 @@ -2577,13 +2577,6 @@ static int tegra_xusb_probe(struct platform_device *pdev)
@@ -71,5 +71,5 @@ index 19543068354ad..299515c678676 100644
  
  	pm_runtime_get_sync(&pdev->dev);
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/sauce/patches/0137-NVIDIA-SAUCE-usb-gadget-msc-fix-Error-Recovery-Test.patch b/features/tegra/sauce/patches/0137-NVIDIA-SAUCE-usb-gadget-msc-fix-Error-Recovery-Test.patch
index 10f5a0a..1463323 100644
--- a/features/tegra/sauce/patches/0137-NVIDIA-SAUCE-usb-gadget-msc-fix-Error-Recovery-Test.patch
+++ b/features/tegra/sauce/patches/0137-NVIDIA-SAUCE-usb-gadget-msc-fix-Error-Recovery-Test.patch
@@ -22,7 +22,7 @@ Reviewed-by: Sing-Han Chen <singhanc@nvidia.com>
 (cherry picked from commit f21d59ada4c11afa51b7fc89975568d5f48ae8cf)
 
 diff --git a/drivers/usb/gadget/function/f_mass_storage.c b/drivers/usb/gadget/function/f_mass_storage.c
-index 6f275c3d11ac5..4763d92da12e6 100644
+index 6f275c3d11ac..4763d92da12e 100644
 --- a/drivers/usb/gadget/function/f_mass_storage.c
 +++ b/drivers/usb/gadget/function/f_mass_storage.c
 @@ -5,6 +5,7 @@
@@ -99,5 +99,5 @@ index 6f275c3d11ac5..4763d92da12e6 100644
  		if (common->ep0_req_tag == exception_req_tag)
  			ep0_queue(common);	/* Complete the status stage */
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/sauce/patches/0138-NVIDIA-SAUCE-usb-gadget-xudc-add-set_wedge-support.patch b/features/tegra/sauce/patches/0138-NVIDIA-SAUCE-usb-gadget-xudc-add-set_wedge-support.patch
index f5ace4b..8e6ab75 100644
--- a/features/tegra/sauce/patches/0138-NVIDIA-SAUCE-usb-gadget-xudc-add-set_wedge-support.patch
+++ b/features/tegra/sauce/patches/0138-NVIDIA-SAUCE-usb-gadget-xudc-add-set_wedge-support.patch
@@ -26,7 +26,7 @@ GVS: buildbot_gerritrpt <buildbot_gerritrpt@nvidia.com>
 (cherry picked from commit 624c0c941cc5162b32384874a4e5fd12d8224b6e)
 
 diff --git a/drivers/usb/gadget/udc/tegra-xudc.c b/drivers/usb/gadget/udc/tegra-xudc.c
-index 5743d2ea36856..c13697c457d89 100644
+index 5743d2ea3685..c13697c457d8 100644
 --- a/drivers/usb/gadget/udc/tegra-xudc.c
 +++ b/drivers/usb/gadget/udc/tegra-xudc.c
 @@ -409,6 +409,7 @@ struct tegra_xudc_ep {
@@ -111,5 +111,5 @@ index 5743d2ea36856..c13697c457d89 100644
  
  static int tegra_xudc_ep0_enable(struct usb_ep *usb_ep,
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/sauce/patches/0139-NVIDIA-SAUCE-xhci-tegra-fix-port-reset-issue.patch b/features/tegra/sauce/patches/0139-NVIDIA-SAUCE-xhci-tegra-fix-port-reset-issue.patch
index 44e8d85..c53cae3 100644
--- a/features/tegra/sauce/patches/0139-NVIDIA-SAUCE-xhci-tegra-fix-port-reset-issue.patch
+++ b/features/tegra/sauce/patches/0139-NVIDIA-SAUCE-xhci-tegra-fix-port-reset-issue.patch
@@ -33,7 +33,7 @@ Reviewed-by: HaoTien Hsu <haotienh@nvidia.com>
 (cherry picked from commit 2313d1badb3c649c772874966fef1ed3a3da84f8)
 
 diff --git a/drivers/usb/host/xhci-tegra.c b/drivers/usb/host/xhci-tegra.c
-index 299515c678676..c634ee7c6c2c3 100644
+index 299515c67867..c634ee7c6c2c 100644
 --- a/drivers/usb/host/xhci-tegra.c
 +++ b/drivers/usb/host/xhci-tegra.c
 @@ -2905,6 +2905,26 @@ static void tegra_xhci_disable_phy_sleepwalk(struct tegra_xusb *tegra)
@@ -148,5 +148,5 @@ index 299515c678676..c634ee7c6c2c3 100644
  			ports = rhub->ports;
  			portsc = readl(ports[port]->addr);
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/sauce/patches/0140-NVIDIA-SAUCE-usb-gadget-xudc-Avoid-skipping-clear-fe.patch b/features/tegra/sauce/patches/0140-NVIDIA-SAUCE-usb-gadget-xudc-Avoid-skipping-clear-fe.patch
index e998088..ebb9552 100644
--- a/features/tegra/sauce/patches/0140-NVIDIA-SAUCE-usb-gadget-xudc-Avoid-skipping-clear-fe.patch
+++ b/features/tegra/sauce/patches/0140-NVIDIA-SAUCE-usb-gadget-xudc-Avoid-skipping-clear-fe.patch
@@ -24,7 +24,7 @@ Reviewed-by: Wayne Chang <waynec@nvidia.com>
 (cherry picked from commit 8c3d561f700689488651995457eac05a18532328)
 
 diff --git a/drivers/usb/gadget/udc/tegra-xudc.c b/drivers/usb/gadget/udc/tegra-xudc.c
-index c13697c457d89..17c30e21b3573 100644
+index c13697c457d8..17c30e21b357 100644
 --- a/drivers/usb/gadget/udc/tegra-xudc.c
 +++ b/drivers/usb/gadget/udc/tegra-xudc.c
 @@ -2,7 +2,7 @@
@@ -50,5 +50,5 @@ index c13697c457d89..17c30e21b3573 100644
  		ep_halt(xudc, ep->index);
  	} else {
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/sauce/patches/0141-NVIDIA-SAUCE-usb-xhci-Check-PSIM-value-to-determine-.patch b/features/tegra/sauce/patches/0141-NVIDIA-SAUCE-usb-xhci-Check-PSIM-value-to-determine-.patch
index 99bab4c..1ace5b7 100644
--- a/features/tegra/sauce/patches/0141-NVIDIA-SAUCE-usb-xhci-Check-PSIM-value-to-determine-.patch
+++ b/features/tegra/sauce/patches/0141-NVIDIA-SAUCE-usb-xhci-Check-PSIM-value-to-determine-.patch
@@ -35,7 +35,7 @@ GVS: buildbot_gerritrpt <buildbot_gerritrpt@nvidia.com>
 (cherry picked from commit c9281038797f8b5b356137a0ec8a96840735a6a3)
 
 diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c
-index a06758addbf82..2449283de5afe 100644
+index 23b104c2956c..39527c98526f 100644
 --- a/drivers/usb/host/xhci.c
 +++ b/drivers/usb/host/xhci.c
 @@ -5399,11 +5399,58 @@ static void xhci_hcd_init_usb3_data(struct xhci_hcd *xhci, struct usb_hcd *hcd)
@@ -98,5 +98,5 @@ index a06758addbf82..2449283de5afe 100644
  	case 1:
  		hcd->speed = HCD_USB31;
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/sauce/patches/0142-NVIDIA-SAUCE-usb-gadget-udc-Add-Tegra264-support.patch b/features/tegra/sauce/patches/0142-NVIDIA-SAUCE-usb-gadget-udc-Add-Tegra264-support.patch
index 5ed4077..5fa7065 100644
--- a/features/tegra/sauce/patches/0142-NVIDIA-SAUCE-usb-gadget-udc-Add-Tegra264-support.patch
+++ b/features/tegra/sauce/patches/0142-NVIDIA-SAUCE-usb-gadget-udc-Add-Tegra264-support.patch
@@ -16,7 +16,7 @@ Signed-off-by: Sing-Han Chen <singhanc@nvidia.com>
 Signed-off-by: Bodla Rakesh Babu <rbodla@nvidia.com>
 
 diff --git a/drivers/usb/gadget/udc/tegra-xudc.c b/drivers/usb/gadget/udc/tegra-xudc.c
-index 17c30e21b3573..83ab8082010f8 100644
+index 17c30e21b357..83ab8082010f 100644
 --- a/drivers/usb/gadget/udc/tegra-xudc.c
 +++ b/drivers/usb/gadget/udc/tegra-xudc.c
 @@ -3747,6 +3747,20 @@ static struct tegra_xudc_soc tegra234_hv_xudc_soc_data = {
@@ -52,5 +52,5 @@ index 17c30e21b3573..83ab8082010f8 100644
  };
  MODULE_DEVICE_TABLE(of, tegra_xudc_of_match);
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/sauce/patches/0143-NVIDIA-SAUCE-usb-host-xhci-tegra-Add-Tegra264-XHCI-s.patch b/features/tegra/sauce/patches/0143-NVIDIA-SAUCE-usb-host-xhci-tegra-Add-Tegra264-XHCI-s.patch
index b692966..5b50898 100644
--- a/features/tegra/sauce/patches/0143-NVIDIA-SAUCE-usb-host-xhci-tegra-Add-Tegra264-XHCI-s.patch
+++ b/features/tegra/sauce/patches/0143-NVIDIA-SAUCE-usb-host-xhci-tegra-Add-Tegra264-XHCI-s.patch
@@ -14,7 +14,7 @@ Signed-off-by: Sing-Han Chen <singhanc@nvidia.com>
 Signed-off-by: Bodla Rakesh Babu <rbodla@nvidia.com>
 
 diff --git a/drivers/usb/host/xhci-tegra.c b/drivers/usb/host/xhci-tegra.c
-index c634ee7c6c2c3..58ed58dfb2899 100644
+index c634ee7c6c2c..58ed58dfb289 100644
 --- a/drivers/usb/host/xhci-tegra.c
 +++ b/drivers/usb/host/xhci-tegra.c
 @@ -3529,6 +3529,33 @@ static const struct tegra_xusb_soc tegra234_vf4_soc = {
@@ -60,5 +60,5 @@ index c634ee7c6c2c3..58ed58dfb2899 100644
  };
  MODULE_DEVICE_TABLE(of, tegra_xusb_of_match);
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/sauce/patches/0144-NVIDIA-SAUCE-usb-xhci-skip-mbox-configuration.patch b/features/tegra/sauce/patches/0144-NVIDIA-SAUCE-usb-xhci-skip-mbox-configuration.patch
index 195d586..53aebbf 100644
--- a/features/tegra/sauce/patches/0144-NVIDIA-SAUCE-usb-xhci-skip-mbox-configuration.patch
+++ b/features/tegra/sauce/patches/0144-NVIDIA-SAUCE-usb-xhci-skip-mbox-configuration.patch
@@ -14,7 +14,7 @@ Signed-off-by: Sing-Han Chen <singhanc@nvidia.com>
 Signed-off-by: Bodla Rakesh Babu <rbodla@nvidia.com>
 
 diff --git a/drivers/usb/host/xhci-tegra.c b/drivers/usb/host/xhci-tegra.c
-index 58ed58dfb2899..a5ff601e2b400 100644
+index 58ed58dfb289..a5ff601e2b40 100644
 --- a/drivers/usb/host/xhci-tegra.c
 +++ b/drivers/usb/host/xhci-tegra.c
 @@ -277,6 +277,7 @@ struct tegra_xusb_soc {
@@ -43,5 +43,5 @@ index 58ed58dfb2899..a5ff601e2b400 100644
  	.has_bar2 = true,
  	.has_pg_support = true,
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/sauce/patches/0145-NVIDIA-SAUCE-xudc-skip-SSPX-programming-in-xudc.patch b/features/tegra/sauce/patches/0145-NVIDIA-SAUCE-xudc-skip-SSPX-programming-in-xudc.patch
index f91fee7..bb1bee5 100644
--- a/features/tegra/sauce/patches/0145-NVIDIA-SAUCE-xudc-skip-SSPX-programming-in-xudc.patch
+++ b/features/tegra/sauce/patches/0145-NVIDIA-SAUCE-xudc-skip-SSPX-programming-in-xudc.patch
@@ -15,7 +15,7 @@ Signed-off-by: Sing-Han Chen <singhanc@nvidia.com>
 Signed-off-by: Bodla Rakesh Babu <rbodla@nvidia.com>
 
 diff --git a/drivers/usb/gadget/udc/tegra-xudc.c b/drivers/usb/gadget/udc/tegra-xudc.c
-index 83ab8082010f8..e1e24ea97e3ab 100644
+index 83ab8082010f..e1e24ea97e3a 100644
 --- a/drivers/usb/gadget/udc/tegra-xudc.c
 +++ b/drivers/usb/gadget/udc/tegra-xudc.c
 @@ -562,6 +562,7 @@ struct tegra_xudc_soc {
@@ -104,5 +104,5 @@ index 83ab8082010f8..e1e24ea97e3ab 100644
  
  static const struct of_device_id tegra_xudc_of_match[] = {
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/sauce/patches/0146-NVIDIA-SAUCE-usb-gadget-xudc-Enable-u1-u2-for-Tegra2.patch b/features/tegra/sauce/patches/0146-NVIDIA-SAUCE-usb-gadget-xudc-Enable-u1-u2-for-Tegra2.patch
index b133e07..1220c3e 100644
--- a/features/tegra/sauce/patches/0146-NVIDIA-SAUCE-usb-gadget-xudc-Enable-u1-u2-for-Tegra2.patch
+++ b/features/tegra/sauce/patches/0146-NVIDIA-SAUCE-usb-gadget-xudc-Enable-u1-u2-for-Tegra2.patch
@@ -14,7 +14,7 @@ Signed-off-by: Sing-Han Chen <singhanc@nvidia.com>
 (cherry picked from commit 8ded5788bfe5d1badd775c7535714a75b5d2afc8)
 
 diff --git a/drivers/usb/gadget/udc/tegra-xudc.c b/drivers/usb/gadget/udc/tegra-xudc.c
-index e1e24ea97e3ab..73497ac46a95c 100644
+index e1e24ea97e3a..73497ac46a95 100644
 --- a/drivers/usb/gadget/udc/tegra-xudc.c
 +++ b/drivers/usb/gadget/udc/tegra-xudc.c
 @@ -3755,8 +3755,8 @@ static struct tegra_xudc_soc tegra264_xudc_soc_data = {
@@ -29,5 +29,5 @@ index e1e24ea97e3ab..73497ac46a95c 100644
  	.invalid_seq_num = false,
  	.pls_quirk = false,
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/sauce/patches/0147-NVIDIA-SAUCE-usb-gadget-xudc-Set-the-u1-timeout-defa.patch b/features/tegra/sauce/patches/0147-NVIDIA-SAUCE-usb-gadget-xudc-Set-the-u1-timeout-defa.patch
index 42cbc26..8bbc7d7 100644
--- a/features/tegra/sauce/patches/0147-NVIDIA-SAUCE-usb-gadget-xudc-Set-the-u1-timeout-defa.patch
+++ b/features/tegra/sauce/patches/0147-NVIDIA-SAUCE-usb-gadget-xudc-Set-the-u1-timeout-defa.patch
@@ -14,7 +14,7 @@ Change-Id: I750f5a96530167662479d62349b520f665d8bdb7
 (cherry picked from commit 29af4fd969ee53e1e7e3b128be386106172d1b4b)
 
 diff --git a/drivers/usb/gadget/udc/tegra-xudc.c b/drivers/usb/gadget/udc/tegra-xudc.c
-index 73497ac46a95c..01567a9f2eb93 100644
+index 73497ac46a95..01567a9f2eb9 100644
 --- a/drivers/usb/gadget/udc/tegra-xudc.c
 +++ b/drivers/usb/gadget/udc/tegra-xudc.c
 @@ -2335,8 +2335,10 @@ static int tegra_xudc_ep0_set_feature(struct tegra_xudc *xudc,
@@ -30,5 +30,5 @@ index 73497ac46a95c..01567a9f2eb93 100644
  					val &= ~PORTPM_U1E;
  			}
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/sauce/patches/0148-NVIDIA-SAUCE-usb-gadget-xudc-Add-platform-init-funct.patch b/features/tegra/sauce/patches/0148-NVIDIA-SAUCE-usb-gadget-xudc-Add-platform-init-funct.patch
index 78f0a2d..05c8a71 100644
--- a/features/tegra/sauce/patches/0148-NVIDIA-SAUCE-usb-gadget-xudc-Add-platform-init-funct.patch
+++ b/features/tegra/sauce/patches/0148-NVIDIA-SAUCE-usb-gadget-xudc-Add-platform-init-funct.patch
@@ -22,7 +22,7 @@ Reviewed-by: EJ Hsu <ejh@nvidia.com>
 (cherry picked from commit 265621324cc30874504d60870ae13ad4ed9e9a38)
 
 diff --git a/drivers/usb/gadget/udc/tegra-xudc.c b/drivers/usb/gadget/udc/tegra-xudc.c
-index 01567a9f2eb93..3ed44e8cc7129 100644
+index 01567a9f2eb9..3ed44e8cc712 100644
 --- a/drivers/usb/gadget/udc/tegra-xudc.c
 +++ b/drivers/usb/gadget/udc/tegra-xudc.c
 @@ -150,7 +150,6 @@
@@ -250,5 +250,5 @@ index 01567a9f2eb93..3ed44e8cc7129 100644
  	tegra_xudc_init_event_ring(xudc);
  
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/sauce/patches/0149-NVIDIA-SAUCE-usb-gadget-tegra-xudc-Reduce-ping.LFPS-.patch b/features/tegra/sauce/patches/0149-NVIDIA-SAUCE-usb-gadget-tegra-xudc-Reduce-ping.LFPS-.patch
index 36daca8..f061755 100644
--- a/features/tegra/sauce/patches/0149-NVIDIA-SAUCE-usb-gadget-tegra-xudc-Reduce-ping.LFPS-.patch
+++ b/features/tegra/sauce/patches/0149-NVIDIA-SAUCE-usb-gadget-tegra-xudc-Reduce-ping.LFPS-.patch
@@ -22,7 +22,7 @@ Reviewed-by: Henry Lin <henryl@nvidia.com>
 (cherry picked from commit 32bff2af996df989efdf3607c9e3576fc6346081)
 
 diff --git a/drivers/usb/gadget/udc/tegra-xudc.c b/drivers/usb/gadget/udc/tegra-xudc.c
-index 3ed44e8cc7129..b5cf8a375d73c 100644
+index 3ed44e8cc712..b5cf8a375d73 100644
 --- a/drivers/usb/gadget/udc/tegra-xudc.c
 +++ b/drivers/usb/gadget/udc/tegra-xudc.c
 @@ -3548,6 +3548,15 @@ static void tegra264_xudc_device_params_init(struct tegra_xudc *xudc)
@@ -42,5 +42,5 @@ index 3ed44e8cc7129..b5cf8a375d73c 100644
  	/*
  	 * Compliance suite appears to be violating polling
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/sauce/patches/0150-NVIDIA-SAUCE-usb-gadget-tegra-xudc-Increase-credit-H.patch b/features/tegra/sauce/patches/0150-NVIDIA-SAUCE-usb-gadget-tegra-xudc-Increase-credit-H.patch
index d0c50ca..1d7fe3b 100644
--- a/features/tegra/sauce/patches/0150-NVIDIA-SAUCE-usb-gadget-tegra-xudc-Increase-credit-H.patch
+++ b/features/tegra/sauce/patches/0150-NVIDIA-SAUCE-usb-gadget-tegra-xudc-Increase-credit-H.patch
@@ -21,7 +21,7 @@ GVS: buildbot_gerritrpt <buildbot_gerritrpt@nvidia.com>
 (cherry picked from commit 03f24b76101bbd1bca5ad6c89d0fed84681f09d6)
 
 diff --git a/drivers/usb/gadget/udc/tegra-xudc.c b/drivers/usb/gadget/udc/tegra-xudc.c
-index b5cf8a375d73c..e425d2c0001ad 100644
+index b5cf8a375d73..e425d2c0001a 100644
 --- a/drivers/usb/gadget/udc/tegra-xudc.c
 +++ b/drivers/usb/gadget/udc/tegra-xudc.c
 @@ -3548,6 +3548,15 @@ static void tegra264_xudc_device_params_init(struct tegra_xudc *xudc)
@@ -41,5 +41,5 @@ index b5cf8a375d73c..e425d2c0001ad 100644
  #define  SSPX_CORE_CNT27_PING_LFPS_TRPT_MASK GENMASK(29, 0)
  #define  SSPX_CORE_CNT27_PING_LFPS_TRPT(x) ((x) & \
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/sauce/patches/0151-NVIDIA-SAUCE-usb-gadget-tegra-xudc-Increase-tPortCon.patch b/features/tegra/sauce/patches/0151-NVIDIA-SAUCE-usb-gadget-tegra-xudc-Increase-tPortCon.patch
index 2758332..4ebfe02 100644
--- a/features/tegra/sauce/patches/0151-NVIDIA-SAUCE-usb-gadget-tegra-xudc-Increase-tPortCon.patch
+++ b/features/tegra/sauce/patches/0151-NVIDIA-SAUCE-usb-gadget-tegra-xudc-Increase-tPortCon.patch
@@ -20,7 +20,7 @@ Reviewed-by: HaoTien Hsu <haotienh@nvidia.com>
 (cherry picked from commit 6b804b9fb4aee05358f0023ecb5156c481d9b74d)
 
 diff --git a/drivers/usb/gadget/udc/tegra-xudc.c b/drivers/usb/gadget/udc/tegra-xudc.c
-index e425d2c0001ad..522a8b89b8184 100644
+index e425d2c0001a..522a8b89b818 100644
 --- a/drivers/usb/gadget/udc/tegra-xudc.c
 +++ b/drivers/usb/gadget/udc/tegra-xudc.c
 @@ -146,10 +146,6 @@
@@ -74,5 +74,5 @@ index e425d2c0001ad..522a8b89b8184 100644
  	/*
  	 * Compliance suite appears to be violating polling
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/sauce/patches/0152-NVIDIA-SAUCE-usb-host-xhci-Add-Tegra264-virtual-func.patch b/features/tegra/sauce/patches/0152-NVIDIA-SAUCE-usb-host-xhci-Add-Tegra264-virtual-func.patch
index 36da31a..5648eb8 100644
--- a/features/tegra/sauce/patches/0152-NVIDIA-SAUCE-usb-host-xhci-Add-Tegra264-virtual-func.patch
+++ b/features/tegra/sauce/patches/0152-NVIDIA-SAUCE-usb-host-xhci-Add-Tegra264-virtual-func.patch
@@ -21,7 +21,7 @@ Reviewed-by: Henry Lin <henryl@nvidia.com>
 (cherry picked from commit 4b1ba9b521871153896b8961e2767f88d39d2299)
 
 diff --git a/drivers/usb/host/xhci-tegra.c b/drivers/usb/host/xhci-tegra.c
-index a5ff601e2b400..ea077047bd75b 100644
+index a5ff601e2b40..ea077047bd75 100644
 --- a/drivers/usb/host/xhci-tegra.c
 +++ b/drivers/usb/host/xhci-tegra.c
 @@ -2,7 +2,7 @@
@@ -136,5 +136,5 @@ index a5ff601e2b400..ea077047bd75b 100644
  };
  MODULE_DEVICE_TABLE(of, tegra_xusb_of_match);
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/sauce/patches/0153-NVIDIA-SAUCE-usb-host-xhci-Add-ELPG-support-in-virtu.patch b/features/tegra/sauce/patches/0153-NVIDIA-SAUCE-usb-host-xhci-Add-ELPG-support-in-virtu.patch
index 8b12380..3126c0f 100644
--- a/features/tegra/sauce/patches/0153-NVIDIA-SAUCE-usb-host-xhci-Add-ELPG-support-in-virtu.patch
+++ b/features/tegra/sauce/patches/0153-NVIDIA-SAUCE-usb-host-xhci-Add-ELPG-support-in-virtu.patch
@@ -25,7 +25,7 @@ GVS: buildbot_gerritrpt <buildbot_gerritrpt@nvidia.com>
 (cherry picked from commit c9eb60a3eed93dfb1693b7168893805b016a85c8)
 
 diff --git a/drivers/usb/host/xhci-tegra.c b/drivers/usb/host/xhci-tegra.c
-index ea077047bd75b..ab0275bd3db04 100644
+index ea077047bd75..ab0275bd3db0 100644
 --- a/drivers/usb/host/xhci-tegra.c
 +++ b/drivers/usb/host/xhci-tegra.c
 @@ -2610,7 +2610,7 @@ static int tegra_xusb_probe(struct platform_device *pdev)
@@ -47,5 +47,5 @@ index ea077047bd75b..ab0275bd3db04 100644
  
  	pm_runtime_put(&pdev->dev);
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/sauce/patches/0154-NVIDIA-SAUCE-usb-gadget-xudc-Add-Tegra264-virtualiza.patch b/features/tegra/sauce/patches/0154-NVIDIA-SAUCE-usb-gadget-xudc-Add-Tegra264-virtualiza.patch
index 98b412f..5afa5b1 100644
--- a/features/tegra/sauce/patches/0154-NVIDIA-SAUCE-usb-gadget-xudc-Add-Tegra264-virtualiza.patch
+++ b/features/tegra/sauce/patches/0154-NVIDIA-SAUCE-usb-gadget-xudc-Add-Tegra264-virtualiza.patch
@@ -18,7 +18,7 @@ GVS: buildbot_gerritrpt <buildbot_gerritrpt@nvidia.com>
 (cherry picked from commit 423df67df668f3ef1c4a71e3a4195605e0f967c1)
 
 diff --git a/drivers/usb/gadget/udc/tegra-xudc.c b/drivers/usb/gadget/udc/tegra-xudc.c
-index 522a8b89b8184..6dea5b07e1886 100644
+index 522a8b89b818..6dea5b07e188 100644
 --- a/drivers/usb/gadget/udc/tegra-xudc.c
 +++ b/drivers/usb/gadget/udc/tegra-xudc.c
 @@ -3833,6 +3833,21 @@ static struct tegra_xudc_soc tegra264_xudc_soc_data = {
@@ -55,5 +55,5 @@ index 522a8b89b8184..6dea5b07e1886 100644
  };
  MODULE_DEVICE_TABLE(of, tegra_xudc_of_match);
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/sauce/patches/0155-NVIDIA-SAUCE-tegra-prod-use-legacy-prod-settings.patch b/features/tegra/sauce/patches/0155-NVIDIA-SAUCE-tegra-prod-use-legacy-prod-settings.patch
index ca60ac1..a92511f 100644
--- a/features/tegra/sauce/patches/0155-NVIDIA-SAUCE-tegra-prod-use-legacy-prod-settings.patch
+++ b/features/tegra/sauce/patches/0155-NVIDIA-SAUCE-tegra-prod-use-legacy-prod-settings.patch
@@ -35,7 +35,7 @@ Reviewed-by: Laxman Dewangan <ldewangan@nvidia.com>
 GVS: buildbot_gerritrpt <buildbot_gerritrpt@nvidia.com>
 
 diff --git a/drivers/phy/tegra/xusb-tegra186.c b/drivers/phy/tegra/xusb-tegra186.c
-index bf37b214776c9..291ae416a4134 100644
+index bf37b214776c..291ae416a413 100644
 --- a/drivers/phy/tegra/xusb-tegra186.c
 +++ b/drivers/phy/tegra/xusb-tegra186.c
 @@ -13,6 +13,10 @@
@@ -133,5 +133,5 @@ index bf37b214776c9..291ae416a4134 100644
  }
  
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/sauce/patches/0156-NVIDIA-SAUCE-phy-tegra-xusb-Add-Tegra264-support.patch b/features/tegra/sauce/patches/0156-NVIDIA-SAUCE-phy-tegra-xusb-Add-Tegra264-support.patch
index e7fc37f..49a14ef 100644
--- a/features/tegra/sauce/patches/0156-NVIDIA-SAUCE-phy-tegra-xusb-Add-Tegra264-support.patch
+++ b/features/tegra/sauce/patches/0156-NVIDIA-SAUCE-phy-tegra-xusb-Add-Tegra264-support.patch
@@ -16,7 +16,7 @@ Signed-off-by: Sing-Han Chen <singhanc@nvidia.com>
 Signed-off-by: Bodla Rakesh Babu <rbodla@nvidia.com>
 
 diff --git a/drivers/phy/tegra/Makefile b/drivers/phy/tegra/Makefile
-index eeeea72de1177..33a695d4ed59a 100644
+index eeeea72de117..33a695d4ed59 100644
 --- a/drivers/phy/tegra/Makefile
 +++ b/drivers/phy/tegra/Makefile
 @@ -8,4 +8,5 @@ phy-tegra-xusb-$(CONFIG_ARCH_TEGRA_210_SOC) += xusb-tegra210.o
@@ -26,7 +26,7 @@ index eeeea72de1177..33a695d4ed59a 100644
 +phy-tegra-xusb-$(CONFIG_ARCH_TEGRA_264_SOC) += xusb-tegra186.o
  obj-$(CONFIG_PHY_TEGRA194_P2U) += phy-tegra194-p2u.o
 diff --git a/drivers/phy/tegra/xusb-tegra186.c b/drivers/phy/tegra/xusb-tegra186.c
-index 291ae416a4134..32186e0af611e 100644
+index 291ae416a413..32186e0af611 100644
 --- a/drivers/phy/tegra/xusb-tegra186.c
 +++ b/drivers/phy/tegra/xusb-tegra186.c
 @@ -1731,7 +1731,8 @@ EXPORT_SYMBOL_GPL(tegra186_xusb_padctl_soc);
@@ -70,7 +70,7 @@ index 291ae416a4134..32186e0af611e 100644
  
  MODULE_AUTHOR("JC Kuo <jckuo@nvidia.com>");
 diff --git a/drivers/phy/tegra/xusb.c b/drivers/phy/tegra/xusb.c
-index e85341bdd5492..6f699e09f54c6 100644
+index e85341bdd549..6f699e09f54c 100644
 --- a/drivers/phy/tegra/xusb.c
 +++ b/drivers/phy/tegra/xusb.c
 @@ -77,6 +77,12 @@ static const struct of_device_id tegra_xusb_padctl_of_match[] = {
@@ -87,7 +87,7 @@ index e85341bdd5492..6f699e09f54c6 100644
  	{ }
  };
 diff --git a/drivers/phy/tegra/xusb.h b/drivers/phy/tegra/xusb.h
-index 7e7774ef2668a..09cb98c273ce6 100644
+index 7e7774ef2668..09cb98c273ce 100644
 --- a/drivers/phy/tegra/xusb.h
 +++ b/drivers/phy/tegra/xusb.h
 @@ -519,5 +519,8 @@ extern const struct tegra_xusb_padctl_soc tegra194_xusb_padctl_soc;
@@ -100,5 +100,5 @@ index 7e7774ef2668a..09cb98c273ce6 100644
  
  #endif /* __PHY_TEGRA_XUSB_H */
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/sauce/patches/0157-NVIDIA-SAUCE-phy-xusb-skip-USB2-PAD-tracking-and-fus.patch b/features/tegra/sauce/patches/0157-NVIDIA-SAUCE-phy-xusb-skip-USB2-PAD-tracking-and-fus.patch
index 3b58e3e..74a0e8d 100644
--- a/features/tegra/sauce/patches/0157-NVIDIA-SAUCE-phy-xusb-skip-USB2-PAD-tracking-and-fus.patch
+++ b/features/tegra/sauce/patches/0157-NVIDIA-SAUCE-phy-xusb-skip-USB2-PAD-tracking-and-fus.patch
@@ -15,7 +15,7 @@ Signed-off-by: Sing-Han Chen <singhanc@nvidia.com>
 Signed-off-by: Bodla Rakesh Babu <rbodla@nvidia.com>
 
 diff --git a/drivers/phy/tegra/xusb-tegra186.c b/drivers/phy/tegra/xusb-tegra186.c
-index 32186e0af611e..0fdf5dd83f9c8 100644
+index 32186e0af611..0fdf5dd83f9c 100644
 --- a/drivers/phy/tegra/xusb-tegra186.c
 +++ b/drivers/phy/tegra/xusb-tegra186.c
 @@ -955,8 +955,13 @@ static int tegra186_utmi_phy_power_on(struct phy *phy)
@@ -68,7 +68,7 @@ index 32186e0af611e..0fdf5dd83f9c8 100644
  EXPORT_SYMBOL_GPL(tegra264_xusb_padctl_soc);
  #endif
 diff --git a/drivers/phy/tegra/xusb.h b/drivers/phy/tegra/xusb.h
-index 09cb98c273ce6..2b4a5f8271e1d 100644
+index 09cb98c273ce..2b4a5f8271e1 100644
 --- a/drivers/phy/tegra/xusb.h
 +++ b/drivers/phy/tegra/xusb.h
 @@ -438,6 +438,7 @@ struct tegra_xusb_padctl_soc {
@@ -80,5 +80,5 @@ index 09cb98c273ce6..2b4a5f8271e1d 100644
  
  struct tegra_xusb_padctl {
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/sauce/patches/0158-NVIDIA-SAUCE-phy-tegra-xusb-Remove-ignore_fuse-flag.patch b/features/tegra/sauce/patches/0158-NVIDIA-SAUCE-phy-tegra-xusb-Remove-ignore_fuse-flag.patch
index 231aa4a..1019b99 100644
--- a/features/tegra/sauce/patches/0158-NVIDIA-SAUCE-phy-tegra-xusb-Remove-ignore_fuse-flag.patch
+++ b/features/tegra/sauce/patches/0158-NVIDIA-SAUCE-phy-tegra-xusb-Remove-ignore_fuse-flag.patch
@@ -24,7 +24,7 @@ Reviewed-by: WK Tsai <wtsai@nvidia.com>
 (cherry picked from commit 8cf6aab509a9d803fe2721df67827b2b3d0b9d31)
 
 diff --git a/drivers/phy/tegra/xusb-tegra186.c b/drivers/phy/tegra/xusb-tegra186.c
-index 0fdf5dd83f9c8..2f2ad4d7a45d2 100644
+index 0fdf5dd83f9c..2f2ad4d7a45d 100644
 --- a/drivers/phy/tegra/xusb-tegra186.c
 +++ b/drivers/phy/tegra/xusb-tegra186.c
 @@ -956,30 +956,30 @@ static int tegra186_utmi_phy_power_on(struct phy *phy)
@@ -101,7 +101,7 @@ index 0fdf5dd83f9c8..2f2ad4d7a45d2 100644
  EXPORT_SYMBOL_GPL(tegra264_xusb_padctl_soc);
  #endif
 diff --git a/drivers/phy/tegra/xusb.h b/drivers/phy/tegra/xusb.h
-index 2b4a5f8271e1d..09cb98c273ce6 100644
+index 2b4a5f8271e1..09cb98c273ce 100644
 --- a/drivers/phy/tegra/xusb.h
 +++ b/drivers/phy/tegra/xusb.h
 @@ -438,7 +438,6 @@ struct tegra_xusb_padctl_soc {
@@ -113,5 +113,5 @@ index 2b4a5f8271e1d..09cb98c273ce6 100644
  
  struct tegra_xusb_padctl {
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/sauce/patches/0159-NVIDIA-SAUCE-soc-tegra-fuse-Add-FUSE_USB_CALIB_EXT2-.patch b/features/tegra/sauce/patches/0159-NVIDIA-SAUCE-soc-tegra-fuse-Add-FUSE_USB_CALIB_EXT2-.patch
index 54a3ca1..e9b0949 100644
--- a/features/tegra/sauce/patches/0159-NVIDIA-SAUCE-soc-tegra-fuse-Add-FUSE_USB_CALIB_EXT2-.patch
+++ b/features/tegra/sauce/patches/0159-NVIDIA-SAUCE-soc-tegra-fuse-Add-FUSE_USB_CALIB_EXT2-.patch
@@ -20,7 +20,7 @@ Reviewed-by: HaoTien Hsu <haotienh@nvidia.com>
 (cherry picked from commit 848fc623c0751a3b762488b0c30a0ea94853f0b2)
 
 diff --git a/include/soc/tegra/fuse.h b/include/soc/tegra/fuse.h
-index 8f421b9f7585c..5a112763457aa 100644
+index 8f421b9f7585..5a112763457a 100644
 --- a/include/soc/tegra/fuse.h
 +++ b/include/soc/tegra/fuse.h
 @@ -23,6 +23,8 @@
@@ -33,5 +33,5 @@ index 8f421b9f7585c..5a112763457aa 100644
  #ifndef __ASSEMBLY__
  
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/sauce/patches/0160-NVIDIA-SAUCE-phy-tegra-xusb-tegra186-Fix-and-extend-.patch b/features/tegra/sauce/patches/0160-NVIDIA-SAUCE-phy-tegra-xusb-tegra186-Fix-and-extend-.patch
index 97566dd..a0e72e3 100644
--- a/features/tegra/sauce/patches/0160-NVIDIA-SAUCE-phy-tegra-xusb-tegra186-Fix-and-extend-.patch
+++ b/features/tegra/sauce/patches/0160-NVIDIA-SAUCE-phy-tegra-xusb-tegra186-Fix-and-extend-.patch
@@ -31,7 +31,7 @@ Reviewed-by: svcacv <svcacv@nvidia.com>
 (cherry picked from commit 1f219c8da2b127952d506fcc3a9e3b420bfe1962)
 
 diff --git a/drivers/phy/tegra/xusb-tegra186.c b/drivers/phy/tegra/xusb-tegra186.c
-index 2f2ad4d7a45d2..1b6e6955d942f 100644
+index 2f2ad4d7a45d..1b6e6955d942 100644
 --- a/drivers/phy/tegra/xusb-tegra186.c
 +++ b/drivers/phy/tegra/xusb-tegra186.c
 @@ -31,6 +31,10 @@
@@ -214,5 +214,5 @@ index 2f2ad4d7a45d2..1b6e6955d942f 100644
  EXPORT_SYMBOL_GPL(tegra234_xusb_padctl_soc);
  
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/sauce/patches/0161-NVIDIA-SAUCE-phy-tegra-fix-port-reset-issue.patch b/features/tegra/sauce/patches/0161-NVIDIA-SAUCE-phy-tegra-fix-port-reset-issue.patch
index cb1c7d8..4cec6bc 100644
--- a/features/tegra/sauce/patches/0161-NVIDIA-SAUCE-phy-tegra-fix-port-reset-issue.patch
+++ b/features/tegra/sauce/patches/0161-NVIDIA-SAUCE-phy-tegra-fix-port-reset-issue.patch
@@ -35,7 +35,7 @@ Reviewed-by: WK Tsai <wtsai@nvidia.com>
 (cherry picked from commit 16804a0a5b2425e703a7342e8d9bfdde34fb6637)
 
 diff --git a/drivers/phy/tegra/xusb-tegra186.c b/drivers/phy/tegra/xusb-tegra186.c
-index 1b6e6955d942f..6c70c6910c9db 100644
+index 1b6e6955d942..6c70c6910c9d 100644
 --- a/drivers/phy/tegra/xusb-tegra186.c
 +++ b/drivers/phy/tegra/xusb-tegra186.c
 @@ -1004,15 +1004,11 @@ static int tegra186_utmi_phy_power_on(struct phy *phy)
@@ -55,5 +55,5 @@ index 1b6e6955d942f..6c70c6910c9db 100644
  }
  
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/sauce/patches/0162-NVIDIA-SAUCE-tegra_hv_ivc-Fix-build-for-Linux-v6.11.patch b/features/tegra/sauce/patches/0162-NVIDIA-SAUCE-tegra_hv_ivc-Fix-build-for-Linux-v6.11.patch
index bb526db..5330350 100644
--- a/features/tegra/sauce/patches/0162-NVIDIA-SAUCE-tegra_hv_ivc-Fix-build-for-Linux-v6.11.patch
+++ b/features/tegra/sauce/patches/0162-NVIDIA-SAUCE-tegra_hv_ivc-Fix-build-for-Linux-v6.11.patch
@@ -12,7 +12,7 @@ Change-Id: I678f900916d786ef262fe40e4b0aeedd1847358a
 Signed-off-by: Jon Hunter <jonathanh@nvidia.com>
 
 diff --git a/drivers/virt/tegra/tegra_hv_ivc.c b/drivers/virt/tegra/tegra_hv_ivc.c
-index b6155fc48a6f5..ede79e3ad3fe6 100644
+index b6155fc48a6f..ede79e3ad3fe 100644
 --- a/drivers/virt/tegra/tegra_hv_ivc.c
 +++ b/drivers/virt/tegra/tegra_hv_ivc.c
 @@ -1138,17 +1138,16 @@ static int tegra_hv_ivc_probe(struct platform_device *pdev)
@@ -36,5 +36,5 @@ index b6155fc48a6f5..ede79e3ad3fe6 100644
  
  static const struct of_device_id tegra_hv_ivc_match[] = {
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/sauce/patches/0163-NVIDIA-SAUCE-tegra_hv_nvsci-Add-header-file.patch b/features/tegra/sauce/patches/0163-NVIDIA-SAUCE-tegra_hv_nvsci-Add-header-file.patch
index 8af6728..88a4085 100644
--- a/features/tegra/sauce/patches/0163-NVIDIA-SAUCE-tegra_hv_nvsci-Add-header-file.patch
+++ b/features/tegra/sauce/patches/0163-NVIDIA-SAUCE-tegra_hv_nvsci-Add-header-file.patch
@@ -16,7 +16,7 @@ Reviewed-by: Aparna Das <aparnad@nvidia.com>
 
 diff --git a/include/soc/tegra/virt/tegra_hv_nvscicom.h b/include/soc/tegra/virt/tegra_hv_nvscicom.h
 new file mode 100644
-index 0000000000000..92bcb910f8343
+index 000000000000..92bcb910f834
 --- /dev/null
 +++ b/include/soc/tegra/virt/tegra_hv_nvscicom.h
 @@ -0,0 +1,144 @@
@@ -165,5 +165,5 @@ index 0000000000000..92bcb910f8343
 +
 +#endif /* __TEGRA_HV_NVSCICOM_H */
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/sauce/patches/0164-NVIDIA-SAUCE-virt-tegra-add-include-tegra_hv_ivc.h-h.patch b/features/tegra/sauce/patches/0164-NVIDIA-SAUCE-virt-tegra-add-include-tegra_hv_ivc.h-h.patch
index 55d9ed4..05d153c 100644
--- a/features/tegra/sauce/patches/0164-NVIDIA-SAUCE-virt-tegra-add-include-tegra_hv_ivc.h-h.patch
+++ b/features/tegra/sauce/patches/0164-NVIDIA-SAUCE-virt-tegra-add-include-tegra_hv_ivc.h-h.patch
@@ -20,7 +20,7 @@ Reviewed-by: Suresh Venkatachalam <skathirampat@nvidia.com>
 (cherry picked from commit ef6b748002cca1a86bca1b42508b4147eb022eeb)
 
 diff --git a/drivers/virt/tegra/tegra_hv_ivc.c b/drivers/virt/tegra/tegra_hv_ivc.c
-index ede79e3ad3fe6..96f398b1bd565 100644
+index ede79e3ad3fe..96f398b1bd56 100644
 --- a/drivers/virt/tegra/tegra_hv_ivc.c
 +++ b/drivers/virt/tegra/tegra_hv_ivc.c
 @@ -17,7 +17,7 @@
@@ -34,7 +34,7 @@ index ede79e3ad3fe6..96f398b1bd565 100644
  
 diff --git a/include/soc/tegra/virt/tegra_hv_ivc.h b/include/soc/tegra/virt/tegra_hv_ivc.h
 new file mode 100644
-index 0000000000000..d88650786019f
+index 000000000000..d88650786019
 --- /dev/null
 +++ b/include/soc/tegra/virt/tegra_hv_ivc.h
 @@ -0,0 +1,658 @@
@@ -697,5 +697,5 @@ index 0000000000000..d88650786019f
 +
 +#endif /* TEGRA_HV_IVC_H */
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/sauce/patches/0165-NVIDIA-SAUCE-tegra_hv_nvsci-include-tegra_hv_ivc.h-h.patch b/features/tegra/sauce/patches/0165-NVIDIA-SAUCE-tegra_hv_nvsci-include-tegra_hv_ivc.h-h.patch
index 0f73ab2..dfa7c55 100644
--- a/features/tegra/sauce/patches/0165-NVIDIA-SAUCE-tegra_hv_nvsci-include-tegra_hv_ivc.h-h.patch
+++ b/features/tegra/sauce/patches/0165-NVIDIA-SAUCE-tegra_hv_nvsci-include-tegra_hv_ivc.h-h.patch
@@ -20,7 +20,7 @@ Reviewed-by: svcacv <svcacv@nvidia.com>
 (cherry picked from commit 3b03016b582ce399fb639a5cd9928bc76935520f)
 
 diff --git a/include/soc/tegra/virt/tegra_hv_nvscicom.h b/include/soc/tegra/virt/tegra_hv_nvscicom.h
-index 92bcb910f8343..71e8ba502edc5 100644
+index 92bcb910f834..71e8ba502edc 100644
 --- a/include/soc/tegra/virt/tegra_hv_nvscicom.h
 +++ b/include/soc/tegra/virt/tegra_hv_nvscicom.h
 @@ -6,7 +6,7 @@
@@ -33,5 +33,5 @@ index 92bcb910f8343..71e8ba502edc5 100644
  /**
   * tegra_hv_nvscicom_reserve - Reserve an NvSciCom IVC queue for use
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/sauce/patches/0166-virt-tegra_hv-move-IVC-layout-declarations-to-tegra_.patch b/features/tegra/sauce/patches/0166-virt-tegra_hv-move-IVC-layout-declarations-to-tegra_.patch
index 8214cd9..0ff25a6 100644
--- a/features/tegra/sauce/patches/0166-virt-tegra_hv-move-IVC-layout-declarations-to-tegra_.patch
+++ b/features/tegra/sauce/patches/0166-virt-tegra_hv-move-IVC-layout-declarations-to-tegra_.patch
@@ -30,7 +30,7 @@ Reviewed-by: Aparna Das <aparnad@nvidia.com>
 (cherry picked from commit 6875009f39ed9fc696a990b3377d2def495912f9)
 
 diff --git a/include/soc/tegra/virt/tegra_hv.h b/include/soc/tegra/virt/tegra_hv.h
-index 035d2546d28d7..6fefb333bf095 100644
+index 035d2546d28d..6fefb333bf09 100644
 --- a/include/soc/tegra/virt/tegra_hv.h
 +++ b/include/soc/tegra/virt/tegra_hv.h
 @@ -27,44 +27,6 @@
@@ -248,7 +248,7 @@ index 035d2546d28d7..6fefb333bf095 100644
  
  #endif /* TEGRA_HV_H */
 diff --git a/include/soc/tegra/virt/tegra_hv_ivc.h b/include/soc/tegra/virt/tegra_hv_ivc.h
-index d88650786019f..27a1e3c9e9881 100644
+index d88650786019..27a1e3c9e988 100644
 --- a/include/soc/tegra/virt/tegra_hv_ivc.h
 +++ b/include/soc/tegra/virt/tegra_hv_ivc.h
 @@ -7,13 +7,215 @@
@@ -468,5 +468,5 @@ index d88650786019f..27a1e3c9e9881 100644
  struct tegra_hv_ivc_cookie {
  	/** @brief irq linked to the ivc queue */
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/sauce/patches/0167-knvsci_ipc-Rename-header-from-tegra_hv_nvscicom.h.patch b/features/tegra/sauce/patches/0167-knvsci_ipc-Rename-header-from-tegra_hv_nvscicom.h.patch
index ffb732e..84df75f 100644
--- a/features/tegra/sauce/patches/0167-knvsci_ipc-Rename-header-from-tegra_hv_nvscicom.h.patch
+++ b/features/tegra/sauce/patches/0167-knvsci_ipc-Rename-header-from-tegra_hv_nvscicom.h.patch
@@ -19,7 +19,7 @@ Reviewed-by: svcacv <svcacv@nvidia.com>
 
 diff --git a/include/soc/tegra/virt/knvsci_ipc.h b/include/soc/tegra/virt/knvsci_ipc.h
 new file mode 100644
-index 0000000000000..1d22e1b421f24
+index 000000000000..1d22e1b421f2
 --- /dev/null
 +++ b/include/soc/tegra/virt/knvsci_ipc.h
 @@ -0,0 +1,144 @@
@@ -169,7 +169,7 @@ index 0000000000000..1d22e1b421f24
 +#endif /* __KNVSCI_IPC_H */
 diff --git a/include/soc/tegra/virt/tegra_hv_nvscicom.h b/include/soc/tegra/virt/tegra_hv_nvscicom.h
 deleted file mode 100644
-index 71e8ba502edc5..0000000000000
+index 71e8ba502edc..000000000000
 --- a/include/soc/tegra/virt/tegra_hv_nvscicom.h
 +++ /dev/null
 @@ -1,144 +0,0 @@
@@ -318,5 +318,5 @@ index 71e8ba502edc5..0000000000000
 -
 -#endif /* __TEGRA_HV_NVSCICOM_H */
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/sauce/patches/0168-NVIDIA-SAUCE-virt-tegra-Bump-max-IVC-queues.patch b/features/tegra/sauce/patches/0168-NVIDIA-SAUCE-virt-tegra-Bump-max-IVC-queues.patch
index ee2dec0..cb75f4e 100644
--- a/features/tegra/sauce/patches/0168-NVIDIA-SAUCE-virt-tegra-Bump-max-IVC-queues.patch
+++ b/features/tegra/sauce/patches/0168-NVIDIA-SAUCE-virt-tegra-Bump-max-IVC-queues.patch
@@ -23,7 +23,7 @@ Reviewed-by: Matt Aamold <maamold@nvidia.com>
 Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
 
 diff --git a/include/soc/tegra/virt/tegra_hv.h b/include/soc/tegra/virt/tegra_hv.h
-index 6fefb333bf095..27aecb68899ca 100644
+index 6fefb333bf09..27aecb68899c 100644
 --- a/include/soc/tegra/virt/tegra_hv.h
 +++ b/include/soc/tegra/virt/tegra_hv.h
 @@ -23,7 +23,7 @@
@@ -36,5 +36,5 @@ index 6fefb333bf095..27aecb68899ca 100644
  #define PCT_MAX_NUM_MEMPOOLS	120U
  
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/sauce/patches/0169-NVIDIA-SAUCE-arm64-defconfig-Increase-FORCE_MAX_ORDE.patch b/features/tegra/sauce/patches/0169-NVIDIA-SAUCE-arm64-defconfig-Increase-FORCE_MAX_ORDE.patch
index 310d30f..40e153a 100644
--- a/features/tegra/sauce/patches/0169-NVIDIA-SAUCE-arm64-defconfig-Increase-FORCE_MAX_ORDE.patch
+++ b/features/tegra/sauce/patches/0169-NVIDIA-SAUCE-arm64-defconfig-Increase-FORCE_MAX_ORDE.patch
@@ -20,7 +20,7 @@ Tested-by: Kartik Rajput <kkartik@nvidia.com>
 Reviewed-by: Kartik Rajput <kkartik@nvidia.com>
 
 diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig
-index 9e834f0f8dd09..2e362f0fade1a 100644
+index 9e834f0f8dd0..2e362f0fade1 100644
 --- a/arch/arm64/Kconfig
 +++ b/arch/arm64/Kconfig
 @@ -1688,6 +1688,7 @@ config XEN
@@ -32,5 +32,5 @@ index 9e834f0f8dd09..2e362f0fade1a 100644
  	default "10"
  	help
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/sauce/patches/0170-NVIDIA-SAUCE-usb-typec-ucsi_ccg-Add-retry-mechanism-.patch b/features/tegra/sauce/patches/0170-NVIDIA-SAUCE-usb-typec-ucsi_ccg-Add-retry-mechanism-.patch
index d93ddaa..d5def8f 100644
--- a/features/tegra/sauce/patches/0170-NVIDIA-SAUCE-usb-typec-ucsi_ccg-Add-retry-mechanism-.patch
+++ b/features/tegra/sauce/patches/0170-NVIDIA-SAUCE-usb-typec-ucsi_ccg-Add-retry-mechanism-.patch
@@ -38,7 +38,7 @@ APS-Inflight: svcenomis <svcenomis@nvidia.com>
 (cherry picked from commit 983c0daa0456b2bf7498611554804fdb23f97b01)
 
 diff --git a/drivers/usb/typec/ucsi/ucsi_ccg.c b/drivers/usb/typec/ucsi/ucsi_ccg.c
-index 6c1f62c78ac25..423d34acb994e 100644
+index 6c1f62c78ac2..423d34acb994 100644
 --- a/drivers/usb/typec/ucsi/ucsi_ccg.c
 +++ b/drivers/usb/typec/ucsi/ucsi_ccg.c
 @@ -2,7 +2,7 @@
@@ -87,5 +87,5 @@ index 6c1f62c78ac25..423d34acb994e 100644
  			dev_err(uc->dev, "i2c_transfer failed %d\n", status);
  			pm_runtime_put_sync(uc->dev);
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/sauce/patches/0171-NVIDIA-SAUCE-knvsci_ipc-Remove-knvsci_ipc.h-from-ker.patch b/features/tegra/sauce/patches/0171-NVIDIA-SAUCE-knvsci_ipc-Remove-knvsci_ipc.h-from-ker.patch
index 755d3c2..c79f819 100644
--- a/features/tegra/sauce/patches/0171-NVIDIA-SAUCE-knvsci_ipc-Remove-knvsci_ipc.h-from-ker.patch
+++ b/features/tegra/sauce/patches/0171-NVIDIA-SAUCE-knvsci_ipc-Remove-knvsci_ipc.h-from-ker.patch
@@ -26,7 +26,7 @@ Reviewed-by: Thomas Cantrell <thcantrell@nvidia.com>
 
 diff --git a/include/soc/tegra/virt/knvsci_ipc.h b/include/soc/tegra/virt/knvsci_ipc.h
 deleted file mode 100644
-index 1d22e1b421f24..0000000000000
+index 1d22e1b421f2..000000000000
 --- a/include/soc/tegra/virt/knvsci_ipc.h
 +++ /dev/null
 @@ -1,144 +0,0 @@
@@ -175,5 +175,5 @@ index 1d22e1b421f24..0000000000000
 -
 -#endif /* __KNVSCI_IPC_H */
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/sauce/patches/0172-NVIDIA-SAUCE-tegra-epl-Enable-by-default-for-Tegra.patch b/features/tegra/sauce/patches/0172-NVIDIA-SAUCE-tegra-epl-Enable-by-default-for-Tegra.patch
index 9779566..ff7e298 100644
--- a/features/tegra/sauce/patches/0172-NVIDIA-SAUCE-tegra-epl-Enable-by-default-for-Tegra.patch
+++ b/features/tegra/sauce/patches/0172-NVIDIA-SAUCE-tegra-epl-Enable-by-default-for-Tegra.patch
@@ -10,7 +10,7 @@ Change-Id: I40c8002a947d4e71b9e94c020ae7c827359d306d
 Signed-off-by: Jon Hunter <jonathanh@nvidia.com>
 
 diff --git a/drivers/platform/tegra/Kconfig b/drivers/platform/tegra/Kconfig
-index 5f6da15cd161a..11157e5514bf2 100644
+index 5f6da15cd161..11157e5514bf 100644
 --- a/drivers/platform/tegra/Kconfig
 +++ b/drivers/platform/tegra/Kconfig
 @@ -17,6 +17,7 @@ if TEGRA_PLATFORM_DEVICES
@@ -22,5 +22,5 @@ index 5f6da15cd161a..11157e5514bf2 100644
  	help
  	  The tegra-epl driver provides interface for reporting software detected
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/sauce/patches/0173-NVIDIA-SAUCE-hsierrrptinj-Enable-by-default-for-Tegr.patch b/features/tegra/sauce/patches/0173-NVIDIA-SAUCE-hsierrrptinj-Enable-by-default-for-Tegr.patch
index 87f5eb0..244e024 100644
--- a/features/tegra/sauce/patches/0173-NVIDIA-SAUCE-hsierrrptinj-Enable-by-default-for-Tegr.patch
+++ b/features/tegra/sauce/patches/0173-NVIDIA-SAUCE-hsierrrptinj-Enable-by-default-for-Tegr.patch
@@ -11,7 +11,7 @@ Change-Id: Ie9333cafbcacffbc40d6a0a083f0a39c8482b034
 Signed-off-by: Jon Hunter <jonathanh@nvidia.com>
 
 diff --git a/drivers/platform/tegra/Kconfig b/drivers/platform/tegra/Kconfig
-index 11157e5514bf2..3b5a66ffd7e4d 100644
+index 11157e5514bf..3b5a66ffd7e4 100644
 --- a/drivers/platform/tegra/Kconfig
 +++ b/drivers/platform/tegra/Kconfig
 @@ -30,7 +30,7 @@ config TEGRA_EPL
@@ -24,5 +24,5 @@ index 11157e5514bf2..3b5a66ffd7e4d 100644
  	  The tegra-hsierrrptinj driver provides a
  	  mechanism for HSI error report transmission
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/sauce/patches/0174-NVIDIA-SAUCE-soc-tegra-add-mssnvlink-support.patch b/features/tegra/sauce/patches/0174-NVIDIA-SAUCE-soc-tegra-add-mssnvlink-support.patch
index a0a3069..04b2a37 100644
--- a/features/tegra/sauce/patches/0174-NVIDIA-SAUCE-soc-tegra-add-mssnvlink-support.patch
+++ b/features/tegra/sauce/patches/0174-NVIDIA-SAUCE-soc-tegra-add-mssnvlink-support.patch
@@ -20,7 +20,7 @@ Reviewed-by: Laxman Dewangan <ldewangan@nvidia.com>
 (cherry picked from commit 7a37704afa8c072c6ae43cb72abf0d476f35451b)
 
 diff --git a/drivers/soc/tegra/Kconfig b/drivers/soc/tegra/Kconfig
-index c0fc54c3cd35e..d3c5855e61f54 100644
+index c0fc54c3cd35..d3c5855e61f5 100644
 --- a/drivers/soc/tegra/Kconfig
 +++ b/drivers/soc/tegra/Kconfig
 @@ -175,3 +175,8 @@ config SOC_TEGRA_CBB
@@ -33,7 +33,7 @@ index c0fc54c3cd35e..d3c5855e61f54 100644
 +	depends on ARCH_TEGRA_234_SOC
 +	default y
 diff --git a/drivers/soc/tegra/Makefile b/drivers/soc/tegra/Makefile
-index 01059619e7643..a51a9a3b96ef3 100644
+index 01059619e764..a51a9a3b96ef 100644
 --- a/drivers/soc/tegra/Makefile
 +++ b/drivers/soc/tegra/Makefile
 @@ -8,3 +8,6 @@ obj-$(CONFIG_SOC_TEGRA_PMC) += pmc.o
@@ -45,7 +45,7 @@ index 01059619e7643..a51a9a3b96ef3 100644
 +endif
 diff --git a/drivers/soc/tegra/mssnvlink.c b/drivers/soc/tegra/mssnvlink.c
 new file mode 100644
-index 0000000000000..0394418a45788
+index 000000000000..0394418a4578
 --- /dev/null
 +++ b/drivers/soc/tegra/mssnvlink.c
 @@ -0,0 +1,174 @@
@@ -225,5 +225,5 @@ index 0000000000000..0394418a45788
 +device_initcall(mssnvlink_init);
 \ No newline at end of file
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/sauce/patches/0175-NVIDIA-SAUCE-soc-tegra-cbb-add-multi-socket-error-ha.patch b/features/tegra/sauce/patches/0175-NVIDIA-SAUCE-soc-tegra-cbb-add-multi-socket-error-ha.patch
index 0f97d13..cb4e8a7 100644
--- a/features/tegra/sauce/patches/0175-NVIDIA-SAUCE-soc-tegra-cbb-add-multi-socket-error-ha.patch
+++ b/features/tegra/sauce/patches/0175-NVIDIA-SAUCE-soc-tegra-cbb-add-multi-socket-error-ha.patch
@@ -15,7 +15,7 @@ Change-Id: Iae55dcf1c81c8044f245a011612b9d88212d2be0
 Signed-off-by: Sumit Gupta <sumitg@nvidia.com>
 
 diff --git a/drivers/soc/tegra/cbb/tegra234-cbb.c b/drivers/soc/tegra/cbb/tegra234-cbb.c
-index fb26f085f6914..9215509967234 100644
+index fb26f085f691..921550996723 100644
 --- a/drivers/soc/tegra/cbb/tegra234-cbb.c
 +++ b/drivers/soc/tegra/cbb/tegra234-cbb.c
 @@ -13,6 +13,7 @@
@@ -210,5 +210,5 @@ index fb26f085f6914..9215509967234 100644
  }
  module_exit(tegra234_cbb_exit);
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/sauce/patches/0176-NVIDIA-SAUCE-nvmem-Add-Tegra-efuse-driver.patch b/features/tegra/sauce/patches/0176-NVIDIA-SAUCE-nvmem-Add-Tegra-efuse-driver.patch
index 085782d..b8247b7 100644
--- a/features/tegra/sauce/patches/0176-NVIDIA-SAUCE-nvmem-Add-Tegra-efuse-driver.patch
+++ b/features/tegra/sauce/patches/0176-NVIDIA-SAUCE-nvmem-Add-Tegra-efuse-driver.patch
@@ -9,7 +9,7 @@ Change-Id: I4f0a4a9c4f9994b5147b545c7cf3f3a519f8fa3b
 Signed-off-by: Kartik <kkartik@nvidia.com>
 
 diff --git a/drivers/nvmem/Makefile b/drivers/nvmem/Makefile
-index 70a4464dcb1e2..ea75453987286 100644
+index 70a4464dcb1e..ea7545398728 100644
 --- a/drivers/nvmem/Makefile
 +++ b/drivers/nvmem/Makefile
 @@ -93,3 +93,5 @@ obj-$(CONFIG_NVMEM_ZYNQMP)		+= nvmem_zynqmp_nvmem.o
@@ -20,7 +20,7 @@ index 70a4464dcb1e2..ea75453987286 100644
 +nvmem-tegra-efuse-y			:= tegra-efuse.o
 diff --git a/drivers/nvmem/tegra-efuse.c b/drivers/nvmem/tegra-efuse.c
 new file mode 100644
-index 0000000000000..f3520fe7b6d44
+index 000000000000..f3520fe7b6d4
 --- /dev/null
 +++ b/drivers/nvmem/tegra-efuse.c
 @@ -0,0 +1,328 @@
@@ -353,7 +353,7 @@ index 0000000000000..f3520fe7b6d44
 +
 +MODULE_LICENSE("GPL v2");
 diff --git a/drivers/soc/tegra/Makefile b/drivers/soc/tegra/Makefile
-index a51a9a3b96ef3..420748447159f 100644
+index a51a9a3b96ef..420748447159 100644
 --- a/drivers/soc/tegra/Makefile
 +++ b/drivers/soc/tegra/Makefile
 @@ -3,6 +3,7 @@ obj-y += fuse/
@@ -365,7 +365,7 @@ index a51a9a3b96ef3..420748447159f 100644
  obj-$(CONFIG_SOC_TEGRA_PMC) += pmc.o
  obj-$(CONFIG_SOC_TEGRA20_VOLTAGE_COUPLER) += regulators-tegra20.o
 diff --git a/drivers/soc/tegra/common.c b/drivers/soc/tegra/common.c
-index dff6d5ef4e46b..25a577fd0644f 100644
+index dff6d5ef4e46..25a577fd0644 100644
 --- a/drivers/soc/tegra/common.c
 +++ b/drivers/soc/tegra/common.c
 @@ -22,6 +22,8 @@ static const struct of_device_id tegra_machine_match[] = {
@@ -378,7 +378,7 @@ index dff6d5ef4e46b..25a577fd0644f 100644
  };
  
 diff --git a/drivers/soc/tegra/fuse/Makefile b/drivers/soc/tegra/fuse/Makefile
-index ea8332cc39805..b2c15670761a6 100644
+index ea8332cc3980..b2c15670761a 100644
 --- a/drivers/soc/tegra/fuse/Makefile
 +++ b/drivers/soc/tegra/fuse/Makefile
 @@ -2,6 +2,7 @@
@@ -390,7 +390,7 @@ index ea8332cc39805..b2c15670761a6 100644
  obj-$(CONFIG_ARCH_TEGRA_2x_SOC)		+= speedo-tegra20.o
  obj-$(CONFIG_ARCH_TEGRA_3x_SOC)		+= speedo-tegra30.o
 diff --git a/drivers/soc/tegra/fuse/fuse-tegra.c b/drivers/soc/tegra/fuse/fuse-tegra.c
-index 74d2fedea71ca..4e292ecf8d7b6 100644
+index 74d2fedea71c..4e292ecf8d7b 100644
 --- a/drivers/soc/tegra/fuse/fuse-tegra.c
 +++ b/drivers/soc/tegra/fuse/fuse-tegra.c
 @@ -37,19 +37,6 @@ static const char *tegra_revision_name[TEGRA_REVISION_MAX] = {
@@ -555,7 +555,7 @@ index 74d2fedea71ca..4e292ecf8d7b6 100644
 -device_initcall(tegra_init_soc);
 -#endif
 diff --git a/drivers/soc/tegra/fuse/fuse-tegra30.c b/drivers/soc/tegra/fuse/fuse-tegra30.c
-index 524fa1b0cd3d6..6b2da7fac5718 100644
+index 524fa1b0cd3d..6b2da7fac571 100644
 --- a/drivers/soc/tegra/fuse/fuse-tegra30.c
 +++ b/drivers/soc/tegra/fuse/fuse-tegra30.c
 @@ -111,7 +111,6 @@ const struct tegra_fuse_soc tegra30_fuse_soc = {
@@ -614,7 +614,7 @@ index 524fa1b0cd3d6..6b2da7fac5718 100644
  };
  #endif
 diff --git a/drivers/soc/tegra/fuse/fuse.h b/drivers/soc/tegra/fuse/fuse.h
-index 9fee6ad6ad9e9..ff30483ffb6b5 100644
+index 9fee6ad6ad9e..ff30483ffb6b 100644
 --- a/drivers/soc/tegra/fuse/fuse.h
 +++ b/drivers/soc/tegra/fuse/fuse.h
 @@ -37,8 +37,6 @@ struct tegra_fuse_soc {
@@ -649,7 +649,7 @@ index 9fee6ad6ad9e9..ff30483ffb6b5 100644
  #endif
 diff --git a/drivers/soc/tegra/fuse/tegra-efuse-nvmem-helper.c b/drivers/soc/tegra/fuse/tegra-efuse-nvmem-helper.c
 new file mode 100644
-index 0000000000000..862e34472f445
+index 000000000000..862e34472f44
 --- /dev/null
 +++ b/drivers/soc/tegra/fuse/tegra-efuse-nvmem-helper.c
 @@ -0,0 +1,58 @@
@@ -713,7 +713,7 @@ index 0000000000000..862e34472f445
 +module_platform_driver(tegra_efuse_nvmem_helper_driver);
 diff --git a/drivers/soc/tegra/tegra-soc.c b/drivers/soc/tegra/tegra-soc.c
 new file mode 100644
-index 0000000000000..767b32749a10c
+index 000000000000..767b32749a10
 --- /dev/null
 +++ b/drivers/soc/tegra/tegra-soc.c
 @@ -0,0 +1,208 @@
@@ -926,7 +926,7 @@ index 0000000000000..767b32749a10c
 +}
 +module_exit(tegra_soc_exit);
 diff --git a/include/soc/tegra/fuse.h b/include/soc/tegra/fuse.h
-index 5a112763457aa..85353f7c3a33b 100644
+index 5a112763457a..85353f7c3a33 100644
 --- a/include/soc/tegra/fuse.h
 +++ b/include/soc/tegra/fuse.h
 @@ -122,7 +122,7 @@ static inline int tegra194_miscreg_mask_serror(void)
@@ -939,5 +939,5 @@ index 5a112763457aa..85353f7c3a33b 100644
  #endif /* __ASSEMBLY__ */
  
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/sauce/patches/0177-NVIDIA-SAUCE-pinctrl-Remove-duplication-of-PINCTRL_T.patch b/features/tegra/sauce/patches/0177-NVIDIA-SAUCE-pinctrl-Remove-duplication-of-PINCTRL_T.patch
index 6f5eb7d..e091890 100644
--- a/features/tegra/sauce/patches/0177-NVIDIA-SAUCE-pinctrl-Remove-duplication-of-PINCTRL_T.patch
+++ b/features/tegra/sauce/patches/0177-NVIDIA-SAUCE-pinctrl-Remove-duplication-of-PINCTRL_T.patch
@@ -13,7 +13,7 @@ Change-Id: Ied9488116bfd50e4c12e627271d624a7f88d33b3
 Signed-off-by: Laxman Dewangan <ldewangan@nvidia.com>
 
 diff --git a/drivers/soc/tegra/Kconfig b/drivers/soc/tegra/Kconfig
-index d3c5855e61f54..63eb57bfd1445 100644
+index d3c5855e61f5..63eb57bfd144 100644
 --- a/drivers/soc/tegra/Kconfig
 +++ b/drivers/soc/tegra/Kconfig
 @@ -135,6 +135,7 @@ config ARCH_TEGRA_264_SOC
@@ -25,5 +25,5 @@ index d3c5855e61f54..63eb57bfd1445 100644
  	  Enable support for the NVIDIA Tegra264 SoC.
  
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/sauce/patches/0178-NVIDIA-SAUCE-efuse-Add-odm-id-odm-info-support.patch b/features/tegra/sauce/patches/0178-NVIDIA-SAUCE-efuse-Add-odm-id-odm-info-support.patch
index a0a1ed7..b35a7ab 100644
--- a/features/tegra/sauce/patches/0178-NVIDIA-SAUCE-efuse-Add-odm-id-odm-info-support.patch
+++ b/features/tegra/sauce/patches/0178-NVIDIA-SAUCE-efuse-Add-odm-id-odm-info-support.patch
@@ -16,7 +16,7 @@ Reviewed-by: Bitan Biswas <bbiswas@nvidia.com>
 (cherry picked from commit 46d5c2f637a55d1646de7a9add610e2a6b1bf76b)
 
 diff --git a/drivers/nvmem/tegra-efuse.c b/drivers/nvmem/tegra-efuse.c
-index f3520fe7b6d44..4e857255419d3 100644
+index f3520fe7b6d4..4e857255419d 100644
 --- a/drivers/nvmem/tegra-efuse.c
 +++ b/drivers/nvmem/tegra-efuse.c
 @@ -10,6 +10,10 @@
@@ -171,5 +171,5 @@ index f3520fe7b6d44..4e857255419d3 100644
  module_platform_driver(tegra_efuse_driver);
  
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/sauce/patches/0179-NVIDIA-SAUCE-efuse-update-ecid-changes.patch b/features/tegra/sauce/patches/0179-NVIDIA-SAUCE-efuse-update-ecid-changes.patch
index a4569cb..09fdb7b 100644
--- a/features/tegra/sauce/patches/0179-NVIDIA-SAUCE-efuse-update-ecid-changes.patch
+++ b/features/tegra/sauce/patches/0179-NVIDIA-SAUCE-efuse-update-ecid-changes.patch
@@ -20,7 +20,7 @@ Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
 (cherry picked from commit 3f7dda17b2984f7fa36680e1e06f2eb3dc27bccd)
 
 diff --git a/drivers/nvmem/tegra-efuse.c b/drivers/nvmem/tegra-efuse.c
-index 4e857255419d3..0e2893b2bf7d6 100644
+index 4e857255419d..0e2893b2bf7d 100644
 --- a/drivers/nvmem/tegra-efuse.c
 +++ b/drivers/nvmem/tegra-efuse.c
 @@ -1,6 +1,6 @@
@@ -50,5 +50,5 @@ index 4e857255419d3..0e2893b2bf7d6 100644
  };
  MODULE_DEVICE_TABLE(of, tegra_efuse_of_match);
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/sauce/patches/0180-NVIDIA-SAUCE-soc-tegra-pmc-Add-sysfs-nodes-to-select.patch b/features/tegra/sauce/patches/0180-NVIDIA-SAUCE-soc-tegra-pmc-Add-sysfs-nodes-to-select.patch
index c0e0088..ef22d0d 100644
--- a/features/tegra/sauce/patches/0180-NVIDIA-SAUCE-soc-tegra-pmc-Add-sysfs-nodes-to-select.patch
+++ b/features/tegra/sauce/patches/0180-NVIDIA-SAUCE-soc-tegra-pmc-Add-sysfs-nodes-to-select.patch
@@ -18,7 +18,7 @@ Reviewed-by: Laxman Dewangan <ldewangan@nvidia.com>
 (cherry picked from commit cbc5d03fb9fe9790586b3ace4ebb98078e17cce3)
 
 diff --git a/drivers/soc/tegra/pmc.c b/drivers/soc/tegra/pmc.c
-index f5759a19b6e5b..044fb34dc5ea9 100644
+index f5759a19b6e5..044fb34dc5ea 100644
 --- a/drivers/soc/tegra/pmc.c
 +++ b/drivers/soc/tegra/pmc.c
 @@ -204,6 +204,29 @@
@@ -245,5 +245,5 @@ index f5759a19b6e5b..044fb34dc5ea9 100644
  	return err;
  }
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/sauce/patches/0181-NVIDIA-SAUCE-soc-tegra-cbb-Fix-build-with-ACPI-disab.patch b/features/tegra/sauce/patches/0181-NVIDIA-SAUCE-soc-tegra-cbb-Fix-build-with-ACPI-disab.patch
index eaa89c1..64b00b6 100644
--- a/features/tegra/sauce/patches/0181-NVIDIA-SAUCE-soc-tegra-cbb-Fix-build-with-ACPI-disab.patch
+++ b/features/tegra/sauce/patches/0181-NVIDIA-SAUCE-soc-tegra-cbb-Fix-build-with-ACPI-disab.patch
@@ -19,7 +19,7 @@ Reviewed-by: Jon Hunter <jonathanh@nvidia.com>
 (cherry picked from commit e05745d7d36986d507a6bfb45f07394cb1d70f25)
 
 diff --git a/drivers/soc/tegra/cbb/tegra234-cbb.c b/drivers/soc/tegra/cbb/tegra234-cbb.c
-index 9215509967234..8ac6344049d0d 100644
+index 921550996723..8ac6344049d0 100644
 --- a/drivers/soc/tegra/cbb/tegra234-cbb.c
 +++ b/drivers/soc/tegra/cbb/tegra234-cbb.c
 @@ -1,7 +1,6 @@
@@ -103,5 +103,5 @@ index 9215509967234..8ac6344049d0d 100644
  	},
  };
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/sauce/patches/0182-NVIDIA-SAUCE-soc-tegra-pmc-Multi-socket-support.patch b/features/tegra/sauce/patches/0182-NVIDIA-SAUCE-soc-tegra-pmc-Multi-socket-support.patch
index e176e89..adc47b9 100644
--- a/features/tegra/sauce/patches/0182-NVIDIA-SAUCE-soc-tegra-pmc-Multi-socket-support.patch
+++ b/features/tegra/sauce/patches/0182-NVIDIA-SAUCE-soc-tegra-pmc-Multi-socket-support.patch
@@ -9,7 +9,7 @@ Change-Id: I526e177cebc590549af160502c6a8903f352a743
 Signed-off-by: Jon Hunter <jonathanh@nvidia.com>
 
 diff --git a/drivers/soc/tegra/pmc.c b/drivers/soc/tegra/pmc.c
-index 044fb34dc5ea9..589f91b24b442 100644
+index 044fb34dc5ea..589f91b24b44 100644
 --- a/drivers/soc/tegra/pmc.c
 +++ b/drivers/soc/tegra/pmc.c
 @@ -3163,6 +3163,78 @@ static void tegra_pmc_reset_suspend_mode(void *data)
@@ -103,5 +103,5 @@ index 044fb34dc5ea9..589f91b24b442 100644
  	if (err < 0)
  		return dev_err_probe(&pdev->dev, err, "failed to parse DT\n");
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/sauce/patches/0183-NVIDIA-SAUCE-soc-tegra-pmc-Add-Tegra234-PCIe-wake-ev.patch b/features/tegra/sauce/patches/0183-NVIDIA-SAUCE-soc-tegra-pmc-Add-Tegra234-PCIe-wake-ev.patch
index 77b2fec..4a4a908 100644
--- a/features/tegra/sauce/patches/0183-NVIDIA-SAUCE-soc-tegra-pmc-Add-Tegra234-PCIe-wake-ev.patch
+++ b/features/tegra/sauce/patches/0183-NVIDIA-SAUCE-soc-tegra-pmc-Add-Tegra234-PCIe-wake-ev.patch
@@ -25,7 +25,7 @@ GVS: buildbot_gerritrpt <buildbot_gerritrpt@nvidia.com>
 APS-Inflight: svcenomis <svcenomis@nvidia.com>
 
 diff --git a/drivers/soc/tegra/pmc.c b/drivers/soc/tegra/pmc.c
-index 589f91b24b442..cf4c7cf6b7571 100644
+index 589f91b24b44..cf4c7cf6b757 100644
 --- a/drivers/soc/tegra/pmc.c
 +++ b/drivers/soc/tegra/pmc.c
 @@ -4681,6 +4681,7 @@ static const char * const tegra234_reset_sources[] = {
@@ -37,5 +37,5 @@ index 589f91b24b442..cf4c7cf6b7571 100644
  	TEGRA_WAKE_GPIO("eqos", 20, 0, TEGRA234_MAIN_GPIO(G, 4)),
  	TEGRA_WAKE_IRQ("pmu", 24, 209),
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/sauce/patches/0184-NVIDIA-SAUCE-gpio-tegra-add-1ms-delay-before-setting.patch b/features/tegra/sauce/patches/0184-NVIDIA-SAUCE-gpio-tegra-add-1ms-delay-before-setting.patch
index 9c65139..c53cc53 100644
--- a/features/tegra/sauce/patches/0184-NVIDIA-SAUCE-gpio-tegra-add-1ms-delay-before-setting.patch
+++ b/features/tegra/sauce/patches/0184-NVIDIA-SAUCE-gpio-tegra-add-1ms-delay-before-setting.patch
@@ -21,7 +21,7 @@ Tested-by: Petlozu Pravareshwar <petlozup@nvidia.com>
 Reviewed-by: Petlozu Pravareshwar <petlozup@nvidia.com>
 
 diff --git a/drivers/gpio/gpio-tegra186.c b/drivers/gpio/gpio-tegra186.c
-index d1eed00e7bbe4..2e2c1240206a2 100644
+index d1eed00e7bbe..2e2c1240206a 100644
 --- a/drivers/gpio/gpio-tegra186.c
 +++ b/drivers/gpio/gpio-tegra186.c
 @@ -15,6 +15,7 @@
@@ -41,5 +41,5 @@ index d1eed00e7bbe4..2e2c1240206a2 100644
  	writel(value, base + TEGRA186_GPIO_DEBOUNCE_CONTROL);
  
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/sauce/patches/0185-NVIDIA-SAUCE-gpio-pca953x-Use-NOIRQ-suspend-resume-f.patch b/features/tegra/sauce/patches/0185-NVIDIA-SAUCE-gpio-pca953x-Use-NOIRQ-suspend-resume-f.patch
index 5f06cb5..713e24e 100644
--- a/features/tegra/sauce/patches/0185-NVIDIA-SAUCE-gpio-pca953x-Use-NOIRQ-suspend-resume-f.patch
+++ b/features/tegra/sauce/patches/0185-NVIDIA-SAUCE-gpio-pca953x-Use-NOIRQ-suspend-resume-f.patch
@@ -22,7 +22,7 @@ Reviewed-by: Laxman Dewangan <ldewangan@nvidia.com>
 Tested-by: Petlozu Pravareshwar <petlozup@nvidia.com>
 
 diff --git a/drivers/gpio/gpio-pca953x.c b/drivers/gpio/gpio-pca953x.c
-index f7daeadaea57c..57f6c0d0bc8d1 100644
+index f7daeadaea57..57f6c0d0bc8d 100644
 --- a/drivers/gpio/gpio-pca953x.c
 +++ b/drivers/gpio/gpio-pca953x.c
 @@ -1419,7 +1419,7 @@ static int pca953x_resume(struct device *dev)
@@ -35,5 +35,5 @@ index f7daeadaea57c..57f6c0d0bc8d1 100644
  /* convenience to stop overlong match-table lines */
  #define OF_653X(__nrgpio, __int) ((void *)(__nrgpio | PCAL653X_TYPE | __int))
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/sauce/patches/0186-NVIDIA-SAUCE-gpio-tegra-add-is_tegra_hypervisor-chec.patch b/features/tegra/sauce/patches/0186-NVIDIA-SAUCE-gpio-tegra-add-is_tegra_hypervisor-chec.patch
index f0ee018..d3ba62f 100644
--- a/features/tegra/sauce/patches/0186-NVIDIA-SAUCE-gpio-tegra-add-is_tegra_hypervisor-chec.patch
+++ b/features/tegra/sauce/patches/0186-NVIDIA-SAUCE-gpio-tegra-add-is_tegra_hypervisor-chec.patch
@@ -25,7 +25,7 @@ Reviewed-by: Bibek Basu <bbasu@nvidia.com>
 (cherry picked from commit 1d3fdf3fc619b9ce12f3dac7b8afc3e3b49f385d)
 
 diff --git a/drivers/gpio/gpio-tegra186.c b/drivers/gpio/gpio-tegra186.c
-index 2e2c1240206a2..43f4eba80e29f 100644
+index 2e2c1240206a..43f4eba80e29 100644
 --- a/drivers/gpio/gpio-tegra186.c
 +++ b/drivers/gpio/gpio-tegra186.c
 @@ -16,6 +16,11 @@
@@ -53,5 +53,5 @@ index 2e2c1240206a2..43f4eba80e29f 100644
  		return 0;
  
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/sauce/patches/0187-NVIDIA-SAUCE-gpio-tegra-add-tegra_hv.h-header-file.patch b/features/tegra/sauce/patches/0187-NVIDIA-SAUCE-gpio-tegra-add-tegra_hv.h-header-file.patch
index ef4e48c..953f9ff 100644
--- a/features/tegra/sauce/patches/0187-NVIDIA-SAUCE-gpio-tegra-add-tegra_hv.h-header-file.patch
+++ b/features/tegra/sauce/patches/0187-NVIDIA-SAUCE-gpio-tegra-add-tegra_hv.h-header-file.patch
@@ -24,7 +24,7 @@ GVS: buildbot_gerritrpt <buildbot_gerritrpt@nvidia.com>
 (cherry picked from commit 67601f537a2a240d6671114ea29c2bbbe5159402)
 
 diff --git a/drivers/gpio/gpio-tegra186.c b/drivers/gpio/gpio-tegra186.c
-index 43f4eba80e29f..24a45d383ff2d 100644
+index 43f4eba80e29..24a45d383ff2 100644
 --- a/drivers/gpio/gpio-tegra186.c
 +++ b/drivers/gpio/gpio-tegra186.c
 @@ -19,7 +19,7 @@
@@ -37,5 +37,5 @@ index 43f4eba80e29f..24a45d383ff2d 100644
  
  #include <dt-bindings/gpio/tegra186-gpio.h>
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/sauce/patches/0188-NVIDIA-SAUCE-firmware-bpmp-build-bpmp-hv-driver-as-b.patch b/features/tegra/sauce/patches/0188-NVIDIA-SAUCE-firmware-bpmp-build-bpmp-hv-driver-as-b.patch
index aef3572..21ebaca 100644
--- a/features/tegra/sauce/patches/0188-NVIDIA-SAUCE-firmware-bpmp-build-bpmp-hv-driver-as-b.patch
+++ b/features/tegra/sauce/patches/0188-NVIDIA-SAUCE-firmware-bpmp-build-bpmp-hv-driver-as-b.patch
@@ -21,7 +21,7 @@ Reviewed-by: svcacv <svcacv@nvidia.com>
 (cherry picked from commit 5bec34dcacc6f07f0bf8ad4b18ddaeb7c599e268)
 
 diff --git a/drivers/firmware/tegra/Makefile b/drivers/firmware/tegra/Makefile
-index 41e2e4dc31d63..25413da15d93a 100644
+index 41e2e4dc31d6..25413da15d93 100644
 --- a/drivers/firmware/tegra/Makefile
 +++ b/drivers/firmware/tegra/Makefile
 @@ -1,10 +1,12 @@
@@ -38,7 +38,7 @@ index 41e2e4dc31d63..25413da15d93a 100644
  obj-$(CONFIG_TEGRA_BPMP)	+= tegra-bpmp.o
  obj-$(CONFIG_TEGRA_IVC)		+= ivc.o
 diff --git a/drivers/firmware/tegra/bpmp-private.h b/drivers/firmware/tegra/bpmp-private.h
-index 07c3d46abb874..59a86db30adf3 100644
+index 07c3d46abb87..59a86db30adf 100644
 --- a/drivers/firmware/tegra/bpmp-private.h
 +++ b/drivers/firmware/tegra/bpmp-private.h
 @@ -1,7 +1,5 @@
@@ -61,7 +61,7 @@ index 07c3d46abb874..59a86db30adf3 100644
  #endif
 diff --git a/drivers/firmware/tegra/bpmp-tegra194-hv.c b/drivers/firmware/tegra/bpmp-tegra194-hv.c
 new file mode 100644
-index 0000000000000..d171aa532e2e8
+index 000000000000..d171aa532e2e
 --- /dev/null
 +++ b/drivers/firmware/tegra/bpmp-tegra194-hv.c
 @@ -0,0 +1,267 @@
@@ -333,7 +333,7 @@ index 0000000000000..d171aa532e2e8
 +	.resume = tegra194_hv_bpmp_resume,
 +};
 diff --git a/drivers/firmware/tegra/bpmp.c b/drivers/firmware/tegra/bpmp.c
-index af1144619acc4..e942d1dd9cd66 100644
+index af1144619acc..e942d1dd9cd6 100644
 --- a/drivers/firmware/tegra/bpmp.c
 +++ b/drivers/firmware/tegra/bpmp.c
 @@ -1,10 +1,9 @@
@@ -427,5 +427,5 @@ index af1144619acc4..e942d1dd9cd66 100644
  	{ }
  };
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/sauce/patches/0189-NVIDIA-SAUCE-firmware-ivc-merge-ivc_ext.c-with-upstr.patch b/features/tegra/sauce/patches/0189-NVIDIA-SAUCE-firmware-ivc-merge-ivc_ext.c-with-upstr.patch
index 30875e7..995e3e4 100644
--- a/features/tegra/sauce/patches/0189-NVIDIA-SAUCE-firmware-ivc-merge-ivc_ext.c-with-upstr.patch
+++ b/features/tegra/sauce/patches/0189-NVIDIA-SAUCE-firmware-ivc-merge-ivc_ext.c-with-upstr.patch
@@ -21,7 +21,7 @@ Reviewed-by: svcacv <svcacv@nvidia.com>
 (cherry picked from commit 0a34c5692db7b568c26d6cbefa73c47e6f7dcaea)
 
 diff --git a/drivers/firmware/tegra/ivc.c b/drivers/firmware/tegra/ivc.c
-index bf2b45ad19807..1d2166dae9e16 100644
+index bf2b45ad1980..1d2166dae9e1 100644
 --- a/drivers/firmware/tegra/ivc.c
 +++ b/drivers/firmware/tegra/ivc.c
 @@ -1,7 +1,5 @@
@@ -180,7 +180,7 @@ index bf2b45ad19807..1d2166dae9e16 100644
  {
  	*dst = *src;
 diff --git a/include/soc/tegra/ivc.h b/include/soc/tegra/ivc.h
-index 736590774114d..739594225b5be 100644
+index 736590774114..739594225b5b 100644
 --- a/include/soc/tegra/ivc.h
 +++ b/include/soc/tegra/ivc.h
 @@ -1,7 +1,5 @@
@@ -289,5 +289,5 @@ index 736590774114d..739594225b5be 100644
   * tegra_ivc_read_get_next_frame - Peek at the next frame to receive
   * @ivc		pointer of the IVC channel
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/sauce/patches/0190-ivc-generate-warning-instead-of-panicing-the-target.patch b/features/tegra/sauce/patches/0190-ivc-generate-warning-instead-of-panicing-the-target.patch
index 2ef332a..cc8cc29 100644
--- a/features/tegra/sauce/patches/0190-ivc-generate-warning-instead-of-panicing-the-target.patch
+++ b/features/tegra/sauce/patches/0190-ivc-generate-warning-instead-of-panicing-the-target.patch
@@ -19,7 +19,7 @@ Reviewed-by: Suresh Venkatachalam <skathirampat@nvidia.com>
 (cherry picked from commit 01eb59a1fb89d76420f9b5edc2ab006c4f66787b)
 
 diff --git a/drivers/firmware/tegra/ivc.c b/drivers/firmware/tegra/ivc.c
-index 1d2166dae9e16..d3bc1d435b2f5 100644
+index 1d2166dae9e1..d3bc1d435b2f 100644
 --- a/drivers/firmware/tegra/ivc.c
 +++ b/drivers/firmware/tegra/ivc.c
 @@ -638,7 +638,7 @@ int tegra_ivc_read(struct tegra_ivc *ivc, void __user *usr_buf, void *buf, size_
@@ -68,5 +68,5 @@ index 1d2166dae9e16..d3bc1d435b2f5 100644
  	/* Advance to next write frame*/
  	if (tegra_ivc_write_advance(ivc) == 0)
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/sauce/patches/0191-ivc-fix-comments-raised-by-secure-code-inspection.patch b/features/tegra/sauce/patches/0191-ivc-fix-comments-raised-by-secure-code-inspection.patch
index 470ec3d..8c4adcc 100644
--- a/features/tegra/sauce/patches/0191-ivc-fix-comments-raised-by-secure-code-inspection.patch
+++ b/features/tegra/sauce/patches/0191-ivc-fix-comments-raised-by-secure-code-inspection.patch
@@ -16,7 +16,7 @@ Reviewed-by: Suresh Venkatachalam <skathirampat@nvidia.com>
 (cherry picked from commit 2aea973e8b1aec28a4609e5119824cb3d4b00846)
 
 diff --git a/drivers/firmware/tegra/ivc.c b/drivers/firmware/tegra/ivc.c
-index d3bc1d435b2f5..e4745c08ff8fa 100644
+index d3bc1d435b2f..e4745c08ff8f 100644
 --- a/drivers/firmware/tegra/ivc.c
 +++ b/drivers/firmware/tegra/ivc.c
 @@ -649,6 +649,12 @@ int tegra_ivc_read(struct tegra_ivc *ivc, void __user *usr_buf, void *buf, size_
@@ -57,5 +57,5 @@ index d3bc1d435b2f5..e4745c08ff8fa 100644
  	if (buf) {
  		iosys_map_memcpy_to(&map, 0, buf, size);
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/sauce/patches/0192-ivc-cert-misra-fixes-in-ivc.c-drv.patch b/features/tegra/sauce/patches/0192-ivc-cert-misra-fixes-in-ivc.c-drv.patch
index ad163cd..4edbcde 100644
--- a/features/tegra/sauce/patches/0192-ivc-cert-misra-fixes-in-ivc.c-drv.patch
+++ b/features/tegra/sauce/patches/0192-ivc-cert-misra-fixes-in-ivc.c-drv.patch
@@ -21,7 +21,7 @@ Reviewed-by: svcacv <svcacv@nvidia.com>
 (cherry picked from commit d4453e5a177ea56ca13f21ec899d95374e91d8f8)
 
 diff --git a/drivers/firmware/tegra/ivc.c b/drivers/firmware/tegra/ivc.c
-index e4745c08ff8fa..7d7956e0a1d19 100644
+index e4745c08ff8f..7d7956e0a1d1 100644
 --- a/drivers/firmware/tegra/ivc.c
 +++ b/drivers/firmware/tegra/ivc.c
 @@ -674,6 +674,7 @@ int tegra_ivc_read_peek(struct tegra_ivc *ivc, void __user *usr_buf,
@@ -49,5 +49,5 @@ index e4745c08ff8fa..7d7956e0a1d19 100644
  	if (buf) {
  		iosys_map_memcpy_from(buf, &map, offset, size);
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/sauce/patches/0193-NVIDIA-SAUCE-firmware-bpmp-include-tegra_hv_ivc.h-he.patch b/features/tegra/sauce/patches/0193-NVIDIA-SAUCE-firmware-bpmp-include-tegra_hv_ivc.h-he.patch
index 7c6a4e6..d807df8 100644
--- a/features/tegra/sauce/patches/0193-NVIDIA-SAUCE-firmware-bpmp-include-tegra_hv_ivc.h-he.patch
+++ b/features/tegra/sauce/patches/0193-NVIDIA-SAUCE-firmware-bpmp-include-tegra_hv_ivc.h-he.patch
@@ -20,7 +20,7 @@ Reviewed-by: Suresh Venkatachalam <skathirampat@nvidia.com>
 (cherry picked from commit 9ceec99a96fe3d0f25f5758ba4c527ddbe0ea5b0)
 
 diff --git a/drivers/firmware/tegra/bpmp-tegra194-hv.c b/drivers/firmware/tegra/bpmp-tegra194-hv.c
-index d171aa532e2e8..47312cf738010 100644
+index d171aa532e2e..47312cf73801 100644
 --- a/drivers/firmware/tegra/bpmp-tegra194-hv.c
 +++ b/drivers/firmware/tegra/bpmp-tegra194-hv.c
 @@ -1,5 +1,5 @@
@@ -40,5 +40,5 @@ index d171aa532e2e8..47312cf738010 100644
  
  /* utilizing the struct tegra_ivc *ivc in struct tegra_bpmp_channel
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/sauce/patches/0194-NVIDIA-SAUCE-bpmp-hv-driver-multi-socket-update.patch b/features/tegra/sauce/patches/0194-NVIDIA-SAUCE-bpmp-hv-driver-multi-socket-update.patch
index a36c46e..21891e7 100644
--- a/features/tegra/sauce/patches/0194-NVIDIA-SAUCE-bpmp-hv-driver-multi-socket-update.patch
+++ b/features/tegra/sauce/patches/0194-NVIDIA-SAUCE-bpmp-hv-driver-multi-socket-update.patch
@@ -22,7 +22,7 @@ Reviewed-by: svc-mobile-coverity <svc-mobile-coverity@nvidia.com>
 (cherry picked from commit 132e50000bcd8b7b8c306e261de930fdb8181e5b)
 
 diff --git a/drivers/firmware/tegra/bpmp-tegra194-hv.c b/drivers/firmware/tegra/bpmp-tegra194-hv.c
-index 47312cf738010..ad4a88974a95c 100644
+index 47312cf73801..ad4a88974a95 100644
 --- a/drivers/firmware/tegra/bpmp-tegra194-hv.c
 +++ b/drivers/firmware/tegra/bpmp-tegra194-hv.c
 @@ -18,8 +18,22 @@
@@ -202,5 +202,5 @@ index 47312cf738010..ad4a88974a95c 100644
  
  const struct tegra_bpmp_ops tegra194_bpmp_hv_ops = {
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/sauce/patches/0195-NVIDIA-SAUCE-i2c-tegra-Report-critical-errors-to-FSI.patch b/features/tegra/sauce/patches/0195-NVIDIA-SAUCE-i2c-tegra-Report-critical-errors-to-FSI.patch
index 53e2cd5..74b4745 100644
--- a/features/tegra/sauce/patches/0195-NVIDIA-SAUCE-i2c-tegra-Report-critical-errors-to-FSI.patch
+++ b/features/tegra/sauce/patches/0195-NVIDIA-SAUCE-i2c-tegra-Report-critical-errors-to-FSI.patch
@@ -19,7 +19,7 @@ Reviewed-by: Laxman Dewangan <ldewangan@nvidia.com>
 Tested-by: Abhilash G <abhilashg@nvidia.com>
 
 diff --git a/drivers/i2c/busses/i2c-tegra.c b/drivers/i2c/busses/i2c-tegra.c
-index 4428343d58d1e..b937212e5e77f 100644
+index 4428343d58d1..b937212e5e77 100644
 --- a/drivers/i2c/busses/i2c-tegra.c
 +++ b/drivers/i2c/busses/i2c-tegra.c
 @@ -28,6 +28,10 @@
@@ -216,5 +216,5 @@ index 4428343d58d1e..b937212e5e77f 100644
  
  static int tegra_i2c_init_clocks(struct tegra_i2c_dev *i2c_dev)
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/sauce/patches/0196-NVIDIA-SAUCE-i2c-Error-report-injection-utility-supp.patch b/features/tegra/sauce/patches/0196-NVIDIA-SAUCE-i2c-Error-report-injection-utility-supp.patch
index 4595db5..51149de 100644
--- a/features/tegra/sauce/patches/0196-NVIDIA-SAUCE-i2c-Error-report-injection-utility-supp.patch
+++ b/features/tegra/sauce/patches/0196-NVIDIA-SAUCE-i2c-Error-report-injection-utility-supp.patch
@@ -24,7 +24,7 @@ Reviewed-by: Abhilash G <abhilashg@nvidia.com>
 Reviewed-by: Laxman Dewangan <ldewangan@nvidia.com>
 
 diff --git a/drivers/i2c/busses/i2c-tegra.c b/drivers/i2c/busses/i2c-tegra.c
-index b937212e5e77f..586187cefaf4c 100644
+index b937212e5e77..586187cefaf4 100644
 --- a/drivers/i2c/busses/i2c-tegra.c
 +++ b/drivers/i2c/busses/i2c-tegra.c
 @@ -32,6 +32,10 @@
@@ -116,5 +116,5 @@ index b937212e5e77f..586187cefaf4c 100644
  	pm_runtime_force_suspend(i2c_dev->dev);
  
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/sauce/patches/0197-NVIDIA-SAUCE-i2c-core-skip-prod-settings-node-during.patch b/features/tegra/sauce/patches/0197-NVIDIA-SAUCE-i2c-core-skip-prod-settings-node-during.patch
index 544fbbc..f4bdfeb 100644
--- a/features/tegra/sauce/patches/0197-NVIDIA-SAUCE-i2c-core-skip-prod-settings-node-during.patch
+++ b/features/tegra/sauce/patches/0197-NVIDIA-SAUCE-i2c-core-skip-prod-settings-node-during.patch
@@ -20,7 +20,7 @@ Reviewed-by: Laxman Dewangan <ldewangan@nvidia.com>
 GVS: Gerrit_Virtual_Submit <buildbot_gerritrpt@nvidia.com>
 
 diff --git a/drivers/i2c/i2c-core-of.c b/drivers/i2c/i2c-core-of.c
-index 354a88d0599e3..dac003f9de5e7 100644
+index 30b48a428c0b..24936d8c3ebc 100644
 --- a/drivers/i2c/i2c-core-of.c
 +++ b/drivers/i2c/i2c-core-of.c
 @@ -97,6 +97,9 @@ void of_i2c_register_devices(struct i2c_adapter *adap)
@@ -34,5 +34,5 @@ index 354a88d0599e3..dac003f9de5e7 100644
  			continue;
  
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/sauce/patches/0198-NVIDIA-SAUCE-tegra-prod-use-legacy-prod-settings.patch b/features/tegra/sauce/patches/0198-NVIDIA-SAUCE-tegra-prod-use-legacy-prod-settings.patch
index 4e7f241..f0035d0 100644
--- a/features/tegra/sauce/patches/0198-NVIDIA-SAUCE-tegra-prod-use-legacy-prod-settings.patch
+++ b/features/tegra/sauce/patches/0198-NVIDIA-SAUCE-tegra-prod-use-legacy-prod-settings.patch
@@ -35,7 +35,7 @@ Reviewed-by: Laxman Dewangan <ldewangan@nvidia.com>
 GVS: buildbot_gerritrpt <buildbot_gerritrpt@nvidia.com>
 
 diff --git a/drivers/i2c/busses/i2c-tegra.c b/drivers/i2c/busses/i2c-tegra.c
-index 586187cefaf4c..f2ae89489c004 100644
+index 586187cefaf4..f2ae89489c00 100644
 --- a/drivers/i2c/busses/i2c-tegra.c
 +++ b/drivers/i2c/busses/i2c-tegra.c
 @@ -36,6 +36,10 @@
@@ -313,5 +313,5 @@ index 586187cefaf4c..f2ae89489c004 100644
  
  	err = tegra_i2c_init_clocks(i2c_dev);
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/sauce/patches/0199-NVIDIA-SAUCE-i2c-tegra-Register-Err-Injection-driver.patch b/features/tegra/sauce/patches/0199-NVIDIA-SAUCE-i2c-tegra-Register-Err-Injection-driver.patch
index 09c48f8..02ca8fb 100644
--- a/features/tegra/sauce/patches/0199-NVIDIA-SAUCE-i2c-tegra-Register-Err-Injection-driver.patch
+++ b/features/tegra/sauce/patches/0199-NVIDIA-SAUCE-i2c-tegra-Register-Err-Injection-driver.patch
@@ -17,7 +17,7 @@ Reviewed-by: Bibek Basu <bbasu@nvidia.com>
 (cherry picked from commit bfcfa75217fda3b57ac8b62d1062867dabaa2e41)
 
 diff --git a/drivers/i2c/busses/i2c-tegra.c b/drivers/i2c/busses/i2c-tegra.c
-index f2ae89489c004..d8ebf991648f1 100644
+index f2ae89489c00..d8ebf991648f 100644
 --- a/drivers/i2c/busses/i2c-tegra.c
 +++ b/drivers/i2c/busses/i2c-tegra.c
 @@ -2326,14 +2326,16 @@ static int tegra_i2c_probe(struct platform_device *pdev)
@@ -46,5 +46,5 @@ index f2ae89489c004..d8ebf991648f1 100644
  
  	return 0;
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/sauce/patches/0200-NVIDIA-SAUCE-iommu-io-pgtable-arm-Support-contiguous.patch b/features/tegra/sauce/patches/0200-NVIDIA-SAUCE-iommu-io-pgtable-arm-Support-contiguous.patch
index 99c8efd..1f243a5 100644
--- a/features/tegra/sauce/patches/0200-NVIDIA-SAUCE-iommu-io-pgtable-arm-Support-contiguous.patch
+++ b/features/tegra/sauce/patches/0200-NVIDIA-SAUCE-iommu-io-pgtable-arm-Support-contiguous.patch
@@ -39,7 +39,7 @@ Reviewed-by: Brad Griffis <bgriffis@nvidia.com>
 (cherry picked from commit 1a7168dbd2c6908b5e33768bbd95e1d499256b09)
 
 diff --git a/drivers/iommu/io-pgtable-arm.c b/drivers/iommu/io-pgtable-arm.c
-index 040f5c4672564..e05233eb0cbcc 100644
+index 040f5c467256..e05233eb0cbc 100644
 --- a/drivers/iommu/io-pgtable-arm.c
 +++ b/drivers/iommu/io-pgtable-arm.c
 @@ -78,6 +78,7 @@
@@ -132,5 +132,5 @@ index 040f5c4672564..e05233eb0cbcc 100644
  }
  
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/sauce/patches/0201-NVIDIA-SAUCE-iommu-arm-smmu-v3-use-reserved-memory-f.patch b/features/tegra/sauce/patches/0201-NVIDIA-SAUCE-iommu-arm-smmu-v3-use-reserved-memory-f.patch
index 890d84b..5d11278 100644
--- a/features/tegra/sauce/patches/0201-NVIDIA-SAUCE-iommu-arm-smmu-v3-use-reserved-memory-f.patch
+++ b/features/tegra/sauce/patches/0201-NVIDIA-SAUCE-iommu-arm-smmu-v3-use-reserved-memory-f.patch
@@ -27,7 +27,7 @@ Tested-by: Bharat Nihalani <bnihalani@nvidia.com>
 (cherry picked from commit 415c7fb8e350ea1d28d8955de03faf174f575d1b)
 
 diff --git a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c
-index da73d6738f669..dcc4715331417 100644
+index da73d6738f66..dcc471533141 100644
 --- a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c
 +++ b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c
 @@ -2,7 +2,8 @@
@@ -59,5 +59,5 @@ index da73d6738f669..dcc4715331417 100644
  		dev_err(dev, "missing #iommu-cells property\n");
  	else if (cells != 1)
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/sauce/patches/0202-NVIDIA-SAUCE-iommu-tegra241-cmdqv-WAR-for-64-bit-wri.patch b/features/tegra/sauce/patches/0202-NVIDIA-SAUCE-iommu-tegra241-cmdqv-WAR-for-64-bit-wri.patch
index 084a76e..4c5a22a 100644
--- a/features/tegra/sauce/patches/0202-NVIDIA-SAUCE-iommu-tegra241-cmdqv-WAR-for-64-bit-wri.patch
+++ b/features/tegra/sauce/patches/0202-NVIDIA-SAUCE-iommu-tegra241-cmdqv-WAR-for-64-bit-wri.patch
@@ -26,7 +26,7 @@ GVS: buildbot_gerritrpt <buildbot_gerritrpt@nvidia.com>
 (cherry picked from commit b82c7a458d43cfd984d3f7a336d9f4718b4c87db)
 
 diff --git a/drivers/iommu/arm/arm-smmu-v3/tegra241-cmdqv.c b/drivers/iommu/arm/arm-smmu-v3/tegra241-cmdqv.c
-index 37ab88cb75fdf..372a8c3339b5b 100644
+index 37ab88cb75fd..372a8c3339b5 100644
 --- a/drivers/iommu/arm/arm-smmu-v3/tegra241-cmdqv.c
 +++ b/drivers/iommu/arm/arm-smmu-v3/tegra241-cmdqv.c
 @@ -3,15 +3,17 @@
@@ -212,5 +212,5 @@ index 37ab88cb75fdf..372a8c3339b5b 100644
  	writeq_relaxed(vcmdq->cmdq.q.q_base, REG_VCMDQ_PAGE1(vcmdq, BASE));
  
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/sauce/patches/0203-NVIDIA-SAUCE-memory-tegra-Skip-SID-override-on-HV.patch b/features/tegra/sauce/patches/0203-NVIDIA-SAUCE-memory-tegra-Skip-SID-override-on-HV.patch
index c3b025b..da9ee34 100644
--- a/features/tegra/sauce/patches/0203-NVIDIA-SAUCE-memory-tegra-Skip-SID-override-on-HV.patch
+++ b/features/tegra/sauce/patches/0203-NVIDIA-SAUCE-memory-tegra-Skip-SID-override-on-HV.patch
@@ -19,7 +19,7 @@ Reviewed-by: Prathamesh Shete <pshete@nvidia.com>
 Tested-by: Prathamesh Shete <pshete@nvidia.com>
 
 diff --git a/drivers/memory/tegra/tegra186.c b/drivers/memory/tegra/tegra186.c
-index 579d058da220c..99930a0848657 100644
+index 579d058da220..99930a084865 100644
 --- a/drivers/memory/tegra/tegra186.c
 +++ b/drivers/memory/tegra/tegra186.c
 @@ -134,6 +134,11 @@ static int tegra186_mc_probe_device(struct tegra_mc *mc, struct device *dev)
@@ -35,5 +35,5 @@ index 579d058da220c..99930a0848657 100644
  					   index, &args)) {
  		if (args.np == mc->dev->of_node && args.args_count != 0) {
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/sauce/patches/0204-NVIDIA-SAUCE-spi-add-tegra-spidev-compatible-string.patch b/features/tegra/sauce/patches/0204-NVIDIA-SAUCE-spi-add-tegra-spidev-compatible-string.patch
index d51dd68..5c0c486 100644
--- a/features/tegra/sauce/patches/0204-NVIDIA-SAUCE-spi-add-tegra-spidev-compatible-string.patch
+++ b/features/tegra/sauce/patches/0204-NVIDIA-SAUCE-spi-add-tegra-spidev-compatible-string.patch
@@ -16,7 +16,7 @@ Tested-by: Abhilash G <abhilashg@nvidia.com>
 Reviewed-by: Abhilash G <abhilashg@nvidia.com>
 
 diff --git a/drivers/spi/spidev.c b/drivers/spi/spidev.c
-index 4d53c394101a4..769942ede87df 100644
+index 4d53c394101a..769942ede87d 100644
 --- a/drivers/spi/spidev.c
 +++ b/drivers/spi/spidev.c
 @@ -733,6 +733,8 @@ static const struct of_device_id spidev_dt_ids[] = {
@@ -29,5 +29,5 @@ index 4d53c394101a4..769942ede87df 100644
  };
  MODULE_DEVICE_TABLE(of, spidev_dt_ids);
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/sauce/patches/0205-NVIDIA-SAUCE-spi-add-tegra-spidev-name-string.patch b/features/tegra/sauce/patches/0205-NVIDIA-SAUCE-spi-add-tegra-spidev-name-string.patch
index 96ffb01..b1b417e 100644
--- a/features/tegra/sauce/patches/0205-NVIDIA-SAUCE-spi-add-tegra-spidev-name-string.patch
+++ b/features/tegra/sauce/patches/0205-NVIDIA-SAUCE-spi-add-tegra-spidev-name-string.patch
@@ -18,7 +18,7 @@ Reviewed-by: Prathamesh Shete <pshete@nvidia.com>
 Tested-by: Prathamesh Shete <pshete@nvidia.com>
 
 diff --git a/drivers/spi/spidev.c b/drivers/spi/spidev.c
-index 769942ede87df..1675e86b4f069 100644
+index 769942ede87d..1675e86b4f06 100644
 --- a/drivers/spi/spidev.c
 +++ b/drivers/spi/spidev.c
 @@ -700,6 +700,7 @@ static const struct spi_device_id spidev_spi_ids[] = {
@@ -30,5 +30,5 @@ index 769942ede87df..1675e86b4f069 100644
  };
  MODULE_DEVICE_TABLE(spi, spidev_spi_ids);
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/sauce/patches/0206-NVIDIA-SAUCE-drivers-spi-fix-warnings-in-spi-core.patch b/features/tegra/sauce/patches/0206-NVIDIA-SAUCE-drivers-spi-fix-warnings-in-spi-core.patch
index 8e2e279..e6b5d5c 100644
--- a/features/tegra/sauce/patches/0206-NVIDIA-SAUCE-drivers-spi-fix-warnings-in-spi-core.patch
+++ b/features/tegra/sauce/patches/0206-NVIDIA-SAUCE-drivers-spi-fix-warnings-in-spi-core.patch
@@ -20,7 +20,7 @@ Reviewed-by: Laxman Dewangan <ldewangan@nvidia.com>
 GVS: Gerrit_Virtual_Submit <buildbot_gerritrpt@nvidia.com>
 
 diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c
-index ac4de4703a6f0..a6512d740d420 100644
+index 6ea9ac2931cd..fbe1f812463a 100644
 --- a/drivers/spi/spi.c
 +++ b/drivers/spi/spi.c
 @@ -2523,6 +2523,8 @@ static void of_register_spi_devices(struct spi_controller *ctlr)
@@ -33,5 +33,5 @@ index ac4de4703a6f0..a6512d740d420 100644
  		if (IS_ERR(spi)) {
  			dev_warn(&ctlr->dev,
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/sauce/patches/0207-NVIDIA-SAUCE-spi-spi-tegra114-retain-the-spi-mode.patch b/features/tegra/sauce/patches/0207-NVIDIA-SAUCE-spi-spi-tegra114-retain-the-spi-mode.patch
index 7bf1f0e..84d6ab2 100644
--- a/features/tegra/sauce/patches/0207-NVIDIA-SAUCE-spi-spi-tegra114-retain-the-spi-mode.patch
+++ b/features/tegra/sauce/patches/0207-NVIDIA-SAUCE-spi-spi-tegra114-retain-the-spi-mode.patch
@@ -18,7 +18,7 @@ Tested-by: Petlozu Pravareshwar <petlozup@nvidia.com>
 GVS: buildbot_gerritrpt <buildbot_gerritrpt@nvidia.com>
 
 diff --git a/drivers/spi/spi-tegra114.c b/drivers/spi/spi-tegra114.c
-index a28597b6b80d6..5a8c4a2737b86 100644
+index a28597b6b80d..5a8c4a2737b8 100644
 --- a/drivers/spi/spi-tegra114.c
 +++ b/drivers/spi/spi-tegra114.c
 @@ -57,6 +57,7 @@
@@ -67,5 +67,5 @@ index a28597b6b80d6..5a8c4a2737b86 100644
  	tegra_spi_writel(tspi, tspi->def_command1_reg, SPI_COMMAND1);
  	tspi->spi_cs_timing1 = tegra_spi_readl(tspi, SPI_CS_TIMING1);
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/sauce/patches/0208-NVIDIA-SAUCE-tegra-prod-use-legacy-prod-settings.patch b/features/tegra/sauce/patches/0208-NVIDIA-SAUCE-tegra-prod-use-legacy-prod-settings.patch
index 9009287..35a203a 100644
--- a/features/tegra/sauce/patches/0208-NVIDIA-SAUCE-tegra-prod-use-legacy-prod-settings.patch
+++ b/features/tegra/sauce/patches/0208-NVIDIA-SAUCE-tegra-prod-use-legacy-prod-settings.patch
@@ -35,7 +35,7 @@ Reviewed-by: Laxman Dewangan <ldewangan@nvidia.com>
 GVS: buildbot_gerritrpt <buildbot_gerritrpt@nvidia.com>
 
 diff --git a/drivers/spi/spi-tegra114.c b/drivers/spi/spi-tegra114.c
-index 5a8c4a2737b86..c48d0f2fbb430 100644
+index 5a8c4a2737b8..c48d0f2fbb43 100644
 --- a/drivers/spi/spi-tegra114.c
 +++ b/drivers/spi/spi-tegra114.c
 @@ -23,6 +23,10 @@
@@ -185,5 +185,5 @@ index 5a8c4a2737b86..c48d0f2fbb430 100644
  	ret = request_threaded_irq(tspi->irq, tegra_spi_isr,
  				   tegra_spi_isr_thread, IRQF_ONESHOT,
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/sauce/patches/0209-NVIDIA-SAUCE-ASoC-tegra-support-codec2codec.patch b/features/tegra/sauce/patches/0209-NVIDIA-SAUCE-ASoC-tegra-support-codec2codec.patch
index 8cc324b..fafb2e3 100644
--- a/features/tegra/sauce/patches/0209-NVIDIA-SAUCE-ASoC-tegra-support-codec2codec.patch
+++ b/features/tegra/sauce/patches/0209-NVIDIA-SAUCE-ASoC-tegra-support-codec2codec.patch
@@ -38,7 +38,7 @@ Reviewed-by: Sharad Gupta <sharadg@nvidia.com>
 GVS: Gerrit_Virtual_Submit <buildbot_gerritrpt@nvidia.com>
 
 diff --git a/sound/soc/tegra/tegra186_asrc.c b/sound/soc/tegra/tegra186_asrc.c
-index f073166db697f..c0851fe5c45b1 100644
+index f073166db697..c0851fe5c45b 100644
 --- a/sound/soc/tegra/tegra186_asrc.c
 +++ b/sound/soc/tegra/tegra186_asrc.c
 @@ -635,6 +635,44 @@ static const struct snd_soc_dapm_route tegra186_asrc_routes[] = {
@@ -118,7 +118,7 @@ index f073166db697f..c0851fe5c45b1 100644
  	.num_controls		= ARRAY_SIZE(tegra186_asrc_controls),
  };
 diff --git a/sound/soc/tegra/tegra186_dspk.c b/sound/soc/tegra/tegra186_dspk.c
-index ef0c7ec297a68..08b629cb5c3a6 100644
+index ef0c7ec297a6..08b629cb5c3a 100644
 --- a/sound/soc/tegra/tegra186_dspk.c
 +++ b/sound/soc/tegra/tegra186_dspk.c
 @@ -329,6 +329,15 @@ static struct snd_soc_dai_driver tegra186_dspk_dais[] = {
@@ -186,7 +186,7 @@ index ef0c7ec297a68..08b629cb5c3a6 100644
  	.num_controls = ARRAY_SIZE(tegrat186_dspk_controls),
  };
 diff --git a/sound/soc/tegra/tegra210_adx.c b/sound/soc/tegra/tegra210_adx.c
-index a604406c547f7..bbdd079875229 100644
+index a604406c547f..bbdd07987522 100644
 --- a/sound/soc/tegra/tegra210_adx.c
 +++ b/sound/soc/tegra/tegra210_adx.c
 @@ -354,6 +354,26 @@ static const struct snd_soc_dapm_route tegra210_adx_routes[] = {
@@ -259,7 +259,7 @@ index a604406c547f7..bbdd079875229 100644
  	.num_controls		= ARRAY_SIZE(tegra210_adx_controls),
  };
 diff --git a/sound/soc/tegra/tegra210_amx.c b/sound/soc/tegra/tegra210_amx.c
-index 1e8888edf0914..82d64f868ccf8 100644
+index 1e8888edf091..82d64f868ccf 100644
 --- a/sound/soc/tegra/tegra210_amx.c
 +++ b/sound/soc/tegra/tegra210_amx.c
 @@ -363,6 +363,26 @@ static const struct snd_soc_dapm_route tegra210_amx_routes[] = {
@@ -332,7 +332,7 @@ index 1e8888edf0914..82d64f868ccf8 100644
  	.num_controls		= ARRAY_SIZE(tegra210_amx_controls),
  };
 diff --git a/sound/soc/tegra/tegra210_dmic.c b/sound/soc/tegra/tegra210_dmic.c
-index 84c7f9e902c71..6fd4f05124ea9 100644
+index 84c7f9e902c7..6fd4f05124ea 100644
 --- a/sound/soc/tegra/tegra210_dmic.c
 +++ b/sound/soc/tegra/tegra210_dmic.c
 @@ -332,6 +332,14 @@ static struct snd_soc_dai_driver tegra210_dmic_dais[] = {
@@ -399,7 +399,7 @@ index 84c7f9e902c71..6fd4f05124ea9 100644
  	.num_controls		= ARRAY_SIZE(tegra210_dmic_controls),
  };
 diff --git a/sound/soc/tegra/tegra210_i2s.c b/sound/soc/tegra/tegra210_i2s.c
-index c091399d2bac7..980e820b523bf 100644
+index c091399d2bac..980e820b523b 100644
 --- a/sound/soc/tegra/tegra210_i2s.c
 +++ b/sound/soc/tegra/tegra210_i2s.c
 @@ -622,6 +622,7 @@ static int tegra210_i2s_hw_params(struct snd_pcm_substream *substream,
@@ -485,7 +485,7 @@ index c091399d2bac7..980e820b523bf 100644
  	.num_controls		= ARRAY_SIZE(tegra210_i2s_controls),
  };
 diff --git a/sound/soc/tegra/tegra210_mixer.c b/sound/soc/tegra/tegra210_mixer.c
-index aab414af6d0db..12753614aa0fa 100644
+index aab414af6d0d..12753614aa0f 100644
 --- a/sound/soc/tegra/tegra210_mixer.c
 +++ b/sound/soc/tegra/tegra210_mixer.c
 @@ -754,11 +754,83 @@ static const struct snd_soc_dapm_route tegra210_mixer_routes[] = {
@@ -575,7 +575,7 @@ index aab414af6d0db..12753614aa0fa 100644
  	.num_controls		= ARRAY_SIZE(tegra210_mixer_gain_ctls),
  };
 diff --git a/sound/soc/tegra/tegra210_mvc.c b/sound/soc/tegra/tegra210_mvc.c
-index 7c88d2656b5ee..c76fdf6e85b56 100644
+index 7c88d2656b5e..c76fdf6e85b5 100644
 --- a/sound/soc/tegra/tegra210_mvc.c
 +++ b/sound/soc/tegra/tegra210_mvc.c
 @@ -632,11 +632,39 @@ static const struct snd_soc_dapm_route tegra210_mvc_routes[] = {
@@ -621,7 +621,7 @@ index 7c88d2656b5ee..c76fdf6e85b56 100644
  	.num_controls		= ARRAY_SIZE(tegra210_mvc_vol_ctrl),
  };
 diff --git a/sound/soc/tegra/tegra210_ope.c b/sound/soc/tegra/tegra210_ope.c
-index e19cd0563082e..59b446b7c773e 100644
+index e19cd0563082..59b446b7c773 100644
 --- a/sound/soc/tegra/tegra210_ope.c
 +++ b/sound/soc/tegra/tegra210_ope.c
 @@ -93,29 +93,6 @@ static int tegra210_ope_hw_params(struct snd_pcm_substream *substream,
@@ -721,7 +721,7 @@ index e19cd0563082e..59b446b7c773e 100644
  	.num_controls		= ARRAY_SIZE(tegra210_ope_controls),
  };
 diff --git a/sound/soc/tegra/tegra210_sfc.c b/sound/soc/tegra/tegra210_sfc.c
-index 68bc39a650124..925e2f3a7637a 100644
+index 68bc39a65012..925e2f3a7637 100644
 --- a/sound/soc/tegra/tegra210_sfc.c
 +++ b/sound/soc/tegra/tegra210_sfc.c
 @@ -3458,6 +3458,17 @@ static const struct snd_soc_dapm_route tegra210_sfc_routes[] = {
@@ -774,5 +774,5 @@ index 68bc39a650124..925e2f3a7637a 100644
  	.num_controls		= ARRAY_SIZE(tegra210_sfc_controls),
  };
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/sauce/patches/0210-NVIDIA-SAUCE-ASoC-tegra-codec2codec-mode-for-AHUB-DA.patch b/features/tegra/sauce/patches/0210-NVIDIA-SAUCE-ASoC-tegra-codec2codec-mode-for-AHUB-DA.patch
index 99be25a..500bfc5 100644
--- a/features/tegra/sauce/patches/0210-NVIDIA-SAUCE-ASoC-tegra-codec2codec-mode-for-AHUB-DA.patch
+++ b/features/tegra/sauce/patches/0210-NVIDIA-SAUCE-ASoC-tegra-codec2codec-mode-for-AHUB-DA.patch
@@ -20,7 +20,7 @@ Reviewed-by: Sharad Gupta <sharadg@nvidia.com>
 Reviewed-by: Mohan kumar <mkumard@nvidia.com>
 
 diff --git a/include/sound/simple_card_utils.h b/include/sound/simple_card_utils.h
-index 69a9c9c4d0e9c..5646c14f6c79e 100644
+index 69a9c9c4d0e9..5646c14f6c79 100644
 --- a/include/sound/simple_card_utils.h
 +++ b/include/sound/simple_card_utils.h
 @@ -70,6 +70,7 @@ struct simple_util_priv {
@@ -32,7 +32,7 @@ index 69a9c9c4d0e9c..5646c14f6c79e 100644
  	struct gpio_desc *pa_gpio;
  	const struct snd_soc_ops *ops;
 diff --git a/sound/soc/generic/audio-graph-card.c b/sound/soc/generic/audio-graph-card.c
-index a8a3bad3df00d..15d4902734766 100644
+index a8a3bad3df00..15d490273476 100644
 --- a/sound/soc/generic/audio-graph-card.c
 +++ b/sound/soc/generic/audio-graph-card.c
 @@ -297,12 +297,18 @@ static int graph_dai_link_of(struct simple_util_priv *priv,
@@ -56,7 +56,7 @@ index a8a3bad3df00d..15d4902734766 100644
  	simple_util_canonicalize_cpu(cpus, is_single_links);
  	simple_util_canonicalize_platform(platforms, cpus);
 diff --git a/sound/soc/generic/simple-card-utils.c b/sound/soc/generic/simple-card-utils.c
-index 9e5be0eaa77f3..e6ca99941128a 100644
+index 9e5be0eaa77f..e6ca99941128 100644
 --- a/sound/soc/generic/simple-card-utils.c
 +++ b/sound/soc/generic/simple-card-utils.c
 @@ -265,6 +265,9 @@ int simple_util_parse_clk(struct device *dev,
@@ -70,7 +70,7 @@ index 9e5be0eaa77f3..e6ca99941128a 100644
  	 * Parse dai->sysclk come from "clocks = <&xxx>"
  	 * (if system has common clock)
 diff --git a/sound/soc/soc-link.c b/sound/soc/soc-link.c
-index 02fd68f2e7028..8415173c7a0e8 100644
+index 02fd68f2e702..8415173c7a0e 100644
 --- a/sound/soc/soc-link.c
 +++ b/sound/soc/soc-link.c
 @@ -50,6 +50,7 @@ int snd_soc_link_be_hw_params_fixup(struct snd_soc_pcm_runtime *rtd,
@@ -82,7 +82,7 @@ index 02fd68f2e7028..8415173c7a0e8 100644
  int snd_soc_link_startup(struct snd_pcm_substream *substream)
  {
 diff --git a/sound/soc/tegra/tegra186_asrc.c b/sound/soc/tegra/tegra186_asrc.c
-index c0851fe5c45b1..6a482c04c59bc 100644
+index c0851fe5c45b..6a482c04c59b 100644
 --- a/sound/soc/tegra/tegra186_asrc.c
 +++ b/sound/soc/tegra/tegra186_asrc.c
 @@ -927,6 +927,7 @@ static const struct snd_soc_component_driver tegra186_asrc_cmpnt = {
@@ -94,7 +94,7 @@ index c0851fe5c45b1..6a482c04c59bc 100644
  
  static bool tegra186_asrc_wr_reg(struct device *dev, unsigned int reg)
 diff --git a/sound/soc/tegra/tegra186_dspk.c b/sound/soc/tegra/tegra186_dspk.c
-index 08b629cb5c3a6..891bf5af5931b 100644
+index 08b629cb5c3a..891bf5af5931 100644
 --- a/sound/soc/tegra/tegra186_dspk.c
 +++ b/sound/soc/tegra/tegra186_dspk.c
 @@ -450,6 +450,7 @@ static const struct snd_soc_component_driver tegra186_dspk_cmpnt = {
@@ -106,7 +106,7 @@ index 08b629cb5c3a6..891bf5af5931b 100644
  
  static bool tegra186_dspk_wr_reg(struct device *dev, unsigned int reg)
 diff --git a/sound/soc/tegra/tegra210_adx.c b/sound/soc/tegra/tegra210_adx.c
-index bbdd079875229..5f917916b57a2 100644
+index bbdd07987522..5f917916b57a 100644
 --- a/sound/soc/tegra/tegra210_adx.c
 +++ b/sound/soc/tegra/tegra210_adx.c
 @@ -547,6 +547,7 @@ static const struct snd_soc_component_driver tegra210_adx_cmpnt = {
@@ -118,10 +118,10 @@ index bbdd079875229..5f917916b57a2 100644
  
  static bool tegra210_adx_wr_reg(struct device *dev,
 diff --git a/sound/soc/tegra/tegra210_ahub.c b/sound/soc/tegra/tegra210_ahub.c
-index ecea0cbfbb1bc..2d3ad8df60e85 100644
+index 001f8161eea7..dfe498dba61f 100644
 --- a/sound/soc/tegra/tegra210_ahub.c
 +++ b/sound/soc/tegra/tegra210_ahub.c
-@@ -2026,6 +2026,7 @@ static const struct snd_soc_component_driver tegra210_ahub_component = {
+@@ -2028,6 +2028,7 @@ static const struct snd_soc_component_driver tegra210_ahub_component = {
  	.num_dapm_widgets	= ARRAY_SIZE(tegra210_ahub_widgets),
  	.dapm_routes		= tegra210_ahub_routes,
  	.num_dapm_routes	= ARRAY_SIZE(tegra210_ahub_routes),
@@ -129,7 +129,7 @@ index ecea0cbfbb1bc..2d3ad8df60e85 100644
  };
  
  static const struct snd_soc_component_driver tegra186_ahub_component = {
-@@ -2033,6 +2034,7 @@ static const struct snd_soc_component_driver tegra186_ahub_component = {
+@@ -2035,6 +2036,7 @@ static const struct snd_soc_component_driver tegra186_ahub_component = {
  	.num_dapm_widgets = ARRAY_SIZE(tegra186_ahub_widgets),
  	.dapm_routes = tegra186_ahub_routes,
  	.num_dapm_routes = ARRAY_SIZE(tegra186_ahub_routes),
@@ -137,7 +137,7 @@ index ecea0cbfbb1bc..2d3ad8df60e85 100644
  };
  
  static const struct snd_soc_component_driver tegra234_ahub_component = {
-@@ -2040,6 +2042,7 @@ static const struct snd_soc_component_driver tegra234_ahub_component = {
+@@ -2042,6 +2044,7 @@ static const struct snd_soc_component_driver tegra234_ahub_component = {
  	.num_dapm_widgets	= ARRAY_SIZE(tegra234_ahub_widgets),
  	.dapm_routes		= tegra186_ahub_routes,
  	.num_dapm_routes	= ARRAY_SIZE(tegra186_ahub_routes),
@@ -145,7 +145,7 @@ index ecea0cbfbb1bc..2d3ad8df60e85 100644
  };
  
  static const struct snd_soc_component_driver tegra264_ahub_component = {
-@@ -2047,6 +2050,7 @@ static const struct snd_soc_component_driver tegra264_ahub_component = {
+@@ -2049,6 +2052,7 @@ static const struct snd_soc_component_driver tegra264_ahub_component = {
  	.num_dapm_widgets	= ARRAY_SIZE(tegra264_ahub_widgets),
  	.dapm_routes		= tegra264_ahub_routes,
  	.num_dapm_routes	= ARRAY_SIZE(tegra264_ahub_routes),
@@ -154,7 +154,7 @@ index ecea0cbfbb1bc..2d3ad8df60e85 100644
  
  static bool tegra210_ahub_wr_reg(struct device *dev, unsigned int reg)
 diff --git a/sound/soc/tegra/tegra210_amx.c b/sound/soc/tegra/tegra210_amx.c
-index 82d64f868ccf8..c97f7ee2e3606 100644
+index 82d64f868ccf..c97f7ee2e360 100644
 --- a/sound/soc/tegra/tegra210_amx.c
 +++ b/sound/soc/tegra/tegra210_amx.c
 @@ -556,6 +556,7 @@ static const struct snd_soc_component_driver tegra210_amx_cmpnt = {
@@ -166,7 +166,7 @@ index 82d64f868ccf8..c97f7ee2e3606 100644
  
  static bool tegra210_amx_wr_reg(struct device *dev, unsigned int reg)
 diff --git a/sound/soc/tegra/tegra210_dmic.c b/sound/soc/tegra/tegra210_dmic.c
-index 6fd4f05124ea9..9be1e1ac9746e 100644
+index 6fd4f05124ea..9be1e1ac9746 100644
 --- a/sound/soc/tegra/tegra210_dmic.c
 +++ b/sound/soc/tegra/tegra210_dmic.c
 @@ -461,6 +461,7 @@ static const struct snd_soc_component_driver tegra210_dmic_compnt = {
@@ -178,7 +178,7 @@ index 6fd4f05124ea9..9be1e1ac9746e 100644
  
  static bool tegra210_dmic_wr_reg(struct device *dev, unsigned int reg)
 diff --git a/sound/soc/tegra/tegra210_i2s.c b/sound/soc/tegra/tegra210_i2s.c
-index 980e820b523bf..7c5a6e6c89305 100644
+index 980e820b523b..7c5a6e6c8930 100644
 --- a/sound/soc/tegra/tegra210_i2s.c
 +++ b/sound/soc/tegra/tegra210_i2s.c
 @@ -899,15 +899,16 @@ static const struct snd_soc_component_driver tegra210_i2s_cmpnt = {
@@ -201,7 +201,7 @@ index 980e820b523bf..7c5a6e6c89305 100644
  
  static bool tegra210_i2s_wr_reg(struct device *dev, unsigned int reg)
 diff --git a/sound/soc/tegra/tegra210_mixer.c b/sound/soc/tegra/tegra210_mixer.c
-index 12753614aa0fa..83ca0f783e1f3 100644
+index 12753614aa0f..83ca0f783e1f 100644
 --- a/sound/soc/tegra/tegra210_mixer.c
 +++ b/sound/soc/tegra/tegra210_mixer.c
 @@ -833,6 +833,7 @@ static const struct snd_soc_component_driver tegra210_mixer_cmpnt = {
@@ -213,7 +213,7 @@ index 12753614aa0fa..83ca0f783e1f3 100644
  
  static bool tegra210_mixer_wr_reg(struct device *dev,
 diff --git a/sound/soc/tegra/tegra210_mvc.c b/sound/soc/tegra/tegra210_mvc.c
-index c76fdf6e85b56..5b2aad0220aa4 100644
+index c76fdf6e85b5..5b2aad0220aa 100644
 --- a/sound/soc/tegra/tegra210_mvc.c
 +++ b/sound/soc/tegra/tegra210_mvc.c
 @@ -667,6 +667,7 @@ static const struct snd_soc_component_driver tegra210_mvc_cmpnt = {
@@ -225,7 +225,7 @@ index c76fdf6e85b56..5b2aad0220aa4 100644
  
  static bool tegra210_mvc_rd_reg(struct device *dev, unsigned int reg)
 diff --git a/sound/soc/tegra/tegra210_ope.c b/sound/soc/tegra/tegra210_ope.c
-index 59b446b7c773e..a62ad268b9550 100644
+index 59b446b7c773..a62ad268b955 100644
 --- a/sound/soc/tegra/tegra210_ope.c
 +++ b/sound/soc/tegra/tegra210_ope.c
 @@ -259,6 +259,7 @@ static const struct snd_soc_component_driver tegra210_ope_cmpnt = {
@@ -237,7 +237,7 @@ index 59b446b7c773e..a62ad268b9550 100644
  
  static bool tegra210_ope_wr_reg(struct device *dev, unsigned int reg)
 diff --git a/sound/soc/tegra/tegra210_sfc.c b/sound/soc/tegra/tegra210_sfc.c
-index 925e2f3a7637a..c4d42a577074b 100644
+index 925e2f3a7637..c4d42a577074 100644
 --- a/sound/soc/tegra/tegra210_sfc.c
 +++ b/sound/soc/tegra/tegra210_sfc.c
 @@ -3526,6 +3526,7 @@ static const struct snd_soc_component_driver tegra210_sfc_cmpnt = {
@@ -249,7 +249,7 @@ index 925e2f3a7637a..c4d42a577074b 100644
  
  static bool tegra210_sfc_wr_reg(struct device *dev, unsigned int reg)
 diff --git a/sound/soc/tegra/tegra_audio_graph_card.c b/sound/soc/tegra/tegra_audio_graph_card.c
-index 121db8ee14cc8..f33e18a707fb8 100644
+index 121db8ee14cc..f33e18a707fb 100644
 --- a/sound/soc/tegra/tegra_audio_graph_card.c
 +++ b/sound/soc/tegra/tegra_audio_graph_card.c
 @@ -6,10 +6,12 @@
@@ -405,5 +405,5 @@ index 121db8ee14cc8..f33e18a707fb8 100644
  
  static const struct tegra_audio_cdata tegra210_data = {
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/sauce/patches/0211-NVIDIA-SAUCE-ASoC-tegra-support-few-external-codecs.patch b/features/tegra/sauce/patches/0211-NVIDIA-SAUCE-ASoC-tegra-support-few-external-codecs.patch
index eac9909..0571d3a 100644
--- a/features/tegra/sauce/patches/0211-NVIDIA-SAUCE-ASoC-tegra-support-few-external-codecs.patch
+++ b/features/tegra/sauce/patches/0211-NVIDIA-SAUCE-ASoC-tegra-support-few-external-codecs.patch
@@ -49,7 +49,7 @@ Reviewed-by: Sharad Gupta <sharadg@nvidia.com>
 GVS: Gerrit_Virtual_Submit <buildbot_gerritrpt@nvidia.com>
 
 diff --git a/sound/soc/generic/audio-graph-card.c b/sound/soc/generic/audio-graph-card.c
-index 15d4902734766..22b258ddd9fb8 100644
+index 15d490273476..22b258ddd9fb 100644
 --- a/sound/soc/generic/audio-graph-card.c
 +++ b/sound/soc/generic/audio-graph-card.c
 @@ -273,6 +273,9 @@ static int graph_dai_link_of_dpcm(struct simple_util_priv *priv,
@@ -73,7 +73,7 @@ index 15d4902734766..22b258ddd9fb8 100644
  end:
  	return graph_ret(priv, ret);
 diff --git a/sound/soc/tegra/Makefile b/sound/soc/tegra/Makefile
-index defea7f53f115..04cf93c842ac4 100644
+index defea7f53f11..04cf93c842ac 100644
 --- a/sound/soc/tegra/Makefile
 +++ b/sound/soc/tegra/Makefile
 @@ -44,7 +44,8 @@ obj-$(CONFIG_SND_SOC_TEGRA210_OPE) += snd-soc-tegra210-ope.o
@@ -87,7 +87,7 @@ index defea7f53f115..04cf93c842ac4 100644
  obj-$(CONFIG_SND_SOC_TEGRA_WM8903) += snd-soc-tegra-wm8903.o
  obj-$(CONFIG_SND_SOC_TEGRA_MACHINE_DRV) += snd-soc-tegra-machine.o
 diff --git a/sound/soc/tegra/tegra_audio_graph_card.c b/sound/soc/tegra/tegra_audio_graph_card.c
-index f33e18a707fb8..addf0aa4f6ba5 100644
+index f33e18a707fb..addf0aa4f6ba 100644
 --- a/sound/soc/tegra/tegra_audio_graph_card.c
 +++ b/sound/soc/tegra/tegra_audio_graph_card.c
 @@ -13,6 +13,8 @@
@@ -123,7 +123,7 @@ index f33e18a707fb8..addf0aa4f6ba5 100644
  static struct snd_soc_dai_driver tegra_dummy_dai = {
 diff --git a/sound/soc/tegra/tegra_codecs.c b/sound/soc/tegra/tegra_codecs.c
 new file mode 100644
-index 0000000000000..1386412dbd6be
+index 000000000000..1386412dbd6b
 --- /dev/null
 +++ b/sound/soc/tegra/tegra_codecs.c
 @@ -0,0 +1,324 @@
@@ -453,7 +453,7 @@ index 0000000000000..1386412dbd6be
 +}
 diff --git a/sound/soc/tegra/tegra_codecs.h b/sound/soc/tegra/tegra_codecs.h
 new file mode 100644
-index 0000000000000..e7de3fde7d5bc
+index 000000000000..e7de3fde7d5b
 --- /dev/null
 +++ b/sound/soc/tegra/tegra_codecs.h
 @@ -0,0 +1,18 @@
@@ -476,5 +476,5 @@ index 0000000000000..e7de3fde7d5bc
 +
 +#endif
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/sauce/patches/0212-NVIDIA-SAUCE-ASoC-Fix-pll-clock-issue.patch b/features/tegra/sauce/patches/0212-NVIDIA-SAUCE-ASoC-Fix-pll-clock-issue.patch
index 9ea9d3d..d56ccc5 100644
--- a/features/tegra/sauce/patches/0212-NVIDIA-SAUCE-ASoC-Fix-pll-clock-issue.patch
+++ b/features/tegra/sauce/patches/0212-NVIDIA-SAUCE-ASoC-Fix-pll-clock-issue.patch
@@ -27,7 +27,7 @@ GVS: buildbot_gerritrpt <buildbot_gerritrpt@nvidia.com>
 (cherry picked from commit 818ddb04bc839d09c56f93b774a457dd24533f35)
 
 diff --git a/sound/soc/tegra/tegra_codecs.c b/sound/soc/tegra/tegra_codecs.c
-index 1386412dbd6be..d9146f1d8be6a 100644
+index 1386412dbd6b..d9146f1d8be6 100644
 --- a/sound/soc/tegra/tegra_codecs.c
 +++ b/sound/soc/tegra/tegra_codecs.c
 @@ -1,5 +1,5 @@
@@ -58,5 +58,5 @@ index 1386412dbd6be..d9146f1d8be6a 100644
  				     srate, channels, width, aud_mclk);
  		if (err < 0)
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/sauce/patches/0213-NVIDIA-SAUCE-ASoC-tegra-Update-ASRC-ratio-controls.patch b/features/tegra/sauce/patches/0213-NVIDIA-SAUCE-ASoC-tegra-Update-ASRC-ratio-controls.patch
index 138bdfb..8cef5c1 100644
--- a/features/tegra/sauce/patches/0213-NVIDIA-SAUCE-ASoC-tegra-Update-ASRC-ratio-controls.patch
+++ b/features/tegra/sauce/patches/0213-NVIDIA-SAUCE-ASoC-tegra-Update-ASRC-ratio-controls.patch
@@ -28,7 +28,7 @@ Reviewed-by: Mohan kumar <mkumard@nvidia.com>
 (cherry picked from commit 4b50b0282b8b281368f8e86031a54a35b300676e)
 
 diff --git a/sound/soc/tegra/tegra186_asrc.c b/sound/soc/tegra/tegra186_asrc.c
-index 6a482c04c59bc..49082dc33d4e2 100644
+index 6a482c04c59b..49082dc33d4e 100644
 --- a/sound/soc/tegra/tegra186_asrc.c
 +++ b/sound/soc/tegra/tegra186_asrc.c
 @@ -270,81 +270,40 @@ static int tegra186_asrc_put_ratio_source(struct snd_kcontrol *kcontrol,
@@ -292,5 +292,5 @@ index 6a482c04c59bc..49082dc33d4e2 100644
  	/* Source of ratio provider */
  	SOC_ENUM_EXT("Ratio1 Source", src_select1,
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/sauce/patches/0214-NVIDIA-SAUCE-ASoC-tegra-Add-S8-PCM-format-support-fo.patch b/features/tegra/sauce/patches/0214-NVIDIA-SAUCE-ASoC-tegra-Add-S8-PCM-format-support-fo.patch
index 844cab8..9167b28 100644
--- a/features/tegra/sauce/patches/0214-NVIDIA-SAUCE-ASoC-tegra-Add-S8-PCM-format-support-fo.patch
+++ b/features/tegra/sauce/patches/0214-NVIDIA-SAUCE-ASoC-tegra-Add-S8-PCM-format-support-fo.patch
@@ -22,7 +22,7 @@ Reviewed-by: svcacv <svcacv@nvidia.com>
 APS-Inflight: svcenomis <svcenomis@nvidia.com>
 
 diff --git a/sound/soc/tegra/tegra210_mvc.c b/sound/soc/tegra/tegra210_mvc.c
-index 5b2aad0220aa4..e797dce60e54a 100644
+index 5b2aad0220aa..e797dce60e54 100644
 --- a/sound/soc/tegra/tegra210_mvc.c
 +++ b/sound/soc/tegra/tegra210_mvc.c
 @@ -1,5 +1,5 @@
@@ -43,5 +43,5 @@ index 5b2aad0220aa4..e797dce60e54a 100644
  		audio_bits = TEGRA_ACIF_BITS_16;
  		break;
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/sauce/patches/0215-NVIDIA-SAUCE-PCI-dwc-Use-pci_alloc_host_bridge-in-pl.patch b/features/tegra/sauce/patches/0215-NVIDIA-SAUCE-PCI-dwc-Use-pci_alloc_host_bridge-in-pl.patch
index 64f40c8..17570ab 100644
--- a/features/tegra/sauce/patches/0215-NVIDIA-SAUCE-PCI-dwc-Use-pci_alloc_host_bridge-in-pl.patch
+++ b/features/tegra/sauce/patches/0215-NVIDIA-SAUCE-PCI-dwc-Use-pci_alloc_host_bridge-in-pl.patch
@@ -77,7 +77,7 @@ Reviewed-by: Abhilash G <abhilashg@nvidia.com>
 Reviewed-by: Laxman Dewangan <ldewangan@nvidia.com>
 
 diff --git a/drivers/pci/controller/dwc/pcie-designware-host.c b/drivers/pci/controller/dwc/pcie-designware-host.c
-index 48e4a887bb1bb..20778b85afde5 100644
+index 48e4a887bb1b..20778b85afde 100644
 --- a/drivers/pci/controller/dwc/pcie-designware-host.c
 +++ b/drivers/pci/controller/dwc/pcie-designware-host.c
 @@ -575,10 +575,15 @@ int dw_pcie_host_init(struct dw_pcie_rp *pp)
@@ -98,5 +98,5 @@ index 48e4a887bb1bb..20778b85afde5 100644
  
  	ret = dw_pcie_host_get_resources(pp);
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/sauce/patches/0216-NVIDIA-SAUCE-PCI-designware-host-Update-resource-cle.patch b/features/tegra/sauce/patches/0216-NVIDIA-SAUCE-PCI-designware-host-Update-resource-cle.patch
index e866675..7086947 100644
--- a/features/tegra/sauce/patches/0216-NVIDIA-SAUCE-PCI-designware-host-Update-resource-cle.patch
+++ b/features/tegra/sauce/patches/0216-NVIDIA-SAUCE-PCI-designware-host-Update-resource-cle.patch
@@ -24,7 +24,7 @@ Reviewed-by: Abhilash G <abhilashg@nvidia.com>
 Reviewed-by: Laxman Dewangan <ldewangan@nvidia.com>
 
 diff --git a/drivers/pci/controller/dwc/pcie-designware-host.c b/drivers/pci/controller/dwc/pcie-designware-host.c
-index 20778b85afde5..8a36bf44cb329 100644
+index 20778b85afde..8a36bf44cb32 100644
 --- a/drivers/pci/controller/dwc/pcie-designware-host.c
 +++ b/drivers/pci/controller/dwc/pcie-designware-host.c
 @@ -708,6 +708,8 @@ EXPORT_SYMBOL_GPL(dw_pcie_host_init);
@@ -59,5 +59,5 @@ index 20778b85afde5..8a36bf44cb329 100644
  EXPORT_SYMBOL_GPL(dw_pcie_host_deinit);
  
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/sauce/patches/0217-NVIDIA-SAUCE-PCI-tegra194-Apply-pinctrl-settings-for.patch b/features/tegra/sauce/patches/0217-NVIDIA-SAUCE-PCI-tegra194-Apply-pinctrl-settings-for.patch
index aaee3a2..763939b 100644
--- a/features/tegra/sauce/patches/0217-NVIDIA-SAUCE-PCI-tegra194-Apply-pinctrl-settings-for.patch
+++ b/features/tegra/sauce/patches/0217-NVIDIA-SAUCE-PCI-tegra194-Apply-pinctrl-settings-for.patch
@@ -16,7 +16,7 @@ Tested-by: Nagarjuna Kristam <nkristam@nvidia.com>
 Reviewed-on: https://git-master.nvidia.com/r/c/linux-stable/+/2888820
 
 diff --git a/drivers/pci/controller/dwc/pcie-tegra194.c b/drivers/pci/controller/dwc/pcie-tegra194.c
-index b05301533d3a8..0b4dcd805c6ec 100644
+index b05301533d3a..0b4dcd805c6e 100644
 --- a/drivers/pci/controller/dwc/pcie-tegra194.c
 +++ b/drivers/pci/controller/dwc/pcie-tegra194.c
 @@ -1644,12 +1644,6 @@ static int tegra_pcie_config_rp(struct tegra_pcie_dw *pcie)
@@ -53,5 +53,5 @@ index b05301533d3a8..0b4dcd805c6ec 100644
  	if (ret < 0) {
  		const char *level = KERN_ERR;
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/sauce/patches/0218-NVIDIA-SAUCE-PCI-tegra194-Add-PEX_PRSNT-GPIO-support.patch b/features/tegra/sauce/patches/0218-NVIDIA-SAUCE-PCI-tegra194-Add-PEX_PRSNT-GPIO-support.patch
index 34487ac..8f19632 100644
--- a/features/tegra/sauce/patches/0218-NVIDIA-SAUCE-PCI-tegra194-Add-PEX_PRSNT-GPIO-support.patch
+++ b/features/tegra/sauce/patches/0218-NVIDIA-SAUCE-PCI-tegra194-Add-PEX_PRSNT-GPIO-support.patch
@@ -24,7 +24,7 @@ Reviewed-by: Abhilash G <abhilashg@nvidia.com>
 Reviewed-by: Laxman Dewangan <ldewangan@nvidia.com>
 
 diff --git a/drivers/pci/controller/dwc/pcie-tegra194.c b/drivers/pci/controller/dwc/pcie-tegra194.c
-index 0b4dcd805c6ec..ca5f7b8675160 100644
+index 0b4dcd805c6e..ca5f7b867516 100644
 --- a/drivers/pci/controller/dwc/pcie-tegra194.c
 +++ b/drivers/pci/controller/dwc/pcie-tegra194.c
 @@ -282,10 +282,16 @@ struct tegra_pcie_dw {
@@ -245,5 +245,5 @@ index 0b4dcd805c6ec..ca5f7b8675160 100644
  	}
  }
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/sauce/patches/0219-NVIDIA-SAUCE-PCI-tegra194-Disable-AER-interrupt-duri.patch b/features/tegra/sauce/patches/0219-NVIDIA-SAUCE-PCI-tegra194-Disable-AER-interrupt-duri.patch
index c38f016..df04940 100644
--- a/features/tegra/sauce/patches/0219-NVIDIA-SAUCE-PCI-tegra194-Disable-AER-interrupt-duri.patch
+++ b/features/tegra/sauce/patches/0219-NVIDIA-SAUCE-PCI-tegra194-Disable-AER-interrupt-duri.patch
@@ -61,7 +61,7 @@ Reviewed-by: Abhilash G <abhilashg@nvidia.com>
 Reviewed-by: Laxman Dewangan <ldewangan@nvidia.com>
 
 diff --git a/drivers/pci/controller/dwc/pcie-tegra194.c b/drivers/pci/controller/dwc/pcie-tegra194.c
-index ca5f7b8675160..a6bfe2aaf2103 100644
+index ca5f7b867516..a6bfe2aaf210 100644
 --- a/drivers/pci/controller/dwc/pcie-tegra194.c
 +++ b/drivers/pci/controller/dwc/pcie-tegra194.c
 @@ -1648,6 +1648,33 @@ static void tegra_pcie_dw_pme_turnoff(struct tegra_pcie_dw *pcie)
@@ -99,5 +99,5 @@ index ca5f7b8675160..a6bfe2aaf2103 100644
  	clk_disable_unprepare(pcie->core_clk_m);
  	dw_pcie_host_deinit(&pcie->pci.pp);
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/sauce/patches/0220-NVIDIA-SAUCE-PCI-tegra194-Add-ASPM-L1-entrance-laten.patch b/features/tegra/sauce/patches/0220-NVIDIA-SAUCE-PCI-tegra194-Add-ASPM-L1-entrance-laten.patch
index 2238c44..ae83d9b 100644
--- a/features/tegra/sauce/patches/0220-NVIDIA-SAUCE-PCI-tegra194-Add-ASPM-L1-entrance-laten.patch
+++ b/features/tegra/sauce/patches/0220-NVIDIA-SAUCE-PCI-tegra194-Add-ASPM-L1-entrance-laten.patch
@@ -20,7 +20,7 @@ Reviewed-by: Abhilash G <abhilashg@nvidia.com>
 Reviewed-by: Laxman Dewangan <ldewangan@nvidia.com>
 
 diff --git a/drivers/pci/controller/dwc/pcie-tegra194.c b/drivers/pci/controller/dwc/pcie-tegra194.c
-index a6bfe2aaf2103..304c0a9796b21 100644
+index a6bfe2aaf210..304c0a9796b2 100644
 --- a/drivers/pci/controller/dwc/pcie-tegra194.c
 +++ b/drivers/pci/controller/dwc/pcie-tegra194.c
 @@ -240,6 +240,8 @@ struct tegra_pcie_dw_of_data {
@@ -74,5 +74,5 @@ index a6bfe2aaf2103..304c0a9796b21 100644
  
  static const struct of_device_id tegra_pcie_dw_of_match[] = {
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/sauce/patches/0221-NVIDIA-SAUCE-PCI-tegra194-Disable-interrupt-before-l.patch b/features/tegra/sauce/patches/0221-NVIDIA-SAUCE-PCI-tegra194-Disable-interrupt-before-l.patch
index 93ba827..3fad67d 100644
--- a/features/tegra/sauce/patches/0221-NVIDIA-SAUCE-PCI-tegra194-Disable-interrupt-before-l.patch
+++ b/features/tegra/sauce/patches/0221-NVIDIA-SAUCE-PCI-tegra194-Disable-interrupt-before-l.patch
@@ -21,7 +21,7 @@ Reviewed-by: Prathamesh Shete <pshete@nvidia.com>
 Tested-by: Prathamesh Shete <pshete@nvidia.com>
 
 diff --git a/drivers/pci/controller/dwc/pcie-tegra194.c b/drivers/pci/controller/dwc/pcie-tegra194.c
-index 304c0a9796b21..02fd890b3ac02 100644
+index 304c0a9796b2..02fd890b3ac0 100644
 --- a/drivers/pci/controller/dwc/pcie-tegra194.c
 +++ b/drivers/pci/controller/dwc/pcie-tegra194.c
 @@ -2480,6 +2480,7 @@ static void tegra_pcie_dw_remove(struct platform_device *pdev)
@@ -55,5 +55,5 @@ index 304c0a9796b21..02fd890b3ac02 100644
  		tegra_pcie_unconfig_controller(pcie);
  		pm_runtime_put_sync(pcie->dev);
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/sauce/patches/0222-NVIDIA-SAUCE-PCI-tegra194-Remove-debugfs-if-link-up.patch b/features/tegra/sauce/patches/0222-NVIDIA-SAUCE-PCI-tegra194-Remove-debugfs-if-link-up.patch
index af04f19..1deddea 100644
--- a/features/tegra/sauce/patches/0222-NVIDIA-SAUCE-PCI-tegra194-Remove-debugfs-if-link-up.patch
+++ b/features/tegra/sauce/patches/0222-NVIDIA-SAUCE-PCI-tegra194-Remove-debugfs-if-link-up.patch
@@ -26,7 +26,7 @@ Reviewed-by: Laxman Dewangan <ldewangan@nvidia.com>
 Tested-by: Prathamesh Shete <pshete@nvidia.com>
 
 diff --git a/drivers/pci/controller/dwc/pcie-tegra194.c b/drivers/pci/controller/dwc/pcie-tegra194.c
-index 02fd890b3ac02..9792b055cd18c 100644
+index 02fd890b3ac0..9792b055cd18 100644
 --- a/drivers/pci/controller/dwc/pcie-tegra194.c
 +++ b/drivers/pci/controller/dwc/pcie-tegra194.c
 @@ -2623,7 +2623,6 @@ static void tegra_pcie_dw_shutdown(struct platform_device *pdev)
@@ -47,5 +47,5 @@ index 02fd890b3ac02..9792b055cd18c 100644
  		tegra_pcie_unconfig_controller(pcie);
  		pm_runtime_put_sync(pcie->dev);
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/sauce/patches/0223-NVIDIA-SAUCE-of-irq-Adjust-of_pci_irq-parsing-for-mu.patch b/features/tegra/sauce/patches/0223-NVIDIA-SAUCE-of-irq-Adjust-of_pci_irq-parsing-for-mu.patch
index 782c514..60582b2 100644
--- a/features/tegra/sauce/patches/0223-NVIDIA-SAUCE-of-irq-Adjust-of_pci_irq-parsing-for-mu.patch
+++ b/features/tegra/sauce/patches/0223-NVIDIA-SAUCE-of-irq-Adjust-of_pci_irq-parsing-for-mu.patch
@@ -24,7 +24,7 @@ Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
 Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
 
 diff --git a/drivers/pci/of.c b/drivers/pci/of.c
-index 3579265f11984..52a3eedfe5638 100644
+index 3579265f1198..52a3eedfe563 100644
 --- a/drivers/pci/of.c
 +++ b/drivers/pci/of.c
 @@ -474,9 +474,17 @@ static int of_irq_parse_pci(const struct pci_dev *pdev, struct of_phandle_args *
@@ -49,5 +49,5 @@ index 3579265f11984..52a3eedfe5638 100644
  
  	/*
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/sauce/patches/0224-NVIDIA-SAUCE-iommu-of-Fix-pci_request_acs-before-enu.patch b/features/tegra/sauce/patches/0224-NVIDIA-SAUCE-iommu-of-Fix-pci_request_acs-before-enu.patch
index 537e26e..71af865 100644
--- a/features/tegra/sauce/patches/0224-NVIDIA-SAUCE-iommu-of-Fix-pci_request_acs-before-enu.patch
+++ b/features/tegra/sauce/patches/0224-NVIDIA-SAUCE-iommu-of-Fix-pci_request_acs-before-enu.patch
@@ -22,7 +22,7 @@ Reviewed-by: Pritesh Raithatha <praithatha@nvidia.com>
 (cherry picked from commit 8ba39bd5f5498c53affe2e199290ecc4990cba19)
 
 diff --git a/drivers/iommu/of_iommu.c b/drivers/iommu/of_iommu.c
-index 6b989a62def20..c31369924944d 100644
+index 6b989a62def2..c31369924944 100644
 --- a/drivers/iommu/of_iommu.c
 +++ b/drivers/iommu/of_iommu.c
 @@ -141,7 +141,6 @@ int of_iommu_configure(struct device *dev, struct device_node *master_np,
@@ -34,7 +34,7 @@ index 6b989a62def20..c31369924944d 100644
  					     of_pci_iommu_init, &info);
  		of_pci_check_device_ats(dev, master_np);
 diff --git a/drivers/pci/of.c b/drivers/pci/of.c
-index 52a3eedfe5638..8ecd72fa318cf 100644
+index 52a3eedfe563..8ecd72fa318c 100644
 --- a/drivers/pci/of.c
 +++ b/drivers/pci/of.c
 @@ -646,9 +646,15 @@ static int pci_parse_request_of_pci_ranges(struct device *dev,
@@ -55,5 +55,5 @@ index 52a3eedfe5638..8ecd72fa318cf 100644
  	bridge->map_irq = of_irq_parse_and_map_pci;
  
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/sauce/patches/0225-NVIDIA-SAUCE-PCI-of-Use-of_property_present.patch b/features/tegra/sauce/patches/0225-NVIDIA-SAUCE-PCI-of-Use-of_property_present.patch
index cb25e2f..cc6f1c9 100644
--- a/features/tegra/sauce/patches/0225-NVIDIA-SAUCE-PCI-of-Use-of_property_present.patch
+++ b/features/tegra/sauce/patches/0225-NVIDIA-SAUCE-PCI-of-Use-of_property_present.patch
@@ -28,7 +28,7 @@ GVS: buildbot_gerritrpt <buildbot_gerritrpt@nvidia.com>
 (cherry picked from commit 3a955f68fd3c02b814a44823679f1f9807299940)
 
 diff --git a/drivers/pci/of.c b/drivers/pci/of.c
-index 8ecd72fa318cf..568e73c71544e 100644
+index 8ecd72fa318c..568e73c71544 100644
 --- a/drivers/pci/of.c
 +++ b/drivers/pci/of.c
 @@ -652,7 +652,7 @@ int devm_of_pci_bridge_init(struct device *dev, struct pci_host_bridge *bridge)
@@ -41,5 +41,5 @@ index 8ecd72fa318cf..568e73c71544e 100644
  
  	bridge->swizzle_irq = pci_common_swizzle;
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/sauce/patches/0226-NVIDIA-SAUCE-PCI-Add-quirk-to-mask-AER-receiver-erro.patch b/features/tegra/sauce/patches/0226-NVIDIA-SAUCE-PCI-Add-quirk-to-mask-AER-receiver-erro.patch
index 0238f1d..b2c96a6 100644
--- a/features/tegra/sauce/patches/0226-NVIDIA-SAUCE-PCI-Add-quirk-to-mask-AER-receiver-erro.patch
+++ b/features/tegra/sauce/patches/0226-NVIDIA-SAUCE-PCI-Add-quirk-to-mask-AER-receiver-erro.patch
@@ -33,7 +33,7 @@ Reviewed-by: Robert Lin <robelin@nvidia.com>
 (cherry picked from commit 458f31b6eab3ffe60c148802709eff618c8c9b15)
 
 diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c
-index fb529b7034ffe..fbfeb451e50ab 100644
+index fb529b7034ff..fbfeb451e50a 100644
 --- a/drivers/pci/quirks.c
 +++ b/drivers/pci/quirks.c
 @@ -6373,3 +6373,50 @@ static void pci_mask_replay_timer_timeout(struct pci_dev *pdev)
@@ -88,5 +88,5 @@ index fb529b7034ffe..fbfeb451e50ab 100644
 +DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_REALTEK, PCI_DEVICE_ID_REALTEK_RTL8126,
 +			quirk_realtek_mask_aer_rcv_err);
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/sauce/patches/0227-NVIDIA-SAUCE-PCI-tegra194-Fix-stop_link-callback-to-.patch b/features/tegra/sauce/patches/0227-NVIDIA-SAUCE-PCI-tegra194-Fix-stop_link-callback-to-.patch
index abad35b..ec6fe17 100644
--- a/features/tegra/sauce/patches/0227-NVIDIA-SAUCE-PCI-tegra194-Fix-stop_link-callback-to-.patch
+++ b/features/tegra/sauce/patches/0227-NVIDIA-SAUCE-PCI-tegra194-Fix-stop_link-callback-to-.patch
@@ -26,7 +26,7 @@ Reviewed-by: Nagarjuna Kristam <nkristam@nvidia.com>
 (cherry picked from commit 14c36a34b8a89bcbf7db9af536de4e937b5f899a)
 
 diff --git a/drivers/pci/controller/dwc/pcie-tegra194.c b/drivers/pci/controller/dwc/pcie-tegra194.c
-index 9792b055cd18c..bb96b14a37372 100644
+index 9792b055cd18..bb96b14a3737 100644
 --- a/drivers/pci/controller/dwc/pcie-tegra194.c
 +++ b/drivers/pci/controller/dwc/pcie-tegra194.c
 @@ -4,7 +4,7 @@
@@ -51,5 +51,5 @@ index 9792b055cd18c..bb96b14a37372 100644
  
  static const struct dw_pcie_ops tegra_dw_pcie_ops = {
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/sauce/patches/0228-NVIDIA-SAUCE-PCI-DOE-Increase-DOE-timeout.patch b/features/tegra/sauce/patches/0228-NVIDIA-SAUCE-PCI-DOE-Increase-DOE-timeout.patch
index 73b68da..12f7763 100644
--- a/features/tegra/sauce/patches/0228-NVIDIA-SAUCE-PCI-DOE-Increase-DOE-timeout.patch
+++ b/features/tegra/sauce/patches/0228-NVIDIA-SAUCE-PCI-DOE-Increase-DOE-timeout.patch
@@ -22,7 +22,7 @@ Reviewed-by: Manikanta Maddireddy <mmaddireddy@nvidia.com>
 (cherry picked from commit e9a584694b502653b5e024fd5f0043dad13acaab)
 
 diff --git a/drivers/pci/doe.c b/drivers/pci/doe.c
-index aae9a8a00406e..3d521f4b0b349 100644
+index aae9a8a00406..3d521f4b0b34 100644
 --- a/drivers/pci/doe.c
 +++ b/drivers/pci/doe.c
 @@ -27,7 +27,7 @@
@@ -35,5 +35,5 @@ index aae9a8a00406e..3d521f4b0b349 100644
  
  #define PCI_DOE_FLAG_CANCEL	0
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/sauce/patches/0229-NVIDIA-SAUCE-pci-Add-wait-for-link-condition-before-.patch b/features/tegra/sauce/patches/0229-NVIDIA-SAUCE-pci-Add-wait-for-link-condition-before-.patch
index 5421fce..cd740bd 100644
--- a/features/tegra/sauce/patches/0229-NVIDIA-SAUCE-pci-Add-wait-for-link-condition-before-.patch
+++ b/features/tegra/sauce/patches/0229-NVIDIA-SAUCE-pci-Add-wait-for-link-condition-before-.patch
@@ -21,7 +21,7 @@ GVS: buildbot_gerritrpt <buildbot_gerritrpt@nvidia.com>
 (cherry picked from commit fb1e51d564de59d55a4c008f820ab33f678c6e98)
 
 diff --git a/drivers/pci/controller/pci-host-common.c b/drivers/pci/controller/pci-host-common.c
-index 422c2c4600173..b6961956faa91 100644
+index 422c2c460017..b6961956faa9 100644
 --- a/drivers/pci/controller/pci-host-common.c
 +++ b/drivers/pci/controller/pci-host-common.c
 @@ -13,7 +13,11 @@
@@ -122,5 +122,5 @@ index 422c2c4600173..b6961956faa91 100644
  	bridge->sysdata = cfg;
  	bridge->ops = (struct pci_ops *)&ops->pci_ops;
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/sauce/patches/0230-NVIDIA-SAUCE-pci-Mask-ADV-NF-AER-for-Pericom-switch.patch b/features/tegra/sauce/patches/0230-NVIDIA-SAUCE-pci-Mask-ADV-NF-AER-for-Pericom-switch.patch
index 7de8344..3991a16 100644
--- a/features/tegra/sauce/patches/0230-NVIDIA-SAUCE-pci-Mask-ADV-NF-AER-for-Pericom-switch.patch
+++ b/features/tegra/sauce/patches/0230-NVIDIA-SAUCE-pci-Mask-ADV-NF-AER-for-Pericom-switch.patch
@@ -20,7 +20,7 @@ Reviewed-by: Brad Griffis <bgriffis@nvidia.com>
 (cherry picked from commit dd3ce51ee801d8cb3ff8f397ab07cc248332fc6c)
 
 diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c
-index fbfeb451e50ab..0be4a1624857e 100644
+index fbfeb451e50a..0be4a1624857 100644
 --- a/drivers/pci/quirks.c
 +++ b/drivers/pci/quirks.c
 @@ -6420,3 +6420,36 @@ static void quirk_realtek_mask_aer_rcv_err(struct pci_dev *dev)
@@ -61,5 +61,5 @@ index fbfeb451e50ab..0be4a1624857e 100644
 +DECLARE_PCI_FIXUP_RESUME(PCI_VENDOR_ID_PERICOM, 0x2608,
 +			 quirk_pericom_mask_aer_adv_nonfatal);
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/sauce/patches/0231-NVIDIA-SAUCE-PCI-tegra194-Disable-pex_rst_irq-only-i.patch b/features/tegra/sauce/patches/0231-NVIDIA-SAUCE-PCI-tegra194-Disable-pex_rst_irq-only-i.patch
index 9d7086f..d0a65a1 100644
--- a/features/tegra/sauce/patches/0231-NVIDIA-SAUCE-PCI-tegra194-Disable-pex_rst_irq-only-i.patch
+++ b/features/tegra/sauce/patches/0231-NVIDIA-SAUCE-PCI-tegra194-Disable-pex_rst_irq-only-i.patch
@@ -25,7 +25,7 @@ Tested-by: Prathamesh Shete <pshete@nvidia.com>
 (cherry picked from commit 5c5d7f5605fd989b0fa5cd0b16c0b712a1bf1556)
 
 diff --git a/drivers/pci/controller/dwc/pcie-tegra194.c b/drivers/pci/controller/dwc/pcie-tegra194.c
-index bb96b14a37372..23db64b402557 100644
+index bb96b14a3737..23db64b40255 100644
 --- a/drivers/pci/controller/dwc/pcie-tegra194.c
 +++ b/drivers/pci/controller/dwc/pcie-tegra194.c
 @@ -2526,6 +2526,16 @@ static int tegra_pcie_dw_suspend_late(struct device *dev)
@@ -46,5 +46,5 @@ index bb96b14a37372..23db64b402557 100644
  		return 0;
  
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/sauce/patches/0232-NVIDIA-SAUCE-PCI-Add-support-for-PEX-WAKE-GPIO.patch b/features/tegra/sauce/patches/0232-NVIDIA-SAUCE-PCI-Add-support-for-PEX-WAKE-GPIO.patch
index c781d30..79cbf0c 100644
--- a/features/tegra/sauce/patches/0232-NVIDIA-SAUCE-PCI-Add-support-for-PEX-WAKE-GPIO.patch
+++ b/features/tegra/sauce/patches/0232-NVIDIA-SAUCE-PCI-Add-support-for-PEX-WAKE-GPIO.patch
@@ -29,7 +29,7 @@ Reviewed-by: Jon Hunter <jonathanh@nvidia.com>
 (cherry picked from commit cd3994cc8533ed624016c837cad155cfabb2f84c)
 
 diff --git a/drivers/pci/controller/dwc/pcie-tegra194.c b/drivers/pci/controller/dwc/pcie-tegra194.c
-index 23db64b402557..7f6641d747a25 100644
+index 23db64b40255..7f6641d747a2 100644
 --- a/drivers/pci/controller/dwc/pcie-tegra194.c
 +++ b/drivers/pci/controller/dwc/pcie-tegra194.c
 @@ -291,6 +291,8 @@ struct tegra_pcie_dw {
@@ -105,5 +105,5 @@ index 23db64b402557..7f6641d747a25 100644
  	if (ret < 0)
  		return ret;
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/sauce/patches/0233-NVIDIA-SAUCE-PCI-MSI-Skip-EP-register-access-when-de.patch b/features/tegra/sauce/patches/0233-NVIDIA-SAUCE-PCI-MSI-Skip-EP-register-access-when-de.patch
index 647af7b..5f7555c 100644
--- a/features/tegra/sauce/patches/0233-NVIDIA-SAUCE-PCI-MSI-Skip-EP-register-access-when-de.patch
+++ b/features/tegra/sauce/patches/0233-NVIDIA-SAUCE-PCI-MSI-Skip-EP-register-access-when-de.patch
@@ -48,7 +48,7 @@ Reviewed-by: Prathamesh Shete <pshete@nvidia.com>
 (cherry picked from commit 82ecac18ee019d77d2118d4f951fe1e2ec4cac8d)
 
 diff --git a/drivers/pci/msi/msi.c b/drivers/pci/msi/msi.c
-index e010ecd9f90dd..2124ce0ffd08c 100644
+index 34d664139f48..a4ae2d29e8ba 100644
 --- a/drivers/pci/msi/msi.c
 +++ b/drivers/pci/msi/msi.c
 @@ -117,7 +117,8 @@ void pci_msi_update_mask(struct msi_desc *desc, u32 clear, u32 set)
@@ -70,7 +70,7 @@ index e010ecd9f90dd..2124ce0ffd08c 100644
  		return;
  
  	entry = irq_get_msi_desc(dev->irq);
-@@ -863,7 +864,7 @@ void __pci_restore_msix_state(struct pci_dev *dev)
+@@ -861,7 +862,7 @@ void __pci_restore_msix_state(struct pci_dev *dev)
  	struct msi_desc *entry;
  	bool write_msg;
  
@@ -80,7 +80,7 @@ index e010ecd9f90dd..2124ce0ffd08c 100644
  
  	/* route the table */
 diff --git a/drivers/pci/msi/msi.h b/drivers/pci/msi/msi.h
-index 0b420b319f50f..cbbbf38225bf4 100644
+index 0b420b319f50..cbbbf38225bf 100644
 --- a/drivers/pci/msi/msi.h
 +++ b/drivers/pci/msi/msi.h
 @@ -42,6 +42,8 @@ static inline void pci_msix_write_vector_ctrl(struct msi_desc *desc, u32 ctrl)
@@ -102,5 +102,5 @@ index 0b420b319f50f..cbbbf38225bf4 100644
  	pci_msix_write_vector_ctrl(desc, desc->pci.msix_ctrl);
  }
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/sauce/patches/0234-NVIDIA-SAUCE-PCI-tegra194-Add-HSI-support.patch b/features/tegra/sauce/patches/0234-NVIDIA-SAUCE-PCI-tegra194-Add-HSI-support.patch
index c540061..8a54dd2 100644
--- a/features/tegra/sauce/patches/0234-NVIDIA-SAUCE-PCI-tegra194-Add-HSI-support.patch
+++ b/features/tegra/sauce/patches/0234-NVIDIA-SAUCE-PCI-tegra194-Add-HSI-support.patch
@@ -18,7 +18,7 @@ Reviewed-by: Abhilash G <abhilashg@nvidia.com>
 Reviewed-by: Laxman Dewangan <ldewangan@nvidia.com>
 
 diff --git a/drivers/pci/controller/dwc/pcie-tegra194.c b/drivers/pci/controller/dwc/pcie-tegra194.c
-index 7f6641d747a25..ec5404a918a42 100644
+index 7f6641d747a2..ec5404a918a4 100644
 --- a/drivers/pci/controller/dwc/pcie-tegra194.c
 +++ b/drivers/pci/controller/dwc/pcie-tegra194.c
 @@ -29,6 +29,12 @@
@@ -881,5 +881,5 @@ index 7f6641d747a25..ec5404a918a42 100644
  	if (pcie->of_data->mode == DW_PCIE_RC_TYPE) {
  		disable_irq(pcie->prsnt_irq);
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/sauce/patches/0235-NVIDIA-SAUCE-PCI-tegra194-Fix-core_clk-rate-set.patch b/features/tegra/sauce/patches/0235-NVIDIA-SAUCE-PCI-tegra194-Fix-core_clk-rate-set.patch
index d829d53..54b06d2 100644
--- a/features/tegra/sauce/patches/0235-NVIDIA-SAUCE-PCI-tegra194-Fix-core_clk-rate-set.patch
+++ b/features/tegra/sauce/patches/0235-NVIDIA-SAUCE-PCI-tegra194-Fix-core_clk-rate-set.patch
@@ -17,7 +17,7 @@ GVS: buildbot_gerritrpt <buildbot_gerritrpt@nvidia.com>
 (cherry picked from commit 2ae4a174492ae5d0f1ade8778551ce10cfdb6696)
 
 diff --git a/drivers/pci/controller/dwc/pcie-tegra194.c b/drivers/pci/controller/dwc/pcie-tegra194.c
-index ec5404a918a42..5ff623b4ba83f 100644
+index ec5404a918a4..5ff623b4ba83 100644
 --- a/drivers/pci/controller/dwc/pcie-tegra194.c
 +++ b/drivers/pci/controller/dwc/pcie-tegra194.c
 @@ -458,7 +458,8 @@ static void tegra_pcie_icc_set(struct tegra_pcie_dw *pcie)
@@ -52,5 +52,5 @@ index ec5404a918a42..5ff623b4ba83f 100644
  
  	return IRQ_HANDLED;
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/sauce/patches/0236-NVIDIA-SAUCE-pci-Move-dw_pcie_ep_linkup-to-threaded_.patch b/features/tegra/sauce/patches/0236-NVIDIA-SAUCE-pci-Move-dw_pcie_ep_linkup-to-threaded_.patch
index 32bfc7a..dd5c571 100644
--- a/features/tegra/sauce/patches/0236-NVIDIA-SAUCE-pci-Move-dw_pcie_ep_linkup-to-threaded_.patch
+++ b/features/tegra/sauce/patches/0236-NVIDIA-SAUCE-pci-Move-dw_pcie_ep_linkup-to-threaded_.patch
@@ -27,7 +27,7 @@ Reviewed-by: Nagarjuna Kristam <nkristam@nvidia.com>
 (cherry picked from commit 6fcabce96ac8ebd9c01d4618cfde0f617d392115)
 
 diff --git a/drivers/pci/controller/dwc/pcie-tegra194.c b/drivers/pci/controller/dwc/pcie-tegra194.c
-index 5ff623b4ba83f..c1c6c99799c70 100644
+index 5ff623b4ba83..c1c6c99799c7 100644
 --- a/drivers/pci/controller/dwc/pcie-tegra194.c
 +++ b/drivers/pci/controller/dwc/pcie-tegra194.c
 @@ -384,9 +384,9 @@ struct tegra_pcie_dw {
@@ -168,5 +168,5 @@ index 5ff623b4ba83f..c1c6c99799c70 100644
  		}
  		spurious = 0;
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/sauce/patches/0237-NVIDIA-SAUCE-tee-optee-ffa-add-static-shared-memory-.patch b/features/tegra/sauce/patches/0237-NVIDIA-SAUCE-tee-optee-ffa-add-static-shared-memory-.patch
index 85f5c72..5dd65cb 100644
--- a/features/tegra/sauce/patches/0237-NVIDIA-SAUCE-tee-optee-ffa-add-static-shared-memory-.patch
+++ b/features/tegra/sauce/patches/0237-NVIDIA-SAUCE-tee-optee-ffa-add-static-shared-memory-.patch
@@ -30,7 +30,7 @@ GVS: buildbot_gerritrpt <buildbot_gerritrpt@nvidia.com>
 (cherry picked from commit cf5f46ac81e4458685d055a810d6df68f4301480)
 
 diff --git a/drivers/tee/optee/ffa_abi.c b/drivers/tee/optee/ffa_abi.c
-index bf8390789ecf8..0273274202873 100644
+index bf8390789ecf..027327420287 100644
 --- a/drivers/tee/optee/ffa_abi.c
 +++ b/drivers/tee/optee/ffa_abi.c
 @@ -18,6 +18,23 @@
@@ -342,7 +342,7 @@ index bf8390789ecf8..0273274202873 100644
  		rc = PTR_ERR(pool);
  		goto err_free_optee;
 diff --git a/drivers/tee/optee/optee_ffa.h b/drivers/tee/optee/optee_ffa.h
-index cc257e7956a31..1a46177397ede 100644
+index cc257e7956a3..1a46177397ed 100644
 --- a/drivers/tee/optee/optee_ffa.h
 +++ b/drivers/tee/optee/optee_ffa.h
 @@ -96,6 +96,8 @@
@@ -355,7 +355,7 @@ index cc257e7956a31..1a46177397ede 100644
  #define OPTEE_FFA_EXCHANGE_CAPABILITIES OPTEE_FFA_BLOCKING_CALL(2)
  
 diff --git a/drivers/tee/optee/optee_private.h b/drivers/tee/optee/optee_private.h
-index db9ea673fbca1..0562764d7cfdc 100644
+index db9ea673fbca..0562764d7cfd 100644
 --- a/drivers/tee/optee/optee_private.h
 +++ b/drivers/tee/optee/optee_private.h
 @@ -158,6 +158,12 @@ struct optee_smc {
@@ -383,5 +383,5 @@ index db9ea673fbca1..0562764d7cfdc 100644
  
  struct optee;
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/sauce/patches/0238-NVIDIA-SAUCE-gpio-tegra186-enable-interrupt-for-all-.patch b/features/tegra/sauce/patches/0238-NVIDIA-SAUCE-gpio-tegra186-enable-interrupt-for-all-.patch
index a6514bd..ced2f39 100644
--- a/features/tegra/sauce/patches/0238-NVIDIA-SAUCE-gpio-tegra186-enable-interrupt-for-all-.patch
+++ b/features/tegra/sauce/patches/0238-NVIDIA-SAUCE-gpio-tegra186-enable-interrupt-for-all-.patch
@@ -12,7 +12,7 @@ Reviewed-by: Bitan Biswas <bbiswas@nvidia.com>
 Reviewed-on: https://git-master.nvidia.com/r/c/linux-stable/+/2892801
 
 diff --git a/drivers/gpio/gpio-tegra186.c b/drivers/gpio/gpio-tegra186.c
-index 24a45d383ff2d..e667e9f80bf6e 100644
+index 24a45d383ff2..e667e9f80bf6 100644
 --- a/drivers/gpio/gpio-tegra186.c
 +++ b/drivers/gpio/gpio-tegra186.c
 @@ -1007,27 +1007,8 @@ static int tegra186_gpio_probe(struct platform_device *pdev)
@@ -46,5 +46,5 @@ index 24a45d383ff2d..e667e9f80bf6e 100644
  	if (gpio->soc->num_irqs_per_bank > 1)
  		tegra186_gpio_init_route_mapping(gpio);
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/sauce/patches/0239-NVIDIA-SAUCE-gpio-tegra186-fix-pinctrl-for-multi-soc.patch b/features/tegra/sauce/patches/0239-NVIDIA-SAUCE-gpio-tegra186-fix-pinctrl-for-multi-soc.patch
index 6691e7b..cf231e3 100644
--- a/features/tegra/sauce/patches/0239-NVIDIA-SAUCE-gpio-tegra186-fix-pinctrl-for-multi-soc.patch
+++ b/features/tegra/sauce/patches/0239-NVIDIA-SAUCE-gpio-tegra186-fix-pinctrl-for-multi-soc.patch
@@ -20,7 +20,7 @@ Signed-off-by: Jon Hunter <jonathanh@nvidia.com>
 Change-Id: I9ccb8766073fd7274262e5c8e0af734d2f6b60a3
 
 diff --git a/drivers/gpio/gpio-tegra186.c b/drivers/gpio/gpio-tegra186.c
-index e667e9f80bf6e..da07424bb6dce 100644
+index e667e9f80bf6..da07424bb6dc 100644
 --- a/drivers/gpio/gpio-tegra186.c
 +++ b/drivers/gpio/gpio-tegra186.c
 @@ -478,7 +478,7 @@ static int tegra186_gpio_add_pin_ranges(struct gpio_chip *chip)
@@ -33,5 +33,5 @@ index e667e9f80bf6e..da07424bb6dce 100644
  		return -ENODEV;
  
 -- 
-2.43.0
+2.55.0
 
diff --git a/features/tegra/sauce/patches/0240-Revert-NVIDIA-SAUCE-soc-tegra-pmc-Multi-socket-suppo.patch b/features/tegra/sauce/patches/0240-Revert-NVIDIA-SAUCE-soc-tegra-pmc-Multi-socket-suppo.patch
index 6dd2d26..839f2be 100644
--- a/features/tegra/sauce/patches/0240-Revert-NVIDIA-SAUCE-soc-tegra-pmc-Multi-socket-suppo.patch
+++ b/features/tegra/sauce/patches/0240-Revert-NVIDIA-SAUCE-soc-tegra-pmc-Multi-socket-suppo.patch
@@ -12,7 +12,7 @@ Signed-off-by: Jon Hunter <jonathanh@nvidia.com>
 Change-Id: I6550815c14cfa0aaa5570eb4849f7aa359c63916
 
 diff --git a/drivers/soc/tegra/pmc.c b/drivers/soc/tegra/pmc.c
-index cf4c7cf6b7571..11682a9f4dd9c 100644
+index cf4c7cf6b757..11682a9f4dd9 100644
 --- a/drivers/soc/tegra/pmc.c
 +++ b/drivers/soc/tegra/pmc.c
 @@ -3163,78 +3163,6 @@ static void tegra_pmc_reset_suspend_mode(void *data)
@@ -106,5 +106,5 @@ index cf4c7cf6b7571..11682a9f4dd9c 100644
  	if (err < 0)
  		return dev_err_probe(&pdev->dev, err, "failed to parse DT\n");
 -- 
-2.43.0
+2.55.0